summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2017-09-21 04:27:16 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2017-09-21 04:27:16 +1000
commit647a85ecbd6527d529ae1d043d2523c34cacc95c (patch)
treeff8a6eab8958b604ab57a4af3089fff81832673e
parentee5ae2758283c097bb171e544ee8c2518a9988eb (diff)
parent393361833260d4e4532c8afd65ac44d6d468601f (diff)
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r--src/mame/drivers/wswan.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp
index 40658dfeaa5..f832c394be6 100644
--- a/src/mame/drivers/wswan.cpp
+++ b/src/mame/drivers/wswan.cpp
@@ -110,7 +110,7 @@ SLOT_INTERFACE_END
static MACHINE_CONFIG_START( wswan )
/* Basic machine hardware */
- MCFG_CPU_ADD("maincpu", V30MZ, 3072000)
+ MCFG_CPU_ADD("maincpu", V30MZ, XTAL_3_072MHz)
MCFG_CPU_PROGRAM_MAP(wswan_mem)
MCFG_CPU_IO_MAP(wswan_io)
@@ -120,11 +120,12 @@ static MACHINE_CONFIG_START( wswan )
MCFG_WSWAN_VIDEO_DMASND_CB(wswan_state, dma_sound_cb)
MCFG_SCREEN_ADD("screen", LCD)
- MCFG_SCREEN_REFRESH_RATE(75)
- MCFG_SCREEN_VBLANK_TIME(0)
+// MCFG_SCREEN_REFRESH_RATE(75)
+// MCFG_SCREEN_VBLANK_TIME(0)
MCFG_SCREEN_UPDATE_DEVICE("vdp", wswan_video_device, screen_update)
- MCFG_SCREEN_SIZE(WSWAN_X_PIXELS, WSWAN_Y_PIXELS)
- MCFG_SCREEN_VISIBLE_AREA(0*8, WSWAN_X_PIXELS - 1, 0, WSWAN_Y_PIXELS - 1)
+// MCFG_SCREEN_SIZE(WSWAN_X_PIXELS, WSWAN_Y_PIXELS)
+// MCFG_SCREEN_VISIBLE_AREA(0*8, WSWAN_X_PIXELS - 1, 0, WSWAN_Y_PIXELS - 1)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_3_072MHz,256,0,WSWAN_X_PIXELS,159,0,WSWAN_Y_PIXELS)
MCFG_SCREEN_PALETTE("palette")
MCFG_DEFAULT_LAYOUT(layout_wswan)
@@ -151,7 +152,6 @@ static MACHINE_CONFIG_START( wswan )
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("wsc_list","wscolor")
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("pc2_list","pockchalv2")
-
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wscolor, wswan )
@@ -171,8 +171,6 @@ static MACHINE_CONFIG_DERIVED( wscolor, wswan )
MCFG_DEVICE_REMOVE("wsc_list")
MCFG_SOFTWARE_LIST_ADD("cart_list","wscolor")
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("ws_list","wswan")
-
-
MACHINE_CONFIG_END
/***************************************************************************