diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2012-10-03 09:27:22 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2012-10-03 09:27:22 +0000 |
commit | e52d60b7f8ce03e5c1f8c801fd5caa234b3aa3cf (patch) | |
tree | be8ce4af035c60e33f580cf3a983cc3c9b684c75 /src/mess/video | |
parent | 92b1c4eebd358d5138fc51662daead09f4a4c72e (diff) |
Replace some *_DEVICE_HANDLER with _MEMBER calls in MESS section (no whatsnew)
Diffstat (limited to 'src/mess/video')
-rw-r--r-- | src/mess/video/bbc.c | 7 | ||||
-rw-r--r-- | src/mess/video/dgn_beta.c | 20 | ||||
-rw-r--r-- | src/mess/video/pecom.c | 12 | ||||
-rw-r--r-- | src/mess/video/pet.c | 2 |
4 files changed, 18 insertions, 23 deletions
diff --git a/src/mess/video/bbc.c b/src/mess/video/bbc.c index 18688fc56b1..b420703cfb5 100644 --- a/src/mess/video/bbc.c +++ b/src/mess/video/bbc.c @@ -276,10 +276,9 @@ static MC6845_UPDATE_ROW( vid_update_row ) } } -static WRITE_LINE_DEVICE_HANDLER( bbc_vsync ) +WRITE_LINE_MEMBER(bbc_state::bbc_vsync) { - bbc_state *bstate = device->machine().driver_data<bbc_state>(); - bstate->m_trom->dew_w(state); + m_trom->dew_w(state); } @@ -293,7 +292,7 @@ const mc6845_interface bbc_mc6845_intf = DEVCB_NULL, /* on_de_changed */ DEVCB_NULL, /* on_cur_changed */ DEVCB_NULL, /* on_hsync_changed */ - DEVCB_LINE(bbc_vsync), /* on_vsync_changed */ + DEVCB_DRIVER_LINE_MEMBER(bbc_state,bbc_vsync), /* on_vsync_changed */ NULL }; diff --git a/src/mess/video/dgn_beta.c b/src/mess/video/dgn_beta.c index 747f6cacb94..6980c9fec66 100644 --- a/src/mess/video/dgn_beta.c +++ b/src/mess/video/dgn_beta.c @@ -240,22 +240,20 @@ static MC6845_UPDATE_ROW( dgnbeta_update_row ) } -static WRITE_LINE_DEVICE_HANDLER( dgnbeta_vsync_changed ) +WRITE_LINE_MEMBER(dgn_beta_state::dgnbeta_vsync_changed) { - dgn_beta_state *st = device->machine().driver_data<dgn_beta_state>(); - - st->m_beta_VSync=state; - if (!st->m_beta_VSync) + m_beta_VSync=state; + if (!m_beta_VSync) { - st->m_FlashCount++; - if(st->m_FlashCount==10) + m_FlashCount++; + if(m_FlashCount==10) { - st->m_FlashCount=0; // Reset counter - st->m_FlashBit=(!st->m_FlashBit) & 0x01; // Invert flash bit. + m_FlashCount=0; // Reset counter + m_FlashBit=(!m_FlashBit) & 0x01; // Invert flash bit. } } - dgn_beta_frame_interrupt(device->machine(), state); + dgn_beta_frame_interrupt(machine(), state); } const mc6845_interface dgnbeta_crtc6845_interface = @@ -268,7 +266,7 @@ const mc6845_interface dgnbeta_crtc6845_interface = DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - DEVCB_LINE(dgnbeta_vsync_changed), + DEVCB_DRIVER_LINE_MEMBER(dgn_beta_state,dgnbeta_vsync_changed), NULL }; diff --git a/src/mess/video/pecom.c b/src/mess/video/pecom.c index 811ce07bf5a..9dd8cf58d1a 100644 --- a/src/mess/video/pecom.c +++ b/src/mess/video/pecom.c @@ -70,17 +70,15 @@ static CDP1869_PCB_READ( pecom_pcb_r ) return BIT(pmd, 7); } -static WRITE_LINE_DEVICE_HANDLER( pecom_prd_w ) +WRITE_LINE_MEMBER(pecom_state::pecom_prd_w) { - pecom_state *driver_state = device->machine().driver_data<pecom_state>(); - // every other PRD triggers a DMAOUT request - if (driver_state->m_dma) + if (m_dma) { - device->machine().device(CDP1802_TAG)->execute().set_input_line(COSMAC_INPUT_LINE_DMAOUT, HOLD_LINE); + machine().device(CDP1802_TAG)->execute().set_input_line(COSMAC_INPUT_LINE_DMAOUT, HOLD_LINE); } - driver_state->m_dma = !driver_state->m_dma; + m_dma = !m_dma; } static CDP1869_INTERFACE( pecom_cdp1869_intf ) @@ -91,7 +89,7 @@ static CDP1869_INTERFACE( pecom_cdp1869_intf ) pecom_pcb_r, pecom_char_ram_r, pecom_char_ram_w, - DEVCB_LINE(pecom_prd_w) + DEVCB_DRIVER_LINE_MEMBER(pecom_state,pecom_prd_w) }; VIDEO_START_MEMBER(pecom_state,pecom) diff --git a/src/mess/video/pet.c b/src/mess/video/pet.c index 5472b1cd7d8..3c76976d689 100644 --- a/src/mess/video/pet.c +++ b/src/mess/video/pet.c @@ -106,7 +106,7 @@ MC6845_UPDATE_ROW( pet80_update_row ) } } -WRITE_LINE_DEVICE_HANDLER( pet_display_enable_changed ) +WRITE_LINE_MEMBER(pet_state::pet_display_enable_changed) { } |