summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/hp16500.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/hp16500.cpp')
-rw-r--r--src/mame/drivers/hp16500.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp
index 8cfe9946354..f26bfda1e2d 100644
--- a/src/mame/drivers/hp16500.cpp
+++ b/src/mame/drivers/hp16500.cpp
@@ -82,23 +82,23 @@ private:
uint8_t m_mask, m_val;
- DECLARE_WRITE32_MEMBER(palette_w);
-
- DECLARE_WRITE16_MEMBER(vram_w);
- DECLARE_READ8_MEMBER (vram_r);
- DECLARE_WRITE8_MEMBER (mask_w);
- DECLARE_WRITE8_MEMBER (val_w);
- DECLARE_READ32_MEMBER(vbl_state_r);
- DECLARE_WRITE32_MEMBER(vbl_ack_w);
- DECLARE_READ16_MEMBER(vbl_ack16_r);
- DECLARE_WRITE16_MEMBER(vbl_ack16_w);
-
- DECLARE_WRITE8_MEMBER(pal_ctrl_w);
- DECLARE_WRITE8_MEMBER(pal_r_w);
- DECLARE_WRITE8_MEMBER(pal_g_w);
- DECLARE_WRITE8_MEMBER(pal_b_w);
-
- DECLARE_WRITE16_MEMBER(maskval_w);
+ void palette_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+ void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint8_t vram_r(offs_t offset);
+ void mask_w(uint8_t data);
+ void val_w(uint8_t data);
+ uint32_t vbl_state_r();
+ void vbl_ack_w(uint32_t data);
+ uint16_t vbl_ack16_r();
+ void vbl_ack16_w(uint16_t data);
+
+ void pal_ctrl_w(uint8_t data);
+ void pal_r_w(uint8_t data);
+ void pal_g_w(uint8_t data);
+ void pal_b_w(uint8_t data);
+
+ void maskval_w(uint16_t data);
DECLARE_WRITE_LINE_MEMBER(irq_2);
DECLARE_WRITE_LINE_MEMBER(vsync_changed);
MC6845_UPDATE_ROW(crtc_update_row);
@@ -112,23 +112,23 @@ private:
uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs;
};
-READ32_MEMBER(hp16500_state::vbl_state_r)
+uint32_t hp16500_state::vbl_state_r()
{
return 0x03000000; // bit 0 set means the interrupt handler advances the pSOS tick counter.
}
-WRITE32_MEMBER(hp16500_state::vbl_ack_w)
+void hp16500_state::vbl_ack_w(uint32_t data)
{
m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE);
}
-READ16_MEMBER(hp16500_state::vbl_ack16_r)
+uint16_t hp16500_state::vbl_ack16_r()
{
m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE);
return 0;
}
-WRITE16_MEMBER(hp16500_state::vbl_ack16_w)
+void hp16500_state::vbl_ack16_w(uint16_t data)
{
m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE);
}
@@ -185,31 +185,31 @@ MC6845_UPDATE_ROW( hp16500_state::crtc_update_row_1650 )
}
}
-WRITE8_MEMBER(hp16500_state::pal_ctrl_w)
+void hp16500_state::pal_ctrl_w(uint8_t data)
{
m_clutoffs = data & 0xf;
}
-WRITE8_MEMBER(hp16500_state::pal_r_w)
+void hp16500_state::pal_r_w(uint8_t data)
{
m_colors[0] = (data<<4);
m_palette[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]);
}
-WRITE8_MEMBER(hp16500_state::pal_g_w)
+void hp16500_state::pal_g_w(uint8_t data)
{
m_colors[1] = (data<<4);
m_palette[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]);
}
-WRITE8_MEMBER(hp16500_state::pal_b_w)
+void hp16500_state::pal_b_w(uint8_t data)
{
m_colors[2] = (data<<4);
m_palette[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]);
}
-WRITE16_MEMBER(hp16500_state::maskval_w)
+void hp16500_state::maskval_w(uint16_t data)
{
// by analogy with the string printer code from the 16500b, which
// appears to be a direct port...
@@ -342,7 +342,7 @@ void hp16500_state::video_start()
// that is why the handler needs to be 16 bits, or it won't be called
// in the first place.
-WRITE16_MEMBER(hp16500_state::vram_w)
+void hp16500_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
if(!ACCESSING_BITS_0_7)
data = data | (data >> 8);
@@ -355,22 +355,22 @@ WRITE16_MEMBER(hp16500_state::vram_w)
}
}
-READ8_MEMBER (hp16500_state::vram_r)
+uint8_t hp16500_state::vram_r(offs_t offset)
{
return m_vram[offset];
}
-WRITE8_MEMBER(hp16500_state::mask_w)
+void hp16500_state::mask_w(uint8_t data)
{
m_mask = data;
}
-WRITE8_MEMBER(hp16500_state::val_w)
+void hp16500_state::val_w(uint8_t data)
{
m_val = data;
}
-WRITE32_MEMBER(hp16500_state::palette_w)
+void hp16500_state::palette_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (mem_mask == 0xff000000)
{