diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c index e209987804f..55eaba4fd0d 100644 --- a/src/mame/video/ppu2c0x.c +++ b/src/mame/video/ppu2c0x.c @@ -203,7 +203,7 @@ void ppu2c0x_init_palette( running_machine *machine, int first_entry ) }; /* Loop through the emphasis modes (8 total) */ - for (color_emphasis = 0; color_emphasis < 8; color_emphasis ++) + for (color_emphasis = 0; color_emphasis < 8; color_emphasis++) { /* double r_mod = 0.0; @@ -1071,7 +1071,7 @@ WRITE8_DEVICE_HANDLER( ppu2c0x_w ) if ((data & PPU_CONTROL1_COLOR_EMPHASIS) != (ppu2c0x->regs[PPU_CONTROL1] & PPU_CONTROL1_COLOR_EMPHASIS)) { int i; - for (i = 0; i <= 0x1f; i ++) + for (i = 0; i <= 0x1f; i++) { UINT8 oldColor = ppu2c0x->palette_ram[i]; @@ -1275,8 +1275,10 @@ static DEVICE_START( ppu2c0x ) memset(ppu2c0x, 0, sizeof(*ppu2c0x)); ppu2c0x->scanlines_per_frame = (int) device->get_config_int(PPU2C0XINFO_INT_SCANLINES_PER_FRAME); + /* usually, no security value... */ ppu2c0x->security_value = 0; + /* ...except for VS. games which specific PPU types */ if (device->type == PPU_2C05_01) ppu2c0x->security_value = 0x1b; // game (jajamaru) doesn't seem to ever actually check it @@ -1443,7 +1445,7 @@ DEVICE_GET_INFO(ppu2c04) } } -DEVICE_GET_INFO(ppu2c05) +DEVICE_GET_INFO(ppu2c05_01) { switch (state) { @@ -1453,6 +1455,21 @@ DEVICE_GET_INFO(ppu2c05) } } +DEVICE_GET_INFO(ppu2c05_02) +{ + DEVICE_GET_INFO_CALL(ppu2c05_01); +} + +DEVICE_GET_INFO(ppu2c05_03) +{ + DEVICE_GET_INFO_CALL(ppu2c05_01); +} + +DEVICE_GET_INFO(ppu2c05_04) +{ + DEVICE_GET_INFO_CALL(ppu2c05_01); +} + DEVICE_GET_INFO(ppu2c07) { switch (state) diff --git a/src/mame/video/ppu2c0x.h b/src/mame/video/ppu2c0x.h index c1ffdd7f8d1..0199b1012e6 100644 --- a/src/mame/video/ppu2c0x.h +++ b/src/mame/video/ppu2c0x.h @@ -76,10 +76,10 @@ enum #define PPU_2C03B DEVICE_GET_INFO_NAME(ppu2c03b) // Vs. Unisystem, Playchoice 10 #define PPU_2C04 DEVICE_GET_INFO_NAME(ppu2c04) // Vs. Unisystem (four versions with different colors) /* The PPU_2C05 variants have different protection value, set at DEVICE_START, but otherwise are all the same... */ -#define PPU_2C05_01 DEVICE_GET_INFO_NAME(ppu2c05) // Vs. Unisystem (Ninja Jajamaru Kun) -#define PPU_2C05_02 DEVICE_GET_INFO_NAME(ppu2c05) // Vs. Unisystem (Mighty Bomb Jack) -#define PPU_2C05_03 DEVICE_GET_INFO_NAME(ppu2c05) // Vs. Unisystem (Gumshoe) -#define PPU_2C05_04 DEVICE_GET_INFO_NAME(ppu2c05) // Vs. Unisystem (Top Gun) +#define PPU_2C05_01 DEVICE_GET_INFO_NAME(ppu2c05_01) // Vs. Unisystem (Ninja Jajamaru Kun) +#define PPU_2C05_02 DEVICE_GET_INFO_NAME(ppu2c05_02) // Vs. Unisystem (Mighty Bomb Jack) +#define PPU_2C05_03 DEVICE_GET_INFO_NAME(ppu2c05_03) // Vs. Unisystem (Gumshoe) +#define PPU_2C05_04 DEVICE_GET_INFO_NAME(ppu2c05_04) // Vs. Unisystem (Top Gun) #define PPU_2C07 DEVICE_GET_INFO_NAME(ppu2c07) // PAL NES /* callback datatypes */ @@ -105,7 +105,10 @@ struct _ppu2c0x_interface DEVICE_GET_INFO(ppu2c02); DEVICE_GET_INFO(ppu2c03b); DEVICE_GET_INFO(ppu2c04); -DEVICE_GET_INFO(ppu2c05); +DEVICE_GET_INFO(ppu2c05_01); +DEVICE_GET_INFO(ppu2c05_02); +DEVICE_GET_INFO(ppu2c05_03); +DEVICE_GET_INFO(ppu2c05_04); DEVICE_GET_INFO(ppu2c07); /* routines */