diff options
author | Angelo Salese <angelosa@users.noreply.github.com> | 2011-06-28 14:23:18 +0000 |
---|---|---|
committer | Angelo Salese <angelosa@users.noreply.github.com> | 2011-06-28 14:23:18 +0000 |
commit | a23c194ed5de7cedbb45434768db7b46565baec7 (patch) | |
tree | 97915bcd553aa5fbc19254b39c93bd51990d6eeb | |
parent | b26860dafbe08edb6de4db914f3095f8fa433546 (diff) |
Port from MESS, nw
-rw-r--r-- | src/emu/cpu/i386/i386.c | 6 | ||||
-rw-r--r-- | src/emu/cpu/sh4/sh4comn.c | 4 | ||||
-rw-r--r-- | src/emu/cpu/z80/z80.c | 24 | ||||
-rw-r--r-- | src/emu/diexec.c | 2 | ||||
-rw-r--r-- | src/emu/emuopts.c | 4 | ||||
-rw-r--r-- | src/emu/imagedev/cartslot.c | 2 | ||||
-rw-r--r-- | src/emu/machine/ldcore.c | 10 | ||||
-rw-r--r-- | src/emu/machine/wd17xx.c | 22 | ||||
-rw-r--r-- | src/emu/sound/c352.c | 2 | ||||
-rw-r--r-- | src/emu/validity.c | 2 | ||||
-rw-r--r-- | src/lib/cothread/ppc.c | 74 | ||||
-rw-r--r-- | src/lib/util/cdrom.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/midvunit.c | 6 | ||||
-rw-r--r-- | src/mame/drivers/mpu4.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/mpu4drvr.c | 20 | ||||
-rw-r--r-- | src/mame/drivers/saturn.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/sfcbox.c | 6 | ||||
-rw-r--r-- | src/mame/drivers/warpsped.c | 106 | ||||
-rw-r--r-- | src/mame/machine/stvcd.c | 5 | ||||
-rw-r--r-- | src/mame/video/stvvdp2.c | 5 |
20 files changed, 153 insertions, 155 deletions
diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c index 57c2f1b9860..8e199cd6c93 100644 --- a/src/emu/cpu/i386/i386.c +++ b/src/emu/cpu/i386/i386.c @@ -519,7 +519,7 @@ static void i386_trap(i386_state *cpustate,int irq, int irq_gate, int trap_level i386_load_protected_mode_segment(cpustate,&desc); CPL = cpustate->CPL; // current privilege level DPL = (desc.flags >> 5) & 0x03; // descriptor privilege level -// RPL = segment & 0x03; // requested privilege level +// RPL = segment & 0x03; // requested privilege level if((segment & ~0x07) == 0) { @@ -828,7 +828,7 @@ static void i286_task_switch(i386_state *cpustate, UINT16 selector, UINT8 nested } /* For nested tasks, we write the outgoing task's selector to the back-link field of the new TSS, - and set the NT flag in the EFLAGS register */ + and set the NT flag in the EFLAGS register */ if(nested != 0) { WRITE16(cpustate,tss+0,old_task); @@ -943,7 +943,7 @@ static void i386_task_switch(i386_state *cpustate, UINT16 selector, UINT8 nested } /* For nested tasks, we write the outgoing task's selector to the back-link field of the new TSS, - and set the NT flag in the EFLAGS register */ + and set the NT flag in the EFLAGS register */ if(nested != 0) { WRITE32(cpustate,tss+0,old_task); diff --git a/src/emu/cpu/sh4/sh4comn.c b/src/emu/cpu/sh4/sh4comn.c index a4b261283cf..88e57e43612 100644 --- a/src/emu/cpu/sh4/sh4comn.c +++ b/src/emu/cpu/sh4/sh4comn.c @@ -633,7 +633,7 @@ WRITE32_HANDLER( sh4_internal_w ) UINT32 old = sh4->m[offset]; COMBINE_DATA(sh4->m+offset); -// printf("sh4_internal_w: Write %08x (%x), %08x @ %08x\n", 0xfe000000+((offset & 0x3fc0) << 11)+((offset & 0x3f) << 2), offset, data, mem_mask); +// printf("sh4_internal_w: Write %08x (%x), %08x @ %08x\n", 0xfe000000+((offset & 0x3fc0) << 11)+((offset & 0x3f) << 2), offset, data, mem_mask); switch( offset ) { @@ -945,7 +945,7 @@ READ32_HANDLER( sh4_internal_r ) UINT32 addr = (offset << 2) + 0xfe000000; offset = ((addr & 0xfc) >> 2) | ((addr & 0x1fe0000) >> 11); -// printf("sh4_internal_r: Read %08x (%x) @ %08x\n", 0xfe000000+((offset & 0x3fc0) << 11)+((offset & 0x3f) << 2), offset, mem_mask); +// printf("sh4_internal_r: Read %08x (%x) @ %08x\n", 0xfe000000+((offset & 0x3fc0) << 11)+((offset & 0x3f) << 2), offset, mem_mask); switch( offset ) { diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c index a5acaeda336..176194ef6a2 100644 --- a/src/emu/cpu/z80/z80.c +++ b/src/emu/cpu/z80/z80.c @@ -3712,7 +3712,7 @@ static void set_irq_line(z80_state *z80, int irqline, int state) z80->nmi_pending = TRUE; z80->nmi_state = state; break; - + case INPUT_LINE_IRQ0: /* update the IRQ state via the daisy chain */ z80->irq_state = state; @@ -3721,7 +3721,7 @@ static void set_irq_line(z80_state *z80, int irqline, int state) /* the main execute loop will take the interrupt */ break; - + case Z80_INPUT_LINE_WAIT: z80->wait_state = state; break; @@ -3743,19 +3743,19 @@ static void set_irq_line_nsc800(z80_state *z80, int irqline, int state) z80->nmi_pending = TRUE; z80->nmi_state = state; break; - + case NSC800_RSTA: z80->nsc800_irq_state[NSC800_RSTA] = state; break; - + case NSC800_RSTB: z80->nsc800_irq_state[NSC800_RSTB] = state; break; - + case NSC800_RSTC: z80->nsc800_irq_state[NSC800_RSTC] = state; break; - + case INPUT_LINE_IRQ0: /* update the IRQ state via the daisy chain */ z80->irq_state = state; @@ -3764,7 +3764,7 @@ static void set_irq_line_nsc800(z80_state *z80, int irqline, int state) /* the main execute loop will take the interrupt */ break; - + case Z80_INPUT_LINE_WAIT: z80->wait_state = state; break; @@ -3841,10 +3841,10 @@ static CPU_SET_INFO( z80 ) switch (state) { /* --- the following bits of info are set as 64-bit signed integers --- */ - case CPUINFO_INT_INPUT_STATE + Z80_INPUT_LINE_BUSRQ: set_irq_line(z80, Z80_INPUT_LINE_BUSRQ, info->i); break; + case CPUINFO_INT_INPUT_STATE + Z80_INPUT_LINE_BUSRQ: set_irq_line(z80, Z80_INPUT_LINE_BUSRQ, info->i); break; case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: set_irq_line(z80, INPUT_LINE_NMI, info->i); break; case CPUINFO_INT_INPUT_STATE + INPUT_LINE_IRQ0: set_irq_line(z80, INPUT_LINE_IRQ0, info->i); break; - case CPUINFO_INT_INPUT_STATE + Z80_INPUT_LINE_WAIT: set_irq_line(z80, Z80_INPUT_LINE_WAIT, info->i); break; + case CPUINFO_INT_INPUT_STATE + Z80_INPUT_LINE_WAIT: set_irq_line(z80, Z80_INPUT_LINE_WAIT, info->i); break; } } @@ -3854,13 +3854,13 @@ static CPU_SET_INFO( nsc800 ) switch (state) { /* --- the following bits of info are set as 64-bit signed integers --- */ - case CPUINFO_INT_INPUT_STATE + Z80_INPUT_LINE_BUSRQ: set_irq_line(z80, Z80_INPUT_LINE_BUSRQ, info->i); break; + case CPUINFO_INT_INPUT_STATE + Z80_INPUT_LINE_BUSRQ: set_irq_line(z80, Z80_INPUT_LINE_BUSRQ, info->i); break; case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: set_irq_line_nsc800(z80, INPUT_LINE_NMI, info->i); break; case CPUINFO_INT_INPUT_STATE + NSC800_RSTA: set_irq_line_nsc800(z80, NSC800_RSTA, info->i); break; case CPUINFO_INT_INPUT_STATE + NSC800_RSTB: set_irq_line_nsc800(z80, NSC800_RSTB, info->i); break; case CPUINFO_INT_INPUT_STATE + NSC800_RSTC: set_irq_line_nsc800(z80, NSC800_RSTC, info->i); break; case CPUINFO_INT_INPUT_STATE + INPUT_LINE_IRQ0: set_irq_line_nsc800(z80, INPUT_LINE_IRQ0, info->i); break; - case CPUINFO_INT_INPUT_STATE + Z80_INPUT_LINE_WAIT: set_irq_line(z80, Z80_INPUT_LINE_WAIT, info->i); break; + case CPUINFO_INT_INPUT_STATE + Z80_INPUT_LINE_WAIT: set_irq_line(z80, Z80_INPUT_LINE_WAIT, info->i); break; } } @@ -3931,7 +3931,7 @@ CPU_GET_INFO( z80 ) case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; } -} +} CPU_GET_INFO( nsc800 ) { diff --git a/src/emu/diexec.c b/src/emu/diexec.c index 3f74e9922d4..f72cb7d4049 100644 --- a/src/emu/diexec.c +++ b/src/emu/diexec.c @@ -386,7 +386,7 @@ void device_execute_interface::run_thread_wrapper() // call the classic run function, then swap back to the scheduler's thread execute_run(); scheduler.make_active(); - } + } } diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c index 4e2be89fcd0..2e2713fe353 100644 --- a/src/emu/emuopts.c +++ b/src/emu/emuopts.c @@ -246,14 +246,14 @@ bool emu_options::add_slot_options(bool isfirst) option_name.printf("%s;%s", slot->device().tag(), slot->device().tag()); if (!exists(slot->device().tag())) { - + // add the option entry[0].name = slot->device().tag(); entry[0].description = NULL; entry[0].flags = OPTION_STRING | OPTION_FLAG_DEVICE; entry[0].defvalue = (slot->get_slot_interfaces() != NULL) ? slot->get_default_card() : NULL; add_entries(entry, true); - + added = true; } } diff --git a/src/emu/imagedev/cartslot.c b/src/emu/imagedev/cartslot.c index 4f699066724..a31bb77bafd 100644 --- a/src/emu/imagedev/cartslot.c +++ b/src/emu/imagedev/cartslot.c @@ -173,7 +173,7 @@ static int process_cartridge(device_image_interface *image, process_mode mode) while(!ROMENTRY_ISREGIONEND(roment)) { if (ROMENTRY_GETTYPE(roment) == ROMENTRYTYPE_CARTRIDGE) - { + { astring regiontag; image->device().siblingtag(regiontag, roment->_hashdata); diff --git a/src/emu/machine/ldcore.c b/src/emu/machine/ldcore.c index 50690ac80cf..3f5cdfd126f 100644 --- a/src/emu/machine/ldcore.c +++ b/src/emu/machine/ldcore.c @@ -1616,7 +1616,7 @@ DEVICE_GET_INFO( laserdisc ) } DEVICE_GET_INFO( unkldplay ) -{ +{ switch (state) { /* --- the following bits of info are returned as pointers --- */ @@ -1642,7 +1642,7 @@ DEVICE_GET_INFO( pioneer_pr8210 ) /* --- the following bits of info are returned as pointers --- */ case DEVINFO_PTR_ROM_REGION: info->romregion = pr8210_interface.romregion; return; case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = pr8210_interface.machine_config; return; - + /* --- the following bits of info are returned as NULL-terminated strings -- */ case DEVINFO_STR_NAME: strcpy(info->s, pr8210_interface.name); return; case DEVINFO_STR_SHORTNAME: strcpy(info->s, pr8210_interface.shortname); return; @@ -1658,7 +1658,7 @@ DEVICE_GET_INFO( simutrek_special ) /* --- the following bits of info are returned as pointers --- */ case DEVINFO_PTR_ROM_REGION: info->romregion = simutrek_interface.romregion; return; case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = simutrek_interface.machine_config; return; - + /* --- the following bits of info are returned as NULL-terminated strings -- */ case DEVINFO_STR_NAME: strcpy(info->s, simutrek_interface.name); return; case DEVINFO_STR_SHORTNAME: strcpy(info->s, simutrek_interface.shortname); return; @@ -1674,7 +1674,7 @@ DEVICE_GET_INFO( pioneer_ldv1000 ) /* --- the following bits of info are returned as pointers --- */ case DEVINFO_PTR_ROM_REGION: info->romregion = ldv1000_interface.romregion; return; case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = ldv1000_interface.machine_config; return; - + /* --- the following bits of info are returned as NULL-terminated strings -- */ case DEVINFO_STR_NAME: strcpy(info->s, ldv1000_interface.name); return; case DEVINFO_STR_SHORTNAME: strcpy(info->s, ldv1000_interface.shortname); return; @@ -1690,7 +1690,7 @@ DEVICE_GET_INFO( phillips_22vp931 ) /* --- the following bits of info are returned as pointers --- */ case DEVINFO_PTR_ROM_REGION: info->romregion = vp931_interface.romregion; return; case DEVINFO_PTR_MACHINE_CONFIG: info->machine_config = vp931_interface.machine_config; return; - + /* --- the following bits of info are returned as NULL-terminated strings -- */ case DEVINFO_STR_NAME: strcpy(info->s, vp931_interface.name); return; case DEVINFO_STR_SHORTNAME: strcpy(info->s, vp931_interface.shortname); return; diff --git a/src/emu/machine/wd17xx.c b/src/emu/machine/wd17xx.c index 6b53a361cc3..f5f022f6bd4 100644 --- a/src/emu/machine/wd17xx.c +++ b/src/emu/machine/wd17xx.c @@ -136,14 +136,14 @@ 2011-Apr-01 Curt Coder - Set complete command delay to 16 usec (DD) / 32 usec (SD) and removed the external delay setting hack. - - 2011-Jun-24 Curt Coder - - Added device types for all known variants, and enforced inverted DAL lines. + + 2011-Jun-24 Curt Coder + - Added device types for all known variants, and enforced inverted DAL lines. TODO: - What happens if a track is read that doesn't have any id's on it? (e.g. unformatted disc) - - Rewrite into a C++ device + - Rewrite into a C++ device ***************************************************************************/ @@ -401,11 +401,11 @@ static void wd17xx_timed_read_sector_request(device_t *device); INLINE wd1770_state *get_safe_token(device_t *device) { assert(device != NULL); - assert(device->type() == FD1771 || device->type() == FD1781 || + assert(device->type() == FD1771 || device->type() == FD1781 || device->type() == FD1791 || device->type() == FD1792 || device->type() == FD1793 || device->type() == FD1794 || device->type() == FD1795 || device->type() == FD1797 || - device->type() == FD1761 || device->type() == FD1762 || device->type() == FD1763 || device->type() == FD1764 || device->type() == FD1765 || device->type() == FD1767 || + device->type() == FD1761 || device->type() == FD1762 || device->type() == FD1763 || device->type() == FD1764 || device->type() == FD1765 || device->type() == FD1767 || device->type() == WD2791 || device->type() == WD2793 || device->type() == WD2795 || device->type() == WD2797 || - device->type() == WD1770 || device->type() == WD1772 || device->type() == WD1773 || + device->type() == WD1770 || device->type() == WD1772 || device->type() == WD1773 || device->type() == MB8866 || device->type() == MB8876 || device->type() == MB8877); return (wd1770_state *)downcast<legacy_device_base *>(device)->token(); @@ -418,9 +418,9 @@ INLINE wd1770_state *get_safe_token(device_t *device) static int wd17xx_has_dal(device_t *device) { - return (device->type() == FD1793 || device->type() == FD1794 || device->type() == FD1797 || - device->type() == FD1763 || device->type() == FD1764 || device->type() == FD1767 || - device->type() == WD1770 || device->type() == WD1772 || device->type() == WD1773 || + return (device->type() == FD1793 || device->type() == FD1794 || device->type() == FD1797 || + device->type() == FD1763 || device->type() == FD1764 || device->type() == FD1767 || + device->type() == WD1770 || device->type() == WD1772 || device->type() == WD1773 || device->type() == WD2793 || device->type() == WD2797 || device->type() == MB8877); } @@ -2001,7 +2001,7 @@ READ8_DEVICE_HANDLER( wd17xx_r ) case 2: data = wd17xx_sector_r(device, 0); break; case 3: data = wd17xx_data_r(device, 0); break; } - + return data; } diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c index 79cca5a2b68..032943c035f 100644 --- a/src/emu/sound/c352.c +++ b/src/emu/sound/c352.c @@ -62,7 +62,7 @@ int c352_device::get_mseq_bit() if (bit) { - reg = ((reg ^ mask) << 1) | 1; + reg = ((reg ^ mask) << 1) | 1; } else { diff --git a/src/emu/validity.c b/src/emu/validity.c index 7424e351cae..5e0750f355b 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -1059,7 +1059,7 @@ static bool validate_inputs(driver_enumerator &drivlist, int_map &defstr_map, io /* find a matching port */ for (scanport = portlist.first(); scanport != NULL; scanport = scanport->next()) { astring porttag; - port->owner().subtag(porttag, setting->condition.tag); + port->owner().subtag(porttag, setting->condition.tag); if (strcmp(porttag.cstr(), scanport->tag()) == 0) break; } diff --git a/src/lib/cothread/ppc.c b/src/lib/cothread/ppc.c index f898e2d3634..637ad426ada 100644 --- a/src/lib/cothread/ppc.c +++ b/src/lib/cothread/ppc.c @@ -22,15 +22,15 @@ floating-point and AltiVec save/restore */ /* State format (offsets in 32-bit words) -+0 Pointer to swap code - Rest of function descriptor for entry function -+8 PC -+10 SP - Special regs - GPRs - FPRs - VRs - stack ++0 Pointer to swap code + Rest of function descriptor for entry function ++8 PC ++10 SP + Special regs + GPRs + FPRs + VRs + stack */ enum { state_size = 1024 }; @@ -56,7 +56,7 @@ or are directly to function */ #ifdef __cplusplus extern "C" #endif - + /* Swap code is in ppc.S */ void co_swap_asm( cothread_t, cothread_t ); #define CO_SWAP_ASM( x, y ) co_swap_asm( x, y ) @@ -285,15 +285,15 @@ static const uint32_t libco_ppc_code [] = { static uint32_t* co_create_( unsigned size, uintptr_t entry ) { uint32_t* t = (uint32_t*) malloc( size ); - + (void) entry; - + #if LIBCO_PPCDESC if ( t ) { /* Copy entry's descriptor */ memcpy( t, (void*) entry, sizeof (void*) * 3 ); - + /* Set function pointer to swap routine */ #ifdef LIBCO_PPC_ASM *(const void**) t = *(void**) &co_swap_asm; @@ -302,7 +302,7 @@ static uint32_t* co_create_( unsigned size, uintptr_t entry ) #endif } #endif - + return t; } @@ -310,54 +310,54 @@ cothread_t co_create( unsigned int size, void (*entry_)( void ) ) { uintptr_t entry = (uintptr_t) entry_; uint32_t* t = NULL; - + /* Be sure main thread was successfully allocated */ if ( co_active() ) { size += state_size + above_stack + stack_align; t = co_create_( size, entry ); } - + if ( t ) { uintptr_t sp; int shift; - + /* Save current registers into new thread, so that any special ones will - have proper values when thread is begun */ + have proper values when thread is begun */ CO_SWAP_ASM( t, t ); - + #if LIBCO_PPCDESC /* Get real address */ entry = (uintptr_t) *(void**) entry; #endif - + /* Put stack near end of block, and align */ sp = (uintptr_t) t + size - above_stack; sp -= sp % stack_align; - + /* On PPC32, we save and restore GPRs as 32 bits. For PPC64, we - save and restore them as 64 bits, regardless of the size the ABI - uses. So, we manually write pointers at the proper size. We always - save and restore at the same address, and since PPC is big-endian, - we must put the low byte first on PPC32. */ - + save and restore them as 64 bits, regardless of the size the ABI + uses. So, we manually write pointers at the proper size. We always + save and restore at the same address, and since PPC is big-endian, + we must put the low byte first on PPC32. */ + /* If uintptr_t is 32 bits, >>32 is undefined behavior, so we do two shifts - and don't have to care how many bits uintptr_t is. */ + and don't have to care how many bits uintptr_t is. */ #if LIBCO_PPC64 shift = 16; #else shift = 0; #endif - + /* Set up so entry will be called on next swap */ t [8] = (uint32_t) (entry >> shift >> shift); t [9] = (uint32_t) entry; - - t [10] = (uint32_t) (sp >> shift >> shift); + + t [10] = (uint32_t) (sp >> shift >> shift); t [11] = (uint32_t) sp; } - + return t; } @@ -370,23 +370,23 @@ static void co_init_( void ) { #if LIBCO_MPROTECT /* TODO: pre- and post-pad PPC code so that this doesn't make other - data executable and writable */ + data executable and writable */ long page_size = sysconf( _SC_PAGESIZE ); if ( page_size > 0 ) { uintptr_t align = page_size; uintptr_t begin = (uintptr_t) libco_ppc_code; uintptr_t end = begin + sizeof libco_ppc_code; - + /* Align beginning and end */ end += align - 1; end -= end % align; begin -= begin % align; - + mprotect( (void*) begin, end - begin, PROT_READ | PROT_WRITE | PROT_EXEC ); } #endif - + co_active_handle = co_create_( state_size, (uintptr_t) &co_switch ); } @@ -394,7 +394,7 @@ cothread_t co_active() { if ( !co_active_handle ) co_init_(); - + return co_active_handle; } @@ -402,6 +402,6 @@ void co_switch( cothread_t t ) { cothread_t old = co_active_handle; co_active_handle = t; - + CO_SWAP_ASM( t, old ); } diff --git a/src/lib/util/cdrom.c b/src/lib/util/cdrom.c index 297615dee1b..a4057934b7b 100644 --- a/src/lib/util/cdrom.c +++ b/src/lib/util/cdrom.c @@ -257,7 +257,7 @@ UINT32 cdrom_read_data(cdrom_file *file, UINT32 lbasector, void *buffer, UINT32 memcpy(buffer, &file->cache[(sectoroffs * CD_FRAME_SIZE) + 16], 2048); return 1; } - + /* return 2352 byte mode 1 raw sector from 2048 bytes of mode 1 data */ if ((datatype == CD_TRACK_MODE1_RAW) && (tracktype == CD_TRACK_MODE1)) { diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c index 28e415e12b7..7135f2a25da 100644 --- a/src/mame/drivers/midvunit.c +++ b/src/mame/drivers/midvunit.c @@ -1122,7 +1122,7 @@ Notes: - not populated for Cruis'n USA - labelled 'Offroad 25" U904' for Offroad Challenge PAL1 - GAL20V8 labelled 'A-19668' - PAL2 - PALC22V10 + PAL2 - PALC22V10 - no label for Cruisin USA - labelled 'A-21883 U38' for Offroad Challenge PAL3 - TIBPAL20L8 @@ -1131,10 +1131,10 @@ Notes: PAL4 - TIBPAL22V10 - labelled 'A-19671' for Cruis'n USA - labelled 'A-21171 U54' for Offroad Challenge - PAL5 - TIBPAL22V10 + PAL5 - TIBPAL22V10 - labelled 'A-19672' for Cruis'n USA - labelled 'A-21884 U114' for Offroad Challenge - PAL6 - TIBPAL22V10 + PAL6 - TIBPAL22V10 - labelled 'A-19673' for Cruis'n USA - no label for Offroad Challenge P3 - P11 - various connectors for controls diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index f6203b08312..8579304ca7c 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -400,7 +400,7 @@ public: int m_gfx_index; UINT16 * m_vid_vidram; UINT16 * m_vid_mainram; -// UINT8 m_scn2674_IR[16]; +// UINT8 m_scn2674_IR[16]; UINT8 m_scn2674_IR_pointer; UINT8 m_scn2674_screen1_l; UINT8 m_scn2674_screen1_h; diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index 3052b8dad06..022f3a2a823 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -172,7 +172,7 @@ TODO: - Find out what causes the games to hang/reset in service mode Probably down to AVDC interrupt timing, there seem to be a number of race conditions re: masks that need sorting out with proper blank handling, etc. - - Deal 'Em lockouts vary on certain cabinets (normally connected to AUX2, but not there?) + - Deal 'Em lockouts vary on certain cabinets (normally connected to AUX2, but not there?) - Deal 'Em has bad tiles (apostrophe, logo, bottom corner), black should actually be transparent to give black on green. ***********************************************************************************************************/ @@ -480,7 +480,7 @@ static SCREEN_UPDATE(mpu4_vid) if (attr) drawgfx_opaque(bitmap,cliprect,screen->machine().gfx[gfxregion],tiledat,0,0,0,(x*8)+(4*8),(y*8)+4); - + } if (dbl_size&2) { @@ -524,7 +524,7 @@ static void scn2674_write_init_regs(mpu4_state *state, UINT8 data) { LOGSTUFF(("scn2674_write_init_regs %02x %02x\n",state->m_scn2674_IR_pointer,data)); -// state->m_scn2674_IR[state->m_scn2674_IR_pointer]=data; +// state->m_scn2674_IR[state->m_scn2674_IR_pointer]=data; switch ( state->m_scn2674_IR_pointer) /* display some debug info, set mame specific variables */ @@ -970,7 +970,7 @@ static WRITE16_HANDLER( mpu4_vid_scn2674_w ) break; case 2: state->m_scn2674_screen1_l = data; break; - case 3: + case 3: state->m_scn2674_screen1_h = (data&0x3f);//uppermost two bytes not part of register state->m_scn2674_dbl1=(data & 0xc0)>>6; if (state->m_IR0_scn2674_double_ht_wd) @@ -983,8 +983,8 @@ static WRITE16_HANDLER( mpu4_vid_scn2674_w ) case 4: state->m_scn2674_cursor_l = data; break; case 5: state->m_scn2674_cursor_h = data; break; case 6: state->m_scn2674_screen2_l = data; break; - case 7: - state->m_scn2674_screen2_h = (data&0x3f); + case 7: + state->m_scn2674_screen2_h = (data&0x3f); state->m_scn2674_spl1 = (data & 0x40); state->m_scn2674_spl2 = (data & 0x80); break; @@ -2051,7 +2051,7 @@ static MACHINE_RESET( mpu4_vid ) static ADDRESS_MAP_START( mpu4_68k_map, AS_PROGRAM, 16 ) AM_RANGE(0x000000, 0x7fffff) AM_ROM AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_MEMBER(mpu4_state, m_vid_mainram)// AM_MIRROR(0x10000) -// AM_RANGE(0x810000, 0x81ffff) AM_RAM /* ? */ +// AM_RANGE(0x810000, 0x81ffff) AM_RAM /* ? */ AM_RANGE(0x900000, 0x900001) AM_DEVWRITE8("saa", saa1099_data_w, 0x00ff) AM_RANGE(0x900002, 0x900003) AM_DEVWRITE8("saa", saa1099_control_w, 0x00ff) AM_RANGE(0xa00000, 0xa00003) AM_READWRITE(ef9369_r, ef9369_w) @@ -2067,7 +2067,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( mpu4oki_68k_map, AS_PROGRAM, 16 ) AM_RANGE(0x000000, 0x5fffff) AM_ROM //AM_WRITENOP AM_RANGE(0x600000, 0x63ffff) AM_RAM /* The Mating Game has an extra 256kB RAM on the program card */ -// AM_RANGE(0x640000, 0x7fffff) AM_NOP /* Possible bug, reads and writes here */ +// AM_RANGE(0x640000, 0x7fffff) AM_NOP /* Possible bug, reads and writes here */ AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_MEMBER(mpu4_state, m_vid_mainram) AM_RANGE(0x900000, 0x900001) AM_DEVWRITE8("saa", saa1099_data_w, 0x00ff) AM_RANGE(0x900002, 0x900003) AM_DEVWRITE8("saa", saa1099_control_w, 0x00ff) @@ -2081,7 +2081,7 @@ static ADDRESS_MAP_START( mpu4oki_68k_map, AS_PROGRAM, 16 ) AM_RANGE(0xffa040, 0xffa04f) AM_WRITE8(ic3ss_vid_w,0x00ff) // 6840PTM on sampled sound board AM_RANGE(0xffa060, 0xffa067) AM_DEVREADWRITE8_MODERN("pia_ic4ss", pia6821_device, read, write,0x00ff) // PIA6821 on sampled sound board AM_RANGE(0xffd000, 0xffd00f) AM_READWRITE(characteriser16_r, characteriser16_w) -// AM_RANGE(0xfff000, 0xffffff) AM_NOP /* Possible bug, reads and writes here */ +// AM_RANGE(0xfff000, 0xffffff) AM_NOP /* Possible bug, reads and writes here */ ADDRESS_MAP_END /* TODO: Fix up MPU4 map*/ @@ -2461,7 +2461,7 @@ static MACHINE_CONFIG_START( mpu4_vid, mpu4_state ) MCFG_SCREEN_VISIBLE_AREA(4*8, (63*8)+(4*8)-1, 4, (37*8)+4-1) MCFG_SCREEN_REFRESH_RATE(50) -// MCFG_SCREEN_RAW_PARAMS(4000000*2, 80*8, 4, (63*8)+4, (37*8)+10+4+3, 4, (37*8)+4)//42*8, 0*8, 37*8) 3 +// MCFG_SCREEN_RAW_PARAMS(4000000*2, 80*8, 4, (63*8)+4, (37*8)+10+4+3, 4, (37*8)+4)//42*8, 0*8, 37*8) 3 MCFG_SCREEN_UPDATE(mpu4_vid) MCFG_CPU_ADD("video", M68000, VIDEO_MASTER_CLOCK ) diff --git a/src/mame/drivers/saturn.c b/src/mame/drivers/saturn.c index 4b665deaf4d..351349eca67 100644 --- a/src/mame/drivers/saturn.c +++ b/src/mame/drivers/saturn.c @@ -4006,8 +4006,6 @@ ROM_START( sfish2 ) DISK_REGION( "cdrom" ) DISK_IMAGE( "sfish2", 0, SHA1(a10073d83bbbe16e16f69ad48565821576557d61) ) - - ROM_REGION32_BE( 0x3000000, "abus", ROMREGION_ERASE00 ) /* SH2 code */ \ ROM_END ROM_START( sfish2j ) @@ -4026,8 +4024,6 @@ ROM_START( sfish2j ) DISK_REGION( "cdrom" ) DISK_IMAGE( "sfish2", 0, SHA1(a10073d83bbbe16e16f69ad48565821576557d61) ) - - ROM_REGION32_BE( 0x3000000, "abus", ROMREGION_ERASE00 ) /* SH2 code */ \ ROM_END diff --git a/src/mame/drivers/sfcbox.c b/src/mame/drivers/sfcbox.c index f66f81d0ef0..65659de7dd4 100644 --- a/src/mame/drivers/sfcbox.c +++ b/src/mame/drivers/sfcbox.c @@ -322,9 +322,9 @@ ROM_START( pss64 ) ROM_REGION( 0x500000, "user3", 0 ) ROM_LOAD( "shvc-m4-0.rom3", 0x000000, 0x100000, CRC(fb259f4f) SHA1(8faeb56f80e82dd042bdc84d19c526a979c6de8f) ) ROM_LOAD( "shvc-8x-1.rom1", 0x100000, 0x400000, CRC(3adef543) SHA1(df02860e691fbee453e345dd343c08b6da08d4ea) ) -// Possibly reverse order : -// ROM_LOAD( "shvc-8x-1.rom1", 0x000000, 0x400000, CRC(3adef543) SHA1(df02860e691fbee453e345dd343c08b6da08d4ea) ) -// ROM_LOAD( "shvc-m4-0.rom3", 0x400000, 0x100000, CRC(fb259f4f) SHA1(8faeb56f80e82dd042bdc84d19c526a979c6de8f) ) +// Possibly reverse order : +// ROM_LOAD( "shvc-8x-1.rom1", 0x000000, 0x400000, CRC(3adef543) SHA1(df02860e691fbee453e345dd343c08b6da08d4ea) ) +// ROM_LOAD( "shvc-m4-0.rom3", 0x400000, 0x100000, CRC(fb259f4f) SHA1(8faeb56f80e82dd042bdc84d19c526a979c6de8f) ) ROM_REGION( 0x100, "user5", 0 ) /* IPL ROM */ ROM_LOAD( "spc700.rom", 0x00, 0x40, CRC(44bb3a40) SHA1(97e352553e94242ae823547cd853eecda55c20f0) ) /* boot rom */ diff --git a/src/mame/drivers/warpsped.c b/src/mame/drivers/warpsped.c index 5a5b4612c68..61b6851813d 100644 --- a/src/mame/drivers/warpsped.c +++ b/src/mame/drivers/warpsped.c @@ -14,24 +14,24 @@ Notes: - What are unknown roms used for? Hardware registers: -0x00 - 0x1f control register for circles generator (8 bytes each) - 0x00, 0x01 circle radius - 0x02, 0x03 circle middle point - 0x04, 0x05 circle middle point - 0x06 circle colour (0-7) - 0x07 unused -0x20 ? -0x21 sound (intro screens have bit 1 toggled for click effect) -0x22 ? -0x23 ? -0x24 ? -0x25 ? -0x26 ? -0x27 ? +0x00 - 0x1f control register for circles generator (8 bytes each) + 0x00, 0x01 circle radius + 0x02, 0x03 circle middle point + 0x04, 0x05 circle middle point + 0x06 circle colour (0-7) + 0x07 unused +0x20 ? +0x21 sound (intro screens have bit 1 toggled for click effect) +0x22 ? +0x23 ? +0x24 ? +0x25 ? +0x26 ? +0x27 ? Board etched... - MEADOWS 024-0084 - MADE IN USA + MEADOWS 024-0084 + MADE IN USA Empty socket at .E3 Z80 processor @@ -40,43 +40,43 @@ Z80 processor 5Mhz crystal All PROMS are SN74s474 -.L18 no sticker -.L17 stickered L9, L13 - L17, G17 -.L15 stickered L10, L15 - L18, G18 -.L13 stickered L9, L13 - L17, G17 -.L10 stickered L10, L15 - L18, G18 -.L9 stickered (damaged) xxx, L13 - xxx, G1y -.K1 stickered K1 -.G2 no sticker K1 -.E4 no sticker -.E5 stickered M16 - PRO - 1 -.E6 stickered M16 - PRO - 3 -.C3 can't read -.C4 stickered M16 - PRO - 4 -.C5 stickered M16 - PRO - 0 -.C6 stickered M16 - PRO - 2 -.E8 stickered E8 -.E10 stickered E10 -.C12 stickered C12 -.G17 stickered L9, L13 - L17, G17 -.G18 stickered L10, L15 - L18, G18 +.L18 no sticker +.L17 stickered L9, L13 + L17, G17 +.L15 stickered L10, L15 + L18, G18 +.L13 stickered L9, L13 + L17, G17 +.L10 stickered L10, L15 + L18, G18 +.L9 stickered (damaged) xxx, L13 + xxx, G1y +.K1 stickered K1 +.G2 no sticker K1 +.E4 no sticker +.E5 stickered M16 + PRO + 1 +.E6 stickered M16 + PRO + 3 +.C3 can't read +.C4 stickered M16 + PRO + 4 +.C5 stickered M16 + PRO + 0 +.C6 stickered M16 + PRO + 2 +.E8 stickered E8 +.E10 stickered E10 +.C12 stickered C12 +.G17 stickered L9, L13 + L17, G17 +.G18 stickered L10, L15 + L18, G18 L9, L13, L17 and G17 all read the same L10, L15, L18 and G18 all read the same diff --git a/src/mame/machine/stvcd.c b/src/mame/machine/stvcd.c index 192ee0a3d66..d144f5a54a2 100644 --- a/src/mame/machine/stvcd.c +++ b/src/mame/machine/stvcd.c @@ -114,7 +114,6 @@ static blockT curblock; static UINT8 tocbuf[102*4]; static UINT8 finfbuf[256]; -static UINT8 onesectorstored; static INT32 sectlenin, sectlenout; @@ -731,7 +730,7 @@ static void cd_writeWord(running_machine &machine, UINT32 addr, UINT16 data) if (freeblocks == 200) { - onesectorstored = 0; + sectorstore = 0; } hirqreg |= EHST; @@ -1024,7 +1023,7 @@ static void cd_writeWord(running_machine &machine, UINT32 addr, UINT16 data) // TODO: buffer full flag - if (freeblocks == 200) { onesectorstored = 0; } + if (freeblocks == 200) { sectorstore = 0; } hirqreg |= (CMOK|ESEL); cr_standard_return(cd_stat); diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index 260de3c9f93..5fd84149193 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -5366,6 +5366,9 @@ UINT8 get_vblank(running_machine &machine) int cur_v,vblank; cur_v = machine.primary_screen->vpos(); + if(!STV_VDP2_DISP) + return 1; + vblank = (state->m_vdp2.pal) ? 288 : 240; if((STV_VDP2_LSMD & 3) == 3) @@ -6340,7 +6343,7 @@ SCREEN_UPDATE( stv_vdp2 ) } #endif - if(STV_VDP2_DISP != 0) + if(STV_VDP2_DISP) { stv_sprite_priorities_usage_valid = 0; memset(stv_sprite_priorities_used, 0, sizeof(stv_sprite_priorities_used)); |