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

Some improvements, some base SNES bug(s) prevents this to work like expected tho

Browse Source
This commit is contained in:
Angelo Salese 2012-08-27 17:09:54 +00:00
parent 8fab9c2755
commit 36ff86ff17
3 changed files with 72 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mame/drivers/nss.c
View File

@ -7,6 +7,7 @@
TODO:
- Fix sound CPU halt / reset lines, particularly needed by this to work
correctly;
- Fix continue behaviour, might be the same issue as the one above.
- Various M50458 bits
- OSD should actually super-impose with the SNES video somehow;
@ -322,10 +323,11 @@ public:
DECLARE_WRITE8_MEMBER(port_02_w);
DECLARE_WRITE8_MEMBER(port_03_w);
DECLARE_WRITE8_MEMBER(port_04_w);
DECLARE_WRITE8_MEMBER(port_07_w);
DECLARE_DRIVER_INIT(nss);
bitmap_rgb32 *m_tmpbitmap;
DECLARE_CUSTOM_INPUT_MEMBER(game_over_flag_r);
};
@ -333,7 +335,6 @@ public:
UINT32 nss_state::screen_update( screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect )
{
m_m50458->screen_update(screen,bitmap,cliprect);
return 0;
}
@ -518,14 +519,14 @@ READ8_MEMBER(nss_state::port_00_r)
*/
UINT8 res;
res = 0 << 7;
res = (m_joy_flag) << 7;
res|= (machine().primary_screen->vblank() & 1) << 6;
res|= (((ioport("SERIAL1_DATA1_H")->read() & 0x80) >> 7) << 5);
res|= (((ioport("SERIAL1_DATA1_L")->read() & 0x80) >> 7) << 4);
res|= (((ioport("SERIAL1_DATA1_L")->read() & 0x08) >> 3) << 3);
res|= (((ioport("SERIAL1_DATA1_L")->read() & 0x04) >> 2) << 2);
res|= (((ioport("SERIAL1_DATA1_L")->read() & 0x02) >> 1) << 1);
res|= (((ioport("SERIAL1_DATA1_L")->read() & 0x01) >> 0) << 0);
res|= (((ioport("SERIAL1_DATA1_H")->read() & 0x04) >> 2) << 3);
res|= (((ioport("SERIAL1_DATA1_H")->read() & 0x08) >> 3) << 2);
res|= (((ioport("SERIAL1_DATA1_H")->read() & 0x02) >> 1) << 1);
res|= (((ioport("SERIAL1_DATA1_H")->read() & 0x01) >> 0) << 0);
return res;
}
@ -604,6 +605,11 @@ WRITE8_MEMBER(nss_state::port_04_w)
coin_counter_w(machine(), 1, (data >> 1) & 1);
}
WRITE8_MEMBER(nss_state::port_07_w)
{
m_joy_flag = 1;
}
static ADDRESS_MAP_START( bios_io_map, AS_IO, 8, nss_state )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_READ(port_00_r) AM_WRITE(port_00_w)
@ -611,7 +617,7 @@ static ADDRESS_MAP_START( bios_io_map, AS_IO, 8, nss_state )
AM_RANGE(0x02, 0x02) AM_READ_PORT("SYSTEM") AM_WRITE(port_02_w)
AM_RANGE(0x03, 0x03) AM_READ_PORT("RTC") AM_WRITE(port_03_w)
AM_RANGE(0x04, 0x04) AM_WRITE(port_04_w)
AM_RANGE(0x07, 0x07) AM_WRITENOP // Pad watchdog
AM_RANGE(0x07, 0x07) AM_WRITE(port_07_w)
ADDRESS_MAP_END
static MACHINE_START( nss )
@ -622,7 +628,12 @@ static MACHINE_START( nss )
state->m_is_nss = 1;
state->m_wram = auto_alloc_array_clear(machine, UINT8, 0x1000);
state->m_tmpbitmap = auto_bitmap_rgb32_alloc(machine,24*12,12*18);
}
CUSTOM_INPUT_MEMBER(nss_state::game_over_flag_r)
{
return m_game_over_flag;
}
static INPUT_PORTS_START( snes )
@ -633,7 +644,7 @@ static INPUT_PORTS_START( snes )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
PORT_START("FP")
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // Game Over Flag, TODO
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM_MEMBER(DEVICE_SELF, nss_state,game_over_flag_r, NULL)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON13 ) PORT_NAME("Restart Button")
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON12 ) PORT_NAME("Page Up Button")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON11 ) PORT_NAME("Page Down Button")
@ -826,6 +837,9 @@ static MACHINE_RESET( nss )
/* start with both CPUs disabled */
device_set_input_line(state->m_maincpu, INPUT_LINE_RESET, ASSERT_LINE);
device_set_input_line(state->m_soundcpu, INPUT_LINE_RESET, ASSERT_LINE);
state->m_game_over_flag = 1;
state->m_joy_flag = 1;
}
static MACHINE_CONFIG_DERIVED( nss, snes )

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

@ -430,6 +430,8 @@ public:
/* HW flags */
UINT8 m_is_nss;
UINT8 m_input_disabled;
UINT8 m_game_over_flag;
UINT8 m_joy_flag;
// UINT8 m_is_sfcbox;
/* timers */

57
src/mame/machine/snes.c
View File

@ -561,20 +561,44 @@ READ8_HANDLER( snes_r_io )
case RDMPYH: /* Product/Remainder of mult/div result (high) */
return snes_ram[offset];
case JOY1L: /* Joypad 1 status register (low) */
if(state->m_is_nss && state->m_input_disabled)
return 0;
return state->m_joy1l;
case JOY1H: /* Joypad 1 status register (high) */
if(state->m_is_nss && state->m_input_disabled)
return 0;
return state->m_joy1h;
case JOY2L: /* Joypad 2 status register (low) */
if(state->m_is_nss && state->m_input_disabled)
return 0;
return state->m_joy2l;
case JOY2H: /* Joypad 2 status register (high) */
if(state->m_is_nss && state->m_input_disabled)
return 0;
return state->m_joy2h;
case JOY3L: /* Joypad 3 status register (low) */
if(state->m_is_nss && state->m_input_disabled)
return 0;
return state->m_joy3l;
case JOY3H: /* Joypad 3 status register (high) */
if(state->m_is_nss && state->m_input_disabled)
return 0;
return state->m_joy3h;
case JOY4L: /* Joypad 4 status register (low) */
if(state->m_is_nss && state->m_input_disabled)
return 0;
return state->m_joy4l;
case JOY4H: /* Joypad 4 status register (high) */
if(state->m_is_nss && state->m_input_disabled)
return 0;
return state->m_joy4h;
case 0x4100: /* NSS Dip-Switches */
@ -584,7 +608,7 @@ READ8_HANDLER( snes_r_io )
return snes_open_bus_r(space, 0);
}
// case 0x4101: //PC: a104 - a10e - a12a //only nss_actr
// case 0x4101: //PC: a104 - a10e - a12a //only nss_actr (DSW actually reads in word units ...)
default:
// mame_printf_debug("snes_r: offset = %x pc = %x\n",offset,cpu_get_pc(&space->device()));
@ -592,7 +616,7 @@ READ8_HANDLER( snes_r_io )
break;
}
//printf("unsupported read: offset == %08x\n", offset);
// printf("unsupported read: offset == %08x\n", offset);
/* Unsupported reads returns open bus */
// printf("%02x %02x\n",offset,snes_open_bus_r(space, 0));
@ -695,7 +719,10 @@ WRITE8_HANDLER( snes_w_io )
state->m_read_idx[0] = 0;
state->m_read_idx[1] = 0;
}
if(state->m_is_nss)
{
state->m_game_over_flag = (data & 4) >> 2;
}
break;
case NMITIMEN: /* Flag for v-blank, timer int. and joy read */
if((data & 0x30) == 0x00)
@ -1527,22 +1554,30 @@ static void nss_io_read( running_machine &machine )
// this actually works like reading the first 16bits from oldjoy1/2 in reverse order
if (snes_ram[NMITIMEN] & 1)
{
state->m_joy1l = (state->m_is_nss && state->m_input_disabled) ? 0 : (state->m_data1[0] & 0x00ff) >> 0;
state->m_joy1h = (state->m_is_nss && state->m_input_disabled) ? 0 : (state->m_data1[0] & 0xff00) >> 8;
state->m_joy2l = (state->m_is_nss && state->m_input_disabled) ? 0 : (state->m_data1[1] & 0x00ff) >> 0;
state->m_joy2h = (state->m_is_nss && state->m_input_disabled) ? 0 : (state->m_data1[1] & 0xff00) >> 8;
state->m_joy3l = (state->m_is_nss && state->m_input_disabled) ? 0 : (state->m_data2[0] & 0x00ff) >> 0;
state->m_joy3h = (state->m_is_nss && state->m_input_disabled) ? 0 : (state->m_data2[0] & 0xff00) >> 8;
state->m_joy4l = (state->m_is_nss && state->m_input_disabled) ? 0 : (state->m_data2[1] & 0x00ff) >> 0;
state->m_joy4h = (state->m_is_nss && state->m_input_disabled) ? 0 : (state->m_data2[1] & 0xff00) >> 8;
state->m_joy1l = (state->m_data1[0] & 0x00ff) >> 0;
state->m_joy1h = (state->m_data1[0] & 0xff00) >> 8;
state->m_joy2l = (state->m_data1[1] & 0x00ff) >> 0;
state->m_joy2h = (state->m_data1[1] & 0xff00) >> 8;
state->m_joy3l = (state->m_data2[0] & 0x00ff) >> 0;
state->m_joy3h = (state->m_data2[0] & 0xff00) >> 8;
state->m_joy4l = (state->m_data2[1] & 0x00ff) >> 0;
state->m_joy4h = (state->m_data2[1] & 0xff00) >> 8;
// make sure read_idx starts returning all 1s because the auto-read reads it :-)
state->m_read_idx[0] = 16;
state->m_read_idx[1] = 16;
}
if(state->m_is_nss)
state->m_joy_flag = 0;
}
/*
if(state->m_is_nss)
state->m_joy_flag = 0;
*/
static UINT8 nss_oldjoy1_read( running_machine &machine )
{
snes_state *state = machine.driver_data<snes_state>();