diff options
Diffstat (limited to 'src/mame/drivers/pc9801.cpp')
-rw-r--r-- | src/mame/drivers/pc9801.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp index 3d776a7ce23..63a1b75d4ad 100644 --- a/src/mame/drivers/pc9801.cpp +++ b/src/mame/drivers/pc9801.cpp @@ -2228,9 +2228,7 @@ void pc9801_state::pc9801_mouse(machine_config &config) void pc9801_state::pc9801_cbus(machine_config &config) { - pc9801_slot_device &cbus0(PC9801CBUS_SLOT(config, "cbus0", pc9801_cbus_devices, "pc9801_26")); - cbus0.set_memspace(m_maincpu, AS_PROGRAM); - cbus0.set_iospace(m_maincpu, AS_IO); + pc9801_slot_device &cbus0(PC9801CBUS_SLOT(config, "cbus0", m_maincpu, pc9801_cbus_devices, "pc9801_26")); cbus0.int_cb<0>().set("ir3", FUNC(input_merger_device::in_w<0>)); cbus0.int_cb<1>().set("ir5", FUNC(input_merger_device::in_w<0>)); cbus0.int_cb<2>().set("ir6", FUNC(input_merger_device::in_w<0>)); @@ -2239,9 +2237,7 @@ void pc9801_state::pc9801_cbus(machine_config &config) cbus0.int_cb<5>().set("ir12", FUNC(input_merger_device::in_w<0>)); cbus0.int_cb<6>().set("ir13", FUNC(input_merger_device::in_w<0>)); - pc9801_slot_device &cbus1(PC9801CBUS_SLOT(config, "cbus1", pc9801_cbus_devices, nullptr)); - cbus1.set_memspace(m_maincpu, AS_PROGRAM); - cbus1.set_iospace(m_maincpu, AS_IO); + pc9801_slot_device &cbus1(PC9801CBUS_SLOT(config, "cbus1", m_maincpu, pc9801_cbus_devices, nullptr)); cbus1.int_cb<0>().set("ir3", FUNC(input_merger_device::in_w<1>)); cbus1.int_cb<1>().set("ir5", FUNC(input_merger_device::in_w<1>)); cbus1.int_cb<2>().set("ir6", FUNC(input_merger_device::in_w<1>)); @@ -2317,8 +2313,8 @@ void pc9801_state::pc9801_common(machine_config &config) m_dmac->out_eop_callback().set(FUNC(pc9801_state::tc_w)); m_dmac->in_memr_callback().set(FUNC(pc9801_state::dma_read_byte)); m_dmac->out_memw_callback().set(FUNC(pc9801_state::dma_write_byte)); - m_dmac->in_ior_callback<2>().set(m_fdc_2hd, FUNC(upd765a_device::dma_r)); - m_dmac->out_iow_callback<2>().set(m_fdc_2hd, FUNC(upd765a_device::dma_w)); + m_dmac->in_ior_callback<2>().set(m_fdc_2hd, FUNC(upd765a_device::mdma_r)); + m_dmac->out_iow_callback<2>().set(m_fdc_2hd, FUNC(upd765a_device::mdma_w)); m_dmac->out_dack_callback<0>().set(FUNC(pc9801_state::dack0_w)); m_dmac->out_dack_callback<1>().set(FUNC(pc9801_state::dack1_w)); m_dmac->out_dack_callback<2>().set(FUNC(pc9801_state::dack2_w)); @@ -2371,12 +2367,12 @@ void pc9801_state::pc9801_common(machine_config &config) UPD7220(config, m_hgdc1, 21.0526_MHz_XTAL / 8); m_hgdc1->set_addrmap(0, &pc9801_state::upd7220_1_map); - m_hgdc1->set_draw_text(FUNC(pc9801_state::hgdc_draw_text)); + m_hgdc1->set_draw_text_callback(FUNC(pc9801_state::hgdc_draw_text), this); m_hgdc1->vsync_wr_callback().set(m_hgdc2, FUNC(upd7220_device::ext_sync_w)); UPD7220(config, m_hgdc2, 21.0526_MHz_XTAL / 8); m_hgdc2->set_addrmap(0, &pc9801_state::upd7220_2_map); - m_hgdc2->set_display_pixels(FUNC(pc9801_state::hgdc_display_pixels)); + m_hgdc2->set_display_pixels_callback(FUNC(pc9801_state::hgdc_display_pixels), this); SPEAKER(config, "mono").front_center(); @@ -2408,8 +2404,8 @@ void pc9801_state::pc9801(machine_config &config) pc9801_sasi(config); UPD1990A(config, m_rtc); - m_dmac->in_ior_callback<3>().set(m_fdc_2dd, FUNC(upd765a_device::dma_r)); - m_dmac->out_iow_callback<3>().set(m_fdc_2dd, FUNC(upd765a_device::dma_w)); + m_dmac->in_ior_callback<3>().set(m_fdc_2dd, FUNC(upd765a_device::mdma_r)); + m_dmac->out_iow_callback<3>().set(m_fdc_2dd, FUNC(upd765a_device::mdma_w)); PALETTE(config, m_palette, FUNC(pc9801_state::pc9801_palette), 16); } @@ -2950,7 +2946,7 @@ void pc9801_state::init_pc9801vm_kanji() uint8_t *chargen = memregion("chargen")->base(); uint8_t *raw_kanji = memregion("raw_kanji")->base(); uint8_t *kanji = memregion("kanji")->base(); - + /* swap bits for 8x8 characters, discard 8x8 "graphics" characters */ /* TODO: should we keep and use the "graphics" characters? */ for( uint32_t i = 0; i < 0x100; i++ ) |