Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-03 09:06:08 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleanups and version bump.

Browse Source
This commit is contained in:
Aaron Giles 2010-01-28 08:03:44 +00:00
parent a8bd722f18
commit fe3d7c4af4
45 changed files with 388 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/cpu/am29000/am29000.c
View File

@ -989,7 +989,7 @@ CPU_GET_INFO( am29000 )
am29000->cps & CPS_DA ? 'D' : '.', am29000->cps & CPS_DA ? 'D' : '.',
(am29000->r[1] >> 2) & 0x7f); break; (am29000->r[1] >> 2) & 0x7f); break;
case CPUINFO_STR_REGISTER + AM29000_PC: sprintf(info->s, "PC: %08X", am29000->pc); break; case CPUINFO_STR_REGISTER + AM29000_PC: sprintf(info->s, "PC: %08X", am29000->pc); break;
case CPUINFO_STR_REGISTER + AM29000_VAB: sprintf(info->s, "VAB: %08X", am29000->vab); break; case CPUINFO_STR_REGISTER + AM29000_VAB: sprintf(info->s, "VAB: %08X", am29000->vab); break;
case CPUINFO_STR_REGISTER + AM29000_OPS: sprintf(info->s, "OPS: %08X", am29000->ops); break; case CPUINFO_STR_REGISTER + AM29000_OPS: sprintf(info->s, "OPS: %08X", am29000->ops); break;
case CPUINFO_STR_REGISTER + AM29000_CPS: sprintf(info->s, "CPS: %08X", am29000->cps); break; case CPUINFO_STR_REGISTER + AM29000_CPS: sprintf(info->s, "CPS: %08X", am29000->cps); break;

2
src/emu/cpu/am29000/am29000.h
View File

@ -334,7 +334,7 @@ enum
#define PROCESSOR_REL_FIELD (PRL_AM29000 | PRL_REV_D) #define PROCESSOR_REL_FIELD (PRL_AM29000 | PRL_REV_D)
#define VAB_SHIFT (16) #define VAB_SHIFT (16)
#define VAB_MASK (0xffff) #define VAB_MASK (0xffff)
#define CPS_CA (1 << 15) #define CPS_CA (1 << 15)

14
src/emu/cpu/am29000/am29ops.h
View File

@ -194,9 +194,9 @@ static void write_spr(am29000_state *am29000, UINT32 idx, UINT32 val)
case SPR_CR: am29000->chc &= ~(CHC_CR_MASK << CHC_CR_SHIFT); case SPR_CR: am29000->chc &= ~(CHC_CR_MASK << CHC_CR_SHIFT);
am29000->chc |= (val & CHC_CR_MASK) << CHC_CR_SHIFT; am29000->chc |= (val & CHC_CR_MASK) << CHC_CR_SHIFT;
break; break;
// case SPR_FPE: // case SPR_FPE:
// case SPR_INTE: // case SPR_INTE:
// case SPR_FPS: // case SPR_FPS:
default: logerror("Unhandled SPR write (%d)\n", idx); default: logerror("Unhandled SPR write (%d)\n", idx);
} }
} }
@ -960,8 +960,8 @@ static void LOAD(am29000_state *am29000)
} }
} }
// if (opt & 2) // if (opt & 2)
// logerror("Am29000: Half word LOAD\n"); // logerror("Am29000: Half word LOAD\n");
if (!FREEZE_MODE) if (!FREEZE_MODE)
{ {
@ -1047,7 +1047,7 @@ static void LOADM(am29000_state *am29000)
{ {
am29000->r[r] = memory_read_dword_32be(am29000->data, addr); am29000->r[r] = memory_read_dword_32be(am29000->data, addr);
// SET_CHC_CR(cnt - 1); // SET_CHC_CR(cnt - 1);
addr += 4; addr += 4;
if (++r == 256) if (++r == 256)
@ -1161,7 +1161,7 @@ static void STOREM(am29000_state *am29000)
{ {
memory_write_dword_32be(am29000->data, addr, am29000->r[r]); memory_write_dword_32be(am29000->data, addr, am29000->r[r]);
// SET_CHC_CR(cnt - 1); // SET_CHC_CR(cnt - 1);
addr += 4; addr += 4;
if (++r == 256) if (++r == 256)

8
src/emu/sound/fm2612.c
View File

@ -1996,7 +1996,7 @@ static void init_timetables(FM_OPN *OPN, double freqbase)
} }
/* 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 */
/* calculate fnumber -> increment counter table */ /* calculate fnumber -> increment counter table */
for(i = 0; i < 4096; i++) for(i = 0; i < 4096; i++)
{ {
@ -2111,7 +2111,7 @@ static void init_tables(void)
o = o / (ENV_STEP/4); o = o / (ENV_STEP/4);
n = (int)(2.0*o); n = (int)(2.0*o);
if (n&1) /* round to nearest */ if (n&1) /* round to nearest */
n = (n>>1)+1; n = (n>>1)+1;
else else
n = n>>1; n = n>>1;
@ -2283,8 +2283,8 @@ void ym2612_update_one(void *chip, FMSAMPLE **buffer, int length)
lt += ((out_fm[5]>>0) & OPN->pan[10]); lt += ((out_fm[5]>>0) & OPN->pan[10]);
rt += ((out_fm[5]>>0) & OPN->pan[11]); rt += ((out_fm[5]>>0) & OPN->pan[11]);
// Limit( lt, MAXOUT, MINOUT ); // Limit( lt, MAXOUT, MINOUT );
// Limit( rt, MAXOUT, MINOUT ); // Limit( rt, MAXOUT, MINOUT );
#ifdef SAVE_SAMPLE #ifdef SAVE_SAMPLE
SAVE_ALL_CHANNELS SAVE_ALL_CHANNELS

2
src/emu/sound/s14001a.h
View File

@ -3,7 +3,7 @@
#ifndef __S14001A_H__ #ifndef __S14001A_H__
#define __S14001A_H__ #define __S14001A_H__
int s14001a_bsy_r(running_device *device); /* read BUSY pin */ int s14001a_bsy_r(running_device *device); /* read BUSY pin */
void s14001a_reg_w(running_device *device, int data); /* write to input latch */ void s14001a_reg_w(running_device *device, int data); /* write to input latch */
void s14001a_rst_w(running_device *device, int data); /* write to RESET pin */ void s14001a_rst_w(running_device *device, int data); /* write to RESET pin */
void s14001a_set_clock(running_device *device, int clock); /* set VSU-1000 clock */ void s14001a_set_clock(running_device *device, int clock); /* set VSU-1000 clock */

12
src/emu/video/hd63484.c
View File

@ -1488,7 +1488,7 @@ WRITE16_DEVICE_HANDLER( hd63484_data_w )
hd63484->regno += 2; /* autoincrement */ hd63484->regno += 2; /* autoincrement */
#if LOG_COMMANDS #if LOG_COMMANDS
// logerror("PC %05x: HD63484 register %02x write %04x\n", cpu_get_pc(space->cpu), hd63484->regno, hd63484->reg[hd63484->regno/2]); // logerror("PC %05x: HD63484 register %02x write %04x\n", cpu_get_pc(space->cpu), hd63484->regno, hd63484->reg[hd63484->regno/2]);
#endif #endif
if (hd63484->regno == 0) /* FIFO */ if (hd63484->regno == 0) /* FIFO */
@ -1505,14 +1505,14 @@ READ16_DEVICE_HANDLER( hd63484_data_r )
else if (hd63484->regno == 0) else if (hd63484->regno == 0)
{ {
#if LOG_COMMANDS #if LOG_COMMANDS
// logerror("%05x: HD63484 read FIFO\n", cpu_get_pc(space->cpu)); // logerror("%05x: HD63484 read FIFO\n", cpu_get_pc(space->cpu));
#endif #endif
res = hd63484->readfifo; res = hd63484->readfifo;
} }
else else
{ {
#if LOG_COMMANDS #if LOG_COMMANDS
// logerror("%05x: HD63484 read register %02x\n", cpu_get_pc(space->cpu), hd63484->regno); // logerror("%05x: HD63484 read register %02x\n", cpu_get_pc(space->cpu), hd63484->regno);
#endif #endif
res = 0; res = 0;
} }
@ -1557,9 +1557,9 @@ static DEVICE_START( hd63484 )
hd63484->skattva_hack = intf->skattva_hack; hd63484->skattva_hack = intf->skattva_hack;
hd63484->ram = auto_alloc_array_clear(device->machine, UINT16, HD63484_RAM_SIZE); hd63484->ram = auto_alloc_array_clear(device->machine, UINT16, HD63484_RAM_SIZE);
// state_save_register_device_item(device, 0, hd63484->clear_bitmap); // state_save_register_device_item(device, 0, hd63484->clear_bitmap);
// state_save_register_device_item_pointer(device, 0, hd63484->spriteram, 0x1000); // state_save_register_device_item_pointer(device, 0, hd63484->spriteram, 0x1000);
// state_save_register_device_item_bitmap(device, 0, hd63484->sprites_bitmap); // state_save_register_device_item_bitmap(device, 0, hd63484->sprites_bitmap);
} }
static DEVICE_RESET( hd63484 ) static DEVICE_RESET( hd63484 )

2
src/mame/audio/micro3d.c
View File

@ -323,7 +323,7 @@ static DEVICE_START( micro3d_sound )
configure_filter(&state->noise_filters[1], 2.7e3 + 1e3, 0.30e-6); configure_filter(&state->noise_filters[1], 2.7e3 + 1e3, 0.30e-6);
configure_filter(&state->noise_filters[2], 2.7e3 + 270, 0.15e-6); configure_filter(&state->noise_filters[2], 2.7e3 + 270, 0.15e-6);
configure_filter(&state->noise_filters[3], 2.7e3 + 0, 0.082e-6); configure_filter(&state->noise_filters[3], 2.7e3 + 0, 0.082e-6);
// configure_filter(&state->noise_filters[4], 33e3, 0.1e-6); // configure_filter(&state->noise_filters[4], 33e3, 0.1e-6);
} }
static DEVICE_RESET( micro3d_sound ) static DEVICE_RESET( micro3d_sound )

4
src/mame/drivers/cybertnk.c
View File

@ -813,12 +813,12 @@ static const y8950_interface y8950_config = {
static MACHINE_DRIVER_START( cybertnk ) static MACHINE_DRIVER_START( cybertnk )
MDRV_CPU_ADD("maincpu", M68000,20000000/2) MDRV_CPU_ADD("maincpu", M68000,20000000/2)
MDRV_CPU_PROGRAM_MAP(master_mem) MDRV_CPU_PROGRAM_MAP(master_mem)
// MDRV_CPU_VBLANK_INT_HACK(master_irq,2) // MDRV_CPU_VBLANK_INT_HACK(master_irq,2)
MDRV_CPU_VBLANK_INT("screen", irq1_line_hold) MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)
MDRV_CPU_ADD("slave", M68000,20000000/2) MDRV_CPU_ADD("slave", M68000,20000000/2)
MDRV_CPU_PROGRAM_MAP(slave_mem) MDRV_CPU_PROGRAM_MAP(slave_mem)
// MDRV_CPU_VBLANK_INT_HACK(slave_irq,2) // MDRV_CPU_VBLANK_INT_HACK(slave_irq,2)
MDRV_CPU_VBLANK_INT("screen", irq3_line_hold) MDRV_CPU_VBLANK_INT("screen", irq3_line_hold)
MDRV_CPU_ADD("audiocpu", Z80,3579500) MDRV_CPU_ADD("audiocpu", Z80,3579500)

26
src/mame/drivers/dwarfd.c
View File

@ -247,23 +247,23 @@ Stamp on disk:
===================================================================================== =====================================================================================
Quater Horse Classic Quater Horse Classic
Board silkscreend QUARTERHORSE Board silkscreend QUARTERHORSE
(C) ARJAY EXPORT CO.,INC/PRESTIGE GAMES> -1995 REV-C-95 (C) ARJAY EXPORT CO.,INC/PRESTIGE GAMES> -1995 REV-C-95
HYANNIS,MA.02601--MADE IN USA HYANNIS,MA.02601--MADE IN USA
.A10 - 27256 stickered QUARTERHORSE CLASSIC .A10 - 27256 stickered QUARTERHORSE CLASSIC
10A - V1.1 10A - V1.1
(c)1995 ARJAY EXPORT - PRESTIGE GAMES (c)1995 ARJAY EXPORT - PRESTIGE GAMES
.H6 - 27128 stickered QUARTERHORSE CLASSIC .H6 - 27128 stickered QUARTERHORSE CLASSIC
CGR - 6H - V1.0 CGR - 6H - V1.0
(c)1995 ARJAY EXPORT - PRESTIGE GAMES (c)1995 ARJAY EXPORT - PRESTIGE GAMES
.K6 - 27128 stickered QUARTERHORSE CLASSIC .K6 - 27128 stickered QUARTERHORSE CLASSIC
CGR - 6K - V1.0 CGR - 6K - V1.0
(c)1995 ARJAY EXPORT - PRESTIGE GAMES (c)1995 ARJAY EXPORT - PRESTIGE GAMES
.U9 - Lattice GAL22V10 on daughter board .U9 - Lattice GAL22V10 on daughter board
P8085 @ B8 P8085 @ B8
P8275 @ F4 P8275 @ F4

6
src/mame/drivers/pinkiri8.c
View File

@ -44,7 +44,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pinkiri8 ) static MACHINE_DRIVER_START( pinkiri8 )
MDRV_CPU_ADD("maincpu",Z180,16000000) MDRV_CPU_ADD("maincpu",Z180,16000000)
MDRV_CPU_PROGRAM_MAP(pinkiri8_map) MDRV_CPU_PROGRAM_MAP(pinkiri8_map)
// MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4) // MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
MDRV_SCREEN_ADD("screen", RASTER) MDRV_SCREEN_ADD("screen", RASTER)
MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_REFRESH_RATE(60)
@ -60,8 +60,8 @@ static MACHINE_DRIVER_START( pinkiri8 )
/* sound hardware */ /* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_SPEAKER_STANDARD_MONO("mono")
// MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4 /* guess */) // MDRV_SOUND_ADD("aysnd", AY8910, 8000000/4 /* guess */)
// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) // MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END MACHINE_DRIVER_END
/*************************************************************************** /***************************************************************************

8
src/mame/drivers/psikyosh.c
View File

@ -724,10 +724,10 @@ static INPUT_PORTS_START( tgm2 )
/* sticks should actually be PORT_4WAY according to manual */ /* sticks should actually be PORT_4WAY according to manual */
PORT_START("JP4") /* jumper pads on the PCB. Checked and discarded. However, if you force word 0x6060000 to 1/2/3 you can have various effects. Disbled at compile time */ PORT_START("JP4") /* jumper pads on the PCB. Checked and discarded. However, if you force word 0x6060000 to 1/2/3 you can have various effects. Disbled at compile time */
// PORT_DIPNAME( 0x03000000, 0x01000000, DEF_STR( Region ) ) // PORT_DIPNAME( 0x03000000, 0x01000000, DEF_STR( Region ) )
// PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) ) // PORT_DIPSETTING( 0x00000000, DEF_STR( Japan ) )
// PORT_DIPSETTING( 0x02000000, "International Ver A." ) // PORT_DIPSETTING( 0x02000000, "International Ver A." )
// PORT_DIPSETTING( 0x01000000, "International Ver B." ) // PORT_DIPSETTING( 0x01000000, "International Ver B." )
PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE("eeprom", eeprom_read_bit) PORT_BIT( 0x10000000, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_READ_LINE_DEVICE("eeprom", eeprom_read_bit)
INPUT_PORTS_END INPUT_PORTS_END

12
src/mame/drivers/subsino.c
View File

@ -274,7 +274,7 @@ static WRITE8_HANDLER( subsino_out_a_w )
coin_counter_w( space->machine, 2, data & 0x10 ); /* keyout */ coin_counter_w( space->machine, 2, data & 0x10 ); /* keyout */
coin_counter_w( space->machine, 3, data & 0x20 ); /* payout */ coin_counter_w( space->machine, 3, data & 0x20 ); /* payout */
// popmessage("Out A %02x",data); // popmessage("Out A %02x",data);
} }
@ -357,7 +357,7 @@ static WRITE8_HANDLER( subsino_out_b_w )
output_set_lamp_value(6, (data >> 6) & 1); /* Lamp 6 */ output_set_lamp_value(6, (data >> 6) & 1); /* Lamp 6 */
output_set_lamp_value(7, (data >> 7) & 1); /* Lamp 7 */ output_set_lamp_value(7, (data >> 7) & 1); /* Lamp 7 */
// popmessage("Out B %02x",data); // popmessage("Out B %02x",data);
} }
@ -444,7 +444,7 @@ static ADDRESS_MAP_START( victor21_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0900b, 0x0900b ) AM_RAM //protection AM_RANGE( 0x0900b, 0x0900b ) AM_RAM //protection
// AM_RANGE( 0x0900c, 0x0900c ) AM_DEVWRITE( "oki", okim6295_w ) // AM_RANGE( 0x0900c, 0x0900c ) AM_DEVWRITE( "oki", okim6295_w )
AM_RANGE( 0x0900e, 0x0900f ) AM_DEVWRITE( "ymsnd", ym2413_w ) AM_RANGE( 0x0900e, 0x0900f ) AM_DEVWRITE( "ymsnd", ym2413_w )
@ -966,7 +966,7 @@ static INPUT_PORTS_START( sharkpy )
PORT_DIPSETTING( 0x10, "5" ) PORT_DIPSETTING( 0x10, "5" )
PORT_DIPSETTING( 0x08, "6" ) PORT_DIPSETTING( 0x08, "6" )
PORT_DIPSETTING( 0x00, "7" ) PORT_DIPSETTING( 0x00, "7" )
PORT_DIPUNKNOWN( 0x40, 0x40 ) PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 ) PORT_DIPUNKNOWN( 0x80, 0x80 )
PORT_START( "DSW4" ) PORT_START( "DSW4" )
@ -1058,7 +1058,7 @@ static INPUT_PORTS_START( smoto16 )
PORT_DIPSETTING( 0x28, "5" ) PORT_DIPSETTING( 0x28, "5" )
PORT_DIPSETTING( 0x30, "6" ) PORT_DIPSETTING( 0x30, "6" )
PORT_DIPSETTING( 0x38, "7" ) PORT_DIPSETTING( 0x38, "7" )
PORT_DIPUNKNOWN( 0x40, 0x40 ) PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 ) PORT_DIPUNKNOWN( 0x80, 0x80 )
PORT_START( "DSW4" ) PORT_START( "DSW4" )
@ -1152,7 +1152,7 @@ static INPUT_PORTS_START( smoto20 )
PORT_DIPSETTING( 0x28, "5" ) PORT_DIPSETTING( 0x28, "5" )
PORT_DIPSETTING( 0x30, "6" ) PORT_DIPSETTING( 0x30, "6" )
PORT_DIPSETTING( 0x38, "7" ) PORT_DIPSETTING( 0x38, "7" )
PORT_DIPUNKNOWN( 0x40, 0x40 ) PORT_DIPUNKNOWN( 0x40, 0x40 )
PORT_DIPUNKNOWN( 0x80, 0x80 ) PORT_DIPUNKNOWN( 0x80, 0x80 )
PORT_START( "DSW4" ) PORT_START( "DSW4" )

8
src/mame/drivers/videopkr.c
View File

@ -28,12 +28,12 @@
======== ========
In 1975, Si Redd founded A1-Supply. This was renamed to Sircoma in 1978, In 1975, Si Redd founded A1-Supply. This was renamed to Sircoma in 1978,
and eventually IGT (International Game Technology) in 1981. and eventually IGT (International Game Technology) in 1981.
Along the way, in 1978, Fortune Coin Company was acquired and contained Along the way, in 1978, Fortune Coin Company was acquired and contained
the basis to their Fortune I game machines. the basis to their Fortune I game machines.
The Fortune I hardware consisted of the following games: The Fortune I hardware consisted of the following games:
Regular Draw Poker Regular Draw Poker
Progressive Draw Poker Progressive Draw Poker
Joker Wild Draw Poker Joker Wild Draw Poker

2
src/mame/includes/micro3d.h
View File

@ -52,7 +52,7 @@ struct _micro3d_state
} mc68901; } mc68901;
UINT16 *shared_ram; UINT16 *shared_ram;
running_device *duart68681; running_device *duart68681;
UINT8 m68681_tx0; UINT8 m68681_tx0;
/* Sound */ /* Sound */

8
src/mame/machine/micro3d.c
View File

@ -639,7 +639,7 @@ static TIMER_CALLBACK( adc_done_callback )
case 3: break; case 3: break;
} }
// mc68901_int_gen(machine, GPIP3); // mc68901_int_gen(machine, GPIP3);
} }
READ16_HANDLER( micro3d_adc_r ) READ16_HANDLER( micro3d_adc_r )
@ -732,14 +732,14 @@ DRIVER_INIT( micro3d )
state->duart68681 = devtag_get_device(machine, "duart68681"); state->duart68681 = devtag_get_device(machine, "duart68681");
/* The Am29000 program seems to rely on RAM from 0x00470000 onwards being /* The Am29000 program seems to rely on RAM from 0x00470000 onwards being
non-zero on a reset, otherwise the 3D object data doesn't get uploaded! */ non-zero on a reset, otherwise the 3D object data doesn't get uploaded! */
memory_write_dword(space, 0x00470000, 0xa5a5a5a5); memory_write_dword(space, 0x00470000, 0xa5a5a5a5);
state->mc68901.timer_a = timer_alloc(machine, mfp_timer_a_cb, NULL); state->mc68901.timer_a = timer_alloc(machine, mfp_timer_a_cb, NULL);
/* TODO? BOTSS crashes when starting the final stage because the 68000 /* TODO? BOTSS crashes when starting the final stage because the 68000
overwrites memory in use by the Am29000. Slowing down the 68000 slightly overwrites memory in use by the Am29000. Slowing down the 68000 slightly
avoids this */ avoids this */
cpu_set_clockscale(devtag_get_device(machine, "maincpu"), 0.945f); cpu_set_clockscale(devtag_get_device(machine, "maincpu"), 0.945f);
} }

40
src/mame/video/hng64.c
View File

@ -1125,8 +1125,8 @@ static void hng64_drawtilemap(running_machine* machine, bitmap_t *bitmap, const
if ((tileregs & 0x1800)==0x1000) // floor mode if ((tileregs & 0x1800)==0x1000) // floor mode
{ {
/* Floor mode - per pixel simple / complex modes? -- every other line? /* Floor mode - per pixel simple / complex modes? -- every other line?
(there doesn't seem to be enough data in Buriki for every line at least) (there doesn't seem to be enough data in Buriki for every line at least)
*/ */
if ((tileregs&0xf000) == 0x1000) if ((tileregs&0xf000) == 0x1000)
{ {
popmessage("Floor is Active"); popmessage("Floor is Active");
@ -1884,7 +1884,7 @@ void recoverPolygonBlock(running_machine* machine, const UINT16* packet, struct
UINT32 address[4]; UINT32 address[4];
UINT32 megaOffset; UINT32 megaOffset;
float eyeCoords[4]; // ObjectCoords transformed by the modelViewMatrix float eyeCoords[4]; // ObjectCoords transformed by the modelViewMatrix
// float clipCoords[4]; // EyeCoords transformed by the projectionMatrix // float clipCoords[4]; // EyeCoords transformed by the projectionMatrix
float ndCoords[4]; // Normalized device coordinates/clipCoordinates (x/w, y/w, z/w) float ndCoords[4]; // Normalized device coordinates/clipCoordinates (x/w, y/w, z/w)
float windowCoords[4]; // Mapped ndCoordinates to screen space float windowCoords[4]; // Mapped ndCoordinates to screen space
float cullRay[4]; float cullRay[4];
@ -1951,10 +1951,10 @@ void recoverPolygonBlock(running_machine* machine, const UINT16* packet, struct
// Debug - ajg // Debug - ajg
//UINT32 tdColor = 0xff000000; //UINT32 tdColor = 0xff000000;
//if (packet[1] & 0x1000) tdColor |= 0x00ff0000; //if (packet[1] & 0x1000) tdColor |= 0x00ff0000;
//if (packet[1] & 0x2000) tdColor |= 0x0000ff00; //if (packet[1] & 0x2000) tdColor |= 0x0000ff00;
//if (packet[1] & 0x4000) tdColor |= 0x000000ff; //if (packet[1] & 0x4000) tdColor |= 0x000000ff;
//if (packet[1] & 0x8000) tdColor |= 0xffffffff; //if (packet[1] & 0x8000) tdColor |= 0xffffffff;
// 3d ROM Offset // 3d ROM Offset
UINT16* threeDRoms = (UINT16*)(memory_region(machine, "verts")); UINT16* threeDRoms = (UINT16*)(memory_region(machine, "verts"));
@ -1969,16 +1969,16 @@ void recoverPolygonBlock(running_machine* machine, const UINT16* packet, struct
} }
/* /*
// Debug - ajg // Debug - ajg
printf("%08x : ", threeDOffset*3*2); printf("%08x : ", threeDOffset*3*2);
for (int k = 0; k < 7*3; k++) for (int k = 0; k < 7*3; k++)
{ {
printf("%04x ", threeDPointer[k]); printf("%04x ", threeDPointer[k]);
if ((k % 3) == 2) printf(" "); if ((k % 3) == 2) printf(" ");
} }
printf("\n"); printf("\n");
} }
*/ */
// There are 4 hunks per address. // There are 4 hunks per address.
address[0] = threeDPointer[0]; address[0] = threeDPointer[0];
@ -2029,9 +2029,9 @@ void recoverPolygonBlock(running_machine* machine, const UINT16* packet, struct
// [0] ??-- - ???? unused ???? // [0] ??-- - ???? unused ????
// [0] --xx - Chunk type // [0] --xx - Chunk type
// [1] ?--- - Flags [x000 = ??? // [1] ?--- - Flags [x000 = ???
0x00 = ??? 0x00 = ???
00x0 = ??? 00x0 = ???
000x = low-res texture flag] 000x = low-res texture flag]
// [1] -x-- - Explicit palette index. // [1] -x-- - Explicit palette index.
// [1] --?- - Unknown // [1] --?- - Unknown
// [1] ---x - Texture index // [1] ---x - Texture index

38
src/mame/video/micro3d.c
View File

@ -87,9 +87,9 @@ void micro3d_scanline_update(running_device *screen, bitmap_t *bitmap, int scanl
UINT16 pix = src[coladdr++ & 0x1ff]; UINT16 pix = src[coladdr++ & 0x1ff];
/* /*
TODO: The upper four bits of the 3D buffer affect priority TODO: The upper four bits of the 3D buffer affect priority
0xfxx forces 3D priority? 0xfxx forces 3D priority?
*/ */
if (pix & 0x80) if (pix & 0x80)
dest[x + 0] = sd_11_7 | (pix & 0x7f); dest[x + 0] = sd_11_7 | (pix & 0x7f);
else else
@ -135,7 +135,7 @@ WRITE16_HANDLER( micro3d_xfer3dk_w )
void micro3d_tms_interrupt(running_device *device, int state) void micro3d_tms_interrupt(running_device *device, int state)
{ {
// mc68901_int_gen(device->machine, GPIP4); // mc68901_int_gen(device->machine, GPIP4);
} }
@ -421,9 +421,9 @@ void rasterise_spans(micro3d_state *state, UINT32 min_y, UINT32 max_y, UINT32 at
else else
{ {
/* /*
I don't know the LFSR arrangement inside the DRAW2 ASIC I don't know the LFSR arrangement inside the DRAW2 ASIC
but here are some possible tap arrangements but here are some possible tap arrangements
*/ */
static const UINT8 taps[8][4] = static const UINT8 taps[8][4] =
{ {
{9, 8, 7, 2}, {9, 8, 7, 2},
@ -629,15 +629,15 @@ MPGDRAW commands
85000xxx End of vertex list - draw (xxx = colour) [0] 85000xxx End of vertex list - draw (xxx = colour) [0]
8Axxxxxx End of vertex list - random fill shading (xxx = colour) [0] 8Axxxxxx End of vertex list - random fill shading (xxx = colour) [0]
90000000 Set clipping Z min [1] 90000000 Set clipping Z min [1]
94000000 Set clipping Z max [1] 94000000 Set clipping Z max [1]
98000000 Set clipping Y max [1] 98000000 Set clipping Y max [1]
9c000000 Set clipping X min [1] 9c000000 Set clipping X min [1]
a0000000 Set clipping X max [1] a0000000 Set clipping X max [1]
a4000001 Set clipping Y min [1] (what does 1 mean?) a4000001 Set clipping Y min [1] (what does 1 mean?)
d8000000 End of frame (will swap render buffer) [0] d8000000 End of frame (will swap render buffer) [0]
f8000000 Toggle health LED [0] f8000000 Toggle health LED [0]
b8000000-1fe Draw ASIC DPRAM address b8000000-1fe Draw ASIC DPRAM address
b80003ff Data b80003ff Data
@ -684,9 +684,9 @@ WRITE32_HANDLER( micro3d_fifo_w )
state->draw_state = STATE_DRAW_VTX_DATA; state->draw_state = STATE_DRAW_VTX_DATA;
/* Invalidate the draw RAM /* Invalidate the draw RAM
* TODO: Not sure this is the right place for it - * TODO: Not sure this is the right place for it -
* causes monitor mode draw tests to fail * causes monitor mode draw tests to fail
*/ */
for (addr = 0; addr < 512; ++addr) for (addr = 0; addr < 512; ++addr)
state->draw_dpram[addr << 1] = 0x3ff000; state->draw_dpram[addr << 1] = 0x3ff000;
@ -764,7 +764,7 @@ READ32_HANDLER( micro3d_pipe_r )
INTERRUPT_GEN( micro3d_vblank ) INTERRUPT_GEN( micro3d_vblank )
{ {
// mc68901_int_gen(device->machine, GPIP7); // mc68901_int_gen(device->machine, GPIP7);
micro3d_state *state = (micro3d_state*)device->machine->driver_data; micro3d_state *state = (micro3d_state*)device->machine->driver_data;
state->display_buffer = state->drawing_buffer ^ 1; state->display_buffer = state->drawing_buffer ^ 1;

6
src/mame/video/psikyosh.c
View File

@ -1098,8 +1098,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
However, sprite-sprite priority needs to be preserved. However, sprite-sprite priority needs to be preserved.
daraku and soldivid only use the lsb daraku and soldivid only use the lsb
? = unknown ? = unknown
Could be a sprite-sprite priority, tests seem to back this up Could be a sprite-sprite priority, tests seem to back this up
**- End Sprite Format -*/ **- End Sprite Format -*/
const int spr_keys[8] = {KEYCODE_Y, KEYCODE_U, KEYCODE_I, KEYCODE_O}; const int spr_keys[8] = {KEYCODE_Y, KEYCODE_U, KEYCODE_I, KEYCODE_O};
@ -1275,7 +1275,7 @@ VIDEO_START( psikyosh )
} }
/* precompute the background zoom table. verified against hardware. /* precompute the background zoom table. verified against hardware.
unsure of the precision, we use .10 fixed point like the sprites */ unsure of the precision, we use .10 fixed point like the sprites */
for(i = 0; i < 0x100; i++) { for(i = 0; i < 0x100; i++) {
state->bg_zoom[i] = (64 * 0x400) / (i + 64); state->bg_zoom[i] = (64 * 0x400) / (i + 64);
} }

16
src/osd/sdl/debugwin.c
View File

@ -32,11 +32,11 @@
#define MAX_VIEWS (4) #define MAX_VIEWS (4)
enum { enum {
WIN_TYPE_MAIN = 0x01, WIN_TYPE_MAIN = 0x01,
WIN_TYPE_MEMORY = 0x02, WIN_TYPE_MEMORY = 0x02,
WIN_TYPE_DISASM = 0x04, WIN_TYPE_DISASM = 0x04,
WIN_TYPE_LOG = 0x08, WIN_TYPE_LOG = 0x08,
WIN_TYPE_ALL = 0x0f WIN_TYPE_ALL = 0x0f
}; };
//============================================================ //============================================================
@ -65,7 +65,7 @@ struct _win_i {
int type; int type;
win_i * next; win_i * next;
GtkWidget * win; GtkWidget * win;
edit ed; edit ed;
running_machine * machine; // machine running_machine * machine; // machine
DView * views[MAX_VIEWS]; DView * views[MAX_VIEWS];
running_device * cpu; // current CPU running_device * cpu; // current CPU
@ -1119,7 +1119,7 @@ on_memoryview_key_press_event (GtkWidget *widget,
DView *info = (DView *) widget; DView *info = (DView *) widget;
//printf("%s\n", event->string); //printf("%s\n", event->string);
//printf("The name of this keysym is `%s'\n", //printf("The name of this keysym is `%s'\n",
// gdk_keyval_name(event->keyval)); // gdk_keyval_name(event->keyval));
//if (/*waiting_for_debugger ||*/ !debugwin_seq_pressed(info->view-> owner->machine)) //if (/*waiting_for_debugger ||*/ !debugwin_seq_pressed(info->view-> owner->machine))
switch (event->keyval) switch (event->keyval)
{ {
@ -1169,15 +1169,15 @@ on_memoryview_key_press_event (GtkWidget *widget,
case GDK_Escape: case GDK_Escape:
//if (info->owner->focuswnd != NULL) //if (info->owner->focuswnd != NULL)
// SetFocus(info->owner->focuswnd); // SetFocus(info->owner->focuswnd);
//info->owner->ignore_char_lparam = lparam >> 16; //info->owner->ignore_char_lparam = lparam >> 16;
break; break;
case GDK_Tab: case GDK_Tab:
//if (GetAsyncKeyState(VK_SHIFT) & 0x8000) //if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
// debugwin_view_prev_view(info->owner, info); // debugwin_view_prev_view(info->owner, info);
//else //else
// debugwin_view_next_view(info->view, dvw); // debugwin_view_next_view(info->view, dvw);
break; break;
default: default:
if (event->keyval >= 32 && event->keyval < 127 && debug_view_get_cursor_supported(info->view)) if (event->keyval >= 32 && event->keyval < 127 && debug_view_get_cursor_supported(info->view))

2
src/osd/sdl/sdl.mak
View File

@ -256,7 +256,7 @@ OBJDIRS += $(SDLOBJ)
OSDCOREOBJS = \ OSDCOREOBJS = \
$(SDLOBJ)/strconv.o \ $(SDLOBJ)/strconv.o \
$(SDLOBJ)/sdldir.o \ $(SDLOBJ)/sdldir.o \
$(SDLOBJ)/sdlfile.o \ $(SDLOBJ)/sdlfile.o \
$(SDLOBJ)/sdlmisc_$(BASE_TARGETOS).o \ $(SDLOBJ)/sdlmisc_$(BASE_TARGETOS).o \
$(SDLOBJ)/sdlos_$(BASE_TARGETOS).o \ $(SDLOBJ)/sdlos_$(BASE_TARGETOS).o \
$(SDLOBJ)/sdlsync_$(SYNC_IMPLEMENTATION).o \ $(SDLOBJ)/sdlsync_$(SYNC_IMPLEMENTATION).o \

2
src/osd/windows/windows.mak
View File

@ -208,7 +208,7 @@ DEFS += -Dmain=utf8_main
# debug build: enable guard pages on all memory allocations # debug build: enable guard pages on all memory allocations
ifdef DEBUG ifdef DEBUG
DEFS += -DMALLOC_DEBUG #DEFS += -DMALLOC_DEBUG
endif endif

8
src/osd/windows/winmain.c
View File

@ -700,10 +700,10 @@ static const char *line_to_symbol(const char *line, FPTR &address)
{ {
#ifdef __GNUC__ #ifdef __GNUC__
/* /*
32-bit gcc map line: 32-bit gcc map line:
0x0089cb00 nbmj9195_palette_r(_address_space const*, unsigned int) 0x0089cb00 nbmj9195_palette_r(_address_space const*, unsigned int)
64-bit gcc map line: 64-bit gcc map line:
0x0000000000961afc nbmj9195_palette_r(_address_space const*, unsigned int) 0x0000000000961afc nbmj9195_palette_r(_address_space const*, unsigned int)
*/ */
char symbol[1024]; char symbol[1024];
@ -720,10 +720,10 @@ static const char *line_to_symbol(const char *line, FPTR &address)
#ifdef _MSC_VER #ifdef _MSC_VER
/* /*
32-bit MSVC map line: 32-bit MSVC map line:
0001:00387890 ?nbmj9195_palette_r@@YAEPBU_address_space@@I@Z 00788890 f nichibut:nbmj9195.o 0001:00387890 ?nbmj9195_palette_r@@YAEPBU_address_space@@I@Z 00788890 f nichibut:nbmj9195.o
64-bit MSVC map line: 64-bit MSVC map line:
0001:004d7510 ?nbmj9195_palette_r@@YAEPEBU_address_space@@I@Z 00000001404d8510 f nichibut:nbmj9195.o 0001:004d7510 ?nbmj9195_palette_r@@YAEPEBU_address_space@@I@Z 00000001404d8510 f nichibut:nbmj9195.o
*/ */
static char symbol[1024]; static char symbol[1024];

2
src/version.c
View File

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