diff options
author | Aaron Giles <aaron@aarongiles.com> | 2009-10-04 05:08:50 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2009-10-04 05:08:50 +0000 |
commit | aff6be5877df225249d9afb36ed658efed0a89e5 (patch) | |
tree | cff7f54ff79782c7304b59354900119050155269 | |
parent | 844ea6b37e87f4d602489dc2083209a199f28733 (diff) |
Cleanups and version bump.
-rw-r--r-- | src/emu/cpu/m68000/m68k_in.c | 6 | ||||
-rw-r--r-- | src/emu/sound/disc_dev.c | 8 | ||||
-rw-r--r-- | src/emu/sound/disc_mth.c | 2 | ||||
-rw-r--r-- | src/emu/sound/disc_sys.c | 16 | ||||
-rw-r--r-- | src/emu/sound/discrete.c | 14 | ||||
-rw-r--r-- | src/emu/sound/discrete.h | 8 | ||||
-rw-r--r-- | src/mame/audio/galaxian.c | 8 | ||||
-rw-r--r-- | src/mame/audio/mario.c | 4 | ||||
-rw-r--r-- | src/mame/audio/sprint8.c | 22 | ||||
-rw-r--r-- | src/mame/drivers/39in1.c | 8 | ||||
-rw-r--r-- | src/mame/drivers/galdrvr.c | 10 | ||||
-rw-r--r-- | src/mame/drivers/megaplay.c | 28 | ||||
-rw-r--r-- | src/mame/drivers/multfish.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/naomi.c | 18 | ||||
-rw-r--r-- | src/mame/drivers/othello.c | 54 | ||||
-rw-r--r-- | src/mame/drivers/plygonet.c | 11 | ||||
-rw-r--r-- | src/mame/drivers/segae.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/segag80r.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/segamsys.c | 50 | ||||
-rw-r--r-- | src/mame/drivers/seta.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/sprint8.c | 2 | ||||
-rw-r--r-- | src/mame/mamedriv.c | 2 | ||||
-rw-r--r-- | src/mame/video/plygonet.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
24 files changed, 143 insertions, 148 deletions
diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/emu/cpu/m68000/m68k_in.c index b5c0b28b588..68b837ef533 100644 --- a/src/emu/cpu/m68000/m68k_in.c +++ b/src/emu/cpu/m68000/m68k_in.c @@ -7997,7 +7997,7 @@ M68KMAKE_OP(pea, 32, ., .) M68KMAKE_OP(pflush, 32, ., .) { - if ((CPU_TYPE_IS_040_PLUS(m68k->cpu_type)) && (m68k->has_pmmu)) + if ((CPU_TYPE_IS_040_PLUS(m68k->cpu_type)) && (m68k->has_pmmu)) { // Nothing to do, unless address translation cache is emulated logerror("680x0: unhandled PFLUSH\n"); @@ -8010,8 +8010,8 @@ M68KMAKE_OP(pmove, 32, ., .) { UINT16 modes; UINT32 ea; - - modes = m68ki_read_imm_16(m68k); + + modes = m68ki_read_imm_16(m68k); ea = M68KMAKE_GET_EA_AY_32; if ((CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type)) && (m68k->has_pmmu)) diff --git a/src/emu/sound/disc_dev.c b/src/emu/sound/disc_dev.c index b6fb4b8f96d..1a02fa6f36d 100644 --- a/src/emu/sound/disc_dev.c +++ b/src/emu/sound/disc_dev.c @@ -523,8 +523,8 @@ static DISCRETE_STEP(dsd_555_mstbl) v_cap = context->cap_voltage; /* Sometimes a switching network is used to setup the capacitance. - * These may select 'no' capacitor, causing oscillation to stop. - */ + * These may select 'no' capacitor, causing oscillation to stop. + */ if (DSD_555_MSTBL__C == 0) { context->flip_flop = 0; @@ -545,7 +545,7 @@ static DISCRETE_STEP(dsd_555_mstbl) /* Has it charged past upper limit? */ /* If trigger is still enabled, then we keep charging, - * regardless of threshold. */ + * regardless of threshold. */ if ((v_cap_next >= context->threshold) && !trigger) { dt = DSD_555_MSTBL__R * DSD_555_MSTBL__C * log(1.0 / (1.0 - ((v_cap_next - context->threshold) / (context->v_charge - v_cap)))); @@ -1491,7 +1491,7 @@ static const struct double osc_stop[6]; } ne566 = { - /* 10 10.5 11 11.5 12 13 14 15 B+ */ + /* 10 10.5 11 11.5 12 13 14 15 B+ */ {3.364, /*3.784,*/ 4.259, /*4.552,*/ 4.888, 5.384, 5.896, 6.416}, /* c_high */ {1.940, /*2.100,*/ 2.276, /*2.404,*/ 2.580, 2.880, 3.180, 3.488}, /* c_low */ {4.352, /*4.144,*/ 4.080, /*4.260,*/ 4.500, 4.960, 5.456, 5.940}, /* sqr_low */ diff --git a/src/emu/sound/disc_mth.c b/src/emu/sound/disc_mth.c index bfb74f14ff7..839dc74c12b 100644 --- a/src/emu/sound/disc_mth.c +++ b/src/emu/sound/disc_mth.c @@ -1464,7 +1464,7 @@ static DISCRETE_RESET(dst_oneshot) context->last_trig = 0; context->type = DST_ONESHOT__TYPE; - + node->output[0] = (context->type & DISC_OUT_ACTIVE_LOW) ? DST_ONESHOT__AMP : 0; } diff --git a/src/emu/sound/disc_sys.c b/src/emu/sound/disc_sys.c index 1488338b2ad..48580ca40a9 100644 --- a/src/emu/sound/disc_sys.c +++ b/src/emu/sound/disc_sys.c @@ -70,7 +70,7 @@ static void task_check(discrete_task *task, const discrete_task *dest_task) found = i; break; } - + if (found<0) { if (task->numbuffered >= DISCRETE_MAX_TASK_OUTPUTS) @@ -86,8 +86,8 @@ static void task_check(discrete_task *task, const discrete_task *dest_task) /* register into source list */ source = auto_alloc(dest_node->info->device->machine, discrete_source_node); - linked_list_add(dest_node->info, - (linked_list_entry **) (FPTR) &dest_task->source_list, + linked_list_add(dest_node->info, + (linked_list_entry **) (FPTR) &dest_task->source_list, source); source->task = task; source->output_node = i; @@ -106,20 +106,20 @@ static DISCRETE_START( dso_task_start ) { discrete_task *task = (discrete_task *) node->context; const linked_list_entry *task_entry; - + task->task_group = (int) DISCRETE_INPUT(0); - + if (task->task_group < 0 || task->task_group >= DISCRETE_MAX_TASK_GROUPS) fatalerror("discrete_dso_task: illegal task_group %d", task->task_group); - + for (task_entry = node->info->task_list; task_entry != NULL; task_entry = task_entry->next) { discrete_task *dest_task = (discrete_task *) task_entry->ptr; - + if (task->task_group > dest_task->task_group) task_check(dest_task, task); } - + } static DISCRETE_STEP( dso_task_end ) diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c index 93f6475dc7b..90cac78ab55 100644 --- a/src/emu/sound/discrete.c +++ b/src/emu/sound/discrete.c @@ -676,7 +676,7 @@ static void *task_callback(void *param, int threadid) discrete_source_node *sn = (discrete_source_node *) entry->ptr; sn->ptr = sn->task->node_buf[sn->output_node]; } - + samples = ti->samples; while (samples-- > 0) { @@ -782,14 +782,14 @@ static void init_nodes(discrete_info *info, const linked_list_entry *block_list, if (block->type == DSO_TASK_START) has_tasks = 1; } - + if (!has_tasks) { /* set up a main task */ task_node_list = NULL; task_node_list_ptr = &task_node_list; } - + /* loop over all nodes */ for (entry = block_list; entry != NULL; entry = entry->next) { @@ -916,9 +916,9 @@ static void init_nodes(discrete_info *info, const linked_list_entry *block_list, if (!has_tasks) { - /* make sure we have one simple task - * No need to create a node since there are no dependencies. - */ + /* make sure we have one simple task + * No need to create a node since there are no dependencies. + */ task = auto_alloc_clear(info->device->machine, discrete_task); task->numbuffered = 0; task->list = task_node_list; @@ -926,7 +926,7 @@ static void init_nodes(discrete_info *info, const linked_list_entry *block_list, task->source_list = NULL; linked_list_tail_add(info, &task_list_ptr, task); } - + /* if no outputs, give an error */ if (linked_list_count(info->output_list) == 0) fatalerror("init_nodes() - Couldn't find an output node"); diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h index 763df9e8e18..35a5823cf52 100644 --- a/src/emu/sound/discrete.h +++ b/src/emu/sound/discrete.h @@ -3599,7 +3599,7 @@ enum #define DISC_SCHMITT_OSC_ENAB_IS_NOR 0x06 #define DISC_SCHMITT_OSC_ENAB_MASK 0x06 /* Bits that define output enable type. - * Used only internally in module. */ + * Used only internally in module. */ /* 555 Common output flags */ #define DISC_555_OUT_DC 0x00 @@ -3621,7 +3621,7 @@ enum #define DISC_555_OUT_COUNT_R_X 0x07 #define DISC_555_OUT_MASK 0x07 /* Bits that define output type. - * Used only internally in module. */ + * Used only internally in module. */ #define DISC_555_ASTABLE_HAS_FAST_CHARGE_DIODE 0x80 #define DISCRETE_555_CC_TO_DISCHARGE_PIN 0x00 @@ -3639,7 +3639,7 @@ enum #define DISC_566_OUT_COUNT_F_X 0x50 #define DISC_566_OUT_COUNT_R_X 0x60 #define DISC_566_OUT_MASK 0x70 /* Bits that define output type. - * Used only internally in module. */ + * Used only internally in module. */ /* LS624 output flags */ #define DISC_LS624_OUT_ENERGY 0x01 @@ -3760,7 +3760,7 @@ struct _discrete_task double *node_buf[DISCRETE_MAX_TASK_OUTPUTS]; node_description *nodes[DISCRETE_MAX_TASK_OUTPUTS]; double *source[DISCRETE_MAX_TASK_OUTPUTS]; - + /* list of source nodes */ linked_list_entry *source_list; /* discrete_source_node */ }; diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c index 0e23f057675..d1ba96b4270 100644 --- a/src/mame/audio/galaxian.c +++ b/src/mame/audio/galaxian.c @@ -273,15 +273,15 @@ static DISCRETE_SOUND_START(galaxian) /************************************************/ /* NOISE */ /************************************************/ - + /* since only a sample of the LFSR is latched @V2 we let the lfsr - * run at a lower speed - */ + * run at a lower speed + */ DISCRETE_LFSR_NOISE(NODE_150, 1, 1, RNG_RATE/100, 1.0, 0, 0.5, &galaxian_lfsr) DISCRETE_SQUAREWFIX(NODE_151,1,60*264/2,1.0,50,0.5,0) /* 2V signal */ DISCRETE_LOGIC_DFLIPFLOP(NODE_152,1,1,NODE_151,NODE_150) DISCRETE_TASK_END() - + /* Group Background and pitch */ DISCRETE_TASK_START(1) diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index cb85e52c0e6..5f50a648bfa 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -138,8 +138,8 @@ * where calculated using least square approximation. * This approach gives a bit better results compared to the first approach. */ -//#define LS624_F(_C, _VI, _VR) pow10( -0.912029404 * log10(_C) + 0.243264328 * (_VI) -// - 0.091695877 * (_VR) -0.014110946 * (_VI) * (_VR) - 3.207072925) +//#define LS624_F(_C, _VI, _VR) pow10( -0.912029404 * log10(_C) + 0.243264328 * (_VI) +// - 0.091695877 * (_VR) -0.014110946 * (_VI) * (_VR) - 3.207072925) #define LS624_F(_in, _num) pow10(context->k1_##_num + 0.243264328 * (_in) + context->k2_##_num * (_in)) /************************************************************************ diff --git a/src/mame/audio/sprint8.c b/src/mame/audio/sprint8.c index b4176e0d9ea..af7b4157418 100644 --- a/src/mame/audio/sprint8.c +++ b/src/mame/audio/sprint8.c @@ -167,8 +167,8 @@ DISCRETE_OP_AMP_FILTER(NODE_RELATIVE(SPRINT8_MOTOR1_SND, _car - 1), 1, NODE_RELA DISCRETE_SOUND_START( sprint8 ) /************************************************ - * Input register mapping - ************************************************/ + * Input register mapping + ************************************************/ DISCRETE_INPUT_LOGIC(SPRINT8_CRASH_EN) DISCRETE_INPUT_NOT (SPRINT8_SCREECH_EN) DISCRETE_INPUT_NOT (SPRINT8_ATTRACT_EN) @@ -180,16 +180,16 @@ DISCRETE_SOUND_START( sprint8 ) DISCRETE_INPUTX_LOGIC(SPRINT8_MOTOR6_EN, DEFAULT_TTL_V_LOGIC_1, 0, 0) DISCRETE_INPUTX_LOGIC(SPRINT8_MOTOR7_EN, DEFAULT_TTL_V_LOGIC_1, 0, 0) DISCRETE_INPUTX_LOGIC(SPRINT8_MOTOR8_EN, DEFAULT_TTL_V_LOGIC_1, 0, 0) - + DISCRETE_TASK_START(0) DISCRETE_ADJUSTMENT_TAG(SPRINT8_R132_POT, 0, SPRINT8_R132, DISC_LINADJ, "R132") /************************************************ - * Noise Generator, Crash, Screech - ************************************************/ + * Noise Generator, Crash, Screech + ************************************************/ /* Address line A2 is used to XOR the feedback bits. - * This can not easily be implemented, so I just set the - * feedback as XNOR. */ + * This can not easily be implemented, so I just set the + * feedback as XNOR. */ DISCRETE_LFSR_NOISE(SPRINT8_NOISE, /* IC F7, pin 13 */ 1, /* ENAB */ SPRINT8_ATTRACT_EN, /* RESET */ @@ -237,8 +237,8 @@ DISCRETE_SOUND_START( sprint8 ) DISCRETE_TASK_END() /************************************************ - * Car Motor - ************************************************/ + * Car Motor + ************************************************/ DISCRETE_TASK_START(1) SPRINT8_MOTOR_CIRCUIT(1) SPRINT8_MOTOR_CIRCUIT(2) @@ -260,8 +260,8 @@ DISCRETE_SOUND_START( sprint8 ) DISCRETE_TASK_END() /************************************************ - * Final Mix - ************************************************/ + * Final Mix + ************************************************/ DISCRETE_TASK_START(2) DISCRETE_MIXER3(SPRINT8_AUDIO_1_2, SPRINT8_ATTRACT_EN, /* ENAB */ diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index b07e24eadad..b74e345925b 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -1470,10 +1470,10 @@ static MACHINE_START(39in1) ROM[i] = BITSWAP8(ROM[i],7,2,5,6,0,3,1,4) ^ BITSWAP8((i>>3)&0xf, 3,2,4,1,4,4,0,4) ^ 0x90; // 60-in-1 decrypt -// if ((i%2)==0) -// { -// ROM[i] = BITSWAP8(ROM[i],5,1,4,2,0,7,6,3)^BITSWAP8(i, 6,0,4,13,0,5,3,11); -// } +// if ((i%2)==0) +// { +// ROM[i] = BITSWAP8(ROM[i],5,1,4,2,0,7,6,3)^BITSWAP8(i, 6,0,4,13,0,5,3,11); +// } } pxa255_start(machine); diff --git a/src/mame/drivers/galdrvr.c b/src/mame/drivers/galdrvr.c index 7f1c4671d6c..bce45c20cf1 100644 --- a/src/mame/drivers/galdrvr.c +++ b/src/mame/drivers/galdrvr.c @@ -3133,22 +3133,22 @@ ROM_END ROM_START( pacmanbla ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "rom1.bin", 0x0000, 0x0800, CRC(75e4f967) SHA1(8bdb5ab2b3f978c578f1498b64bb16d2cb292ef2) ) - ROM_CONTINUE(0x2000,0x800) + ROM_CONTINUE(0x2000,0x800) ROM_LOAD( "rom2.bin", 0x0800, 0x0800, CRC(5b2e4293) SHA1(bb925491e315d2e6bb9e756bdf664d173f83cd58) ) ROM_CONTINUE(0x2800,0x800) ROM_LOAD( "rom3.bin", 0x1000, 0x0800, CRC(c06e30a4) SHA1(00d8d114bd4e0b689e75e312c93f6c7b8492426e) ) - ROM_CONTINUE(0x3000,0x800) + ROM_CONTINUE(0x3000,0x800) ROM_LOAD( "rom4.bin", 0x1800, 0x0800, CRC(592b4ba8) SHA1(52a559344f70cd8a3a87de71de2bae57c885641a) ) - ROM_CONTINUE(0x3800,0x800) + ROM_CONTINUE(0x3800,0x800) ROM_REGION( 0x2000, "tempgfx", 0 ) ROM_LOAD( "rom5.bin", 0x0000, 0x1000, CRC(f2d8c01e) SHA1(d4a5789476fa7859bb936df10590775e97e87578) ) ROM_LOAD( "rom6.bin", 0x1000, 0x1000, CRC(346a1720) SHA1(e152c9161f4e8ef53153b9c4a8ecef9fdbbe2463) ) - + ROM_REGION( 0x1000, "gfx1", 0 ) ROM_COPY( "tempgfx", 0x0800, 0x0000, 0x0800 ) ROM_COPY( "tempgfx", 0x1800, 0x0800, 0x0800 ) - + ROM_REGION( 0x1000, "gfx2", 0 ) ROM_COPY( "tempgfx", 0x0000, 0x0000, 0x0800 ) ROM_COPY( "tempgfx", 0x1000, 0x0800, 0x0800 ) diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index ca63969ccd2..ab6839f0f15 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -1,11 +1,11 @@ /* Sega MegaPlay changelog: - + 01 Oct 2009 - Converted to use the HazeMD SMS code so that old code can be removed, however this makes the text transparent, - which IIRC is incorrect - + which IIRC is incorrect + 22 Sept 2007 - Started updating this to use the new Megadrive code, fixing issues with Mazin Wars + Grand Slam. However I'm still not convinced that the handling of @@ -84,7 +84,7 @@ UINT16 *ic36_ram; //static UINT8 ic36_ram[0x4000]; -//static UINT8 hintcount; /* line interrupt counter, decreased each scanline */ +//static UINT8 hintcount; /* line interrupt counter, decreased each scanline */ extern UINT8 segae_vintpending; extern UINT8 segae_hintpending; extern UINT8 *segae_vdp_regs[]; /* pointer to vdp's registers */ @@ -582,7 +582,7 @@ static READ8_HANDLER( bank_r ) UINT8* bank = memory_region(space->machine, "mtbios"); fulladdress = mp_bios_bank_addr + offset; - + if ((fulladdress >= 0x000000) && (fulladdress <= 0x3fffff)) // ROM Addresses { @@ -612,7 +612,7 @@ static READ8_HANDLER( bank_r ) return OLD_megaplay_genesis_io_r(space, (offset & 0x1f) / 2, 0xffff); } else - { + { printf("bank_r fulladdress %08x\n",fulladdress); return 0x00; } @@ -642,7 +642,7 @@ static WRITE8_HANDLER ( bank_w ) OLD_megaplay_genesis_io_w(space, (offset & 0x1f) / 2, data, 0xffff); } else - { + { printf("bank_w fulladdress %08x\n",fulladdress); } } @@ -722,10 +722,10 @@ static WRITE8_HANDLER( megaplay_game_w ) // popmessage("Game bank selected: 0x%03x",game_banksel); logerror("BIOS [0x%04x]: 68K address space bank selected: 0x%03x\n",cpu_get_previouspc(space->cpu),game_banksel); } - + mp_bios_bank_addr = ( ( mp_bios_bank_addr >> 1 ) | ( data << 23 ) ) & 0xff8000; - + } static ADDRESS_MAP_START( megaplay_bios_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -795,14 +795,14 @@ static VIDEO_START(megplay) { //printf("megplay vs\n"); VIDEO_START_CALL(megadriv); -// VIDEO_START_CALL(megaplay_normal); +// VIDEO_START_CALL(megaplay_normal); } static VIDEO_UPDATE(megplay) { //printf("megplay vu\n"); VIDEO_UPDATE_CALL(megadriv); -// VIDEO_UPDATE_CALL(megaplay_normal); +// VIDEO_UPDATE_CALL(megaplay_normal); VIDEO_UPDATE_CALL(megaplay_bios); return 0; } @@ -836,7 +836,7 @@ static MACHINE_DRIVER_START( mpnew ) MDRV_MACHINE_RESET( mpnew ) MDRV_VIDEO_EOF( mpnew ) - + MDRV_QUANTUM_TIME(HZ(6000)) MDRV_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15) @@ -871,7 +871,7 @@ ROM_END /* The system appears to access the instruction rom at 0x300000 in the 68k space (rom window from z80 side) - + This probably means the maximum 68k rom size is 0x2fffff for MegaPlay */ @@ -1072,7 +1072,7 @@ static DRIVER_INIT (megaplay) memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa02000, 0xa03fff, 0, 0, megadriv_68k_read_z80_extra_ram, megadriv_68k_write_z80_extra_ram); DRIVER_INIT_CALL(megatech_bios); // create the SMS vdp etc. - + } /* diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index 306941729b9..0d9581b731d 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -18,7 +18,7 @@ Turn Service Mode OFF (press 'F2') Reset the game (press 'F3') - To Init Roll Fruit + To Init Roll Fruit Turn Service Mode ON (press 'F2') Press and hold Service 1 ('9') @@ -222,7 +222,7 @@ static UINT8 multfish_hopper = 0; static CUSTOM_INPUT( multfish_hopper_r ) { - if ( multfish_hopper_motor != 0 ) + if ( multfish_hopper_motor != 0 ) { multfish_hopper++; return multfish_hopper>>4; diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 9d40bded5f8..e4ffd635435 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -5294,18 +5294,18 @@ ROM_START( vf4cart ) ROM_LOAD( "mpr-23784.ic11", 0xa800000, 0x1000000, CRC(f74f2fee) SHA1(84b07baa6d116727e66ef27e24ba6484c3393891) ) ROM_END -/* - This is the same nonsense layout rom board as gram2000, and just like - that it tests IC1 which doesn't exist - is it a mirror, or protection - related? There is no physical rom for it, also note, the roms are - interleaved, so each test is testing 2 roms and the labeling / ic - positions on the cart don't relate to the display in test mode. +/* + This is the same nonsense layout rom board as gram2000, and just like + that it tests IC1 which doesn't exist - is it a mirror, or protection + related? There is no physical rom for it, also note, the roms are + interleaved, so each test is testing 2 roms and the labeling / ic + positions on the cart don't relate to the display in test mode. - Desired IC1 @ 0x800000 sums from the header = 9f39 fdc4 + Desired IC1 @ 0x800000 sums from the header = 9f39 fdc4 - We need a USB dump of this from 0x800000 to 0x1000000. + We need a USB dump of this from 0x800000 to 0x1000000. */ -ROM_START( vf4evoct ) +ROM_START( vf4evoct ) NAOMI2_BIOS ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF) diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c index 4b13852f185..c4f73693886 100644 --- a/src/mame/drivers/othello.c +++ b/src/mame/drivers/othello.c @@ -1,5 +1,5 @@ /* - + Othello (version 3.0) - Success 1984 ------------------------------------- @@ -12,9 +12,9 @@ CPU Board: AY-3-8910 x2 - Sound D7751C - ADPCM "Speech processor" D8243 - I/O Expander for D7751C (8048 based) - + Video Board: - almost empty - 3/4 sodlering pins not populated + almost empty - 3/4 sodlering pins not populated @@ -62,12 +62,12 @@ static MC6845_UPDATE_ROW( update_row ) int cx,x; UINT32 data_address; UINT32 tmp; - + const UINT8 *gfx = memory_region(device->machine, "gfx"); for(cx=0;cx<x_count;++cx) { - data_address=((videoram[ma+cx]+tile_bank)<<4)|ra; + data_address=((videoram[ma+cx]+tile_bank)<<4)|ra; tmp=gfx[data_address]|(gfx[data_address+0x2000]<<8)|(gfx[data_address+0x4000]<<16); for(x=0;x<TILE_WIDTH;++x) @@ -85,7 +85,7 @@ static PALETTE_INIT( othello ) { palette_set_color(machine,i,MAKE_RGB(0xff,0x00,0xff)); } - + /* only colors 2,3,7,9,c,d,f are used */ palette_set_color(machine,0x02,MAKE_RGB(0x00,0xff,0x00)); palette_set_color(machine,0x03,MAKE_RGB(0xff,0x7f,0x00)); @@ -119,12 +119,12 @@ static READ8_HANDLER( unk_87_r ) static WRITE8_HANDLER(unk_8a_w) { /* - n7751_command = (data & 0x07); - cputag_set_input_line(space->machine, "n7751", 0, ((data & 0x08) == 0) ? ASSERT_LINE : CLEAR_LINE); - //cputag_set_input_line(device->machine, "n7751", 0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE); - cpuexec_boost_interleave(space->machine, attotime_zero, ATTOTIME_IN_USEC(100)); - */ - + n7751_command = (data & 0x07); + cputag_set_input_line(space->machine, "n7751", 0, ((data & 0x08) == 0) ? ASSERT_LINE : CLEAR_LINE); + //cputag_set_input_line(device->machine, "n7751", 0, (data & 0x02) ? CLEAR_LINE : ASSERT_LINE); + cpuexec_boost_interleave(space->machine, attotime_zero, ATTOTIME_IN_USEC(100)); + */ + logerror("8a -> %x\n",data); } @@ -201,7 +201,7 @@ static WRITE8_HANDLER(ay_data_w) static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM - AM_RANGE(0x8000, 0x83ff) AM_RAM + AM_RANGE(0x8000, 0x83ff) AM_RAM ADDRESS_MAP_END static ADDRESS_MAP_START( audio_portmap, ADDRESS_SPACE_IO, 8 ) @@ -236,7 +236,7 @@ static WRITE8_DEVICE_HANDLER( n7751_rom_control_w ) case 3: sound_addr &= 0xfff; { - + if (!(data & 0x01) ) sound_addr |= 0x0000; if (!(data & 0x02) ) sound_addr |= 0x1000; if (!(data & 0x04) ) sound_addr |= 0x2000; @@ -294,7 +294,7 @@ static INPUT_PORTS_START( othello ) PORT_DIPNAME( 0x08, 0x00, "Limit for Matta" ) PORT_DIPLOCATION("SW1:4") PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPLOCATION("SW1:5") /* stored at $fd1e */ + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_DIPLOCATION("SW1:5") /* stored at $fd1e */ PORT_DIPNAME( 0x60, 0x60, "Timer (seconds)" ) PORT_DIPLOCATION("SW1:6,7") PORT_DIPSETTING( 0x00, "4" ) PORT_DIPSETTING( 0x20, "6" ) @@ -303,27 +303,27 @@ static INPUT_PORTS_START( othello ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x00, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x80, DEF_STR( Hard ) ) - + PORT_START("INP") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) - + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) - + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) + PORT_START("SYSTEM") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) - PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) INPUT_PORTS_END @@ -352,7 +352,7 @@ static MACHINE_DRIVER_START( othello ) MDRV_CPU_ADD("audiocpu",Z80,XTAL_3_579545MHz) MDRV_CPU_PROGRAM_MAP(audio_map) MDRV_CPU_IO_MAP(audio_portmap) - + MDRV_CPU_ADD("n7751", N7751, XTAL_6MHz) MDRV_CPU_IO_MAP(n7751_portmap) @@ -366,12 +366,12 @@ static MACHINE_DRIVER_START( othello ) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_SIZE(64*6, 64*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 64*6-1, 0*8, 64*8-1) - + MDRV_PALETTE_LENGTH(0x10) MDRV_PALETTE_INIT(othello) MDRV_VIDEO_UPDATE(othello) - + MDRV_MC6845_ADD("crtc", H46505, 1000000 /* ? MHz */, h46505_intf) /* H46505 @ CPU clock */ /* sound hardware */ @@ -382,7 +382,7 @@ static MACHINE_DRIVER_START( othello ) MDRV_SOUND_ADD("ay2", AY8910, 2000000) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) - + MDRV_SOUND_ADD("dac", DAC, 0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_DRIVER_END @@ -390,10 +390,10 @@ MACHINE_DRIVER_END ROM_START( othello ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "4.ic59", 0x0000, 0x2000, CRC(9f82fe14) SHA1(59600264ccce787383827fc5aa0f2c23728f6946)) - + ROM_REGION( 0x10000, "audiocpu", 0 ) ROM_LOAD( "3.ic32", 0x0000, 0x2000, CRC(2bb4f75d) SHA1(29a659031acf0d50f374f440b8d353bcf98145a0)) - + ROM_REGION( 0x1000, "n7751", 0 ) /* 4k for 7751 onboard ROM */ ROM_LOAD( "7751.bin", 0x0000, 0x0400, CRC(6a9534fc) SHA1(67ad94674db5c2aab75785668f610f6f4eccd158) ) diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index ecef9dec42f..a8c8c8811a9 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -248,11 +248,6 @@ static WRITE32_HANDLER( shared_ram_write ) COMBINE_DATA(&shared_ram[offset]) ; logerror("68k WRITING %04x & %04x to shared ram %x & %x [%08x] (@%x)\n", (shared_ram[offset] & 0xffff0000) >> 16, - (shared_ram[offset] & 0x0000ffff), - 0xc000 + (offset<<1), - 0xc000 +((offset<<1)+1), - mem_mask, - cpu_get_pc(space->cpu)); /* write to the current dsp56k word */ if (mem_mask | (0xffff0000)) @@ -274,12 +269,12 @@ static WRITE32_HANDLER( dsp_w_lines ) /* 0x01000000 is the reset line - 0 is high, 1 is low */ if ((data >> 24) & 0x01) { -// logerror("RESET CLEARED\n"); +// logerror("RESET CLEARED\n"); cputag_set_input_line(space->machine, "dsp", DSP56K_IRQ_RESET, CLEAR_LINE); } else { -// logerror("RESET ASSERTED\n"); +// logerror("RESET ASSERTED\n"); cputag_set_input_line(space->machine, "dsp", DSP56K_IRQ_RESET, ASSERT_LINE); /* A little hacky - I can't seem to set these lines anywhere else where reset is asserted, so i do it here */ @@ -527,7 +522,7 @@ static WRITE16_HANDLER( dsp56k_ram_bank04_write ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE(plygonet_palette_w) AM_BASE(&paletteram32) - AM_RANGE(0x400000, 0x40001f) AM_RAM AM_BASE((UINT32**)&K053936_0_ctrl) + AM_RANGE(0x400000, 0x40001f) AM_RAM AM_BASE((UINT32**)&K053936_0_ctrl) AM_RANGE(0x440000, 0x440fff) AM_READWRITE(polygonet_roz_ram_r, polygonet_roz_ram_w) AM_RANGE(0x480000, 0x4bffff) AM_READ(polygonet_eeprom_r) AM_RANGE(0x4C0000, 0x4fffff) AM_WRITE(polygonet_eeprom_w) diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index ff9aaa1a376..7186464e61c 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -302,10 +302,10 @@ covert megatech / megaplay drivers to use new code etc. etc. /**************************************************************************************** Memory Maps - + most of the memory map / IO maps are filled in at run time - this is due to the SMS code that this is based on being designed that way due to weird features of the MD. - + ****************************************************************************************/ static UINT8 f7_bank_value; diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c index 04a1d28a400..678248c5994 100644 --- a/src/mame/drivers/segag80r.c +++ b/src/mame/drivers/segag80r.c @@ -13,7 +13,7 @@ Known bugs: * Pig Newton doesn't read cocktail controls (might be game bug) * Astro Blaster v1 dies when you first start if you only - have one credit at the time (bad dump?, protection?) + have one credit at the time (bad dump?, protection?) **************************************************************************** diff --git a/src/mame/drivers/segamsys.c b/src/mame/drivers/segamsys.c index 989fdc26510..c0a15391048 100644 --- a/src/mame/drivers/segamsys.c +++ b/src/mame/drivers/segamsys.c @@ -1,11 +1,11 @@ /* - SMS code from HazeMD - - used by Syetem E - - Megatech / Megaplay - - this contains common code to support those systems - - (not currently very good / accurate, should be rewritten) + SMS code from HazeMD + - used by Syetem E + - Megatech / Megaplay + + this contains common code to support those systems + + (not currently very good / accurate, should be rewritten) */ @@ -1165,7 +1165,7 @@ static void end_of_frame(running_machine *machine, struct sms_vdp *chip) visarea.max_x = (256-160)/2+160-1; visarea.min_y = (192-144)/2; visarea.max_y = (192-144)/2+144-1; - + video_screen_configure(machine->primary_screen, 256, 256, &visarea, HZ_TO_ATTOSECONDS(chip->sms_framerate)); } @@ -1186,7 +1186,7 @@ VIDEO_EOF(sms) // the SMS has a 'RESET' button on the machine, it generates an NMI if (input_port_read_safe(machine,"PAUSE",0x00)) cputag_set_input_line(machine, "maincpu", INPUT_LINE_NMI, PULSE_LINE); - + } @@ -1314,8 +1314,8 @@ VIDEO_UPDATE(megaplay_bios) for (x=0;x<256;x++) { UINT16 src = srcptr[x]&0x7fff; - - if (src) + + if (src) lineptr[x]=srcptr[x]&0x7fff; } } @@ -1402,7 +1402,7 @@ DRIVER_INIT( megatech_bios ) vdp1_vram_bank0 = vdp1->vram; vdp1_vram_bank1 = auto_alloc_array(machine, UINT8, 0x4000); - + smsgg_backupram = 0; } @@ -1416,10 +1416,10 @@ DRIVER_INIT( smscm ) md_sms_vdp->sms_total_scanlines = 313; md_sms_vdp->sms_framerate = 50; md_sms_vdp->chip_id = 3; - + vdp1_vram_bank0 = md_sms_vdp->vram; - vdp1_vram_bank1 = auto_alloc_array(machine, UINT8, 0x4000); - + vdp1_vram_bank1 = auto_alloc_array(machine, UINT8, 0x4000); + smsgg_backupram = 0; } @@ -1433,9 +1433,9 @@ DRIVER_INIT( smspal ) md_sms_vdp->sms_total_scanlines = 313; md_sms_vdp->sms_framerate = 50; md_sms_vdp->chip_id = 3; - + vdp1_vram_bank0 = md_sms_vdp->vram; - vdp1_vram_bank1 = auto_alloc_array(machine, UINT8, 0x4000); + vdp1_vram_bank1 = auto_alloc_array(machine, UINT8, 0x4000); smsgg_backupram = 0; } @@ -1495,7 +1495,7 @@ DRIVER_INIT( smsgg ) md_sms_vdp->sms_total_scanlines = 262; md_sms_vdp->sms_framerate = 60; md_sms_vdp->chip_id = 3; - + smsgg_backupram = 0; } @@ -1528,7 +1528,7 @@ DRIVER_INIT( hazemd_segasyse ) -- these are needed because on a Genesis the Sound Z80 becomes the SMS Z80 in comptibility mode so we need to be able to dynamically change the mapping - + */ static READ8_HANDLER( z80_unmapped_port_r ) @@ -1592,7 +1592,7 @@ static WRITE8_HANDLER( mt_sms_standard_rom_bank_w ) sms_mainram[0x1ffc+offset] = data; switch (offset) - { + { case 0: logerror("bank w %02x %02x\n", offset, data); if ((data & 0x08) && smsgg_backupram) @@ -1603,7 +1603,7 @@ static WRITE8_HANDLER( mt_sms_standard_rom_bank_w ) { memory_install_readwrite8_handler(space, 0x0000, 0xbfff, 0, 0, (read8_space_func)SMH_BANK(5), (write8_space_func)SMH_UNMAP); } - + //printf("bank ram??\n"); break; case 1: @@ -1663,7 +1663,7 @@ static void megatech_set_genz80_as_sms_standard_ports(running_machine *machine, void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const char* tag, int mapper) { /* INIT THE MEMMAP / BANKING *********************************************************************************/ - + /* catch any addresses that don't get mapped */ memory_install_readwrite8_handler(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xffff, 0, 0, z80_unmapped_r, z80_unmapped_w); @@ -1698,7 +1698,7 @@ void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const cha memory_set_bankptr(machine, 5, sms_rom ); memcpy(sms_rom, memory_region(machine, "maincpu"), 0xc000); - + memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x0000, 0, 0, codemasters_rom_bank_0000_w); memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x4000, 0, 0, codemasters_rom_bank_4000_w); memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0x8000, 0, 0, codemasters_rom_bank_8000_w); @@ -1736,7 +1736,7 @@ MACHINE_DRIVER_START( sms ) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB15) MDRV_SCREEN_SIZE(256, 256) MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 223) -// MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 191) +// MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 191) MDRV_PALETTE_LENGTH(0x200) @@ -1745,7 +1745,7 @@ MACHINE_DRIVER_START( sms ) MDRV_VIDEO_EOF(sms) /* Used to Sync the timing */ MDRV_NVRAM_HANDLER( sms ) - + /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index baeaa0ce064..d1349113470 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -27,7 +27,7 @@ P0-045-A (M6100429A) 89 DownTown Taito / RomStar ? (M6100430A) 89 U.S. Classic(2) Taito / RomStar ? 88 Caliber 50 Taito / RomStar ? 89 Arbalester Taito / RomStar -PO-047A ?? Seta Roulette Seta / Visco +PO-047A ?? Seta Roulette Seta / Visco P1-036-A + P0-045-A + P1-049-A 89 Meta Fox Taito / RomStar P0-053-1 89 Castle of Dragon/Dragon Unit Taito / RomStar / Athena @@ -7281,7 +7281,7 @@ static MACHINE_DRIVER_START( setaroul ) MDRV_PALETTE_LENGTH(512) MDRV_VIDEO_START(dummy_start) - //MDRV_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */ + //MDRV_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */ MDRV_VIDEO_UPDATE(dummy_update) /* sound hardware */ diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c index de9523eba21..175059fab3d 100644 --- a/src/mame/drivers/sprint8.c +++ b/src/mame/drivers/sprint8.c @@ -480,7 +480,7 @@ static MACHINE_DRIVER_START( sprint8 ) /* sound hardware */ /* the proper way is to hook up 4 speakers, but they are not really - * F/R/L/R speakers. Though you can pretend the 1-2 mix is the front. */ + * F/R/L/R speakers. Though you can pretend the 1-2 mix is the front. */ MDRV_SPEAKER_ADD("speaker_1_2", 0.0, 0.0, 1.0) /* front */ MDRV_SPEAKER_ADD("speaker_3_7", -0.2, 0.0, 1.0) /* left */ MDRV_SPEAKER_ADD("speaker_5_6", 0.0, 0.0, -0.5) /* back */ diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index 62d2c1b0b67..d9b386325e4 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -7527,7 +7527,7 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11 DRIVER( calibr50 ) /* UH (c) 1989 + Romstar or Taito license (DSW) */ DRIVER( arbalest ) /* UK (c) 1989 + Jordan, Romstar or Taito license (DSW) */ DRIVER( metafox ) /* UP (c) 1989 + Jordan, Romstar or Taito license (DSW) */ - DRIVER( setaroul ) /* UF (c) 19?? Seta / Visco */ + DRIVER( setaroul ) /* UF (c) 19?? Seta / Visco */ DRIVER( drgnunit ) /* (c) 1989 Athena / Seta + Romstar or Taito license (DSW) */ DRIVER( wits ) /* (c) 1989 Athena (Visco license) */ DRIVER( thunderl ) /* (c) 1990 Seta + Romstar or Visco license (DSW) */ diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c index 176caffcc16..808460d285c 100644 --- a/src/mame/video/plygonet.c +++ b/src/mame/video/plygonet.c @@ -32,7 +32,7 @@ static TILE_GET_INFO( ttl_get_tile_info ) static TILE_GET_INFO( roz_get_tile_info ) { int attr, code; - + attr = (roz_vram[tile_index] >> 12) + 16; // roz base palette is palette 16 code = roz_vram[tile_index] & 0x3ff; @@ -114,7 +114,7 @@ VIDEO_START( polygonet ) state_save_register_global_array(machine, ttl_vram); // set up the roz t-map too - roz_tilemap = tilemap_create(machine, roz_get_tile_info, plygonet_scan_cols, 16, 16, 32, 64); + roz_tilemap = tilemap_create(machine, roz_get_tile_info, plygonet_scan_cols, 16, 16, 32, 64); tilemap_set_transparent_pen(roz_tilemap, 0); } diff --git a/src/version.c b/src/version.c index 1145b040c50..28af684f51c 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.134u1 ("__DATE__")"; +const char build_version[] = "0.134u2 ("__DATE__")"; |