summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/leland.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/video/leland.c')
-rw-r--r--src/mame/video/leland.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c
index e296ee05c66..06375f64a8a 100644
--- a/src/mame/video/leland.c
+++ b/src/mame/video/leland.c
@@ -129,10 +129,9 @@ WRITE8_MEMBER(leland_state::leland_gfx_port_w)
*
*************************************/
-static void leland_video_addr_w(address_space &space, int offset, int data, int num)
+void leland_state::leland_video_addr_w(address_space &space, int offset, int data, int num)
{
- leland_state *drvstate = space.machine().driver_data<leland_state>();
- struct vram_state_data *state = drvstate->m_vram_state + num;
+ struct vram_state_data *state = m_vram_state + num;
if (!offset)
state->m_addr = (state->m_addr & 0xfe00) | ((data << 1) & 0x01fe);
@@ -148,10 +147,9 @@ static void leland_video_addr_w(address_space &space, int offset, int data, int
*
*************************************/
-static int leland_vram_port_r(address_space &space, int offset, int num)
+int leland_state::leland_vram_port_r(address_space &space, int offset, int num)
{
- leland_state *drvstate = space.machine().driver_data<leland_state>();
- struct vram_state_data *state = drvstate->m_vram_state + num;
+ struct vram_state_data *state = m_vram_state + num;
int addr = state->m_addr;
int inc = (offset >> 2) & 2;
int ret;
@@ -159,18 +157,18 @@ static int leland_vram_port_r(address_space &space, int offset, int num)
switch (offset & 7)
{
case 3: /* read hi/lo (alternating) */
- ret = drvstate->m_video_ram[addr];
+ ret = m_video_ram[addr];
addr += inc & (addr << 1);
addr ^= 1;
break;
case 5: /* read hi */
- ret = drvstate->m_video_ram[addr | 1];
+ ret = m_video_ram[addr | 1];
addr += inc;
break;
case 6: /* read lo */
- ret = drvstate->m_video_ram[addr & ~1];
+ ret = m_video_ram[addr & ~1];
addr += inc;
break;
@@ -196,11 +194,10 @@ static int leland_vram_port_r(address_space &space, int offset, int num)
*
*************************************/
-static void leland_vram_port_w(address_space &space, int offset, int data, int num)
+void leland_state::leland_vram_port_w(address_space &space, int offset, int data, int num)
{
- leland_state *drvstate = space.machine().driver_data<leland_state>();
- UINT8 *video_ram = drvstate->m_video_ram;
- struct vram_state_data *state = drvstate->m_vram_state + num;
+ UINT8 *video_ram = m_video_ram;
+ struct vram_state_data *state = m_vram_state + num;
int addr = state->m_addr;
int inc = (offset >> 2) & 2;
int trans = (offset >> 4) & num;