diff options
author | 2014-05-01 08:36:28 +0000 | |
---|---|---|
committer | 2014-05-01 08:36:28 +0000 | |
commit | cc8edf5ac2faa4e0bd54c3b9715871870cd61cdf (patch) | |
tree | 6a686dca4d3758b6db3d5dcce1b5aca00b16f8bf /src/mess/machine | |
parent | ea02fd06a5883097ad970c81219d9d8124002853 (diff) |
mc6845: converted to devcb2, delegates and inline configs. nw.
while at it, cleaned up the args of the mc6845 delegates as well
(no need to pass back and forth pieces of the driver class, now
that delegates belong to it as well)
even if I tested the changes extensively, I might have missed
something among the 177 source files using this, so please report
any regressions you see :)
Diffstat (limited to 'src/mess/machine')
-rw-r--r-- | src/mess/machine/amstrad.c | 31 | ||||
-rw-r--r-- | src/mess/machine/svi318.c | 7 |
2 files changed, 3 insertions, 35 deletions
diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c index a46a1a7303c..cb12927cba1 100644 --- a/src/mess/machine/amstrad.c +++ b/src/mess/machine/amstrad.c @@ -1079,37 +1079,6 @@ UINT32 amstrad_state::screen_update_amstrad(screen_device &screen, bitmap_ind16 } -MC6845_INTERFACE( amstrad_mc6845_intf ) -{ - false, /* show border area */ - 0,0,0,0, /* visarea adjustment */ - 16, /* number of pixels per video memory address */ - NULL, /* begin_update */ - NULL, /* update_row */ - NULL, /* end_update */ - DEVCB_DRIVER_LINE_MEMBER(amstrad_state,amstrad_de_changed), /* on_de_changed */ - DEVCB_NULL, /* on_cur_changed */ - DEVCB_DRIVER_LINE_MEMBER(amstrad_state,amstrad_hsync_changed), /* on_hsync_changed */ - DEVCB_DRIVER_LINE_MEMBER(amstrad_state,amstrad_vsync_changed), /* on_vsync_changed */ - NULL -}; - - -MC6845_INTERFACE( amstrad_plus_mc6845_intf ) -{ - false, /* show border area */ - 0,0,0,0, /* visarea adjustment */ - 16, /* number of pixels per video memory address */ - NULL, /* begin_update */ - NULL, /* update_row */ - NULL, /* end_update */ - DEVCB_DRIVER_LINE_MEMBER(amstrad_state,amstrad_plus_de_changed), /* on_de_changed */ - DEVCB_NULL, /* on_cur_changed */ - DEVCB_DRIVER_LINE_MEMBER(amstrad_state,amstrad_plus_hsync_changed), /* on_hsync_changed */ - DEVCB_DRIVER_LINE_MEMBER(amstrad_state,amstrad_plus_vsync_changed), /* on_vsync_changed */ - NULL -}; - /* traverses the daisy-chain of expansion devices, looking for the specified device */ static device_t* get_expansion_device(running_machine &machine, const char* tag) { diff --git a/src/mess/machine/svi318.c b/src/mess/machine/svi318.c index d7a8e93f0b6..131e9cc7168 100644 --- a/src/mess/machine/svi318.c +++ b/src/mess/machine/svi318.c @@ -313,16 +313,15 @@ READ8_MEMBER(svi318_state::svi318_fdc_irqdrq_r) return result; } -MC6845_UPDATE_ROW( svi806_crtc6845_update_row ) +MC6845_UPDATE_ROW( svi318_state::crtc_update_row ) { - svi318_state *state = device->machine().driver_data<svi318_state>(); - const rgb_t *palette = state->m_palette->palette()->entry_list_raw(); + const rgb_t *palette = m_palette->palette()->entry_list_raw(); int i; for( i = 0; i < x_count; i++ ) { int j; - UINT8 data = state->m_svi.svi806_gfx[ state->m_svi.svi806_ram->u8(( ma + i ) & 0x7FF) * 16 + ra ]; + UINT8 data = m_svi.svi806_gfx[ m_svi.svi806_ram->u8(( ma + i ) & 0x7FF) * 16 + ra ]; if ( i == cursor_x ) { |