diff options
Diffstat (limited to 'src/mess/drivers/wswan.c')
-rw-r--r-- | src/mess/drivers/wswan.c | 76 |
1 files changed, 24 insertions, 52 deletions
diff --git a/src/mess/drivers/wswan.c b/src/mess/drivers/wswan.c index 9961219ad07..edbc4eab746 100644 --- a/src/mess/drivers/wswan.c +++ b/src/mess/drivers/wswan.c @@ -35,61 +35,35 @@ #include "wswan.lh" static ADDRESS_MAP_START (wswan_mem, AS_PROGRAM, 8, wswan_state) - AM_RANGE(0x00000, 0x03fff) AM_RAM /* 16kb RAM / 4 colour tiles */ - AM_RANGE(0x04000, 0x0ffff) AM_NOP /* nothing */ - AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(wswan_sram_r, wswan_sram_w) /* SRAM bank */ - AM_RANGE(0x20000, 0x2ffff) AM_ROMBANK("rom1") /* ROM bank 1 */ - AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("rom2") /* ROM bank 2 */ - AM_RANGE(0x40000, 0x4ffff) AM_ROMBANK("rom3") /* ROM bank 3 */ - AM_RANGE(0x50000, 0x5ffff) AM_ROMBANK("rom4") /* ROM bank 4 */ - AM_RANGE(0x60000, 0x6ffff) AM_ROMBANK("rom5") /* ROM bank 5 */ - AM_RANGE(0x70000, 0x7ffff) AM_ROMBANK("rom6") /* ROM bank 6 */ - AM_RANGE(0x80000, 0x8ffff) AM_ROMBANK("rom7") /* ROM bank 7 */ - AM_RANGE(0x90000, 0x9ffff) AM_ROMBANK("rom8") /* ROM bank 8 */ - AM_RANGE(0xa0000, 0xaffff) AM_ROMBANK("rom9") /* ROM bank 9 */ - AM_RANGE(0xb0000, 0xbffff) AM_ROMBANK("rom10") /* ROM bank 10 */ - AM_RANGE(0xc0000, 0xcffff) AM_ROMBANK("rom11") /* ROM bank 11 */ - AM_RANGE(0xd0000, 0xdffff) AM_ROMBANK("rom12") /* ROM bank 12 */ - AM_RANGE(0xe0000, 0xeffff) AM_ROMBANK("rom13") /* ROM bank 13 */ - AM_RANGE(0xf0000, 0xfffff) AM_ROMBANK("rom14") /* ROM bank 14 */ + AM_RANGE(0x00000, 0x03fff) AM_RAM // 16kb RAM / 4 colour tiles + AM_RANGE(0x04000, 0x0ffff) AM_NOP // nothing + //AM_RANGE(0x10000, 0xeffff) // cart range, setup at machine_start + AM_RANGE(0xf0000, 0xfffff) AM_READ(bios_r) ADDRESS_MAP_END static ADDRESS_MAP_START (wscolor_mem, AS_PROGRAM, 8, wswan_state) - AM_RANGE(0x00000, 0x0ffff) AM_RAM /* 16kb RAM / 4 colour tiles, 16 colour tiles + palettes */ - AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(wswan_sram_r, wswan_sram_w) /* SRAM bank */ - AM_RANGE(0x20000, 0x2ffff) AM_ROMBANK("rom1") /* ROM bank 1 */ - AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("rom2") /* ROM bank 2 */ - AM_RANGE(0x40000, 0x4ffff) AM_ROMBANK("rom3") /* ROM bank 3 */ - AM_RANGE(0x50000, 0x5ffff) AM_ROMBANK("rom4") /* ROM bank 4 */ - AM_RANGE(0x60000, 0x6ffff) AM_ROMBANK("rom5") /* ROM bank 5 */ - AM_RANGE(0x70000, 0x7ffff) AM_ROMBANK("rom6") /* ROM bank 6 */ - AM_RANGE(0x80000, 0x8ffff) AM_ROMBANK("rom7") /* ROM bank 7 */ - AM_RANGE(0x90000, 0x9ffff) AM_ROMBANK("rom8") /* ROM bank 8 */ - AM_RANGE(0xa0000, 0xaffff) AM_ROMBANK("rom9") /* ROM bank 9 */ - AM_RANGE(0xb0000, 0xbffff) AM_ROMBANK("rom10") /* ROM bank 10 */ - AM_RANGE(0xc0000, 0xcffff) AM_ROMBANK("rom11") /* ROM bank 11 */ - AM_RANGE(0xd0000, 0xdffff) AM_ROMBANK("rom12") /* ROM bank 12 */ - AM_RANGE(0xe0000, 0xeffff) AM_ROMBANK("rom13") /* ROM bank 13 */ - AM_RANGE(0xf0000, 0xfffff) AM_ROMBANK("rom14") /* ROM bank 14 */ + AM_RANGE(0x00000, 0x0ffff) AM_RAM // 16kb RAM / 4 colour tiles, 16 colour tiles + palettes + //AM_RANGE(0x10000, 0xeffff) // cart range, setup at machine_start + AM_RANGE(0xf0000, 0xfffff) AM_READ(bios_r) ADDRESS_MAP_END static ADDRESS_MAP_START (wswan_io, AS_IO, 8, wswan_state) - AM_RANGE(0x00, 0xff) AM_READWRITE(wswan_port_r, wswan_port_w) /* I/O ports */ + AM_RANGE(0x00, 0xff) AM_READWRITE(port_r, port_w) // I/O ports ADDRESS_MAP_END static INPUT_PORTS_START( wswan ) - PORT_START("CURSX") /* Cursors (X1-X4) */ + PORT_START("CURSX") PORT_BIT( 0x1, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_NAME("X1 - Up") PORT_BIT( 0x4, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_NAME("X3 - Down") PORT_BIT( 0x8, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_NAME("X4 - Left") PORT_BIT( 0x2, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_NAME("X2 - Right") - PORT_START("BUTTONS") /* Buttons */ + PORT_START("BUTTONS") PORT_BIT( 0x2, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start") PORT_BIT( 0x4, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Button A") PORT_BIT( 0x8, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Button B") - PORT_START("CURSY") /* Cursors (Y1-Y4) */ + PORT_START("CURSY") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Y1 - Up") PORT_CODE(KEYCODE_W) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Y3 - Down") PORT_CODE(KEYCODE_S) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Y4 - Left") PORT_CODE(KEYCODE_A) @@ -102,18 +76,16 @@ GFXDECODE_END /* WonderSwan can display 16 shades of grey */ PALETTE_INIT_MEMBER(wswan_state, wswan) { - int ii; - for (ii = 0; ii < 16; ii++) + for (int i = 0; i < 16; i++) { - UINT8 shade = ii * (256 / 16); - palette.set_pen_color(15 - ii, shade, shade, shade); + UINT8 shade = i * (256 / 16); + palette.set_pen_color(15 - i, shade, shade, shade); } } PALETTE_INIT_MEMBER(wswan_state,wscolor) { - int i; - for (i = 0; i < 4096; i++) + for (int i = 0; i < 4096; i++) { int r = (i & 0x0f00) >> 8; int g = (i & 0x00f0) >> 4; @@ -122,6 +94,12 @@ PALETTE_INIT_MEMBER(wswan_state,wscolor) } } +static SLOT_INTERFACE_START(wswan_cart) + SLOT_INTERFACE_INTERNAL("ws_rom", WS_ROM_STD) + SLOT_INTERFACE_INTERNAL("ws_sram", WS_ROM_SRAM) + SLOT_INTERFACE_INTERNAL("ws_eeprom", WS_ROM_EEPROM) +SLOT_INTERFACE_END + static MACHINE_CONFIG_START( wswan, wswan_state ) /* Basic machine hardware */ MCFG_CPU_ADD("maincpu", V30MZ, 3072000) @@ -142,7 +120,6 @@ static MACHINE_CONFIG_START( wswan, wswan_state ) MCFG_NVRAM_ADD_1FILL("nvram") - MCFG_GFXDECODE_ADD("gfxdecode", "palette", wswan) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(wswan_state, wswan) @@ -154,11 +131,7 @@ static MACHINE_CONFIG_START( wswan, wswan_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) /* cartridge */ - MCFG_CARTSLOT_ADD("cart") - MCFG_CARTSLOT_EXTENSION_LIST("ws,wsc,bin") - MCFG_CARTSLOT_MANDATORY - MCFG_CARTSLOT_INTERFACE("wswan_cart") - MCFG_CARTSLOT_LOAD(wswan_state,wswan_cart) + MCFG_WSWAN_CARTRIDGE_ADD("cartslot", wswan_cart, NULL) /* software lists */ MCFG_SOFTWARE_LIST_ADD("cart_list","wswan") @@ -174,7 +147,6 @@ static MACHINE_CONFIG_DERIVED( wscolor, wswan ) MCFG_PALETTE_ENTRIES(4096) MCFG_PALETTE_INIT_OWNER(wswan_state, wscolor ) - /* software lists */ MCFG_DEVICE_REMOVE("cart_list") MCFG_DEVICE_REMOVE("wsc_list") @@ -199,5 +171,5 @@ ROM_START( wscolor ) ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME*/ -CONS( 1999, wswan, 0, 0, wswan, wswan, wswan_state, wswan, "Bandai", "WonderSwan", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) -CONS( 2000, wscolor, wswan, 0, wscolor, wswan, wswan_state, wswan, "Bandai", "WonderSwan Color", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +CONS( 1999, wswan, 0, 0, wswan, wswan, driver_device, 0, "Bandai", "WonderSwan", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +CONS( 2000, wscolor, wswan, 0, wscolor, wswan, driver_device, 0, "Bandai", "WonderSwan Color", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) |