diff options
Diffstat (limited to 'src/mame/drivers/zr107.cpp')
-rw-r--r-- | src/mame/drivers/zr107.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp index 079fe7f1e6f..068be6a9617 100644 --- a/src/mame/drivers/zr107.cpp +++ b/src/mame/drivers/zr107.cpp @@ -263,7 +263,7 @@ private: uint32_t screen_update_jetwave(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(zr107_vblank); WRITE_LINE_MEMBER(k054539_irq_gen); - ADC083X_INPUT_CB(adc0838_callback); + double adc0838_callback(uint8_t input); K056832_CB_MEMBER(tile_callback); void jetwave_map(address_map &map); @@ -719,7 +719,7 @@ INPUT_PORTS_END /* ADC0838 Interface */ -ADC083X_INPUT_CB(zr107_state::adc0838_callback) +double zr107_state::adc0838_callback(uint8_t input) { switch (input) { @@ -729,16 +729,11 @@ ADC083X_INPUT_CB(zr107_state::adc0838_callback) return (double)(5 * m_analog2->read()) / 255.0; case ADC083X_CH2: return (double)(5 * m_analog3->read()) / 255.0; - case ADC083X_CH3: - return 0; - case ADC083X_COM: - return 0; - case ADC083X_AGND: - return 0; case ADC083X_VREF: return 5; + default: + return 0; } - return 0; } @@ -835,8 +830,8 @@ MACHINE_CONFIG_START(zr107_state::zr107) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_DEVICE_ADD("adc0838", ADC0838, 0) - MCFG_ADC083X_INPUT_CB(zr107_state, adc0838_callback) + adc0838_device &adc(ADC0838(config, "adc", 0)); + adc.set_input_callback(FUNC(zr107_state::adc0838_callback)); MCFG_DEVICE_ADD("konppc", KONPPC, 0) MCFG_KONPPC_CGBOARD_NUMBER(1) @@ -914,8 +909,8 @@ MACHINE_CONFIG_START(zr107_state::jetwave) MCFG_SOUND_ROUTE(0, "lspeaker", 0.75) MCFG_SOUND_ROUTE(1, "rspeaker", 0.75) - MCFG_DEVICE_ADD("adc0838", ADC0838, 0) - MCFG_ADC083X_INPUT_CB(zr107_state, adc0838_callback) + adc0838_device &adc(ADC0838(config, "adc", 0)); + adc.set_input_callback(FUNC(zr107_state::adc0838_callback)); MCFG_DEVICE_ADD("konppc", KONPPC, 0) MCFG_KONPPC_CGBOARD_NUMBER(1) |