X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmmu.cpp;h=67c9b8ab7d7705f88c3c2ee2d0b394e08a956108;hb=685bb45b7766e8a12cd0de8ee486b9a61183c425;hp=9f9380e47c206c944175ac9b0b7440d6075d5c07;hpb=94e1e961b57f253b760298ab0bae96a7de6d20fa;p=virtualjaguar

diff --git a/src/mmu.cpp b/src/mmu.cpp
index 9f9380e..67c9b8a 100644
--- a/src/mmu.cpp
+++ b/src/mmu.cpp
@@ -3,9 +3,9 @@
 //
 // Jaguar Memory Manager Unit
 //
-// by James L. Hammons
+// by James Hammons
 //
-// JLH = James L. Hammons
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // WHO  WHEN        WHAT
 // ---  ----------  -----------------------------------------------------------
@@ -18,6 +18,7 @@
 #include "dac.h"
 //#include "jaguar.h"
 //#include "memory.h"
+#include "jagbios.h"
 #include "wavetable.h"
 
 /*
@@ -160,7 +161,7 @@ The approach here is to have a list of addresses and who handles them. Could be
 a one-to-one memory location up to a range for each function. Will look
 something like this:
 
-	{ 0xF14000, 0xF14001, MM_IO, JoystickReadHanlder, JoystickWriteHandler },
+	{ 0xF14000, 0xF14001, MM_IO, JoystickReadHandler, JoystickWriteHandler },
 
 Would be nice to have a way of either calling a handler function or reading/writing
 directly to/from a variable or array...
@@ -211,7 +212,7 @@ MemDesc memoryMap[] = {
 	{ 0xDFFF28, 0xDFFF2B, MM_IO,   &i2sdat2 }, // i2s FIFO data (old)
 	{ 0xDFFF2C, 0xDFFF2F, MM_IO,   &unknown }, // Seems to be some sort of I2S interface
 
-	{ 0xE00000, 0xE3FFFF, MM_ROM,  jaguarBootROM },
+	{ 0xE00000, 0xE1FFFF, MM_ROM,  jaguarBootROM },
 
 	// TOM REGISTERS
 
@@ -250,9 +251,11 @@ MemDesc memoryMap[] = {
 	{ 0xF00058, 0xF0005B, MM_IO_W, &bg }, // BG			Background Colour					F00058		WO
 	{ 0xF000E0, 0xF000E1, MM_IO,   &int1 }, // INT1		CPU Interrupt Control Register		F000E0		RW
 	{ 0xF000E2, 0xF000E3, MM_IO_W, &int2 }, // INT2		CPU Interrupt Resume Register		F000E2		WO
-	{ 0xF00400, 0xF005FF, MM_RAM,  &clut }, // CLUT		Colour Look-Up Table				F00400-7FE	RW
-	{ 0xF00600, 0xF007FF, MM_RAM,  &clut },
-	{ 0xF00800, 0xF01D9F, MM_RAM,  &lbuf }, // LBUF		Line Buffer							F00800-1D9E	RW
+//Some of these RAM spaces may be 16- or 32-bit only... in which case, we need
+//to cast appropriately (in memory.cpp, that is)...
+	{ 0xF00400, 0xF005FF, MM_RAM,  clut }, // CLUT		Colour Look-Up Table				F00400-7FE	RW
+	{ 0xF00600, 0xF007FF, MM_RAM,  clut },
+	{ 0xF00800, 0xF01D9F, MM_RAM,  lbuf }, // LBUF		Line Buffer							F00800-1D9E	RW
 //Need high speed RAM interface for GPU & DSP (we have it now...)
 
 	// GPU REGISTERS
@@ -320,7 +323,7 @@ MemDesc memoryMap[] = {
 
 	// JERRY REGISTERS
 
-	{ 0xF10000, 0xF10002, MM_IO_W, &jpit1 }, // JPIT1		Timer 1 Pre-scaler					F10000		WO
+	{ 0xF10000, 0xF10001, MM_IO_W, &jpit1 }, // JPIT1		Timer 1 Pre-scaler					F10000		WO
 	{ 0xF10002, 0xF10003, MM_IO_W, &jpit2 }, // JPIT2		Timer 1 Divider						F10002		WO
 	{ 0xF10004, 0xF10005, MM_IO_W, &jpit3 }, // JPIT3		Timer 2 Pre-scaler					F10004		WO
 	{ 0xF10006, 0xF10007, MM_IO_W, &jpit4 }, // JPIT4		Timer 2 Divider						F10006		WO