(mapper) Silence -Wunused-variablewarning

2017-10-01 20:51:36 +08:00
parent edc2c3f677
commit b769573876
6 changed files with 93 additions and 78 deletions
--- a/src/boards/fk23c.c
+++ b/src/boards/fk23c.c
@@ -46,55 +46,58 @@ static void BMCFK23CCW(uint32 A, uint8 V) {
 	}
 }

-//some games are wired differently, and this will need to be changed.
-//all the WXN games require prg_bonus = 1, and cah4e3's multicarts require prg_bonus = 0
-//we'll populate this from a game database
+/* some games are wired differently, and this will need to be changed.
+ * all the WXN games require prg_bonus = 1, and cah4e3's multicarts require prg_bonus = 0
+ * we'll populate this from a game database
+ */
 static int prg_mask;
 static int prg_bonus = 1;

-//prg_bonus = 0
-//4-in-1 (FK23C8021)[p1][!].nes
-//4-in-1 (FK23C8033)[p1][!].nes
-//4-in-1 (FK23C8043)[p1][!].nes
-//4-in-1 (FK23Cxxxx, S-0210A PCB)[p1][!].nes
+/*
+ * prg_bonus = 0
+ * 4-in-1 (FK23C8021)[p1][!].nes
+ * 4-in-1 (FK23C8033)[p1][!].nes
+ * 4-in-1 (FK23C8043)[p1][!].nes
+ * 4-in-1 (FK23Cxxxx, S-0210A PCB)[p1][!].nes

-//prg_bonus = 1
-//[m176]大富翁2-上海大亨.wxn.nes
-//[m176]宠物翡翠.fix.nes
-//[m176]格兰帝亚.wxn.nes
-//[m176]梦幻之星.wxn.nes
-//[m176]水浒神兽.fix.nes
-//[m176]西楚霸王.fix.nes
-//[m176]超级大富翁.wxn.nes
-//[m176]雄霸天下.wxn.nes
+ * prg_bonus = 1
+ * [m176]大富翁2-上海大亨.wxn.nes
+ * [m176]宠物翡翠.fix.nes
+ * [m176]格兰帝亚.wxn.nes
+ * [m176]梦幻之星.wxn.nes
+ * [m176]水浒神兽.fix.nes
+ * [m176]西楚霸王.fix.nes
+ * [m176]超级大富翁.wxn.nes
+ * [m176]雄霸天下.wxn.nes

-//works as-is under virtuanes m176
-//[m176]三侠五义.wxn.nes
-//[m176]口袋金.fix.nes
-//[m176]爆笑三国.fix.nes
+ * works as-is under virtuanes m176
+ * [m176]三侠五义.wxn.nes
+ * [m176]口袋金.fix.nes
+ * [m176]爆笑三国.fix.nes

-//needs other tweaks
-//[m176]三国忠烈传.wxn.nes
-//[m176]破釜沉舟.fix.nes
+ * needs other tweaks
+ * [m176]三国忠烈传.wxn.nes
+ * [m176]破釜沉舟.fix.nes
+*/

 static uint64 CartList[] =
 {
-	0x1606b8c2aff8d942LL, // 4-in-1 (BS-8088) [p1][!].nes
-	0x62b51b108a01d2beLL, // 4-in-1 (FK23C8021) [p1][!].nes
-	0xa37eb9163e001a46LL, // 4-in-1 (FK23C8026) [p1][!].nes
-	0x8bb48490d8d22711LL, // 4-in-1 (FK23C8033) [p1][!].nes
-	0xc75888d7b48cd378LL, // 4-in-1 (FK23C8043) [p1][!].nes
-	0xde5ce25860233f7eLL, // 4-in-1 (FK23C8045) [p1][!].nes
-	0x8b6c9fc7769a5500LL, // 4-in-1 (FK23C8052) [p1][!].nes
-	0x5b3aa4cdc484a088LL, // 4-in-1 (FK23C8056) [p1][!].nes
-	0x497344d14c308a1aLL, // 4-in-1 (FK23C8078) (Ch) [p1].nes
-	0x9342bf9bae1c798aLL, // 4-in-1 (FK23C8079) [p1][!].nes
-	0xf81a376fa54fdd69LL, // 4-in-1 (FK23Cxxxx, S-0210A PCB)[p1][!].nes
-	0x8fd9c235957a6df0LL, // 5-in-1 (K5003) [p1][!]-1125) (Ch).nes
-	0x0315924d00dd7807LL, // Mortal Kombat 30 Peoples (DH1043) (Ch).nes
-	0x4b99c39fdb66128aLL, // 4-in-1 (FK23C8078) (Ch) [p1][U][!].unf
-	0x22a0ba5743191778LL, // Rockman 4 MI (Hack)
-	0	/* Abandon all hope if the game has 0 in the lower 64-bits of its MD5 hash */
+	0x1606b8c2aff8d942LL, /* 4-in-1 (BS-8088) [p1][!].nes				*/
+	0x62b51b108a01d2beLL, /* 4-in-1 (FK23C8021) [p1][!].nes				*/
+	0xa37eb9163e001a46LL, /* 4-in-1 (FK23C8026) [p1][!].nes				*/
+	0x8bb48490d8d22711LL, /* 4-in-1 (FK23C8033) [p1][!].nes				*/
+	0xc75888d7b48cd378LL, /* 4-in-1 (FK23C8043) [p1][!].nes				*/
+	0xde5ce25860233f7eLL, /* 4-in-1 (FK23C8045) [p1][!].nes				*/
+	0x8b6c9fc7769a5500LL, /* 4-in-1 (FK23C8052) [p1][!].nes				*/
+	0x5b3aa4cdc484a088LL, /* 4-in-1 (FK23C8056) [p1][!].nes				*/
+	0x497344d14c308a1aLL, /* 4-in-1 (FK23C8078) (Ch) [p1].nes			*/
+	0x9342bf9bae1c798aLL, /* 4-in-1 (FK23C8079) [p1][!].nes				*/
+	0xf81a376fa54fdd69LL, /* 4-in-1 (FK23Cxxxx, S-0210A PCB)[p1][!].nes	*/
+	0x8fd9c235957a6df0LL, /* 5-in-1 (K5003) [p1][!]-1125) (Ch).nes		*/
+	0x0315924d00dd7807LL, /* Mortal Kombat 30 Peoples (DH1043) (Ch).nes	*/
+	0x4b99c39fdb66128aLL, /* 4-in-1 (FK23C8078) (Ch) [p1][U][!].unf		*/
+	0x22a0ba5743191778LL, /* Rockman 4 MI (Hack)						*/
+	0
 };

 int DetectPRGbonus(CartInfo *tmp) {
@@ -115,8 +118,8 @@ int DetectPRGbonus(CartInfo *tmp) {
 static void BMCFK23CPW(uint32 A, uint8 V) {
 	/* Modified (c)May 2017 - Backport older implementations from FCEUmm
 	 * to support big sized FK23CA carts which broke in latest commits.
-	*/
-	uint32 bank = (EXPREGS[1] & 0x1F);
+	 */
+	/* uint32 bank = (EXPREGS[1] & 0x1F); */
 	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);
@@ -134,7 +137,7 @@ static void BMCFK23CPW(uint32 A, uint8 V) {
 			uint32 blocksize = (6) - (EXPREGS[0] & 3);
 			uint32 mask = (1 << blocksize) - 1;
 			V &= mask;
-			//V &= 63; //? is this a good idea?
+			/* V &= 63; */ /* ??? is this a good idea? */
 			V |= EXPREGS[1] << 1;
 			setprg8(A, (V | (hiblock << 1)));
 		} else
@@ -163,8 +166,9 @@ static DECLFW(BMCFK23CHiWrite) {
 			FixMMC3CHR(MMC3_cmd);
 		} 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
+				if (UNIFchrrama) { /* hacky... strange behaviour, must be bit scramble due to pcb layot restrictions
+								    * check if it not interfer with other dumps
+								    */
 					if ((A == 0x8000) && (V == 0x46))
 						V = 0x47;
 					else if ((A==0x8000) && (V == 0x47))
@@ -182,14 +186,18 @@ static DECLFW(BMCFK23CWrite) {
 		int remap = 0;
 		EXPREGS[A & 3] = 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
+		/* 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);

-		//this is an actual mapping reg. i think reg0 controls what happens when reg1 is written. anyway, we have to immediately remap these
+		/* 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;
-		//this too.
+		/* this too. */
 		remap |= (A & 3) == 2;

 		if (remap) {
@@ -200,15 +208,20 @@ static DECLFW(BMCFK23CWrite) {

 	if (is_BMCFK23CA)
 		if(EXPREGS[3] & 2)
-			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)
+			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)
+								 */
 }

 static void BMCFK23CReset(void) {
-	//NOT NECESSARY ANYMORE
-	//this little hack makes sure that we try all the dip switch settings eventually, if we reset enough
-	// dipswitch++;
-	// dipswitch&=7;
-	//printf("BMCFK23C dipswitch set to %d\n",dipswitch);
+	/* !NOT NECESSARY ANYMORE!
+	 *
+	 * this little hack makes sure that we try all the dip switch settings eventually, if we reset enough
+	 * dipswitch++;
+	 * dipswitch&=7;
+	 * 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;