From 809c406e3527f875c6b0941d5927de1c4330bd3b Mon Sep 17 00:00:00 2001 From: Scott Stone Date: Thu, 17 Jun 2010 14:04:37 +0000 Subject: [PATCH] Added many instances of missing static and const qualifiers to MAME, and disabled a fair chunk of dead code in konamiic.c. [Atari Ace] --- src/emu/cpu/i8008/8008dasm.c | 4 +- src/emu/cpu/m68000/m68kfpu.c | 4 +- src/emu/cpu/mn10200/mn10200.c | 6 +-- src/emu/sound/tms5220.c | 2 +- src/lib/util/cdrom.c | 2 +- src/mame/drivers/kongambl.c | 4 +- src/mame/drivers/mpu4.c | 6 +-- src/mame/drivers/mpu4drvr.c | 26 ++++++------ src/mame/drivers/pntnpuzl.c | 6 ++- src/mame/drivers/sigmab98.c | 4 +- src/mame/includes/galaxian.h | 2 +- src/mame/includes/konamigx.h | 15 +------ src/mame/machine/konamigx.c | 4 +- src/mame/video/galaxian.c | 4 ++ src/mame/video/konamigx.c | 22 ++++++---- src/mame/video/konamiic.c | 78 ++++++++++++++++++++++++++++++++--- src/mame/video/konamiic.h | 48 +++++++++++++++++++++ src/mame/video/konicdev.c | 17 -------- src/mame/video/konicdev.h | 2 - src/mame/video/toaplan2.c | 10 ++--- 20 files changed, 184 insertions(+), 82 deletions(-) diff --git a/src/emu/cpu/i8008/8008dasm.c b/src/emu/cpu/i8008/8008dasm.c index 50cb5d7b994..221ac3c3230 100644 --- a/src/emu/cpu/i8008/8008dasm.c +++ b/src/emu/cpu/i8008/8008dasm.c @@ -13,8 +13,8 @@ #define OP(A) oprom[(A) - PC] #define ARG(A) opram[(A) - PC] -static char reg[] = { 'a', 'b', 'c', 'd', 'e', 'h', 'l', 'm' }; -static char flag_names[] = { 'c', 'z', 's', 'p' }; +static const char reg[] = { 'a', 'b', 'c', 'd', 'e', 'h', 'l', 'm' }; +static const char flag_names[] = { 'c', 'z', 's', 'p' }; CPU_DISASSEMBLE( i8008 ) { diff --git a/src/emu/cpu/m68000/m68kfpu.c b/src/emu/cpu/m68000/m68kfpu.c index 482fc4b1389..aa81e8aaf53 100644 --- a/src/emu/cpu/m68000/m68kfpu.c +++ b/src/emu/cpu/m68000/m68kfpu.c @@ -12,7 +12,7 @@ extern flag floatx80_is_nan( floatx80 a ); // masks for packed dwords, positive k-factor -static UINT32 pkmask2[18] = +static const UINT32 pkmask2[18] = { 0xffffffff, 0, 0xf0000000, 0xff000000, 0xfff00000, 0xffff0000, 0xfffff000, 0xffffff00, 0xfffffff0, 0xffffffff, @@ -20,7 +20,7 @@ static UINT32 pkmask2[18] = 0xffffffff, 0xffffffff, 0xffffffff }; -static UINT32 pkmask3[18] = +static const UINT32 pkmask3[18] = { 0xffffffff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xf0000000, 0xff000000, 0xfff00000, 0xffff0000, diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c index f651c49ea82..5d43be1adac 100644 --- a/src/emu/cpu/mn10200/mn10200.c +++ b/src/emu/cpu/mn10200/mn10200.c @@ -2124,8 +2124,8 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type) } case 0x28a: case 0x29a: case 0x2aa: case 0x2ba: case 0x2ca: case 0x2da: case 0x2ea: case 0x2fa: { - static const char *trans[4] = { "M-IO", "M-M", "M-X1", "m-X2" }; - static const char *start[32] = { + static const char *const trans[4] = { "M-IO", "M-M", "M-X1", "m-X2" }; + static const char *const start[32] = { "soft", "a/d", "ser0tx", "set0rx", "ser1tx", "ser1rx", "timer0", "timer1", "timer2", "timer3", "timer4", "timer5", "timer6", "timer7", "timer8", "timer9", "timer10u", "timer10a", "timer10b", @@ -2146,7 +2146,7 @@ static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type) } case 0x28b: case 0x29b: case 0x2ab: case 0x2bb: case 0x2cb: case 0x2db: case 0x2eb: case 0x2fb: { - static const char *tradr[4] = { "inc", "dec", "fixed", "reserved" }; + static const char *const tradr[4] = { "inc", "dec", "fixed", "reserved" }; int dma = (adr-0x280) >> 4; mn102->dma[dma].ctrlh = data; logerror("MN10200: DMA %d control %s irq=%s %s %s dir=%s %s %s\n", diff --git a/src/emu/sound/tms5220.c b/src/emu/sound/tms5220.c index d9419754140..40d42c80458 100644 --- a/src/emu/sound/tms5220.c +++ b/src/emu/sound/tms5220.c @@ -225,7 +225,7 @@ device), PES Speech adapter (serial port connection) #define TMS5220_IS_TMC0285 TMS5220_IS_5200 -static UINT8 reload_table[4] = { 0, 50, 100, 150 }; //is the sample count reload for 5220c only; 5200 and 5220 always reload with 0 +static const UINT8 reload_table[4] = { 0, 50, 100, 150 }; //is the sample count reload for 5220c only; 5200 and 5220 always reload with 0 typedef struct _tms5220_state tms5220_state; struct _tms5220_state diff --git a/src/lib/util/cdrom.c b/src/lib/util/cdrom.c index 9db938abda1..3c84bb5bb02 100644 --- a/src/lib/util/cdrom.c +++ b/src/lib/util/cdrom.c @@ -419,7 +419,7 @@ const cdrom_toc *cdrom_get_toc(cdrom_file *file) and track data size -------------------------------------------------*/ -void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trktype, UINT32 *datasize) +static void cdrom_get_info_from_type_string(const char *typestring, UINT32 *trktype, UINT32 *datasize) { if (!strcmp(typestring, "MODE1")) { diff --git a/src/mame/drivers/kongambl.c b/src/mame/drivers/kongambl.c index c2a0cca982a..59769a6ba21 100644 --- a/src/mame/drivers/kongambl.c +++ b/src/mame/drivers/kongambl.c @@ -99,11 +99,11 @@ static ADDRESS_MAP_START( kongamaud_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x2000ff) AM_RAM // unknown (YMZ280b? Shared with 68020?) ADDRESS_MAP_END -void kongambl_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) +static void kongambl_sprite_callback( running_machine *machine, int *code, int *color, int *priority_mask ) { } -void kongambl_tile_callback( running_machine *machine, int layer, int *code, int *color, int *flags ) +static void kongambl_tile_callback( running_machine *machine, int layer, int *code, int *color, int *flags ) { } diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index 64f3285d2ef..565f7feb357 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -323,7 +323,7 @@ struct mpu4_chr_table UINT8 response; }; -static mpu4_chr_table* mpu4_current_chr_table; +static const mpu4_chr_table* mpu4_current_chr_table; /* LED Segments related to pins (5 is not connected): @@ -1702,7 +1702,7 @@ static READ8_HANDLER( characteriser_r ) return 0; } -mpu4_chr_table ccelbr_data[72] = { +static const mpu4_chr_table ccelbr_data[72] = { {0x00, 0x00},{0x1a, 0x84},{0x04, 0x8c},{0x10, 0xb8},{0x18, 0x74},{0x0f, 0x80},{0x13, 0x1c},{0x1b, 0xb4}, {0x03, 0xd8},{0x07, 0x74},{0x17, 0x00},{0x1d, 0xd4},{0x36, 0xc8},{0x35, 0x78},{0x2b, 0xa4},{0x28, 0x4c}, {0x39, 0xe0},{0x21, 0xdc},{0x22, 0xf4},{0x25, 0x88},{0x2c, 0x78},{0x29, 0x24},{0x31, 0x84},{0x34, 0xcc}, @@ -1714,7 +1714,7 @@ mpu4_chr_table ccelbr_data[72] = { {0x00, 0x00},{0x01, 0x50},{0x04, 0x00},{0x09, 0x50},{0x10, 0x10},{0x19, 0x40},{0x24, 0x04},{0x31, 0x00} }; -mpu4_chr_table gmball_data[72] = { +static const mpu4_chr_table gmball_data[72] = { {0x00, 0x00},{0x1a, 0x0c},{0x04, 0x50},{0x10, 0x90},{0x18, 0xb0},{0x0f, 0x38},{0x13, 0xd4},{0x1b, 0xa0}, {0x03, 0xbc},{0x07, 0xd4},{0x17, 0x30},{0x1d, 0x90},{0x36, 0x38},{0x35, 0xc4},{0x2b, 0xac},{0x28, 0x70}, {0x39, 0x98},{0x21, 0xdc},{0x22, 0xdc},{0x25, 0x54},{0x2c, 0x80},{0x29, 0xb4},{0x31, 0x38},{0x34, 0xcc}, diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index 1883d0ced07..edf274bd6fa 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -2326,7 +2326,7 @@ static READ16_HANDLER( characteriser16_r ) } -mpu4_chr_table adders_data[64] = { +static const mpu4_chr_table adders_data[64] = { {0x00, 0x00}, {0x1A, 0x8C}, {0x04, 0x64}, {0x10, 0x84}, {0x18, 0x84}, {0x0F, 0xC4}, {0x13, 0x84}, {0x1B, 0x84}, {0x03, 0x9C}, {0x07, 0xF4}, {0x17, 0x04}, {0x1D, 0xCC}, {0x36, 0x24}, {0x35, 0x84}, {0x2B, 0xC4}, {0x28, 0x94}, {0x39, 0x54}, {0x21, 0x0C}, {0x22, 0x74}, {0x25, 0x0C}, {0x2C, 0x34}, {0x29, 0x04}, {0x31, 0x84}, {0x34, 0x84}, @@ -2337,7 +2337,7 @@ mpu4_chr_table adders_data[64] = { {0x0D, 0x94}, {0x1F, 0x14}, {0x16, 0x44}, {0x05, 0x8C}, {0x13, 0x34}, {0x1C, 0x04}, {0x02, 0x9C}, {0x00, 0x00} }; -mpu4_chr_table crmaze_data[64] = { +static const mpu4_chr_table crmaze_data[64] = { {0x00, 0x00}, {0x1A, 0x34}, {0x04, 0x14}, {0x10, 0x0C}, {0x18, 0x54}, {0x0F, 0x04}, {0x13, 0x24}, {0x1B, 0x34}, {0x03, 0x94}, {0x07, 0x94}, {0x17, 0x0C}, {0x1D, 0x5C}, {0x36, 0x6C}, {0x35, 0x44}, {0x2B, 0x24}, {0x28, 0x24}, {0x39, 0x3C}, {0x21, 0x6C}, {0x22, 0xCC}, {0x25, 0x4C}, {0x2C, 0xC4}, {0x29, 0xA4}, {0x31, 0x24}, {0x34, 0x24}, @@ -2348,7 +2348,7 @@ mpu4_chr_table crmaze_data[64] = { {0x0D, 0xA4}, {0x1F, 0x24}, {0x16, 0x24}, {0x05, 0x34}, {0x13, 0x04}, {0x1C, 0x34}, {0x02, 0x94}, {0x00, 0x00} }; -mpu4_chr_table crmazea_data[64] = { +static const mpu4_chr_table crmazea_data[64] = { {0x00, 0x00}, {0x1A, 0x0C}, {0x04, 0x90}, {0x10, 0xE0}, {0x18, 0xA4}, {0x0F, 0xAC}, {0x13, 0x78}, {0x1B, 0x5C}, {0x03, 0xDC}, {0x07, 0xD4}, {0x17, 0xA0}, {0x1D, 0xEC}, {0x36, 0x78}, {0x35, 0x54}, {0x2B, 0x48}, {0x28, 0x50}, {0x39, 0xC8}, {0x21, 0xF8}, {0x22, 0xDC}, {0x25, 0x94}, {0x2C, 0xE0}, {0x29, 0x24}, {0x31, 0x0C}, {0x34, 0xD8}, @@ -2359,7 +2359,7 @@ mpu4_chr_table crmazea_data[64] = { {0x0D, 0x48}, {0x1F, 0xD8}, {0x16, 0xDC}, {0x05, 0x94}, {0x13, 0xE8}, {0x1C, 0x38}, {0x02, 0xDC}, {0x00, 0x00} }; -mpu4_chr_table crmaze2_data[64] = { +static const mpu4_chr_table crmaze2_data[64] = { {0x00, 0x00}, {0x1A, 0x88}, {0x04, 0x54}, {0x10, 0x40}, {0x18, 0x88}, {0x0F, 0x54}, {0x13, 0x40}, {0x1B, 0x88}, {0x03, 0x74}, {0x07, 0x28}, {0x17, 0x30}, {0x1D, 0x60}, {0x36, 0x80}, {0x35, 0x84}, {0x2B, 0xC4}, {0x28, 0xA4}, {0x39, 0xC4}, {0x21, 0x8C}, {0x22, 0x74}, {0x25, 0x08}, {0x2C, 0x30}, {0x29, 0x00}, {0x31, 0x80}, {0x34, 0x84}, @@ -2370,7 +2370,7 @@ mpu4_chr_table crmaze2_data[64] = { {0x0D, 0xA0}, {0x1F, 0x84}, {0x16, 0x84}, {0x05, 0x8C}, {0x13, 0x34}, {0x1C, 0x00}, {0x02, 0xA8}, {0x00, 0x00} }; -mpu4_chr_table crmaze3_data[64] = { +static const mpu4_chr_table crmaze3_data[64] = { {0x00, 0x00}, {0x1A, 0x84}, {0x04, 0x94}, {0x10, 0x3C}, {0x18, 0xEC}, {0x0F, 0x5C}, {0x13, 0xEC}, {0x1B, 0x50}, {0x03, 0x2C}, {0x07, 0x68}, {0x17, 0x60}, {0x1D, 0xAC}, {0x36, 0x74}, {0x35, 0x00}, {0x2B, 0xAC}, {0x28, 0x58}, {0x39, 0xEC}, {0x21, 0x7C}, {0x22, 0xEC}, {0x25, 0x58}, {0x2C, 0xE0}, {0x29, 0x90}, {0x31, 0x18}, {0x34, 0xEC}, @@ -2381,7 +2381,7 @@ mpu4_chr_table crmaze3_data[64] = { {0x0D, 0x20}, {0x1F, 0xAC}, {0x16, 0x74}, {0x05, 0x04}, {0x13, 0xA4}, {0x1C, 0x94}, {0x02, 0x3C}, {0x00, 0x00} }; -mpu4_chr_table crmaze3a_data[64] = { +static const mpu4_chr_table crmaze3a_data[64] = { {0x00, 0x00}, {0x1A, 0x0C}, {0x04, 0x60}, {0x10, 0x84}, {0x18, 0x34}, {0x0F, 0x08}, {0x13, 0xC0}, {0x1B, 0x14}, {0x03, 0xA8}, {0x07, 0xF0}, {0x17, 0x10}, {0x1D, 0xA0}, {0x36, 0x1C}, {0x35, 0xE4}, {0x2B, 0x1C}, {0x28, 0xE4}, {0x39, 0x34}, {0x21, 0xA8}, {0x22, 0xF8}, {0x25, 0x64}, {0x2C, 0x8C}, {0x29, 0xF0}, {0x31, 0x30}, {0x34, 0x08}, @@ -2392,7 +2392,7 @@ mpu4_chr_table crmaze3a_data[64] = { {0x0D, 0xBC}, {0x1F, 0xE4}, {0x16, 0x1C}, {0x05, 0x64}, {0x13, 0x8C}, {0x1C, 0x58}, {0x02, 0xEC}, {0x00, 0x00} }; -mpu4_chr_table mating_data[64] = { +static const mpu4_chr_table mating_data[64] = { {0x00, 0x00}, {0x1A, 0x18}, {0x04, 0xC8}, {0x10, 0xA4}, {0x18, 0x0C}, {0x0F, 0x80}, {0x13, 0x0C}, {0x1B, 0x90}, {0x03, 0x34}, {0x07, 0x30}, {0x17, 0x00}, {0x1D, 0x58}, {0x36, 0xC8}, {0x35, 0x84}, {0x2B, 0x4C}, {0x28, 0xA0}, {0x39, 0x4C}, {0x21, 0xC0}, {0x22, 0x3C}, {0x25, 0xC8}, {0x2C, 0xA4}, {0x29, 0x4C}, {0x31, 0x80}, {0x34, 0x0C}, @@ -2403,7 +2403,7 @@ mpu4_chr_table mating_data[64] = { {0x0D, 0x2C}, {0x1F, 0x90}, {0x16, 0x44}, {0x05, 0x18}, {0x13, 0xE8}, {0x1C, 0x84}, {0x02, 0x3C}, {0x00, 0x00} }; -mpu4_chr_table skiltrek_data[64] = { +static const mpu4_chr_table skiltrek_data[64] = { {0x00, 0x00}, {0x1A, 0x1C}, {0x04, 0xCC}, {0x10, 0x64}, {0x18, 0x1C}, {0x0F, 0x4C}, {0x13, 0x64}, {0x1B, 0x1C}, {0x03, 0xEC}, {0x07, 0xE4}, {0x17, 0x0C}, {0x1D, 0xD4}, {0x36, 0x84}, {0x35, 0x0C}, {0x2B, 0x44}, {0x28, 0x2C}, {0x39, 0xD4}, {0x21, 0x14}, {0x22, 0x34}, {0x25, 0x14}, {0x2C, 0x24}, {0x29, 0x0C}, {0x31, 0x44}, {0x34, 0x0C}, @@ -2414,7 +2414,7 @@ mpu4_chr_table skiltrek_data[64] = { {0x0D, 0x2C}, {0x1F, 0x54}, {0x16, 0x84}, {0x05, 0x1C}, {0x13, 0xEC}, {0x1C, 0x44}, {0x02, 0x3C}, {0x00, 0x00} }; -mpu4_chr_table timemchn_data[64] = { +static const mpu4_chr_table timemchn_data[64] = { {0x00, 0x00}, {0x1A, 0x2C}, {0x04, 0x94}, {0x10, 0x14}, {0x18, 0x04}, {0x0F, 0x0C}, {0x13, 0xC4}, {0x1B, 0x0C}, {0x03, 0xD4}, {0x07, 0x64}, {0x17, 0x0C}, {0x1D, 0xB4}, {0x36, 0x04}, {0x35, 0x0C}, {0x2B, 0x84}, {0x28, 0x5C}, {0x39, 0xDC}, {0x21, 0x9C}, {0x22, 0xDC}, {0x25, 0x9C}, {0x2C, 0xDC}, {0x29, 0xCC}, {0x31, 0x84}, {0x34, 0x0C}, @@ -2425,7 +2425,7 @@ mpu4_chr_table timemchn_data[64] = { {0x0D, 0xC4}, {0x1F, 0x0C}, {0x16, 0xC4}, {0x05, 0x2C}, {0x13, 0xC4}, {0x1C, 0x0C}, {0x02, 0xD4}, {0x00, 0x00} }; -mpu4_chr_table strikeit_data[64] = { +static const mpu4_chr_table strikeit_data[64] = { {0x00, 0x00}, {0x1A, 0xC4}, {0x04, 0xC4}, {0x10, 0x44}, {0x18, 0xC4}, {0x0F, 0x44}, {0x13, 0x44}, {0x1B, 0xC4}, {0x03, 0xCC}, {0x07, 0x3C}, {0x17, 0x5C}, {0x1D, 0x7C}, {0x36, 0x54}, {0x35, 0x24}, {0x2B, 0xC4}, {0x28, 0x4C}, {0x39, 0xB4}, {0x21, 0x84}, {0x22, 0xCC}, {0x25, 0x34}, {0x2C, 0x04}, {0x29, 0x4C}, {0x31, 0x14}, {0x34, 0x24}, @@ -2436,7 +2436,7 @@ mpu4_chr_table strikeit_data[64] = { {0x0D, 0x5C}, {0x1F, 0x5C}, {0x16, 0x7C}, {0x05, 0x74}, {0x13, 0x04}, {0x1C, 0xC4}, {0x02, 0xCC}, {0x00, 0x00} }; -mpu4_chr_table turnover_data[64] = { +static const mpu4_chr_table turnover_data[64] = { {0x00, 0x00}, {0x1A, 0x1C}, {0x04, 0x6C}, {0x10, 0xA4}, {0x18, 0x0C}, {0x0F, 0x24}, {0x13, 0x0C}, {0x1B, 0x34}, {0x03, 0x94}, {0x07, 0x94}, {0x17, 0x44}, {0x1D, 0x5C}, {0x36, 0x6C}, {0x35, 0x24}, {0x2B, 0x1C}, {0x28, 0xAC}, {0x39, 0x64}, {0x21, 0x1C}, {0x22, 0xEC}, {0x25, 0x64}, {0x2C, 0x0C}, {0x29, 0xA4}, {0x31, 0x0C}, {0x34, 0x24}, @@ -2447,7 +2447,7 @@ mpu4_chr_table turnover_data[64] = { {0x0D, 0x0C}, {0x1F, 0x34}, {0x16, 0x04}, {0x05, 0x1C}, {0x13, 0xEC}, {0x1C, 0x24}, {0x02, 0x9C}, {0x00, 0x00} }; -mpu4_chr_table eyesdown_data[64] = { +static const mpu4_chr_table eyesdown_data[64] = { {0x00, 0x00}, {0x1A, 0x8C}, {0x04, 0x64}, {0x10, 0x0C}, {0x18, 0xC4}, {0x0F, 0x0C}, {0x13, 0x54}, {0x1B, 0x14}, {0x03, 0x94}, {0x07, 0x94}, {0x17, 0x24}, {0x1D, 0xAC}, {0x36, 0x44}, {0x35, 0x0C}, {0x2B, 0x44}, {0x28, 0x1C}, {0x39, 0x7C}, {0x21, 0x6C}, {0x22, 0x74}, {0x25, 0x84}, {0x2C, 0x3C}, {0x29, 0x4C}, {0x31, 0x44}, {0x34, 0x0C}, @@ -2458,7 +2458,7 @@ mpu4_chr_table eyesdown_data[64] = { {0x0D, 0x5C}, {0x1F, 0x5C}, {0x16, 0x7C}, {0x05, 0x6C}, {0x13, 0x54}, {0x1C, 0x04}, {0x02, 0x9C}, {0x00, 0x00} }; -mpu4_chr_table quidgrid_data[64] = { +static const mpu4_chr_table quidgrid_data[64] = { {0x00, 0x00}, {0x1A, 0x64}, {0x04, 0x64}, {0x10, 0x24}, {0x18, 0x64}, {0x0F, 0x64}, {0x13, 0x24}, {0x1B, 0x64}, {0x03, 0x74}, {0x07, 0x54}, {0x17, 0x84}, {0x1D, 0xA4}, {0x36, 0x24}, {0x35, 0x24}, {0x2B, 0x64}, {0x28, 0x24}, {0x39, 0xE4}, {0x21, 0x64}, {0x22, 0x74}, {0x25, 0x44}, {0x2C, 0x34}, {0x29, 0x04}, {0x31, 0x24}, {0x34, 0x24}, diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index d3839940946..4f713eea39f 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -172,11 +172,11 @@ static VIDEO_UPDATE( pntnpuzl ) { int x,y; int count; +#if 0 static int xxx=0x18f; static int yyy=512; static int sss=0xa8; -#if 0 if ( input_code_pressed_once(screen->machine, KEYCODE_Q) ) { xxx--; @@ -212,6 +212,10 @@ static VIDEO_UPDATE( pntnpuzl ) sss++; mame_printf_debug("sss %04x\n",sss); } +#else + const int xxx=0x18f; + const int yyy=512; + const int sss=0xa8; #endif diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c index 1344ac26945..efe2a32055a 100644 --- a/src/mame/drivers/sigmab98.c +++ b/src/mame/drivers/sigmab98.c @@ -148,7 +148,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } -VIDEO_UPDATE(sigmab98) +static VIDEO_UPDATE(sigmab98) { bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); draw_sprites(screen->machine, bitmap, cliprect); @@ -253,7 +253,7 @@ static READ8_HANDLER( regs2_r ) // Outputs -UINT8 c0,c4,c6,c8; +static UINT8 c0,c4,c6,c8; static void show_outputs() { #ifdef MAME_DEBUG diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index a8a3ea4007e..6869a8f07c2 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -72,7 +72,7 @@ extern galaxian_draw_background_func galaxian_draw_background_ptr; /* special purpose background rendering */ void galaxian_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect); void frogger_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect); -void amidar_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect); +//void amidar_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect); void turtles_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect); void scramble_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect); void jumpbug_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect); diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h index 41a642ecda2..9344cf1b556 100644 --- a/src/mame/includes/konamigx.h +++ b/src/mame/includes/konamigx.h @@ -1,13 +1,10 @@ /*----------- defined in video/konamigx.c -----------*/ // 2nd-Tier GX/MW Hardware Functions -void K053247GP_set_SpriteOffset(int offsx, int offsy); void K053936GP_set_offset(int chip, int xoffs, int yoffs); void K053936GP_clip_enable(int chip, int status); void K053936GP_set_cliprect(int chip, int minx, int maxx, int miny, int maxy); -void K053936GP_0_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tmap, int tilebpp, int blend, int alpha); -void K053936GP_1_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tmap, int tilebpp, int blend, int alpha); @@ -16,10 +13,6 @@ extern UINT8 konamigx_wrport1_0, konamigx_wrport1_1; extern UINT16 konamigx_wrport2; -// Tile and Sprite Mixcode Decoders -int K055555GX_decode_vmixcolor(int layer, int *color); -int K055555GX_decode_osmixcolor(int layer, int *color); - // Sprite Callbacks @@ -37,11 +30,6 @@ int K055555GX_decode_osmixcolor(int layer, int *color); #define K055555_SKIPSHADOW 0x40000000 #define K055555_FULLSHADOW 0x80000000 -void konamigx_type2_sprite_callback(int *code, int *color, int *priority); - -void konamigx_dragoonj_sprite_callback(int *code, int *color, int *priority); -void konamigx_salmndr2_sprite_callback(int *code, int *color, int *priority); -void konamigx_le2_sprite_callback(int *code, int *color, int *priority); // Centralized Sprites and Layer Blitter @@ -95,9 +83,11 @@ VIDEO_START(racinfrc); VIDEO_UPDATE(konamigx); WRITE32_HANDLER( konamigx_palette_w ); +#ifdef UNUSED_FUNCTION WRITE32_HANDLER( konamigx_palette2_w ); WRITE32_HANDLER( konamigx_555_palette_w ); WRITE32_HANDLER( konamigx_555_palette2_w ); +#endif WRITE32_HANDLER( konamigx_tilebank_w ); WRITE32_HANDLER( konamigx_t1_psacmap_w ); WRITE32_HANDLER( konamigx_t4_psacmap_w ); @@ -116,7 +106,6 @@ WRITE16_HANDLER( K053990_martchmp_word_w ); void konamigx_esc_alert(UINT32 *srcbase, int srcoffs, int count, int mode); void fantjour_dma_install(running_machine *machine); -WRITE32_HANDLER(fantjour_dma_w); diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c index bc436aac844..b54ee8d8080 100644 --- a/src/mame/machine/konamigx.c +++ b/src/mame/machine/konamigx.c @@ -17,6 +17,8 @@ // K055550/K053990 protection chips, perform simple memset() and other game logic operations static UINT16 prot_data[0x20]; +static WRITE32_HANDLER(fantjour_dma_w); + READ16_HANDLER( K055550_word_r ) { return(prot_data[offset]); @@ -444,7 +446,7 @@ void fantjour_dma_install(running_machine *machine) memset(fantjour_dma, 0, sizeof(fantjour_dma)); } -WRITE32_HANDLER(fantjour_dma_w) +static WRITE32_HANDLER(fantjour_dma_w) { COMBINE_DATA(fantjour_dma + offset); if(!offset && ACCESSING_BITS_24_31) { diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c index 10ddcdfc3a7..c23842acd47 100644 --- a/src/mame/video/galaxian.c +++ b/src/mame/video/galaxian.c @@ -950,6 +950,7 @@ static void stars_draw_row(bitmap_t *bitmap, int maxx, int y, UINT32 star_offs, * *************************************/ +#ifdef UNUSED_FUNCTION static int flip_and_clip(rectangle *draw, int xstart, int xend, const rectangle *cliprect) { *draw = *cliprect; @@ -966,6 +967,7 @@ static int flip_and_clip(rectangle *draw, int xstart, int xend, const rectangle sect_rect(draw, cliprect); return (draw->min_x <= draw->max_x); } +#endif void galaxian_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) @@ -1027,6 +1029,7 @@ void frogger_draw_background(running_machine *machine, bitmap_t *bitmap, const r } +#ifdef UNUSED_FUNCTION void amidar_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { const UINT8 *prom = memory_region(machine, "user1"); @@ -1056,6 +1059,7 @@ void amidar_draw_background(running_machine *machine, bitmap_t *bitmap, const re bitmap_fill(bitmap, &draw, MAKE_RGB(red, green, blue)); } } +#endif void turtles_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index 25a44b64521..3f50b77c639 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -353,13 +353,13 @@ static void K053936GP_zoom_draw(running_machine *machine, } } -void K053936GP_0_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, +static void K053936GP_0_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tmap, int tilebpp, int blend, int alpha, int pixeldouble_output) { K053936GP_zoom_draw(machine, 0,K053936_0_ctrl,K053936_0_linectrl,bitmap,cliprect,tmap,tilebpp,blend,alpha, pixeldouble_output); } -void K053936GP_1_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, +static void K053936GP_1_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, tilemap_t *tmap, int tilebpp, int blend, int alpha, int pixeldouble_output) { K053936GP_zoom_draw(machine, 1,K053936_1_ctrl,K053936_1_linectrl,bitmap,cliprect,tmap,tilebpp,blend,alpha, pixeldouble_output); @@ -924,7 +924,7 @@ INLINE int K055555GX_decode_inpri(int c18) // (see p.59 7.2.2) return(c18 | op); } -void konamigx_type2_sprite_callback(int *code, int *color, int *priority) +static void konamigx_type2_sprite_callback(int *code, int *color, int *priority) { int num = *code; int c18 = *color; @@ -935,7 +935,7 @@ void konamigx_type2_sprite_callback(int *code, int *color, int *priority) *priority = K055555GX_decode_inpri(c18); } -void konamigx_dragoonj_sprite_callback(int *code, int *color, int *priority) +static void konamigx_dragoonj_sprite_callback(int *code, int *color, int *priority) { int num, op, pri, c18; @@ -953,7 +953,7 @@ void konamigx_dragoonj_sprite_callback(int *code, int *color, int *priority) *color = K055555GX_decode_objcolor(c18); } -void konamigx_salmndr2_sprite_callback(int *code, int *color, int *priority) +static void konamigx_salmndr2_sprite_callback(int *code, int *color, int *priority) { int num, op, pri, c18; @@ -971,7 +971,7 @@ void konamigx_salmndr2_sprite_callback(int *code, int *color, int *priority) *color = K055555GX_decode_objcolor(c18); } -void konamigx_le2_sprite_callback(int *code, int *color, int *priority) +static void konamigx_le2_sprite_callback(int *code, int *color, int *priority) { int num, op, pri; @@ -988,7 +988,7 @@ void konamigx_le2_sprite_callback(int *code, int *color, int *priority) *priority = pri | op; } -int K055555GX_decode_vmixcolor(int layer, int *color) // (see p.62 7.2.6 and p.27 3.3) +static int K055555GX_decode_vmixcolor(int layer, int *color) // (see p.62 7.2.6 and p.27 3.3) { int vcb, shift, pal, vmx, von, pl45, emx; @@ -1017,6 +1017,7 @@ int K055555GX_decode_vmixcolor(int layer, int *color) // (see p.62 7.2.6 and p.2 return(emx); } +#ifdef UNUSED_FUNCTION int K055555GX_decode_osmixcolor(int layer, int *color) // (see p.63, p.49-50 and p.27 3.3) { int scb, shift, pal, osmx, oson, pl45, emx; @@ -1054,6 +1055,7 @@ int K055555GX_decode_osmixcolor(int layer, int *color) // (see p.63, p.49-50 and return(emx); } +#endif static void gx_wipezbuf(running_machine *machine, int noshadow) { @@ -1121,7 +1123,7 @@ static int K053247_dx, K053247_dy; static int *K054338_shdRGB; -void K053247GP_set_SpriteOffset(int offsx, int offsy) +static void K053247GP_set_SpriteOffset(int offsx, int offsy) { K053247_dx = offsx; K053247_dy = offsy; @@ -2627,6 +2629,7 @@ WRITE32_HANDLER( konamigx_palette_w ) palette_set_color(space->machine,offset,MAKE_RGB(r,g,b)); } +#ifdef UNUSED_FUNCTION WRITE32_HANDLER( konamigx_palette2_w ) { int r,g,b; @@ -2641,12 +2644,14 @@ WRITE32_HANDLER( konamigx_palette2_w ) palette_set_color(space->machine,offset,MAKE_RGB(r,g,b)); } +#endif INLINE void set_color_555(running_machine *machine, pen_t color, int rshift, int gshift, int bshift, UINT16 data) { palette_set_color_rgb(machine, color, pal5bit(data >> rshift), pal5bit(data >> gshift), pal5bit(data >> bshift)); } +#ifdef UNUSED_FUNCTION // main monitor for type 3 WRITE32_HANDLER( konamigx_555_palette_w ) { @@ -2671,6 +2676,7 @@ WRITE32_HANDLER( konamigx_555_palette2_w ) set_color_555(space->machine, offset*2, 0, 5, 10,coldat >> 16); set_color_555(space->machine, offset*2+1, 0, 5, 10,coldat & 0xffff); } +#endif WRITE32_HANDLER( konamigx_tilebank_w ) diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index c5eae36ea0f..c83c378618b 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -1162,6 +1162,7 @@ Registers (word-wise): (it could be easily converted into an iterative one). It's called shuffle because it mimics the shuffling of a deck of cards. */ +#ifdef UNUSED_FUNCTION static void shuffle(UINT16 *buf,int len) { int i; @@ -1206,6 +1207,7 @@ void konami_rom_deinterleave_4(running_machine *machine, const char *mem_region) konami_rom_deinterleave_2(machine, mem_region); konami_rom_deinterleave_2(machine, mem_region); } +#endif static void decode_gfx(running_machine *machine, int gfx_index, UINT8 *data, UINT32 total, const gfx_layout *layout, int bpp) @@ -1227,6 +1229,7 @@ static void decode_gfx(running_machine *machine, int gfx_index, UINT8 *data, UIN /* */ /***************************************************************************/ +#ifdef UNUSED_FUNCTION UINT8 K007121_ctrlram[MAX_K007121][8]; static int K007121_flipscreen[MAX_K007121]; @@ -1442,6 +1445,7 @@ if (input_code_pressed(gfx->machine, KEYCODE_D)) source += inc; } } +#endif @@ -1451,6 +1455,7 @@ if (input_code_pressed(gfx->machine, KEYCODE_D)) /* */ /***************************************************************************/ +#ifdef UNUSED_FUNCTION static UINT8 *K007342_ram,*K007342_scroll_ram; static int K007342_gfxnum; static int K007342_int_enabled; @@ -1674,6 +1679,7 @@ int K007342_is_INT_enabled(void) { return K007342_int_enabled; } +#endif @@ -1683,6 +1689,7 @@ int K007342_is_INT_enabled(void) /* */ /***************************************************************************/ +#ifdef UNUSED_FUNCTION static gfx_element *K007420_gfx; static void (*K007420_callback)(int *code,int *color); static UINT8 *K007420_ram; @@ -2931,6 +2938,7 @@ WRITE8_HANDLER( K052109_051960_w ) else K051960_w(space,offset - 0x3c00,data); } +#endif @@ -2958,10 +2966,12 @@ static int K05324x_z_rejection; -1 = accept all(default) 0x00-0xff = zcode to ignore */ +#ifdef UNUSED_FUNCTION void K05324x_set_z_rejection(int zcode) { K05324x_z_rejection = zcode; } +#endif @@ -2971,6 +2981,7 @@ void K05324x_set_z_rejection(int zcode) /* */ /***************************************************************************/ +#ifdef UNUSED_FUNCTION #define MAX_K053245_CHIPS 2 static const char *K053245_memory_region[MAX_K053245_CHIPS]; @@ -3695,6 +3706,7 @@ if (input_code_pressed(machine, KEYCODE_D)) #endif #undef NUM_SPRITES } +#endif /***************************************************************************/ @@ -3729,6 +3741,7 @@ void K053247_export_config(UINT16 **ram, gfx_element **gfx, void (**callback)(in int K053246_read_register(int regnum) { return(K053246_regs[regnum]); } int K053247_read_register(int regnum) { return(K053247_regs[regnum]); } +#ifdef UNUSED_FUNCTION void K053247_set_SpriteOffset(int offsx, int offsy) { K053247_dx = offsx; @@ -3825,6 +3838,7 @@ void K053247_vh_start(running_machine *machine, const char *gfx_memory_region, i state_save_register_global_array(machine, K053247_regs); state_save_register_global(machine, K053246_OBJCHA_line); } +#endif /* K055673 used with the 54246 in PreGX/Run and Gun/System GX games */ void K055673_vh_start(running_machine *machine, const char *gfx_memory_region, int layout, int dx, int dy, void (*callback)(int *code,int *color,int *priority)) @@ -3993,6 +4007,7 @@ WRITE32_HANDLER( K053247_long_w ) COMBINE_DATA(K053247_ram + offset); } +#ifdef UNUSED_FUNCTION READ8_HANDLER( K053247_r ) { int offs = offset >> 1; @@ -4012,6 +4027,7 @@ WRITE8_HANDLER( K053247_w ) else K053247_ram[offs] = (K053247_ram[offs] & 0x00ff) | (data<<8); } +#endif // Mystic Warriors hardware games support a non-OBJCHA based ROM readback // write the address to the 246 as usual, but there's a completely separate ROM @@ -4089,6 +4105,7 @@ READ16_HANDLER( K055673_GX6bpp_rom_word_r ) return 0; } +#ifdef UNUSED_FUNCTION READ8_HANDLER( K053246_r ) { if (K053246_OBJCHA_line == ASSERT_LINE) @@ -4107,17 +4124,20 @@ READ8_HANDLER( K053246_r ) return 0; } } +#endif -WRITE8_HANDLER( K053246_w ) +static WRITE8_HANDLER( K053246_w ) { K053246_regs[offset] = data; } +#ifdef UNUSED_FUNCTION READ16_HANDLER( K053246_word_r ) { offset <<= 1; return K053246_r(space, offset + 1) | (K053246_r(space, offset) << 8); } +#endif WRITE16_HANDLER( K053246_word_w ) { @@ -4127,11 +4147,13 @@ WRITE16_HANDLER( K053246_word_w ) K053246_w(space, (offset<<1) + 1,data & 0xff); } +#ifdef UNUSED_FUNCTION READ32_HANDLER( K053246_long_r ) { offset <<= 1; return (K053246_word_r(space, offset+1, 0xffff) | K053246_word_r(space, offset, 0xffff)<<16); } +#endif WRITE32_HANDLER( K053246_long_w ) { @@ -4180,6 +4202,7 @@ int K053246_is_IRQ_enabled(void) * The rest of the sprite remains normal. */ +#ifdef UNUSED_FUNCTION void K053247_sprites_draw(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect) //* { #define NUM_SPRITES 256 @@ -4551,6 +4574,7 @@ void K053247_sprites_draw(running_machine *machine, bitmap_t *bitmap,const recta } // end of sprite-list loop #undef NUM_SPRITES } +#endif @@ -4560,6 +4584,7 @@ void K053247_sprites_draw(running_machine *machine, bitmap_t *bitmap,const recta /* */ /***************************************************************************/ +#ifdef UNUSED_FUNCTION #define MAX_K051316 3 static const char *K051316_memory_region[MAX_K051316]; @@ -4909,6 +4934,7 @@ void K051316_zoom_draw_2(bitmap_t *bitmap,const rectangle *cliprect,int flags,UI { K051316_zoom_draw(2,bitmap,cliprect,flags,priority); } +#endif @@ -5054,10 +5080,12 @@ void K053936_0_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap_t *t K053936_zoom_draw(0,K053936_0_ctrl,K053936_0_linectrl,bitmap,cliprect,tmap,flags,priority, glfgreat_hack); } +#ifdef UNUSED_FUNCTION void K053936_1_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap_t *tmap,int flags,UINT32 priority, int glfgreat_hack) { K053936_zoom_draw(1,K053936_1_ctrl,K053936_1_linectrl,bitmap,cliprect,tmap,flags,priority, glfgreat_hack); } +#endif void K053936_wraparound_enable(int chip, int status) @@ -5080,6 +5108,7 @@ void K053936_set_offset(int chip, int xoffs, int yoffs) /* */ /***************************************************************************/ +#ifdef UNUSED_FUNCTION static UINT8 K053251_ram[16]; static int K053251_palette_index[5]; static tilemap_t *K053251_tilemaps[5]; @@ -5182,6 +5211,7 @@ int K053251_get_palette_index(int ci) { return K053251_palette_index[ci]; } +#endif @@ -5193,14 +5223,14 @@ int K053251_get_palette_index(int ci) static UINT8 K054000_ram[0x20]; -WRITE8_HANDLER( K054000_w ) +static WRITE8_HANDLER( K054000_w ) { //logerror("%04x: write %02x to 054000 address %02x\n",cpu_get_pc(space->cpu),data,offset); K054000_ram[offset] = data; } -READ8_HANDLER( K054000_r ) +static READ8_HANDLER( K054000_r ) { int Acx,Acy,Aax,Aay; int Bcx,Bcy,Bax,Bay; @@ -5256,6 +5286,7 @@ WRITE16_HANDLER( K054000_lsb_w ) /* */ /***************************************************************************/ +#ifdef UNUSED_FUNCTION static UINT8 K051733_ram[0x20]; WRITE8_HANDLER( K051733_w ) @@ -5344,6 +5375,7 @@ READ8_HANDLER( K051733_r ) return K051733_ram[offset]; } } +#endif /***************************************************************************/ /* */ @@ -5496,6 +5528,7 @@ if (!(K056832_djmain_hack==1) || K056832_LayerAssociatedWithPage[pageIndex] == - K056832_MarkAllTilemapsDirty(); } +#ifdef UNUSED_FUNCTION int K056832_get_lookup(int bits) { int res; @@ -5507,6 +5540,7 @@ int K056832_get_lookup(int bits) return res; } +#endif static void (*K056832_callback)(int layer, int *code, int *color, int *flags); @@ -5591,12 +5625,14 @@ static void K056832_change_rambank(void) K056832_MarkAllTilemapsDirty(); } +#ifdef UNUSED_FUNCTION int K056832_get_current_rambank(void) { int bank = K056832_regs[0x19]; return ((bank>>1)&0xc)|(bank&3); } +#endif static void K056832_change_rombank(void) { @@ -5614,6 +5650,7 @@ static void K056832_change_rombank(void) K056832_CurGfxBank = bank % K056832_NumGfxBanks; } +#ifdef UNUSED_FUNCTION void K056832_set_tile_bank(int bank) { K056832_uses_tile_banks = 1; @@ -5630,6 +5667,7 @@ void K056832_set_tile_bank(int bank) K056832_change_rombank(); } +#endif static STATE_POSTLOAD( K056832_postload ) { @@ -5867,10 +5905,12 @@ void K056832_vh_start(running_machine *machine, const char *gfx_memory_region, i } /* call if a game uses external linescroll */ +#ifdef UNUSED_FUNCTION void K056832_SetExtLinescroll(void) { K056832_use_ext_linescroll = 1; } +#endif /* generic helper routine for ROM checksumming */ static int K056832_rom_read_b(running_machine *machine, int offset, int blksize, int blksize2, int zerosec) @@ -5907,6 +5947,7 @@ static int K056832_rom_read_b(running_machine *machine, int offset, int blksize, return ret; } +#ifdef UNUSED_FUNCTION READ16_HANDLER( K056832_5bpp_rom_word_r ) { if (mem_mask == 0xff00) @@ -5923,6 +5964,7 @@ READ16_HANDLER( K056832_5bpp_rom_word_r ) } return 0; } +#endif READ32_HANDLER( K056832_5bpp_rom_long_r ) { @@ -5974,6 +6016,7 @@ READ32_HANDLER( K056832_6bpp_rom_long_r ) return 0; } +#ifdef UNUSED_FUNCTION READ16_HANDLER( K056832_rom_word_r ) { int ofs16, ofs8; @@ -6004,6 +6047,7 @@ READ16_HANDLER( K056832_rom_word_r ) return ret; } +#endif // data is arranged like this: // 0000 1111 22 0000 1111 22 @@ -6072,6 +6116,7 @@ READ16_HANDLER( K056832_mw_rom_word_r ) } +#ifdef UNUSED_FUNCTION READ16_HANDLER( K056832_bishi_rom_word_r ) { int addr = 0x4000*K056832_CurGfxBank+offset; @@ -6113,6 +6158,7 @@ READ32_HANDLER( K056832_rom_long_r ) offset <<= 1; return (K056832_rom_word_r(space, offset+1, 0xffff) | (K056832_rom_word_r(space, offset, 0xffff)<<16)); } +#endif /* only one page is mapped to videoram at a time through a window */ READ16_HANDLER( K056832_ram_word_r ) @@ -6123,10 +6169,12 @@ READ16_HANDLER( K056832_ram_word_r ) return K056832_videoram[K056832_SelectedPagex4096+offset]; } +#ifdef UNUSED_FUNCTION READ16_HANDLER( K056832_ram_half_word_r ) { return K056832_videoram[K056832_SelectedPagex4096+(((offset << 1) & 0xffe) | ((offset >> 11) ^ 1))]; } +#endif READ32_HANDLER( K056832_ram_long_r ) { @@ -6138,6 +6186,7 @@ READ32_HANDLER( K056832_ram_long_r ) return(pMem[0]<<16 | pMem[1]); } +#ifdef UNUSED_FUNCTION /* special 8-bit handlers for Lethal Enforcers */ READ8_HANDLER( K056832_ram_code_lo_r ) { @@ -6230,6 +6279,7 @@ WRITE8_HANDLER( K056832_ram_attr_hi_w ) K056832_mark_line_dirty(K056832_SelectedPage, offset); } } +#endif WRITE16_HANDLER( K056832_ram_word_w ) { @@ -6253,6 +6303,7 @@ WRITE16_HANDLER( K056832_ram_word_w ) } } +#ifdef UNUSED_FUNCTION WRITE16_HANDLER( K056832_ram_half_word_w ) { UINT16 *adr = &K056832_videoram[K056832_SelectedPagex4096+(((offset << 1) & 0xffe) | 1)]; @@ -6271,6 +6322,7 @@ WRITE16_HANDLER( K056832_ram_half_word_w ) K056832_mark_line_dirty(K056832_SelectedPage, dofs); } } +#endif WRITE32_HANDLER( K056832_ram_long_w ) { @@ -6427,6 +6479,7 @@ WRITE16_HANDLER( K056832_b_word_w ) COMBINE_DATA( &K056832_regsb[offset] ); } +#ifdef UNUSED_FUNCTION WRITE8_HANDLER( K056832_w ) { if (offset & 1) @@ -6462,6 +6515,7 @@ WRITE32_HANDLER( K056832_b_long_w ) K056832_b_word_w(space, (offset<<1)+1, data, mem_mask); } } +#endif static int K056832_update_linemap(running_machine *machine, bitmap_t *bitmap, int page, int flags) { @@ -6876,6 +6930,7 @@ void K056832_tilemap_draw(running_machine *machine, bitmap_t *bitmap, const rect } // end of function +#ifdef UNUSED_FUNCTION void K056832_tilemap_draw_dj(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer, UINT32 flags, UINT32 priority) //* { static int last_colorbase[K056832_PAGE_COUNT]; @@ -7139,6 +7194,7 @@ void K056832_set_LayerAssociation(int status) { K056832_DefaultLayerAssociation = status; } +#endif int K056832_get_LayerAssociation(void) { @@ -7151,17 +7207,20 @@ void K056832_set_LayerOffset(int layer, int offsx, int offsy) K056832_LayerOffset[layer][1] = offsy; } +#ifdef UNUSED_FUNCTION void K056832_set_LSRAMPage(int logical_page, int physical_page, int physical_offset) { K056832_LSRAMPage[logical_page][0] = physical_page; K056832_LSRAMPage[logical_page][1] = physical_offset; } +#endif void K056832_set_UpdateMode(int mode) { K056832_UpdateMode = mode; } +#ifdef UNUSED_FUNCTION void K056832_linemap_enable(int enable) { K056832_linemap_enabled = enable; @@ -7182,6 +7241,7 @@ int K056832_read_register(int regnum) { return(K056832_regs[regnum]); } +#endif @@ -7340,6 +7400,7 @@ void K054338_update_all_shadows(running_machine *machine, int rushingheroes_hack } } +#ifdef UNUSED_FUNCTION // K054338 BG color fill void K054338_fill_solid_bg(bitmap_t *bitmap) { @@ -7359,6 +7420,7 @@ void K054338_fill_solid_bg(bitmap_t *bitmap) *pLine++ = bgcolor; } } +#endif // Unified K054338/K055555 BG color fill void K054338_fill_backcolor(running_machine *machine, bitmap_t *bitmap, int mode) // (see p.67) @@ -7530,7 +7592,7 @@ void K053250_set_LayerOffset(int chip, int offsx, int offsy) // The DMA process should be instantaneous but since rendering in MAME is performed at VIDEO_UPDATE() // the K053250 memory must be buffered to maintain visual integrity. -void K053250_dma(running_machine *machine, int chip, int limiter) +static void K053250_dma(running_machine *machine, int chip, int limiter) { struct K053250_CHIPTAG *chip_ptr; int last_frame, current_frame; @@ -7626,6 +7688,7 @@ READ16_HANDLER( K053250_0_rom_r ) return *(K053250_info.chip[0].base + 0x80000*K053250_info.chip[0].regs[6] + 0x800*K053250_info.chip[0].regs[7] + (offset>>1)); } +#ifdef UNUSED_FUNCTION WRITE16_HANDLER( K053250_1_w ) { if (ACCESSING_BITS_0_7) @@ -7659,7 +7722,6 @@ READ16_HANDLER( K053250_1_rom_r ) return *(K053250_info.chip[1].base + 0x80000*K053250_info.chip[1].regs[6] + 0x800*K053250_info.chip[1].regs[7] + (offset>>1)); } -#if 0 static void K053250_pdraw_scanline8( bitmap_t *bitmap,int x,int y,int length, @@ -8430,26 +8492,31 @@ void K053250_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *c // K053252 CRT and interrupt control unit static UINT16 K053252_regs[16]; +#ifdef UNUSED_FUNCTION READ16_HANDLER( K053252_word_r ) { return(K053252_regs[offset]); } +#endif WRITE16_HANDLER( K053252_word_w ) { COMBINE_DATA(K053252_regs + offset); } +#ifdef UNUSED_FUNCTION WRITE32_HANDLER( K053252_long_w ) { offset <<= 1; K053252_word_w(space, offset, data>>16, mem_mask>>16); K053252_word_w(space, offset+1, data, mem_mask); } +#endif // debug handlers +#ifdef UNUSED_FUNCTION READ16_HANDLER( K056832_word_r ) { return(K056832_regs[offset]); } // VACSET READ16_HANDLER( K056832_b_word_r ) { return(K056832_regsb[offset]); } // VSCCS (board dependent) READ16_HANDLER( K053246_reg_word_r ) { return(K053246_regs[offset*2]<<8|K053246_regs[offset*2+1]); } // OBJSET1 @@ -8478,4 +8545,5 @@ READ32_HANDLER( K055555_long_r ) } READ16_HANDLER( K053244_reg_word_r ) { return(K053244_regs[0][offset*2]<<8|K053244_regs[0][offset*2+1]); } +#endif diff --git a/src/mame/video/konamiic.h b/src/mame/video/konamiic.h index 6d7f62b04d2..1a10770d111 100644 --- a/src/mame/video/konamiic.h +++ b/src/mame/video/konamiic.h @@ -1,3 +1,4 @@ +#ifdef UNUSED_FUNCTION /* helper function to join two 16-bit ROMs and form a 32-bit data stream */ void konami_rom_deinterleave_2(running_machine *machine, const char *mem_region); void konami_rom_deinterleave_2_half(running_machine *machine, const char *mem_region); @@ -33,6 +34,7 @@ READ8_HANDLER( K007420_r ); WRITE8_HANDLER( K007420_w ); void K007420_sprites_draw(bitmap_t *bitmap,const rectangle *cliprect); void K007420_set_banklimit(int limit); +#endif /* @@ -49,6 +51,7 @@ permutations which may be required). #define GRADIUS3_PLANE_ORDER 0x1111 #define TASMAN_PLANE_ORDER 0x1616 +#ifdef UNUSED_FUNCTION /* The callback is passed: - layer number (0 = FIX, 1 = A, 2 = B) @@ -133,6 +136,7 @@ void K053245_sprites_draw(running_machine *machine, int chip, bitmap_t *bitmap,c void K053245_sprites_draw_lethal(running_machine *machine, int chip, bitmap_t *bitmap,const rectangle *cliprect); /* for lethal enforcers */ void K053245_clear_buffer(int chip); void K053245_set_SpriteOffset(int chip,int offsx, int offsy); +#endif #define K055673_LAYOUT_GX 0 #define K055673_LAYOUT_RNG 1 @@ -154,28 +158,38 @@ Callback procedures for non-standard shadows: #define K053247_CUSTOMSHADOW 0x20000000 #define K053247_SHDSHIFT 20 +#ifdef UNUSED_FUNCTION void K053247_vh_start(running_machine *machine, const char *gfx_memory_region,int dx,int dy,int plane_order, void (*callback)(int *code,int *color,int *priority_mask)); READ8_HANDLER( K053247_r ); WRITE8_HANDLER( K053247_w ); +#endif READ16_HANDLER( K053247_word_r ); WRITE16_HANDLER( K053247_word_w ); READ32_HANDLER( K053247_long_r ); WRITE32_HANDLER( K053247_long_w ); WRITE16_HANDLER( K053247_reg_word_w ); // "OBJSET2" registers WRITE32_HANDLER( K053247_reg_long_w ); +#ifdef UNUSED_FUNCTION void K053247_sprites_draw(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect); +#endif int K053247_read_register(int regnum); void K053247_set_SpriteOffset(int offsx, int offsy); +#ifdef UNUSED_FUNCTION void K053247_wraparound_enable(int status); void K05324x_set_z_rejection(int zcode); // common to K053245/6/7 +#endif void K053247_export_config(UINT16 **ram, gfx_element **gfx, void (**callback)(int *, int *, int *), int *dx, int *dy); +#ifdef UNUSED_FUNCTION READ8_HANDLER( K053246_r ); WRITE8_HANDLER( K053246_w ); READ16_HANDLER( K053246_word_r ); +#endif WRITE16_HANDLER( K053246_word_w ); +#ifdef UNUSED_FUNCTION READ32_HANDLER( K053246_long_r ); +#endif WRITE32_HANDLER( K053246_long_w ); void K053246_set_OBJCHA_line(int state); int K053246_is_IRQ_enabled(void); @@ -193,6 +207,7 @@ The callback must put: - if necessary, put flags for the TileMap code in the tile_info structure (e.g. TILE_FLIPX) */ +#ifdef UNUSED_FUNCTION void K051316_vh_start_0(running_machine *machine,const char *gfx_memory_region,int bpp, int tilemap_type,int transparent_pen, void (*callback)(int *code,int *color,int *flags)); @@ -219,12 +234,15 @@ void K051316_zoom_draw_1(bitmap_t *bitmap,const rectangle *cliprect,int flags,UI void K051316_zoom_draw_2(bitmap_t *bitmap,const rectangle *cliprect,int flags,UINT32 priority); void K051316_wraparound_enable(int chip, int status); void K051316_set_offset(int chip, int xoffs, int yoffs); +#endif extern UINT16 *K053936_0_ctrl,*K053936_0_linectrl; extern UINT16 *K053936_1_ctrl,*K053936_1_linectrl; void K053936_0_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap_t *tmap,int flags,UINT32 priority, int glfgreat_hack); +#ifdef UNUSED_FUNCTION void K053936_1_zoom_draw(bitmap_t *bitmap,const rectangle *cliprect,tilemap_t *tmap,int flags,UINT32 priority, int glfgreat_hack); +#endif void K053936_wraparound_enable(int chip, int status); void K053936_set_offset(int chip, int xoffs, int yoffs); @@ -244,15 +262,19 @@ void K053251_set_tilemaps(tilemap_t *ci0,tilemap_t *ci1,tilemap_t *ci2,tilemap_t void K053251_vh_start(running_machine *machine); +#ifdef UNUSED_FUNCTION WRITE8_HANDLER( K054000_w ); READ8_HANDLER( K054000_r ); +#endif WRITE16_HANDLER( K054000_lsb_w ); READ16_HANDLER( K054000_lsb_r ); +#ifdef UNUSED_FUNCTION WRITE8_HANDLER( K051733_w ); READ8_HANDLER( K051733_r ); void K056832_SetExtLinescroll(void); /* Lethal Enforcers */ +#endif #define K056382_DRAW_FLAG_FORCE_XYSCROLL 0x00800000 @@ -262,18 +284,25 @@ void K056832_vh_start(running_machine *machine, const char *gfx_memory_region, i int djmain_hack); READ16_HANDLER( K056832_ram_word_r ); WRITE16_HANDLER( K056832_ram_word_w ); +#ifdef UNUSED_FUNCTION READ16_HANDLER( K056832_ram_half_word_r ); WRITE16_HANDLER( K056832_ram_half_word_w ); READ16_HANDLER( K056832_5bpp_rom_word_r ); +#endif READ32_HANDLER( K056832_5bpp_rom_long_r ); READ32_HANDLER( K056832_6bpp_rom_long_r ); +#ifdef UNUSED_FUNCTION READ16_HANDLER( K056832_rom_word_r ); +#endif READ16_HANDLER( K056832_mw_rom_word_r ); +#ifdef UNUSED_FUNCTION READ16_HANDLER( K056832_bishi_rom_word_r ); READ16_HANDLER( K056832_old_rom_word_r ); READ16_HANDLER( K056832_rom_word_8000_r ); +#endif WRITE16_HANDLER( K056832_word_w ); // "VRAM" registers WRITE16_HANDLER( K056832_b_word_w ); +#ifdef UNUSED_FUNCTION READ8_HANDLER( K056832_ram_code_lo_r ); READ8_HANDLER( K056832_ram_code_hi_r ); READ8_HANDLER( K056832_ram_attr_lo_r ); @@ -284,15 +313,21 @@ WRITE8_HANDLER( K056832_ram_attr_lo_w ); WRITE8_HANDLER( K056832_ram_attr_hi_w ); WRITE8_HANDLER( K056832_w ); WRITE8_HANDLER( K056832_b_w ); +#endif void K056832_mark_plane_dirty(int num); void K056832_MarkAllTilemapsDirty(void); void K056832_tilemap_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int num, UINT32 flags, UINT32 priority); +#ifdef UNUSED_FUNCTION void K056832_tilemap_draw_dj(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int layer, UINT32 flags, UINT32 priority); void K056832_set_LayerAssociation(int status); +#endif int K056832_get_LayerAssociation(void); void K056832_set_LayerOffset(int layer, int offsx, int offsy); +#ifdef UNUSED_FUNCTION void K056832_set_LSRAMPage(int logical_page, int physical_page, int physical_offset); +#endif void K056832_set_UpdateMode(int mode); +#ifdef UNUSED_FUNCTION void K056832_linemap_enable(int enable); int K056832_is_IRQ_enabled(int irqline); void K056832_read_AVAC(int *mode, int *data); @@ -300,9 +335,12 @@ int K056832_read_register(int regnum); int K056832_get_current_rambank(void); int K056832_get_lookup(int bits); /* Asterix */ void K056832_set_tile_bank(int bank); /* Asterix */ +#endif READ32_HANDLER( K056832_ram_long_r ); +#ifdef UNUSED_FUNCTION READ32_HANDLER( K056832_rom_long_r ); +#endif WRITE32_HANDLER( K056832_ram_long_w ); WRITE32_HANDLER( K056832_long_w ); WRITE32_HANDLER( K056832_b_long_w ); @@ -420,11 +458,13 @@ READ16_HANDLER( K053250_0_r ); WRITE16_HANDLER( K053250_0_ram_w ); READ16_HANDLER( K053250_0_ram_r ); READ16_HANDLER( K053250_0_rom_r ); +#ifdef UNUSED_FUNCTION WRITE16_HANDLER( K053250_1_w ); READ16_HANDLER( K053250_1_r ); WRITE16_HANDLER( K053250_1_ram_w ); READ16_HANDLER( K053250_1_ram_r ); READ16_HANDLER( K053250_1_rom_r ); +#endif // K053250_draw() control flags #define K053250_WRAP500 0x01 @@ -433,16 +473,23 @@ READ16_HANDLER( K053250_1_rom_r ); void K053250_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int chip, int colorbase, int flags, int pri); void K053250_set_LayerOffset(int chip, int offsx, int offsy); void K053250_unpack_pixels(running_machine *machine, const char *region); +#ifdef UNUSED_FUNCTION void K053250_dma(running_machine *machine, int chip, int limiter); +#endif // K053252 CRT and interrupt control unit +#ifdef UNUSED_FUNCTION READ16_HANDLER( K053252_word_r ); // CCU registers +#endif WRITE16_HANDLER( K053252_word_w ); +#ifdef UNUSED_FUNCTION WRITE32_HANDLER( K053252_long_w ); +#endif // debug handlers +#ifdef UNUSED_FUNCTION READ16_HANDLER( K056832_word_r ); // VACSET READ16_HANDLER( K056832_b_word_r ); // VSCCS (board dependent) READ16_HANDLER( K053246_reg_word_r ); // OBJSET1 @@ -457,3 +504,4 @@ READ32_HANDLER( K053247_reg_long_r ); // OBJSET2 READ32_HANDLER( K055555_long_r ); // PCU2 READ16_HANDLER( K053244_reg_word_r ); // OBJSET0 +#endif diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c index bbc26e64f10..d27215ec246 100644 --- a/src/mame/video/konicdev.c +++ b/src/mame/video/konicdev.c @@ -1356,17 +1356,6 @@ INLINE k007121_state *k007121_get_safe_token( running_device *device ) DEVICE HANDLERS *****************************************************************************/ -/* FIXME: this is probably unused... check! */ -WRITE8_DEVICE_HANDLER( k007121_ctrlram_w ) -{ - k007121_state *k007121 = k007121_get_safe_token(device); - - assert(offset < 8); - - k007121->ctrlram[offset] = data; -} - - READ8_DEVICE_HANDLER( k007121_ctrlram_r ) { k007121_state *k007121 = k007121_get_safe_token(device); @@ -1759,12 +1748,6 @@ void k007342_tilemap_update( running_device *device ) #endif } -void k007342_tilemap_set_enable( running_device *device, int tmap, int enable ) -{ - k007342_state *k007342 = k007342_get_safe_token(device); - tilemap_set_enable(k007342->tilemap[tmap], enable); -} - void k007342_tilemap_draw( running_device *device, bitmap_t *bitmap, const rectangle *cliprect, int num, int flags, UINT32 priority ) { k007342_state *k007342 = k007342_get_safe_token(device); diff --git a/src/mame/video/konicdev.h b/src/mame/video/konicdev.h index 3ab368ccc80..7d750166216 100644 --- a/src/mame/video/konicdev.h +++ b/src/mame/video/konicdev.h @@ -322,7 +322,6 @@ void konami_sortlayers5(int *layer, int *pri); ***************************************************************************/ /** Konami 007121 **/ -WRITE8_DEVICE_HANDLER( k007121_ctrlram_w ); // FIXME: this is probably unused: writes to ctrlram should use ctrl_w below! READ8_DEVICE_HANDLER( k007121_ctrlram_r ); WRITE8_DEVICE_HANDLER( k007121_ctrl_w ); @@ -340,7 +339,6 @@ WRITE8_DEVICE_HANDLER( k007342_scroll_w ); WRITE8_DEVICE_HANDLER( k007342_vreg_w ); void k007342_tilemap_update(running_device *device); -void k007342_tilemap_set_enable(running_device *device, int layer, int enable); void k007342_tilemap_draw(running_device *device, bitmap_t *bitmap, const rectangle *cliprect, int num, int flags, UINT32 priority); int k007342_is_int_enabled(running_device *device); diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c index ee4b65cd2bd..4e108140452 100644 --- a/src/mame/video/toaplan2.c +++ b/src/mame/video/toaplan2.c @@ -1343,7 +1343,7 @@ static void toaplan2_log_vram(running_machine *machine) Sprite Handlers ***************************************************************************/ -static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int controller, UINT8* primap ) +static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int controller, const UINT8* primap ) { const gfx_element *gfx = machine->gfx[ ((controller*2)+1) ]; @@ -1532,7 +1532,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect Draw the game screen in the given bitmap_t. ***************************************************************************/ -void toaplan2_draw_custom_tilemap(running_machine* machine, bitmap_t* bitmap, tilemap_t* tilemap, UINT8* priremap, UINT8* pri_enable ) +static void toaplan2_draw_custom_tilemap(running_machine* machine, bitmap_t* bitmap, tilemap_t* tilemap, const UINT8* priremap, const UINT8* pri_enable ) { int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); @@ -1579,11 +1579,11 @@ void toaplan2_draw_custom_tilemap(running_machine* machine, bitmap_t* bitmap, ti } -UINT8 toaplan2_primap1[16] = { 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, 0x18, 0x1c, 0x20, 0x24, 0x28, 0x2c, 0x30, 0x34, 0x38, 0x3c }; +static const UINT8 toaplan2_primap1[16] = { 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, 0x18, 0x1c, 0x20, 0x24, 0x28, 0x2c, 0x30, 0x34, 0x38, 0x3c }; //UINT8 toaplan2_sprprimap1[16] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }; -UINT8 toaplan2_sprprimap1[16] = { 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, 0x18, 0x1c, 0x20, 0x24, 0x28, 0x2c, 0x30, 0x34, 0x38, 0x3c }; +static const UINT8 toaplan2_sprprimap1[16] = { 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, 0x18, 0x1c, 0x20, 0x24, 0x28, 0x2c, 0x30, 0x34, 0x38, 0x3c }; -UINT8 batsugun_prienable0[16]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; +static const UINT8 batsugun_prienable0[16]={ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; VIDEO_UPDATE( toaplan2_0 )