diff options
Diffstat (limited to 'src/mame/drivers/hp95lx.cpp')
-rw-r--r-- | src/mame/drivers/hp95lx.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mame/drivers/hp95lx.cpp b/src/mame/drivers/hp95lx.cpp index 7ab7658ad24..dc8b0ec5998 100644 --- a/src/mame/drivers/hp95lx.cpp +++ b/src/mame/drivers/hp95lx.cpp @@ -112,12 +112,12 @@ public: , m_p_chargen(*this, "gfx1") { } - DECLARE_WRITE8_MEMBER(d300_w); - DECLARE_READ8_MEMBER(d300_r); - DECLARE_WRITE8_MEMBER(e300_w); - DECLARE_READ8_MEMBER(e300_r); - DECLARE_WRITE8_MEMBER(f300_w); - DECLARE_READ8_MEMBER(f300_r); + void d300_w(offs_t offset, uint8_t data); + uint8_t d300_r(offs_t offset); + void e300_w(offs_t offset, uint8_t data); + uint8_t e300_r(offs_t offset); + void f300_w(offs_t offset, uint8_t data); + uint8_t f300_r(offs_t offset); void hp95lx(machine_config &config); protected: @@ -145,14 +145,14 @@ private: DECLARE_WRITE_LINE_MEMBER(keyboard_clock_w); DECLARE_WRITE_LINE_MEMBER(keyboard_data_w); - DECLARE_READ8_MEMBER(keyboard_r); - DECLARE_WRITE8_MEMBER(keyboard_w); - DECLARE_READ8_MEMBER(video_r); - DECLARE_WRITE8_MEMBER(video_w); - DECLARE_WRITE8_MEMBER(video_address_w); - DECLARE_READ8_MEMBER(video_register_r); - DECLARE_WRITE8_MEMBER(video_register_w); - DECLARE_WRITE8_MEMBER(debug_w); + uint8_t keyboard_r(offs_t offset); + void keyboard_w(offs_t offset, uint8_t data); + uint8_t video_r(offs_t offset); + void video_w(offs_t offset, uint8_t data); + void video_address_w(uint8_t data); + uint8_t video_register_r(); + void video_register_w(uint8_t data); + void debug_w(offs_t offset, uint8_t data); void hp95lx_io(address_map &map); void hp95lx_map(address_map &map); @@ -297,7 +297,7 @@ void hp95lx_state::machine_reset() } -WRITE8_MEMBER(hp95lx_state::d300_w) +void hp95lx_state::d300_w(offs_t offset, uint8_t data) { LOG("%s: IO %04x <- %02x\n", machine().describe_context(), 0xd300 + offset, data); @@ -321,7 +321,7 @@ WRITE8_MEMBER(hp95lx_state::d300_w) } } -READ8_MEMBER(hp95lx_state::d300_r) +uint8_t hp95lx_state::d300_r(offs_t offset) { uint8_t data = 0; @@ -350,7 +350,7 @@ READ8_MEMBER(hp95lx_state::d300_r) return data; } -WRITE8_MEMBER(hp95lx_state::e300_w) +void hp95lx_state::e300_w(offs_t offset, uint8_t data) { LOG("%s: IO %04x <- %02x\n", machine().describe_context(), 0xe300 + offset, data); @@ -384,7 +384,7 @@ WRITE8_MEMBER(hp95lx_state::e300_w) } } -READ8_MEMBER(hp95lx_state::e300_r) +uint8_t hp95lx_state::e300_r(offs_t offset) { uint8_t data = 0; @@ -421,7 +421,7 @@ READ8_MEMBER(hp95lx_state::e300_r) return data; } -WRITE8_MEMBER(hp95lx_state::f300_w) +void hp95lx_state::f300_w(offs_t offset, uint8_t data) { address_map_bank_device *mapper; const char *mapname; @@ -520,7 +520,7 @@ WRITE8_MEMBER(hp95lx_state::f300_w) } } -READ8_MEMBER(hp95lx_state::f300_r) +uint8_t hp95lx_state::f300_r(offs_t offset) { uint8_t data = 0; @@ -531,7 +531,7 @@ READ8_MEMBER(hp95lx_state::f300_r) /* keyboard HLE -- adapted from pt68k4.cpp */ -READ8_MEMBER(hp95lx_state::keyboard_r) +uint8_t hp95lx_state::keyboard_r(offs_t offset) { if (offset == 0) { @@ -543,7 +543,7 @@ READ8_MEMBER(hp95lx_state::keyboard_r) return 0; } -WRITE8_MEMBER(hp95lx_state::keyboard_w) +void hp95lx_state::keyboard_w(offs_t offset, uint8_t data) { LOGKBD("kbd: write %02X <= %02X\n", offset + 0x60, data); m_pic8259->ir1_w(CLEAR_LINE); @@ -589,7 +589,7 @@ WRITE_LINE_MEMBER(hp95lx_state::keyboard_data_w) /* video HLE */ -READ8_MEMBER(hp95lx_state::video_register_r) +uint8_t hp95lx_state::video_register_r() { uint8_t ret = 0; @@ -611,7 +611,7 @@ READ8_MEMBER(hp95lx_state::video_register_r) return ret; } -WRITE8_MEMBER(hp95lx_state::video_register_w) +void hp95lx_state::video_register_w(uint8_t data) { switch (m_register_address_latch) { @@ -638,19 +638,19 @@ WRITE8_MEMBER(hp95lx_state::video_register_w) } } -WRITE8_MEMBER(hp95lx_state::video_address_w) +void hp95lx_state::video_address_w(uint8_t data) { m_register_address_latch = data & 0x3f; } -READ8_MEMBER(hp95lx_state::video_r) +uint8_t hp95lx_state::video_r(offs_t offset) { int data = 0xff; switch (offset) { case 1: case 3: case 5: case 7: - data = video_register_r(space, offset); + data = video_register_r(); break; case 10: @@ -661,21 +661,21 @@ READ8_MEMBER(hp95lx_state::video_r) return data; } -WRITE8_MEMBER(hp95lx_state::video_w) +void hp95lx_state::video_w(offs_t offset, uint8_t data) { switch (offset) { case 0: case 2: case 4: case 6: - video_address_w(space, offset, data); + video_address_w(data); break; case 1: case 3: case 5: case 7: - video_register_w(space, offset, data); + video_register_w(data); break; } } -WRITE8_MEMBER(hp95lx_state::debug_w) +void hp95lx_state::debug_w(offs_t offset, uint8_t data) { LOGDBG("%11.6f %s debug: port %02X <= %02X\n", machine().time().as_double(), machine().describe_context(), offset + 0x90, data); } |