Cleanups and version bump.

This commit is contained in:
Aaron Giles 2009-08-21 01:52:51 +00:00
parent 2e64cfa8f3
commit ac3d58fad5
26 changed files with 292 additions and 291 deletions

View File

@ -278,8 +278,8 @@ const UINT8 lut_cycles_8085[256]={
/* special cases (partially taken care of elsewhere): /* special cases (partially taken care of elsewhere):
base c taken? not taken? base c taken? not taken?
M_RET 8080 5 +6(11) -0 (conditional) M_RET 8080 5 +6(11) -0 (conditional)
M_RET 8085 6 +6(12) -0 (conditional) M_RET 8085 6 +6(12) -0 (conditional)
M_JMP 8080 10 +0 -0 M_JMP 8080 10 +0 -0
M_JMP 8085 10 +0 -3(7) M_JMP 8085 10 +0 -3(7)
M_CALL 8080 11 +6(17) -0 M_CALL 8080 11 +6(17) -0

View File

@ -699,7 +699,7 @@ typedef struct
/* there are 2048 FNUMs that can be generated using FNUM/BLK registers /* there are 2048 FNUMs that can be generated using FNUM/BLK registers
but LFO works with one more bit of a precision so we really need 4096 elements */ but LFO works with one more bit of a precision so we really need 4096 elements */
UINT32 fn_table[4096]; /* fnumber->increment counter */ UINT32 fn_table[4096]; /* fnumber->increment counter */
UINT32 fn_max; /* maximal phase increment (used for phase overflow) */ UINT32 fn_max; /* maximal phase increment (used for phase overflow) */
@ -1952,7 +1952,7 @@ static void OPNSetPres(FM_OPN *OPN, int pres, int timer_prescaler, int SSGpres)
init_timetables( &OPN->ST, dt_tab ); init_timetables( &OPN->ST, dt_tab );
/* there are 2048 FNUMs that can be generated using FNUM/BLK registers /* there are 2048 FNUMs that can be generated using FNUM/BLK registers
but LFO works with one more bit of a precision so we really need 4096 elements */ but LFO works with one more bit of a precision so we really need 4096 elements */
for(i = 0; i < 4096; i++) for(i = 0; i < 4096; i++)
{ {
/* freq table for octave 7 */ /* freq table for octave 7 */

View File

@ -292,10 +292,10 @@ static DISCRETE_SOUND_START(galaxian)
/************************************************/ /************************************************/
/* two cascaded LS164 which are reset to pitch latch value, /* two cascaded LS164 which are reset to pitch latch value,
* thus generating SOUND_CLOCK / (256 - pitch_clock) signal * thus generating SOUND_CLOCK / (256 - pitch_clock) signal
* *
* One possibility to implement this is * One possibility to implement this is
* DISCRETE_TRANSFORM3(NODE_130, SOUND_CLOCK, 256, GAL_INP_PITCH, "012-/") * DISCRETE_TRANSFORM3(NODE_130, SOUND_CLOCK, 256, GAL_INP_PITCH, "012-/")
* DISCRETE_COUNTER(NODE_132, 1, 0, NODE_130, 15, DISC_COUNT_UP, 0, DISC_CLK_IS_FREQ) * DISCRETE_COUNTER(NODE_132, 1, 0, NODE_130, 15, DISC_COUNT_UP, 0, DISC_CLK_IS_FREQ)
* but there is a native choice: * but there is a native choice:
*/ */
@ -320,7 +320,7 @@ static DISCRETE_SOUND_START(galaxian)
/* Not 100% correct - switching causes high impedance input for node_157 /* Not 100% correct - switching causes high impedance input for node_157
* this is not emulated */ * this is not emulated */
DISCRETE_RCDISC5(NODE_155, NODE_152, GAL_INP_HIT, (GAL_R35 + GAL_R36), GAL_C21) DISCRETE_RCDISC5(NODE_155, NODE_152, GAL_INP_HIT, (GAL_R35 + GAL_R36), GAL_C21)
DISCRETE_OP_AMP_FILTER(NODE_157, 1, NODE_155, 0, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &galaxian_bandpass_desc) DISCRETE_OP_AMP_FILTER(NODE_157, 1, NODE_155, 0, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &galaxian_bandpass_desc)

View File

@ -95,9 +95,9 @@
* Battery backed up RAM * Battery backed up RAM
Input Nº | Pin | Colours | Ground Input N? | Pin N? | Colours | Ground
---------+--------+---------+--------------------------------------------------------------- ---------+--------+---------+---------------------------------------------------------------
00 | 1A | Brn-Wht | Universal Hopper Early / AWP hopper switch 1 (£1) / Y2K Hop 1. 00 | 1A | Brn-Wht | Universal Hopper Early / AWP hopper switch 1 (?1) / Y2K Hop 1.
01 | 2A | Red-Wht | Universal Hopper Late / AWP hopper switch 2 (20p) / Y2K Hop 2. 01 | 2A | Red-Wht | Universal Hopper Late / AWP hopper switch 2 (20p) / Y2K Hop 2.
02 | 3A | Org-Wht | CC46 Coin / C435 Accept 1. 02 | 3A | Org-Wht | CC46 Coin / C435 Accept 1.
03 | 4A | Yel-Wht | CC46 Error / C435 Accept 2. 03 | 4A | Yel-Wht | CC46 Error / C435 Accept 2.
@ -123,9 +123,9 @@
23 | 34A | Pnk-Brn | 23 | 34A | Pnk-Brn |
Output Nº | Pin | Colours | Description Output N? | Pin N? | Colours | Description
----------+--------+---------+--------------------------------------------------------------- ----------+--------+---------+---------------------------------------------------------------
00 | 4B | Brn-Blu | Universal Hopper Drive / AWP hopper drive 1 (£1) / Y2K Hop 1. 00 | 4B | Brn-Blu | Universal Hopper Drive / AWP hopper drive 1 (?1) / Y2K Hop 1.
01 | 5B | Red-Blu | Candle 1. 01 | 5B | Red-Blu | Candle 1.
02 | 6B | Org-Blu | Candle 2. 02 | 6B | Org-Blu | Candle 2.
03 | 7B | Yel-Blu | Cancel Button Lamp. 03 | 7B | Yel-Blu | Cancel Button Lamp.
@ -268,7 +268,7 @@ static PALETTE_INIT( coinmvga )
//static WRITE8_HANDLER( debug_w ) //static WRITE8_HANDLER( debug_w )
//{ //{
// popmessage("written : %02X", data); // popmessage("written : %02X", data);
//} //}
static WRITE16_HANDLER( ramdac_bg_w ) static WRITE16_HANDLER( ramdac_bg_w )
@ -337,7 +337,7 @@ static WRITE16_HANDLER( ramdac_fg_w )
/* /*
static READ16_HANDLER( test_r ) static READ16_HANDLER( test_r )
{ {
return mame_rand(space->machine); return mame_rand(space->machine);
}*/ }*/
/************************* /*************************
@ -348,11 +348,11 @@ static ADDRESS_MAP_START( coinmvga_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("maincpu", 0) //maybe not AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("maincpu", 0) //maybe not
// AM_RANGE(0x0a0000, 0x0fffff) AM_RAM // AM_RANGE(0x0a0000, 0x0fffff) AM_RAM
// AM_RANGE(0x100000, 0x1fffff) AM_RAM //colorama // AM_RANGE(0x100000, 0x1fffff) AM_RAM //colorama
AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_BASE(&vram) AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_BASE(&vram)
// AM_RANGE(0x40746e, 0x40746f) AM_READ(test_r) AM_WRITENOP //touch screen related, colorama // AM_RANGE(0x40746e, 0x40746f) AM_READ(test_r) AM_WRITENOP //touch screen related, colorama
// AM_RANGE(0x403afa, 0x403afb) AM_READ(test_r) AM_WRITENOP //touch screen related, cmrltv75 // AM_RANGE(0x403afa, 0x403afb) AM_READ(test_r) AM_WRITENOP //touch screen related, cmrltv75
AM_RANGE(0x400000, 0x40ffff) AM_RAM AM_RANGE(0x400000, 0x40ffff) AM_RAM
AM_RANGE(0x600000, 0x600001) AM_WRITE(ramdac_bg_w) AM_RANGE(0x600000, 0x600001) AM_WRITE(ramdac_bg_w)
@ -367,28 +367,28 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( coinmvga_io_map, ADDRESS_SPACE_IO, 8 ) static ADDRESS_MAP_START( coinmvga_io_map, ADDRESS_SPACE_IO, 8 )
/* Digital I/O ports (ports 4-B are valid on 16-bit H8/3xx) */ /* Digital I/O ports (ports 4-B are valid on 16-bit H8/3xx) */
// AM_RANGE(H8_PORT_4, H8_PORT_4) // AM_RANGE(H8_PORT_4, H8_PORT_4)
// AM_RANGE(H8_PORT_5, H8_PORT_5) // AM_RANGE(H8_PORT_5, H8_PORT_5)
// AM_RANGE(H8_PORT_6, H8_PORT_6) // AM_RANGE(H8_PORT_6, H8_PORT_6)
// AM_RANGE(H8_PORT_7, H8_PORT_7) <---- 0006 RW colorama // AM_RANGE(H8_PORT_7, H8_PORT_7) <---- 0006 RW colorama
// AM_RANGE(H8_PORT_8, H8_PORT_8) // AM_RANGE(H8_PORT_8, H8_PORT_8)
// AM_RANGE(H8_PORT_9, H8_PORT_9) // AM_RANGE(H8_PORT_9, H8_PORT_9)
// AM_RANGE(H8_PORT_A, H8_PORT_A) // AM_RANGE(H8_PORT_A, H8_PORT_A)
// AM_RANGE(H8_PORT_B, H8_PORT_B) // AM_RANGE(H8_PORT_B, H8_PORT_B)
/* Analog Inputs */ /* Analog Inputs */
// AM_RANGE(H8_ADC_0_H, H8_ADC_0_L) // AM_RANGE(H8_ADC_0_H, H8_ADC_0_L)
// AM_RANGE(H8_ADC_1_H, H8_ADC_1_L) // AM_RANGE(H8_ADC_1_H, H8_ADC_1_L)
// AM_RANGE(H8_ADC_2_H, H8_ADC_2_L) // AM_RANGE(H8_ADC_2_H, H8_ADC_2_L)
// AM_RANGE(H8_ADC_3_H, H8_ADC_3_L) // AM_RANGE(H8_ADC_3_H, H8_ADC_3_L)
/* Serial ports */ /* Serial ports */
// AM_RANGE(H8_SERIAL_0, H8_SERIAL_0) // AM_RANGE(H8_SERIAL_0, H8_SERIAL_0)
// AM_RANGE(H8_SERIAL_1, H8_SERIAL_1) // AM_RANGE(H8_SERIAL_1, H8_SERIAL_1)
ADDRESS_MAP_END ADDRESS_MAP_END
/* unknown writes (cmrltv75): /* unknown writes (cmrltv75):
CPU 'main' (PC=00000218): unmapped program memory word write to 00FFFFF2 = 001E & 00FF CPU 'main' (PC=00000218): unmapped program memory word write to 00FFFFF2 = 001E & 00FF
CPU 'main' (PC=0000021C): unmapped program memory word write to 00FFFFEC = E800 & FF00 CPU 'main' (PC=0000021C): unmapped program memory word write to 00FFFFEC = E800 & FF00
@ -403,7 +403,7 @@ CPU 'main' (PC=00000330): unmapped program memory word read from 0040FBEE & FFFF
CPU 'main' (PC=00000330): unmapped program memory word read from 0040FBF0 & FFFF CPU 'main' (PC=00000330): unmapped program memory word read from 0040FBF0 & FFFF
** unknown writes (colorama): ** unknown writes (colorama):
CPU 'main' (PC=00000218): unmapped program memory word write to 00FFFFF2 = 001E & 00FF CPU 'main' (PC=00000218): unmapped program memory word write to 00FFFFF2 = 001E & 00FF
@ -660,7 +660,7 @@ static MACHINE_DRIVER_START( coinmvga )
MDRV_CPU_IO_MAP(coinmvga_io_map) MDRV_CPU_IO_MAP(coinmvga_io_map)
MDRV_CPU_VBLANK_INT("screen", vblank_irq) /* wrong, fix me */ MDRV_CPU_VBLANK_INT("screen", vblank_irq) /* wrong, fix me */
// MDRV_NVRAM_HANDLER(generic_0fill) // MDRV_NVRAM_HANDLER(generic_0fill)
/* video hardware */ /* video hardware */
MDRV_SCREEN_ADD("screen", RASTER) MDRV_SCREEN_ADD("screen", RASTER)

View File

@ -695,7 +695,7 @@ ROM_END
/********************************************************* /*********************************************************
Crazy Monkey Crazy Monkey
Roms 1-4 were changed after the 070315 update. Roms 1-4 were changed after the 070315 update.
The official list of hashes shows the 070315 updated roms. The official list of hashes shows the 070315 updated roms.
**********************************************************/ **********************************************************/
@ -870,7 +870,7 @@ ROM_END
/********************************************************* /*********************************************************
Fruit Cocktail Fruit Cocktail
All the roms were changed after the 070305 update. All the roms were changed after the 070305 update.
The official list of hashes shows the 070305 updated roms. The official list of hashes shows the 070305 updated roms.
**********************************************************/ **********************************************************/
@ -1045,7 +1045,7 @@ ROM_END
/********************************************************* /*********************************************************
Lucky Haunter Lucky Haunter
Roms 1-4 were changed after the 070402 update. Roms 1-4 were changed after the 070402 update.
The official list of hashes shows the 070402 updated roms. The official list of hashes shows the 070402 updated roms.
**********************************************************/ **********************************************************/
@ -1190,7 +1190,7 @@ ROM_END
/********************************************************* /*********************************************************
Garage Garage
Roms 1-4 were changed after the 070213 update. Roms 1-4 were changed after the 070213 update.
The official list of hashes shows the 070213 updated roms. The official list of hashes shows the 070213 updated roms.
**********************************************************/ **********************************************************/
@ -1305,7 +1305,7 @@ ROM_END
/********************************************************* /*********************************************************
Rock Clibmer Rock Clibmer
Roms 1-4 were changed after the 070322 update. Roms 1-4 were changed after the 070322 update.
The official list of hashes shows the 070322 updated roms. The official list of hashes shows the 070322 updated roms.
**********************************************************/ **********************************************************/
@ -1424,7 +1424,7 @@ ROM_END
/********************************************************* /*********************************************************
Resident Resident
Roms 1-4 were changed after the 070222 update. Roms 1-4 were changed after the 070222 update.
The official list of hashes shows the 070222 updated roms. The official list of hashes shows the 070222 updated roms.
**********************************************************/ **********************************************************/
@ -1479,7 +1479,7 @@ ROM_END
/********************************************************* /*********************************************************
Roll Fruit Roll Fruit
Roms 4-8 were changed after the 080327 update. Roms 4-8 were changed after the 080327 update.
The official list of hashes shows both set of roms. The official list of hashes shows both set of roms.
**********************************************************/ **********************************************************/
@ -1623,7 +1623,7 @@ ROM_END
/********************************************************* /*********************************************************
Keks Keks
Roms 1-4 were changed after the 070119 update. Roms 1-4 were changed after the 070119 update.
The official list of hashes shows the 070119 updated roms. The official list of hashes shows the 070119 updated roms.
**********************************************************/ **********************************************************/

View File

@ -1877,7 +1877,7 @@ static INPUT_PORTS_START( spacwalk )
/* 8 pin DIP Switch on location C2 on PCB A084-90700-D640 */ /* 8 pin DIP Switch on location C2 on PCB A084-90700-D640 */
/* PCB picture also shows a 2nd DIP Switch on location B2, supposedly for language selection, /* PCB picture also shows a 2nd DIP Switch on location B2, supposedly for language selection,
but ROM contents suggests it's not connected (no different languages or unmapped reads) */ but ROM contents suggests it's not connected (no different languages or unmapped reads) */
PORT_START("IN2") PORT_START("IN2")
PORT_DIPNAME( 0x03, 0x01, DEF_STR( Game_Time ) ) PORT_DIPLOCATION("C2:1,2") PORT_DIPNAME( 0x03, 0x01, DEF_STR( Game_Time ) ) PORT_DIPLOCATION("C2:1,2")
PORT_DIPSETTING( 0x03, "40 seconds + 20 extended" ) PORT_CONDITION("IN2", 0x30, PORTCOND_NOTEQUALS, 0x00) // 45 + 20 for 2 players PORT_DIPSETTING( 0x03, "40 seconds + 20 extended" ) PORT_CONDITION("IN2", 0x30, PORTCOND_NOTEQUALS, 0x00) // 45 + 20 for 2 players

View File

@ -493,7 +493,7 @@ struct SNES_PPU_STRUCT /* once all the regs are saved in this structure, it woul
UINT8 bg3_priority_bit; UINT8 bg3_priority_bit;
UINT8 direct_color; UINT8 direct_color;
UINT8 ppu_last_scroll; /* as per Anomie's doc and Theme Park, all scroll regs shares (but mode 7 ones) the same UINT8 ppu_last_scroll; /* as per Anomie's doc and Theme Park, all scroll regs shares (but mode 7 ones) the same
'previous' scroll value */ 'previous' scroll value */
UINT8 mode7_last_scroll; /* as per Anomie's doc mode 7 scroll regs use a different value, shared with mode 7 matrix! */ UINT8 mode7_last_scroll; /* as per Anomie's doc mode 7 scroll regs use a different value, shared with mode 7 matrix! */
UINT8 main_bg_enabled[5]; // these would probably better fit the layer struct, but it would make worse the code in snes_update_mode_X() UINT8 main_bg_enabled[5]; // these would probably better fit the layer struct, but it would make worse the code in snes_update_mode_X()

View File

@ -405,7 +405,7 @@ Blocks marked ** are decrypted and verified
** Block 11 Found Base 0136 - Inline Encryption (size 13) - Mode? 00 Unknown 3f Key (unused?) 53 Length 00fe ** Block 11 Found Base 0136 - Inline Encryption (size 13) - Mode? 00 Unknown 3f Key (unused?) 53 Length 00fe
** Block 12 Found Base 024d - Mode? 02 Unknown 38 Key 00 Length 0050 | just a shift ** Block 12 Found Base 024d - Mode? 02 Unknown 38 Key 00 Length 0050 | just a shift
** Block 13 Found Base 02a3 - Mode? 02 Unknown 6f Key bc Length 09e0 | shift 2 places - (test mode code / data!) ** Block 13 Found Base 02a3 - Mode? 02 Unknown 6f Key bc Length 09e0 | shift 2 places - (test mode code / data!)
** Block 14 Found Base 0c89 - Mode? 03 Unknown 01 Key 31 Length 1880 | just a table ** Block 14 Found Base 0c89 - Mode? 03 Unknown 01 Key 31 Length 1880 | just a table
** Block 15 Found Base 250f - Mode? 02 Unknown 3f Key 24 Length 03b8 | shift 3 places + table, contains GAME OVER, CONTINUE ** Block 15 Found Base 250f - Mode? 02 Unknown 3f Key 24 Length 03b8 | shift 3 places + table, contains GAME OVER, CONTINUE
** Block 16 Found Base 28cd - Mode? 01 Unknown 03 Key 80 Length 018a ** Block 16 Found Base 28cd - Mode? 01 Unknown 03 Key 80 Length 018a
** Block 17 Found Base 2a5d - Mode? 01 Unknown 1f Key 15 Length 018a ** Block 17 Found Base 2a5d - Mode? 01 Unknown 1f Key 15 Length 018a

View File

@ -593,7 +593,7 @@ WRITE64_DEVICE_HANDLER( naomibd_w )
case 0x1fffc: // decryption key case 0x1fffc: // decryption key
v->prot_key = data; v->prot_key = data;
// printf("Protection: set up read @ %x, key %x (PIO %x DMA %x) [%s]\n", v->prot_offset, v->prot_key, v->rom_offset, v->dma_offset, cpuexec_describe_context(device->machine)); // printf("Protection: set up read @ %x, key %x (PIO %x DMA %x) [%s]\n", v->prot_offset, v->prot_key, v->rom_offset, v->dma_offset, cpuexec_describe_context(device->machine));
// translate address if necessary // translate address if necessary
if (v->prot_translate != NULL) if (v->prot_translate != NULL)
@ -1030,7 +1030,7 @@ DEVICE_GET_INFO( naomibd )
case DEVINFO_INT_INLINE_CONFIG_BYTES: info->i = sizeof(naomibd_config); break; case DEVINFO_INT_INLINE_CONFIG_BYTES: info->i = sizeof(naomibd_config); break;
case DEVINFO_INT_CLASS: info->i = DEVICE_CLASS_PERIPHERAL; break; case DEVINFO_INT_CLASS: info->i = DEVICE_CLASS_PERIPHERAL; break;
case DEVINFO_INT_DMAOFFSET: case DEVINFO_INT_DMAOFFSET:
// printf("DMA source %x, flags %x\n", get_safe_token(device)->dma_offset, get_safe_token(device)->dma_offset_flags); // printf("DMA source %x, flags %x\n", get_safe_token(device)->dma_offset, get_safe_token(device)->dma_offset_flags);
// if the flag is cleared that lets the protection chip go, // if the flag is cleared that lets the protection chip go,
// we need to handle this specially. // we need to handle this specially.

View File

@ -72,7 +72,7 @@ static void snes_latch_counters(running_machine *machine)
snes_ppu.beam.latch_vert = video_screen_get_vpos(machine->primary_screen); snes_ppu.beam.latch_vert = video_screen_get_vpos(machine->primary_screen);
snes_ppu.beam.latch_horz = snes_ppu.beam.current_horz; snes_ppu.beam.latch_horz = snes_ppu.beam.current_horz;
snes_ram[STAT78] |= 0x40; // indicate we latched snes_ram[STAT78] |= 0x40; // indicate we latched
// read_ophct = read_opvct = 0; // clear read flags - 2009-08: I think we must clear these when STAT78 is read... // read_ophct = read_opvct = 0; // clear read flags - 2009-08: I think we must clear these when STAT78 is read...
// printf("latched @ H %d V %d\n", snes_ppu.beam.latch_horz, snes_ppu.beam.latch_vert); // printf("latched @ H %d V %d\n", snes_ppu.beam.latch_horz, snes_ppu.beam.latch_vert);
} }
@ -372,12 +372,12 @@ READ8_HANDLER( snes_r_io )
return snes_ppu.ppu1_open_bus; return snes_ppu.ppu1_open_bus;
// According to BSNES, these should return snes_open_bus_r! // According to BSNES, these should return snes_open_bus_r!
// case OAMADDL: // case OAMADDL:
// case OAMADDH: // case OAMADDH:
// case VMADDH: // case VMADDH:
// case CGADD: // case CGADD:
// case CGDATA: // case CGDATA:
// return snes_ram[offset]; // return snes_ram[offset];
case MPYL: /* Multiplication result (low) */ case MPYL: /* Multiplication result (low) */
{ {
/* Perform 16bit * 8bit multiply */ /* Perform 16bit * 8bit multiply */
@ -577,7 +577,7 @@ READ8_HANDLER( snes_r_io )
joypad[1].oldrol&=0xf; joypad[1].oldrol&=0xf;
if( !(joypad[1].oldrol % 17) ) if( !(joypad[1].oldrol % 17) )
value = 0x1; value = 0x1;
//value |= 0x1c; // bits 4, 3, and 2 are always set //value |= 0x1c; // bits 4, 3, and 2 are always set
return value | 0x1c | (snes_open_bus_r(space,0) & 0xe0); //correct? return value | 0x1c | (snes_open_bus_r(space,0) & 0xe0); //correct?
} }
case HTIMEL: case HTIMEL:
@ -666,7 +666,7 @@ READ8_HANDLER( snes_r_io )
} }
/* Unsupported reads returns open bus */ /* Unsupported reads returns open bus */
// printf("%02x %02x\n",offset,snes_open_bus_r(space,0)); // printf("%02x %02x\n",offset,snes_open_bus_r(space,0));
return snes_open_bus_r(space,0); return snes_open_bus_r(space,0);
} }
@ -681,7 +681,7 @@ WRITE8_HANDLER( snes_w_io )
// APU is mirrored from 2140 to 217f // APU is mirrored from 2140 to 217f
if (offset >= APU00 && offset < WMDATA) if (offset >= APU00 && offset < WMDATA)
{ {
// printf("816: %02x to APU @ %d\n", data, offset&3); // printf("816: %02x to APU @ %d\n", data, offset&3);
spc_port_in[offset & 0x3] = data; spc_port_in[offset & 0x3] = data;
cpuexec_boost_interleave(space->machine, attotime_zero, ATTOTIME_IN_USEC(20)); cpuexec_boost_interleave(space->machine, attotime_zero, ATTOTIME_IN_USEC(20));
return; return;
@ -2193,7 +2193,7 @@ void snes_gdma( const address_space *space, UINT8 channels )
if( !length ) if( !length )
length = 0x10000; /* 0x0000 really means 0x10000 */ length = 0x10000; /* 0x0000 really means 0x10000 */
// printf( "GDMA-Ch %d: len: %X, abus: %X, bbus: %X, incr: %d, dir: %s, type: %d\n", i, length, abus, bbus, increment, snes_ram[SNES_DMA_BASE + dma] & 0x80 ? "PPU->CPU" : "CPU->PPU", snes_ram[SNES_DMA_BASE + dma] & 0x7 ); // printf( "GDMA-Ch %d: len: %X, abus: %X, bbus: %X, incr: %d, dir: %s, type: %d\n", i, length, abus, bbus, increment, snes_ram[SNES_DMA_BASE + dma] & 0x80 ? "PPU->CPU" : "CPU->PPU", snes_ram[SNES_DMA_BASE + dma] & 0x7 );
#ifdef SNES_DBG_GDMA #ifdef SNES_DBG_GDMA
mame_printf_debug( "GDMA-Ch %d: len: %X, abus: %X, bbus: %X, incr: %d, dir: %s, type: %d\n", i, length, abus, bbus, increment, snes_ram[SNES_DMA_BASE + dma] & 0x80 ? "PPU->CPU" : "CPU->PPU", snes_ram[SNES_DMA_BASE + dma] & 0x7 ); mame_printf_debug( "GDMA-Ch %d: len: %X, abus: %X, bbus: %X, incr: %d, dir: %s, type: %d\n", i, length, abus, bbus, increment, snes_ram[SNES_DMA_BASE + dma] & 0x80 ? "PPU->CPU" : "CPU->PPU", snes_ram[SNES_DMA_BASE + dma] & 0x7 );

View File

@ -9517,28 +9517,28 @@ Other Sun games
/* Igrosoft */ /* Igrosoft */
/* Multifish */ /* Multifish */
//DRIVER( mfish ) /* (c) 2002 */ //DRIVER( mfish ) /* (c) 2002 */
//DRIVER( mfish_2 ) /* (c) 2002 */ //DRIVER( mfish_2 ) /* (c) 2002 */
DRIVER( mfish_3 ) /* (c) 2002 */ DRIVER( mfish_3 ) /* (c) 2002 */
DRIVER( mfish_3a ) /* (c) 2002 */ DRIVER( mfish_3a ) /* (c) 2002 */
//DRIVER( mfish_4 ) /* (c) 2002 */ //DRIVER( mfish_4 ) /* (c) 2002 */
//DRIVER( mfish_5 ) /* (c) 2002 */ //DRIVER( mfish_5 ) /* (c) 2002 */
//DRIVER( mfish_6 ) /* (c) 2002 */ //DRIVER( mfish_6 ) /* (c) 2002 */
//DRIVER( mfish_7 ) /* (c) 2002 */ //DRIVER( mfish_7 ) /* (c) 2002 */
//DRIVER( mfish_8 ) /* (c) 2002 */ //DRIVER( mfish_8 ) /* (c) 2002 */
//DRIVER( mfish_9 ) /* (c) 2002 */ //DRIVER( mfish_9 ) /* (c) 2002 */
//DRIVER( mfish_10 ) /* (c) 2002 */ //DRIVER( mfish_10 ) /* (c) 2002 */
//DRIVER( mfish_11 ) /* (c) 2002 */ //DRIVER( mfish_11 ) /* (c) 2002 */
DRIVER( mfish_12 ) /* (c) 2002 */ DRIVER( mfish_12 ) /* (c) 2002 */
DRIVER( mfish_12a ) /* (c) 2002 */ DRIVER( mfish_12a ) /* (c) 2002 */
//DRIVER( mfish_13 ) /* (c) 2002 */ //DRIVER( mfish_13 ) /* (c) 2002 */
/* Crazy Monkey */ /* Crazy Monkey */
//DRIVER( crzmon ) /* (c) 2003 */ //DRIVER( crzmon ) /* (c) 2003 */
//DRIVER( crzmon_2 ) /* (c) 2003 */ //DRIVER( crzmon_2 ) /* (c) 2003 */
//DRIVER( crzmon_3 ) /* (c) 2003 */ //DRIVER( crzmon_3 ) /* (c) 2003 */
//DRIVER( crzmon_4 ) /* (c) 2003 */ //DRIVER( crzmon_4 ) /* (c) 2003 */
//DRIVER( crzmon_5 ) /* (c) 2003 */ //DRIVER( crzmon_5 ) /* (c) 2003 */
//DRIVER( crzmon_6 ) //DRIVER( crzmon_6 )
DRIVER( crzmon_7 ) /* (c) 2003 */ DRIVER( crzmon_7 ) /* (c) 2003 */
DRIVER( crzmon_7a ) /* (c) 2003 */ DRIVER( crzmon_7a ) /* (c) 2003 */
@ -9547,11 +9547,11 @@ Other Sun games
DRIVER( crzmon_8a ) /* (c) 2003 */ DRIVER( crzmon_8a ) /* (c) 2003 */
/* Fruit Cocktail */ /* Fruit Cocktail */
//DRIVER( fcockt ) /* (c) 2003 */ //DRIVER( fcockt ) /* (c) 2003 */
//DRIVER( fcockt_2 ) /* (c) 2003 */ //DRIVER( fcockt_2 ) /* (c) 2003 */
//DRIVER( fcockt_3 ) /* (c) 2003 */ //DRIVER( fcockt_3 ) /* (c) 2003 */
//DRIVER( fcockt_4 ) /* (c) 2003 */ //DRIVER( fcockt_4 ) /* (c) 2003 */
//DRIVER( fcockt_5 ) /* (c) 2003 */ //DRIVER( fcockt_5 ) /* (c) 2003 */
DRIVER( fcockt_6 ) /* (c) 2003 */ DRIVER( fcockt_6 ) /* (c) 2003 */
DRIVER( fcockt_6a ) /* (c) 2003 */ DRIVER( fcockt_6a ) /* (c) 2003 */
DRIVER( fcockt_6b ) /* (c) 2003 */ DRIVER( fcockt_6b ) /* (c) 2003 */
@ -9560,9 +9560,9 @@ Other Sun games
DRIVER( fcockt_8 ) /* (c) 2003 */ DRIVER( fcockt_8 ) /* (c) 2003 */
/* Lucky Haunter */ /* Lucky Haunter */
//DRIVER( lhaunt ) /* (c) 2003 */ //DRIVER( lhaunt ) /* (c) 2003 */
//DRIVER( lhaunt_2 ) /* (c) 2003 */ //DRIVER( lhaunt_2 ) /* (c) 2003 */
//DRIVER( lhaunt_3 ) /* (c) 2003 */ //DRIVER( lhaunt_3 ) /* (c) 2003 */
DRIVER( lhaunt_4 ) /* (c) 2003 */ DRIVER( lhaunt_4 ) /* (c) 2003 */
DRIVER( lhaunt_4a ) /* (c) 2003 */ DRIVER( lhaunt_4a ) /* (c) 2003 */
DRIVER( lhaunt_5 ) /* (c) 2003 */ DRIVER( lhaunt_5 ) /* (c) 2003 */
@ -9571,21 +9571,21 @@ Other Sun games
DRIVER( lhaunt_6a ) /* (c) 2003 */ DRIVER( lhaunt_6a ) /* (c) 2003 */
/* Rollfruit */ /* Rollfruit */
//DRIVER( rollfr ) /* (c) 2003 */ //DRIVER( rollfr ) /* (c) 2003 */
DRIVER( rollfr_2 ) /* (c) 2003 */ DRIVER( rollfr_2 ) /* (c) 2003 */
/* Garage */ /* Garage */
//DRIVER( garage ) /* (c) 2004 */ //DRIVER( garage ) /* (c) 2004 */
//DRIVER( garage_2 ) /* (c) 2004 */ //DRIVER( garage_2 ) /* (c) 2004 */
//DRIVER( garage_3 ) /* (c) 2004 */ //DRIVER( garage_3 ) /* (c) 2004 */
DRIVER( garage_4 ) /* (c) 2004 */ DRIVER( garage_4 ) /* (c) 2004 */
DRIVER( garage_4a ) /* (c) 2004 */ DRIVER( garage_4a ) /* (c) 2004 */
DRIVER( garage_5 ) /* (c) 2004 */ DRIVER( garage_5 ) /* (c) 2004 */
DRIVER( garage_5a ) /* (c) 2004 */ DRIVER( garage_5a ) /* (c) 2004 */
/* Rock Climber */ /* Rock Climber */
//DRIVER( rclimb ) /* (c) 2004 */ //DRIVER( rclimb ) /* (c) 2004 */
//DRIVER( rclimb_2 ) /* (c) 2004 */ //DRIVER( rclimb_2 ) /* (c) 2004 */
DRIVER( rclimb_3 ) /* (c) 2004 */ DRIVER( rclimb_3 ) /* (c) 2004 */
DRIVER( rclimb_3a ) /* (c) 2004 */ DRIVER( rclimb_3a ) /* (c) 2004 */
DRIVER( rclimb_3b ) /* (c) 2004 */ DRIVER( rclimb_3b ) /* (c) 2004 */
@ -9595,7 +9595,7 @@ Other Sun games
DRIVER( sweetla ) /* (c) 2004 */ DRIVER( sweetla ) /* (c) 2004 */
/* Resident */ /* Resident */
//DRIVER( resdnt ) /* (c) 2004 */ //DRIVER( resdnt ) /* (c) 2004 */
DRIVER( resdnt_2 ) /* (c) 2004 */ DRIVER( resdnt_2 ) /* (c) 2004 */
DRIVER( resdnt_2a ) /* (c) 2004 */ DRIVER( resdnt_2a ) /* (c) 2004 */
@ -9604,8 +9604,9 @@ Other Sun games
DRIVER( islanda ) /* (c) 2005 */ DRIVER( islanda ) /* (c) 2005 */
/* Pirate */ /* Pirate */
//DRIVER( pirate ) /* (c) 2005 */ //DRIVER( pirate ) /* (c) 2005 */
DRIVER( pirate_1 ) /* (c) 2005 */ DRIVER( pirate_1 ) /* (c) 2005 */
//DRIVER( pirate_2 )/* (c) 2005 */
/* Island 2 */ /* Island 2 */
DRIVER( island2 ) /* (c) 2006 */ DRIVER( island2 ) /* (c) 2006 */

View File

@ -418,8 +418,8 @@ INLINE void snes_update_line( UINT8 screen, UINT8 color_depth, UINT8 hires, UINT
/* scrolling */ /* scrolling */
UINT32 basevmap; UINT32 basevmap;
UINT16 vscroll, hscroll, vtilescroll; UINT16 vscroll, hscroll, vtilescroll;
// UINT16 offset_per_tile_valid; // UINT16 offset_per_tile_valid;
// UINT8 offset_per_tile_mode; // UINT8 offset_per_tile_mode;
UINT8 vshift, hshift, tile_size; UINT8 vshift, hshift, tile_size;
/* variables depending on color_depth */ /* variables depending on color_depth */
UINT8 color_shift = 0; UINT8 color_shift = 0;
@ -508,7 +508,7 @@ INLINE void snes_update_line( UINT8 screen, UINT8 color_depth, UINT8 hires, UINT
wrap_around_x = 0; /* Make sure we don't do this again */ wrap_around_x = 0; /* Make sure we don't do this again */
} }
//if (tmap > 0x10000) //if (tmap > 0x10000)
// tmap %= 0x10000; // tmap %= 0x10000;
vflip = snes_vram[tmap + ii + 1] & 0x80; vflip = snes_vram[tmap + ii + 1] & 0x80;
hflip = snes_vram[tmap + ii + 1] & 0x40; hflip = snes_vram[tmap + ii + 1] & 0x40;

View File

@ -10,4 +10,4 @@
***************************************************************************/ ***************************************************************************/
extern const char build_version[]; extern const char build_version[];
const char build_version[] = "0.133u2 ("__DATE__")"; const char build_version[] = "0.133u3 ("__DATE__")";