fk23c fixes

trunk/src/boards/fk23c.cpp

@@ -34,20 +34,16 @@ static void BMCFK23CCW(uint32 A, uint8 V)
 		setchr8(EXPREGS[2]|unromchr);
 	else if(EXPREGS[0]&0x20) {
 		setchr1r(0x10, A, V);
-  }
+	} else {
-  else
-  {
 		uint16 base=(EXPREGS[2]&0x7F)<<3;
-    if(EXPREGS[3]&2)
+		if(EXPREGS[3]&2) {
-    {
 			int cbase=(MMC3_cmd&0x80)<<5;
 			setchr1(A,V|base);
 			setchr1(0x0000^cbase,DRegBuf[0]|base);
 			setchr1(0x0400^cbase,EXPREGS[6]|base);
 			setchr1(0x0800^cbase,DRegBuf[1]|base);
 			setchr1(0x0c00^cbase,EXPREGS[7]|base);
-    }
+		} else
-    else
 			setchr1(A,V|base);
 	}
 }
@@ -90,30 +86,28 @@ static void BMCFK23CPW(uint32 A, uint8 V)
 	uint32 hiblock = ((EXPREGS[0] & 8) << 4)|((EXPREGS[0] & 0x80) << 1)|(UNIFchrrama?((EXPREGS[2] & 0x40)<<3):0);
 	uint32 block = (EXPREGS[1] & 0x60) | hiblock;
 	uint32 extra = (EXPREGS[3] & 2);
+//			 FCEU_printf("0:%04X:%02X\n",A,V);
 
 	if((EXPREGS[0]&7)==4)
 		setprg32(0x8000,EXPREGS[1]>>1);
-  else if ((EXPREGS[0]&7)==3)
+	else if ((EXPREGS[0]&7)==3) {
-  {
 		setprg16(0x8000,EXPREGS[1]);
 		setprg16(0xC000,EXPREGS[1]);
-  }  
+	} else {
-  else
+		if(EXPREGS[0]&3) {
-  { 
-    if(EXPREGS[0]&3)
-		{
 			uint32 blocksize = (6)-(EXPREGS[0]&3);
 			uint32 mask = (1<<blocksize)-1;
 			V &= mask;
 			//V &= 63; //? is this a good idea?
 			V |= (EXPREGS[1]<<1);
+//			FCEU_printf("1:%04X:%02X\n",A,V);
 			setprg8(A,V);
-		}
+		} else {
-    else
 			setprg8(A,V & prg_mask);
+//			FCEU_printf("2:%04X:%02X\n",A,V);
+		}
 
-    if(EXPREGS[3]&2)
+		if(EXPREGS[3]&2) {
-    {
 			setprg8(0xC000,EXPREGS[4]);
 			setprg8(0xE000,EXPREGS[5]);
 		}
@@ -124,25 +118,23 @@ static void BMCFK23CPW(uint32 A, uint8 V)
 //PRG handler ($8000-$FFFF)
 static DECLFW(BMCFK23CHiWrite)
 {
-	if(EXPREGS[0]&0x40)
+//	FCEU_printf("K4:(exp0=%02x)\n",EXPREGS[0]);
-	{
+//	FCEU_printf("W0:%04X:%02X (exp0=%02x)\n",A,V,EXPREGS[0]);
+	if((EXPREGS[0]&0x60)==0x40) {
+//		FCEU_printf("W2:%04X:%02X (exp0=%02x)\n",A,V,EXPREGS[0]);
 		if(EXPREGS[0]&0x30)
 			unromchr=0;
-		else
+		else {
-		{
 			unromchr=V&3;
 			FixMMC3CHR(MMC3_cmd);
 		}
-	}
+	} else {
-	else
+		if((A==0x8001)&&(EXPREGS[3]&2)&&(MMC3_cmd&8)) {
-	{
+//			FCEU_printf("W3:%04X:%02X (exp0=%02x)\n",A,V,EXPREGS[0]);
-		if((A==0x8001)&&(EXPREGS[3]&2&&MMC3_cmd&8))
-		{
 			EXPREGS[4|(MMC3_cmd&3)]=V;
 			FixMMC3PRG(MMC3_cmd);
 			FixMMC3CHR(MMC3_cmd);
-		}
+		} else
-    else
 			if(A<0xC000) {
 				if(UNIFchrrama) {	// hacky... strange behaviour, must be bit scramble due to pcb layot restrictions
 									// check if it not interfer with other dumps
@@ -151,44 +143,48 @@ static DECLFW(BMCFK23CHiWrite)
 					else if((A==0x8000)&&(V==0x47))
 						V=0x46;
 				}
+//				FCEU_printf("W1:%04X:%02X\n",A,V);
 				MMC3_CMDWrite(A,V);
 				FixMMC3PRG(MMC3_cmd);
-      }
+			} else {
-      else
 				MMC3_IRQWrite(A,V);
+//				FCEU_printf("W4:%04X:%02X (exp0=%02x)\n",A,V,EXPREGS[0]);
+			}
 	}
 }
 
 //EXP handler ($5000-$5FFF)
 static DECLFW(BMCFK23CWrite)
 {
-  if(A&(1<<(dipswitch+4)))
+	if(A&(1<<(dipswitch+4))) {
-  {
 		//printf("+ ");
 		EXPREGS[A&3]=V;
 
+//		BUT WHY is there any rom that need it actually?
 		bool remap = false;
+//		FCEU_printf("K3:(exp0=%02x)\n",EXPREGS[0]);
+//		FCEU_printf("WH0:%04X:%02X\n",A,V);
 
 		//sometimes writing to reg0 causes remappings to occur. we think the 2 signifies this.
 		//if not, 0x24 is a value that is known to work
 		//however, the low 4 bits are known to control the mapping mode, so 0x20 is more likely to be the immediate remap flag
-		remap |= ((EXPREGS[0]&0xF0)==0x20); 
+//		remap |= ((EXPREGS[0]&0xF0)==0x20);
 
 		//this is an actual mapping reg. i think reg0 controls what happens when reg1 is written. anyway, we have to immediately remap these
-		remap |= (A&3)==1; 
+//		remap |= (A&3)==1;
 		//this too.
-		remap |= (A&3)==2; 
+//		remap |= (A&3)==2;
 
-		if(remap)
+//		if(remap) {
-		{
+//			FCEU_printf("WH1:%04X:%02X\n",A,V);
 			FixMMC3PRG(MMC3_cmd);
 			FixMMC3CHR(MMC3_cmd);
-		}
+//		}
 	}
 
-	if(is_BMCFK23CA)
+	if(is_BMCFK23CA) {
-	{
 		if(EXPREGS[3]&2)
+//			FCEU_printf("EXTRA!\n",A);
 			EXPREGS[0] &= ~7;	// hacky hacky! if someone wants extra banking, then for sure doesn't want mode 4 for it! (allow to run A version boards on normal mapper)
 	}
 
@@ -199,13 +195,15 @@ static DECLFW(BMCFK23CWrite)
 static void BMCFK23CReset(void)
 {
 	//NOT NECESSARY ANYMORE
+	// BUT WHY?
 	//this little hack makes sure that we try all the dip switch settings eventually, if we reset enough
-	// dipswitch++;
+	 dipswitch++;
-	// dipswitch&=7;
+	 dipswitch&=7;
-	//printf("BMCFK23C dipswitch set to %d\n",dipswitch);
+	printf("BMCFK23C dipswitch set to %d\n",dipswitch);
 
 	EXPREGS[0]=EXPREGS[1]=EXPREGS[2]=EXPREGS[3]=0;
 	EXPREGS[4]=EXPREGS[5]=EXPREGS[6]=EXPREGS[7]=0xFF;
+//	FCEU_printf("K0:(exp0=%02x)\n",EXPREGS[0]);
 	MMC3RegReset();
 	FixMMC3PRG(MMC3_cmd);
 	FixMMC3CHR(MMC3_cmd);
@@ -213,15 +211,15 @@ static void BMCFK23CReset(void)
 
 static void BMCFK23CPower(void)
 {
-	dipswitch = 0;
 	GenMMC3Power();
+	dipswitch = 0;
 	EXPREGS[0]=EXPREGS[1]=EXPREGS[2]=EXPREGS[3]=0;
 	EXPREGS[4]=EXPREGS[5]=EXPREGS[6]=EXPREGS[7]=0xFF;
-  GenMMC3Power();
+//	FCEU_printf("K1:(exp0=%02x)\n",EXPREGS[0]);
-  SetWriteHandler(0x5000,0x5fff,BMCFK23CWrite);
-  SetWriteHandler(0x8000,0xFFFF,BMCFK23CHiWrite);
 	FixMMC3PRG(MMC3_cmd);
 	FixMMC3CHR(MMC3_cmd);
+	SetWriteHandler(0x5000,0x5fff,BMCFK23CWrite);
+	SetWriteHandler(0x8000,0xFFFF,BMCFK23CHiWrite);
 }
 
 static void BMCFK23CAPower(void)
@@ -230,10 +228,11 @@ static void BMCFK23CAPower(void)
 	dipswitch = 0;
 	EXPREGS[0]=EXPREGS[1]=EXPREGS[2]=EXPREGS[3]=0;
 	EXPREGS[4]=EXPREGS[5]=EXPREGS[6]=EXPREGS[7]=0xFF;
-  SetWriteHandler(0x5000,0x5fff,BMCFK23CWrite);
+//	FCEU_printf("K2:(exp0=%02x)\n",EXPREGS[0]);
-  SetWriteHandler(0x8000,0xFFFF,BMCFK23CHiWrite);
 	FixMMC3PRG(MMC3_cmd);
 	FixMMC3CHR(MMC3_cmd);
+	SetWriteHandler(0x5000,0x5fff,BMCFK23CWrite);
+	SetWriteHandler(0x8000,0xFFFF,BMCFK23CHiWrite);
 }
 
 static void BMCFK23CAClose(void)