summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/vlc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/vlc.cpp')
-rw-r--r--src/mame/drivers/vlc.cpp74
1 files changed, 37 insertions, 37 deletions
diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp
index 4e61a13f1cd..ef8934c87b0 100644
--- a/src/mame/drivers/vlc.cpp
+++ b/src/mame/drivers/vlc.cpp
@@ -155,8 +155,8 @@ nevada TYPE2 : 64 45 51 06 32 02 31 31
class nevada_state : public driver_device
{
public:
- nevada_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ nevada_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_duart(*this, {"duart18", "duart40", "duart39"}),
m_rtc(*this, "rtc"),
m_maincpu(*this, "maincpu"),
@@ -166,12 +166,15 @@ public:
m_backup(*this, "backup"),
m_vram(*this, "vram"),
m_gfxdecode(*this, "gfxdecode")
- { }
+ { }
void nevada(machine_config &config);
void init_nevada();
+protected:
+ virtual void video_start() override;
+
private:
required_device_array<mc68681_device, 3> m_duart;
required_device<msm6242_device> m_rtc;
@@ -185,20 +188,19 @@ private:
required_shared_ptr<uint16_t> m_vram;
required_device<gfxdecode_device> m_gfxdecode;
- void nvram_init(nvram_device &nvram, void *data, size_t size);
-
- uint16_t m_datA40000;
- //uint8_t* m_videoram;
- //uint8_t* m_colorram;
+ //uint8_t* m_videoram;
+ //uint8_t* m_colorram;
tilemap_t *m_tilemap;
- virtual void video_start() override;
+ uint16_t m_datA40000;
+
+ void nvram_init(nvram_device &nvram, void *data, size_t size);
uint32_t screen_update_nevada(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_PALETTE_INIT(nevada);
+ void nevada_palette(palette_device &palette) const;
- template<int N> DECLARE_READ8_MEMBER(duart_r);
- template<int N> DECLARE_WRITE8_MEMBER(duart_w);
+ template<int N> uint8_t duart_r(offs_t offset);
+ template<int N> void duart_w(offs_t offset, uint8_t data);
DECLARE_READ8_MEMBER(rtc_r);
DECLARE_WRITE8_MEMBER(rtc_w);
DECLARE_READ16_MEMBER(io_board_r);
@@ -228,23 +230,22 @@ funny thing , the DOOR ACCESS Switch is connected on the CLEAR PIN of this 4bit
so when D3..D0 are LOW , DOOR is OPEN
*/
static const uint8_t pal35[256] = {
-0x11, 0x42, 0x5B, 0xCA, 0x19, 0x42, 0x5B, 0xCA, 0x38, 0x63, 0x3A, 0x63, 0x3A, 0x63, 0x3A, 0x63,
-0xD3, 0x08, 0x5B, 0xCA, 0x19, 0xCA, 0x19, 0xCA, 0x18, 0xEB, 0x18, 0xEB, 0x18, 0xEB, 0x18, 0xEB,
-0xD3, 0xCA, 0x5B, 0xCC, 0x5B, 0xCC, 0x5B, 0xCC, 0xBA, 0x63, 0x38, 0x65, 0x38, 0x65, 0x38, 0x65,
-0xD1, 0xCA, 0x5B, 0xC8, 0x5B, 0xC8, 0x5B, 0xC8, 0x9A, 0xEB, 0x1A, 0xED, 0x1A, 0xED, 0x1A, 0xED,
-0x0C, 0x65, 0xF0, 0x00, 0x64, 0xF5, 0x04, 0x65, 0xB8, 0x25, 0x20, 0x20, 0x24, 0x24, 0x24, 0x24,
-0xF0, 0x00, 0xF8, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0xB8, 0x3D, 0xFC, 0x19, 0xFC, 0x19, 0xFC, 0x19,
-0x44, 0xF9, 0xC4, 0xF9, 0xC4, 0xFD, 0xC4, 0xFD, 0xFC, 0xFD, 0xFC, 0xFD, 0xFC, 0xFD, 0xFC, 0xFD,
-0xC0, 0xD9, 0xC8, 0xD9, 0xC8, 0xD9, 0xC8, 0xD9, 0xD8, 0xD9, 0xD8, 0xD9, 0xD8, 0xD9, 0xD8, 0xD9,
-0x0C, 0x44, 0xFB, 0x04, 0x67, 0xD4, 0x0C, 0x44, 0xBA, 0x24, 0x22, 0x02, 0x26, 0x06, 0x26, 0x06,
-0xFB, 0x00, 0xFB, 0x00, 0xEF, 0x10, 0xCE, 0x18, 0xEF, 0x18, 0xEF, 0x18, 0xFF, 0x18, 0xFF, 0x18,
-0x44, 0xF8, 0xC6, 0xD8, 0xCE, 0xDC, 0xCE, 0xDC, 0xEF, 0x9E, 0x67, 0xB8, 0x67, 0xBC, 0x67, 0xBC,
-0xC6, 0xD8, 0xCA, 0xD8, 0xCA, 0xD8, 0xCA, 0xD8, 0xCB, 0x9A, 0xEF, 0x9A, 0xFF, 0xD8, 0xDB, 0xD8,
-0x66, 0xF4, 0x00, 0x64, 0xBA, 0x25, 0x22, 0x22, 0x26, 0x26, 0x26, 0x26, 0xF2, 0x00, 0xFA, 0x00,
-0xFA, 0x00, 0xFA, 0x00, 0xBA, 0x3D, 0xFA, 0x19, 0xFA, 0x19, 0xFA, 0x19, 0x44, 0xF9, 0xC2, 0xF0,
-0xC2, 0xF4, 0xC2, 0xF4, 0xFA, 0xF4, 0xFA, 0xF4, 0xFA, 0xF4, 0xFA, 0xF4, 0xC2, 0xD0, 0xCA, 0xD0,
-0xCA, 0xD0, 0xCA, 0xD0, 0xDA, 0xD0, 0xDA, 0xD0, 0xDA, 0xD0, 0xDA, 0xD0, 0x08, 0x63, 0xD3, 0x08
-};
+ 0x11, 0x42, 0x5b, 0xca, 0x19, 0x42, 0x5b, 0xca, 0x38, 0x63, 0x3a, 0x63, 0x3a, 0x63, 0x3a, 0x63,
+ 0xd3, 0x08, 0x5b, 0xca, 0x19, 0xca, 0x19, 0xca, 0x18, 0xeb, 0x18, 0xeb, 0x18, 0xeb, 0x18, 0xeb,
+ 0xd3, 0xca, 0x5b, 0xcc, 0x5b, 0xcc, 0x5b, 0xcc, 0xba, 0x63, 0x38, 0x65, 0x38, 0x65, 0x38, 0x65,
+ 0xd1, 0xca, 0x5b, 0xc8, 0x5b, 0xc8, 0x5b, 0xc8, 0x9a, 0xeb, 0x1a, 0xed, 0x1a, 0xed, 0x1a, 0xed,
+ 0x0c, 0x65, 0xf0, 0x00, 0x64, 0xf5, 0x04, 0x65, 0xb8, 0x25, 0x20, 0x20, 0x24, 0x24, 0x24, 0x24,
+ 0xf0, 0x00, 0xf8, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xb8, 0x3d, 0xfc, 0x19, 0xfc, 0x19, 0xfc, 0x19,
+ 0x44, 0xf9, 0xc4, 0xf9, 0xc4, 0xfd, 0xc4, 0xfd, 0xfc, 0xfd, 0xfc, 0xfd, 0xfc, 0xfd, 0xfc, 0xfd,
+ 0xc0, 0xd9, 0xc8, 0xd9, 0xc8, 0xd9, 0xc8, 0xd9, 0xd8, 0xd9, 0xd8, 0xd9, 0xd8, 0xd9, 0xd8, 0xd9,
+ 0x0c, 0x44, 0xfb, 0x04, 0x67, 0xd4, 0x0c, 0x44, 0xba, 0x24, 0x22, 0x02, 0x26, 0x06, 0x26, 0x06,
+ 0xfb, 0x00, 0xfb, 0x00, 0xef, 0x10, 0xce, 0x18, 0xef, 0x18, 0xef, 0x18, 0xff, 0x18, 0xff, 0x18,
+ 0x44, 0xf8, 0xc6, 0xd8, 0xce, 0xdc, 0xce, 0xdc, 0xef, 0x9e, 0x67, 0xb8, 0x67, 0xbc, 0x67, 0xbc,
+ 0xc6, 0xd8, 0xca, 0xd8, 0xca, 0xd8, 0xca, 0xd8, 0xcb, 0x9a, 0xef, 0x9a, 0xff, 0xd8, 0xdb, 0xd8,
+ 0x66, 0xf4, 0x00, 0x64, 0xba, 0x25, 0x22, 0x22, 0x26, 0x26, 0x26, 0x26, 0xf2, 0x00, 0xfa, 0x00,
+ 0xfa, 0x00, 0xfa, 0x00, 0xba, 0x3d, 0xfa, 0x19, 0xfa, 0x19, 0xfa, 0x19, 0x44, 0xf9, 0xc2, 0xf0,
+ 0xc2, 0xf4, 0xc2, 0xf4, 0xfa, 0xf4, 0xfa, 0xf4, 0xfa, 0xf4, 0xfa, 0xf4, 0xc2, 0xd0, 0xca, 0xd0,
+ 0xca, 0xd0, 0xca, 0xd0, 0xda, 0xd0, 0xda, 0xd0, 0xda, 0xd0, 0xda, 0xd0, 0x08, 0x63, 0xd3, 0x08 };
/***************************************************************************/
@@ -310,7 +311,7 @@ uint32_t nevada_state::screen_update_nevada(screen_device &screen, bitmap_ind16
}
/***************************************************************************/
-PALETTE_INIT_MEMBER(nevada_state, nevada)
+void nevada_state::nevada_palette(palette_device &palette) const
{
// Palette init
}
@@ -344,15 +345,15 @@ void nevada_state::nvram_init(nvram_device &nvram, void *data, size_t size)
***************************************************************************/
template<int N>
-READ8_MEMBER(nevada_state::duart_r)
+uint8_t nevada_state::duart_r(offs_t offset)
{
- return m_duart[N]->read(space, offset >> 3);
+ return m_duart[N]->read(offset >> 3);
}
template<int N>
-WRITE8_MEMBER(nevada_state::duart_w)
+void nevada_state::duart_w(offs_t offset, uint8_t data)
{
- m_duart[N]->write(space, offset >> 3, data);
+ m_duart[N]->write(offset >> 3, data);
}
/***************************************************************************/
@@ -589,9 +590,8 @@ MACHINE_CONFIG_START(nevada_state::nevada)
MCFG_SCREEN_UPDATE_DRIVER(nevada_state, screen_update_nevada)
MCFG_SCREEN_PALETTE("palette")
- MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_nevada)
- MCFG_PALETTE_ADD("palette", 256)
- MCFG_PALETTE_INIT_OWNER(nevada_state, nevada)
+ GFXDECODE(config, m_gfxdecode, "palette", gfx_nevada);
+ PALETTE(config, "palette", FUNC(nevada_state::nevada_palette), 256);
mc6845_device &crtc(MC6845(config, "crtc", MC6845_CLOCK));
crtc.set_screen("screen");