diff options
author | 2012-09-21 08:25:27 +0000 | |
---|---|---|
committer | 2012-09-21 08:25:27 +0000 | |
commit | 1f9d1cd62092e47bdda6868f6f865ef092656742 (patch) | |
tree | 7dfd5e67f785ac1e612c38804ee868e9ef2290d0 /src/mess/drivers | |
parent | 81f215089087327e3738b6e9eac2d5ee07b0e6c6 (diff) |
change from device->machine() to space.machine() in device handlers in order to make next changes easier (no whatsnew)
Diffstat (limited to 'src/mess/drivers')
45 files changed, 220 insertions, 220 deletions
diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c index 30cfb3e8a8f..b74dea81692 100644 --- a/src/mess/drivers/a2600.c +++ b/src/mess/drivers/a2600.c @@ -1177,8 +1177,8 @@ ADDRESS_MAP_END static WRITE8_DEVICE_HANDLER(switch_A_w) { - a2600_state *state = device->machine().driver_data<a2600_state>(); - running_machine &machine = device->machine(); + a2600_state *state = space.machine().driver_data<a2600_state>(); + running_machine &machine = space.machine(); /* Left controller port */ if ( machine.root_device().ioport("CONTROLLERS")->read() / CATEGORY_SELECT == 0x03 ) @@ -1201,7 +1201,7 @@ static WRITE8_DEVICE_HANDLER(switch_A_w) static READ8_DEVICE_HANDLER( switch_A_r ) { static const UINT8 driving_lookup[4] = { 0x00, 0x02, 0x03, 0x01 }; - running_machine &machine = device->machine(); + running_machine &machine = space.machine(); UINT8 val = 0; /* Left controller port PINs 1-4 ( 4321 ) */ @@ -1261,7 +1261,7 @@ static WRITE_LINE_DEVICE_HANDLER( irq_callback ) static READ8_DEVICE_HANDLER( riot_input_port_8_r ) { - return device->machine().root_device().ioport("SWB")->read(); + return space.machine().root_device().ioport("SWB")->read(); } static const riot6532_interface r6532_interface = diff --git a/src/mess/drivers/ami1200.c b/src/mess/drivers/ami1200.c index 4b489aecb9e..3435cd5ed41 100644 --- a/src/mess/drivers/ami1200.c +++ b/src/mess/drivers/ami1200.c @@ -85,10 +85,10 @@ WRITE32_MEMBER(ami1200_state::aga_overlay_w) static WRITE8_DEVICE_HANDLER( ami1200_cia_0_porta_w ) { - ami1200_state *state = device->machine().driver_data<ami1200_state>(); + ami1200_state *state = space.machine().driver_data<ami1200_state>(); /* bit 2 = Power Led on Amiga */ - set_led_status(device->machine(), 0, !BIT(data, 1)); + set_led_status(space.machine(), 0, !BIT(data, 1)); handle_cd32_joystick_cia(state, data, mos6526_r(device, space, 2)); } @@ -111,14 +111,14 @@ static WRITE8_DEVICE_HANDLER( ami1200_cia_0_porta_w ) static READ8_DEVICE_HANDLER( ami1200_cia_0_portb_r ) { /* parallel port */ - logerror("%s:CIA0_portb_r\n", device->machine().describe_context()); + logerror("%s:CIA0_portb_r\n", space.machine().describe_context()); return 0xff; } static WRITE8_DEVICE_HANDLER( ami1200_cia_0_portb_w ) { /* parallel port */ - logerror("%s:CIA0_portb_w(%02x)\n", device->machine().describe_context(), data); + logerror("%s:CIA0_portb_w(%02x)\n", space.machine().describe_context(), data); } static ADDRESS_MAP_START( a1200_map, AS_PROGRAM, 32, ami1200_state ) @@ -246,8 +246,8 @@ INPUT_PORTS_END static READ8_DEVICE_HANDLER( a1200_cia_0_portA_r ) { - UINT8 ret = device->machine().root_device().ioport("CIA0PORTA")->read() & 0xc0; /* Gameport 1 and 0 buttons */ - ret |= device->machine().device<amiga_fdc>("fdc")->ciaapra_r(); + UINT8 ret = space.machine().root_device().ioport("CIA0PORTA")->read() & 0xc0; /* Gameport 1 and 0 buttons */ + ret |= space.machine().device<amiga_fdc>("fdc")->ciaapra_r(); return ret; } diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index 147ca668f77..0bf9eb65303 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -76,7 +76,7 @@ static WRITE16_HANDLER( amiga_clock_w ) static READ8_DEVICE_HANDLER( amiga_cia_1_porta_r ) { - centronics_device *centronics = device->machine().device<centronics_device>("centronics"); + centronics_device *centronics = space.machine().device<centronics_device>("centronics"); UINT8 result = 0; /* centronics status is stored in PA0 to PA2 */ @@ -523,21 +523,21 @@ MACHINE_CONFIG_END static READ8_DEVICE_HANDLER( amiga_cia_0_portA_r ) { - UINT8 ret = device->machine().root_device().ioport("CIA0PORTA")->read() & 0xc0; /* Gameport 1 and 0 buttons */ - ret |= device->machine().device<amiga_fdc>("fdc")->ciaapra_r(); + UINT8 ret = space.machine().root_device().ioport("CIA0PORTA")->read() & 0xc0; /* Gameport 1 and 0 buttons */ + ret |= space.machine().device<amiga_fdc>("fdc")->ciaapra_r(); return ret; } static READ8_DEVICE_HANDLER( amiga_cia_0_cdtv_portA_r ) { - return device->machine().root_device().ioport("CIA0PORTA")->read() & 0xc0; /* Gameport 1 and 0 buttons */ + return space.machine().root_device().ioport("CIA0PORTA")->read() & 0xc0; /* Gameport 1 and 0 buttons */ } static WRITE8_DEVICE_HANDLER( amiga_cia_0_portA_w ) { - amiga_state *state = device->machine().driver_data<amiga_state>(); + amiga_state *state = space.machine().driver_data<amiga_state>(); /* switch banks as appropriate */ state->membank("bank1")->set_entry(data & 1); @@ -550,17 +550,17 @@ static WRITE8_DEVICE_HANDLER( amiga_cia_0_portA_w ) } /* overlay disabled, map RAM on 0x000000 */ - device->machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x000000, state->m_chip_ram.bytes() - 1, 0, mirror_mask, "bank1"); + space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x000000, state->m_chip_ram.bytes() - 1, 0, mirror_mask, "bank1"); /* if there is a cart region, check for cart overlay */ - if (device->machine().root_device().memregion("user2")->base() != NULL) - amiga_cart_check_overlay(device->machine()); + if (space.machine().root_device().memregion("user2")->base() != NULL) + amiga_cart_check_overlay(space.machine()); } else /* overlay enabled, map Amiga system ROM on 0x000000 */ - device->machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x000000, state->m_chip_ram.bytes() - 1); + space.machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x000000, state->m_chip_ram.bytes() - 1); - set_led_status( device->machine(), 0, ( data & 2 ) ? 0 : 1 ); /* bit 2 = Power Led on Amiga */ + set_led_status( space.machine(), 0, ( data & 2 ) ? 0 : 1 ); /* bit 2 = Power Led on Amiga */ output_set_value("power_led", ( data & 2 ) ? 0 : 1); } diff --git a/src/mess/drivers/apexc.c b/src/mess/drivers/apexc.c index 27e94542ed3..09f5003f975 100644 --- a/src/mess/drivers/apexc.c +++ b/src/mess/drivers/apexc.c @@ -283,7 +283,7 @@ static WRITE8_DEVICE_HANDLER(tape_write) if (image->exists()) image->fwrite(& data5, 1); - apexc_teletyper_putchar(device->machine(), data & 0x1f); /* display on screen */ + apexc_teletyper_putchar(space.machine(), data & 0x1f); /* display on screen */ } /* diff --git a/src/mess/drivers/apollo.c b/src/mess/drivers/apollo.c index 97f6b52526c..343002d9287 100644 --- a/src/mess/drivers/apollo.c +++ b/src/mess/drivers/apollo.c @@ -1158,7 +1158,7 @@ INPUT_PORTS_END static WRITE8_DEVICE_HANDLER( apollo_kbd_putchar ) { // put keyboard character to the keyboard sio // DLOG1(("apollo_kbd_putchar: 0x%02x", data)); - apollo_sio_rx_data(device->machine().device(APOLLO_SIO_TAG), 0, data); + apollo_sio_rx_data(space.machine().device(APOLLO_SIO_TAG), 0, data); } static READ8_DEVICE_HANDLER( apollo_kbd_has_beeper ) { @@ -1181,7 +1181,7 @@ static WRITE8_DEVICE_HANDLER( terminal_kbd_putchar ) { // FIXME: as of mess0145u1, terminal.c will append a null character after each input character if (data != 0) { - apollo_sio_rx_data(device->machine().device(APOLLO_SIO_TAG), 1, data); + apollo_sio_rx_data(space.machine().device(APOLLO_SIO_TAG), 1, data); } } diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c index 4cfb3d84112..7fc9fb8a9ef 100644 --- a/src/mess/drivers/apple2.c +++ b/src/mess/drivers/apple2.c @@ -223,24 +223,24 @@ Apple 3.5 and Apple 5.25 drives - up to three devices static WRITE8_DEVICE_HANDLER(a2bus_irq_w) { - apple2_state *a2 = device->machine().driver_data<apple2_state>(); + apple2_state *a2 = space.machine().driver_data<apple2_state>(); a2->m_maincpu->set_input_line(M6502_IRQ_LINE, data); } static WRITE8_DEVICE_HANDLER(a2bus_nmi_w) { - apple2_state *a2 = device->machine().driver_data<apple2_state>(); + apple2_state *a2 = space.machine().driver_data<apple2_state>(); a2->m_maincpu->set_input_line(INPUT_LINE_NMI, data); } static WRITE8_DEVICE_HANDLER(a2bus_inh_w) { - apple2_state *a2 = device->machine().driver_data<apple2_state>(); + apple2_state *a2 = space.machine().driver_data<apple2_state>(); a2->m_inh_slot = data; - apple2_update_memory(device->machine()); + apple2_update_memory(space.machine()); } /*************************************************************************** diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c index 9fd8360c0aa..d7fa59e186e 100644 --- a/src/mess/drivers/apple2gs.c +++ b/src/mess/drivers/apple2gs.c @@ -186,27 +186,27 @@ static WRITE8_DEVICE_HANDLER(a2bus_irq_w) { if (data) { - apple2gs_add_irq(device->machine(), IRQ_SLOT); + apple2gs_add_irq(space.machine(), IRQ_SLOT); } else { - apple2gs_remove_irq(device->machine(), IRQ_SLOT); + apple2gs_remove_irq(space.machine(), IRQ_SLOT); } } static WRITE8_DEVICE_HANDLER(a2bus_nmi_w) { - apple2gs_state *a2 = device->machine().driver_data<apple2gs_state>(); + apple2gs_state *a2 = space.machine().driver_data<apple2gs_state>(); a2->m_maincpu->set_input_line(INPUT_LINE_NMI, data); } static WRITE8_DEVICE_HANDLER(a2bus_inh_w) { - apple2_state *a2 = device->machine().driver_data<apple2_state>(); + apple2_state *a2 = space.machine().driver_data<apple2_state>(); a2->m_inh_slot = data; - apple2_update_memory(device->machine()); + apple2_update_memory(space.machine()); } static const struct a2bus_interface a2bus_intf = diff --git a/src/mess/drivers/atari400.c b/src/mess/drivers/atari400.c index 47d1d619d62..aea208dac36 100644 --- a/src/mess/drivers/atari400.c +++ b/src/mess/drivers/atari400.c @@ -909,13 +909,13 @@ static WRITE8_DEVICE_HANDLER(a1200xl_pia_pb_w) { a1200xl_mmu(device->machine(), static WRITE8_DEVICE_HANDLER(a800xl_pia_pb_w) { if (downcast<pia6821_device *>(device)->port_b_z_mask() != 0xff) - a800xl_mmu(device->machine(), data); + a800xl_mmu(space.machine(), data); } static WRITE8_DEVICE_HANDLER(xegs_pia_pb_w) { if (downcast<pia6821_device *>(device)->port_b_z_mask() != 0xff) - xegs_mmu(device->machine(), data); + xegs_mmu(space.machine(), data); } static const pokey_interface atari_pokey_interface = diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c index 8a40aa2b409..8ce509f35c7 100644 --- a/src/mess/drivers/bml3.c +++ b/src/mess/drivers/bml3.c @@ -330,7 +330,7 @@ WRITE8_MEMBER( bml3_state::bml3_psg_latch_w) static READ8_DEVICE_HANDLER( bml3_ym2203_r ) { - bml3_state *state = device->machine().driver_data<bml3_state>(); + bml3_state *state = space.machine().driver_data<bml3_state>(); UINT8 dev_offs = ((state->m_psg_latch & 3) != 3); return ym2203_r(device,space, dev_offs); @@ -338,7 +338,7 @@ static READ8_DEVICE_HANDLER( bml3_ym2203_r ) static WRITE8_DEVICE_HANDLER( bml3_ym2203_w ) { - bml3_state *state = device->machine().driver_data<bml3_state>(); + bml3_state *state = space.machine().driver_data<bml3_state>(); UINT8 dev_offs = ((state->m_psg_latch & 3) != 3); ym2203_w(device,space, dev_offs,data); diff --git a/src/mess/drivers/dectalk.c b/src/mess/drivers/dectalk.c index 84b4094f8fd..7454083f8c6 100644 --- a/src/mess/drivers/dectalk.c +++ b/src/mess/drivers/dectalk.c @@ -719,7 +719,7 @@ DRIVER_INIT_MEMBER(dectalk_state,dectalk) static WRITE8_DEVICE_HANDLER( dectalk_kbd_put ) { - duart68681_rx_data(device->machine().device("duart68681"), 1, data); + duart68681_rx_data(space.machine().device("duart68681"), 1, data); } static GENERIC_TERMINAL_INTERFACE( dectalk_terminal_intf ) diff --git a/src/mess/drivers/digel804.c b/src/mess/drivers/digel804.c index 792477b1795..47d5fe0b086 100644 --- a/src/mess/drivers/digel804.c +++ b/src/mess/drivers/digel804.c @@ -560,7 +560,7 @@ INPUT_PORTS_END ******************************************************************************/ static WRITE8_DEVICE_HANDLER( digel804_serial_put ) { - digel804_state *state = device->machine().driver_data<digel804_state>(); + digel804_state *state = space.machine().driver_data<digel804_state>(); state->m_acia->receive_character(data); } diff --git a/src/mess/drivers/dm7000.c b/src/mess/drivers/dm7000.c index 0c4a2f38de5..6093c7569d8 100644 --- a/src/mess/drivers/dm7000.c +++ b/src/mess/drivers/dm7000.c @@ -270,7 +270,7 @@ UINT32 dm7000_state::screen_update_dm7000(screen_device &screen, bitmap_ind16 &b static READ32_DEVICE_HANDLER( dcr_r ) { - dm7000_state *state = device->machine().driver_data<dm7000_state>(); + dm7000_state *state = space.machine().driver_data<dm7000_state>(); mame_printf_debug("DCR %03X read\n", offset); if(offset>=1024) {printf("get %04X\n", offset); return 0;} else switch(offset) { @@ -285,7 +285,7 @@ static READ32_DEVICE_HANDLER( dcr_r ) static WRITE32_DEVICE_HANDLER( dcr_w ) { mame_printf_debug("DCR %03X write = %08X\n", offset, data); - dm7000_state *state = device->machine().driver_data<dm7000_state>(); + dm7000_state *state = space.machine().driver_data<dm7000_state>(); if(offset>=1024) {printf("get %04X\n", offset); } else state->dcr[offset] = data; } diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c index 7dd4cc01937..b6c514b23e6 100644 --- a/src/mess/drivers/einstein.c +++ b/src/mess/drivers/einstein.c @@ -240,23 +240,23 @@ READ8_MEMBER(einstein_state::einstein_keyboard_data_read) static WRITE8_DEVICE_HANDLER( einstein_drsel_w ) { - einstein_state *einstein = device->machine().driver_data<einstein_state>(); + einstein_state *einstein = space.machine().driver_data<einstein_state>(); if(VERBOSE_DISK) - logerror("%s: einstein_drsel_w %02x\n", device->machine().describe_context(), data); + logerror("%s: einstein_drsel_w %02x\n", space.machine().describe_context(), data); /* bit 0 to 3 select the drive */ static const char *names[] = { "fd0", "fd1", "fd2", "fd3" }; floppy_image_device *floppy = 0; for(int i=0; i<4; i++) { if(BIT(data, i)) { - floppy_connector *con = device->machine().device<floppy_connector>(names[i]); + floppy_connector *con = space.machine().device<floppy_connector>(names[i]); if(con) floppy = con->get_device(); } } /* double sided drive connected? */ - if (device->machine().root_device().ioport("config")->read() & data) + if (space.machine().root_device().ioport("config")->read() & data) { /* bit 4 selects the side then */ //floppy->ss_w(BIT(data, 4)); diff --git a/src/mess/drivers/elwro800.c b/src/mess/drivers/elwro800.c index 61471a95116..428d9d2201e 100644 --- a/src/mess/drivers/elwro800.c +++ b/src/mess/drivers/elwro800.c @@ -176,13 +176,13 @@ static void elwro800jr_mmu_w(running_machine &machine, UINT8 data) static READ8_DEVICE_HANDLER(i8255_port_c_r) { - centronics_device *centronics = device->machine().device<centronics_device>("centronics"); + centronics_device *centronics = space.machine().device<centronics_device>("centronics"); return (centronics->ack_r() << 2); } static WRITE8_DEVICE_HANDLER(i8255_port_c_w) { - centronics_device *centronics = device->machine().device<centronics_device>("centronics"); + centronics_device *centronics = space.machine().device<centronics_device>("centronics"); centronics->strobe_w((data >> 7) & 0x01); } diff --git a/src/mess/drivers/enterp.c b/src/mess/drivers/enterp.c index b718fb2d18f..ad36f8b2ceb 100644 --- a/src/mess/drivers/enterp.c +++ b/src/mess/drivers/enterp.c @@ -100,7 +100,7 @@ static void enterprise_update_memory_page(address_space &space, offs_t page, int /* EP specific handling of dave register write */ static WRITE8_DEVICE_HANDLER( enterprise_dave_reg_write ) { - ep_state *ep = device->machine().driver_data<ep_state>(); + ep_state *ep = space.machine().driver_data<ep_state>(); switch (offset) { @@ -108,7 +108,7 @@ static WRITE8_DEVICE_HANDLER( enterprise_dave_reg_write ) case 0x11: case 0x12: case 0x13: - enterprise_update_memory_page(device->machine().device("maincpu")->memory().space(AS_PROGRAM), offset - 0x0f, data); + enterprise_update_memory_page(space.machine().device("maincpu")->memory().space(AS_PROGRAM), offset - 0x0f, data); break; case 0x15: @@ -126,19 +126,19 @@ static READ8_DEVICE_HANDLER( enterprise_dave_reg_read ) "LINE5", "LINE6", "LINE7", "LINE8", "LINE9" }; - ep_state *ep = device->machine().driver_data<ep_state>(); + ep_state *ep = space.machine().driver_data<ep_state>(); switch (offset) { case 0x015: /* read keyboard line */ - dave_set_reg(device, 0x015, device->machine().root_device().ioport(keynames[ep->keyboard_line])->read()); + dave_set_reg(device, 0x015, space.machine().root_device().ioport(keynames[ep->keyboard_line])->read()); break; case 0x016: { int ExternalJoystickInputs; - int ExternalJoystickPortInput = device->machine().root_device().ioport("JOY1")->read(); + int ExternalJoystickPortInput = space.machine().root_device().ioport("JOY1")->read(); if (ep->keyboard_line <= 4) { diff --git a/src/mess/drivers/fidelz80.c b/src/mess/drivers/fidelz80.c index 555f0e69366..8095c6d8ab3 100644 --- a/src/mess/drivers/fidelz80.c +++ b/src/mess/drivers/fidelz80.c @@ -943,7 +943,7 @@ READ8_MEMBER(fidelz80_state::rand_r) static WRITE8_DEVICE_HANDLER( digit_w ) { - fidelz80_state *state = device->machine().driver_data<fidelz80_state>(); + fidelz80_state *state = space.machine().driver_data<fidelz80_state>(); if (state->m_digit_line_status[offset]) return; diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c index c5dfe1e0aaa..974b75e1680 100644 --- a/src/mess/drivers/fm7.c +++ b/src/mess/drivers/fm7.c @@ -943,12 +943,12 @@ READ8_MEMBER(fm7_state::fm7_fmirq_r) static READ8_DEVICE_HANDLER( fm77av_joy_1_r ) { - return device->machine().root_device().ioport("joy1")->read(); + return space.machine().root_device().ioport("joy1")->read(); } static READ8_DEVICE_HANDLER( fm77av_joy_2_r ) { - return device->machine().root_device().ioport("joy2")->read(); + return space.machine().root_device().ioport("joy2")->read(); } READ8_MEMBER(fm7_state::fm7_unknown_r) diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c index 83ada1d37bd..069bece6227 100644 --- a/src/mess/drivers/fmtowns.c +++ b/src/mess/drivers/fmtowns.c @@ -2555,7 +2555,7 @@ static const struct pit8253_config towns_pit8253_config_2 = static READ8_DEVICE_HANDLER( get_slave_ack ) { - towns_state* state = device->machine().driver_data<towns_state>(); + towns_state* state = space.machine().driver_data<towns_state>(); if (offset==7) { // IRQ = 7 return pic8259_acknowledge(state->m_pic_slave); } diff --git a/src/mess/drivers/jr100.c b/src/mess/drivers/jr100.c index e140030143a..f3d62c16430 100644 --- a/src/mess/drivers/jr100.c +++ b/src/mess/drivers/jr100.c @@ -229,7 +229,7 @@ static const char *const keynames[] = { static READ8_DEVICE_HANDLER(jr100_via_read_b) { - jr100_state *state = device->machine().driver_data<jr100_state>(); + jr100_state *state = space.machine().driver_data<jr100_state>(); UINT8 val = 0x1f; if (keynames[state->m_keyboard_line]) { val = state->ioport(keynames[state->m_keyboard_line])->read(); @@ -239,13 +239,13 @@ static READ8_DEVICE_HANDLER(jr100_via_read_b) static WRITE8_DEVICE_HANDLER(jr100_via_write_a ) { - jr100_state *state = device->machine().driver_data<jr100_state>(); + jr100_state *state = space.machine().driver_data<jr100_state>(); state->m_keyboard_line = data & 0x0f; } static WRITE8_DEVICE_HANDLER(jr100_via_write_b ) { - jr100_state *state = device->machine().driver_data<jr100_state>(); + jr100_state *state = space.machine().driver_data<jr100_state>(); state->m_use_pcg = (data & 0x20) ? TRUE : FALSE; state->m_speaker = data>>7; } diff --git a/src/mess/drivers/juicebox.c b/src/mess/drivers/juicebox.c index 1cce3acbd56..76335cc5929 100644 --- a/src/mess/drivers/juicebox.c +++ b/src/mess/drivers/juicebox.c @@ -233,7 +233,7 @@ WRITE32_MEMBER(juicebox_state::juicebox_nand_w) static WRITE16_DEVICE_HANDLER( s3c44b0_i2s_data_w ) { - juicebox_state *juicebox = device->machine().driver_data<juicebox_state>(); + juicebox_state *juicebox = space.machine().driver_data<juicebox_state>(); juicebox->dac->write_signed16(data ^ 0x8000); } diff --git a/src/mess/drivers/mini2440.c b/src/mess/drivers/mini2440.c index 5d5dde797b0..f161b685140 100644 --- a/src/mess/drivers/mini2440.c +++ b/src/mess/drivers/mini2440.c @@ -113,25 +113,25 @@ static int s3c2440_core_pin_r( device_t *device, int pin) static WRITE8_DEVICE_HANDLER( s3c2440_nand_command_w ) { - mini2440_state *state = device->machine().driver_data<mini2440_state>(); + mini2440_state *state = space.machine().driver_data<mini2440_state>(); state->m_nand->command_w(data); } static WRITE8_DEVICE_HANDLER( s3c2440_nand_address_w ) { - mini2440_state *state = device->machine().driver_data<mini2440_state>(); + mini2440_state *state = space.machine().driver_data<mini2440_state>(); state->m_nand->address_w(data); } static READ8_DEVICE_HANDLER( s3c2440_nand_data_r ) { - mini2440_state *state = device->machine().driver_data<mini2440_state>(); + mini2440_state *state = space.machine().driver_data<mini2440_state>(); return state->m_nand->data_r(); } static WRITE8_DEVICE_HANDLER( s3c2440_nand_data_w ) { - mini2440_state *state = device->machine().driver_data<mini2440_state>(); + mini2440_state *state = space.machine().driver_data<mini2440_state>(); state->m_nand->data_w(data); } @@ -139,7 +139,7 @@ static WRITE8_DEVICE_HANDLER( s3c2440_nand_data_w ) static WRITE16_DEVICE_HANDLER( s3c2440_i2s_data_w ) { - mini2440_state *state = device->machine().driver_data<mini2440_state>(); + mini2440_state *state = space.machine().driver_data<mini2440_state>(); state->m_dac[offset]->write_signed16(data + 0x8000); } @@ -150,10 +150,10 @@ static READ32_DEVICE_HANDLER( s3c2440_adc_data_r ) UINT32 data = 0; switch (offset) { - case 2 + 0 : data = device->machine().root_device().ioport( "PENX")->read(); break; - case 2 + 1 : data = 915 - device->machine().root_device().ioport( "PENY")->read() + 90; break; + case 2 + 0 : data = space.machine().root_device().ioport( "PENX")->read(); break; + case 2 + 1 : data = 915 - space.machine().root_device().ioport( "PENY")->read() + 90; break; } - verboselog( device->machine(), 5, "s3c2440_adc_data_r %08X\n", data); + verboselog( space.machine(), 5, "s3c2440_adc_data_r %08X\n", data); return data; } diff --git a/src/mess/drivers/mirage.c b/src/mess/drivers/mirage.c index 144c6f528c8..7e2d739ff57 100644 --- a/src/mess/drivers/mirage.c +++ b/src/mess/drivers/mirage.c @@ -165,7 +165,7 @@ static WRITE8_DEVICE_HANDLER( mirage_via_write_porta ) static WRITE8_DEVICE_HANDLER( mirage_via_write_portb ) { int bank = 0; - mirage_state *state = device->machine().driver_data<mirage_state>(); + mirage_state *state = space.machine().driver_data<mirage_state>(); // handle sound RAM bank switching bank = (data & 2) ? (64*1024) : 0; diff --git a/src/mess/drivers/ms0515.c b/src/mess/drivers/ms0515.c index 69050349877..4ef5924f249 100644 --- a/src/mess/drivers/ms0515.c +++ b/src/mess/drivers/ms0515.c @@ -236,7 +236,7 @@ void ms0515_state::palette_init() static WRITE8_DEVICE_HANDLER(ms0515_portc_w) { - ms0515_state *state = device->machine().driver_data<ms0515_state>(); + ms0515_state *state = space.machine().driver_data<ms0515_state>(); state->m_sysreg = data; } I8255A_INTERFACE( ms0515_ppi8255_interface_1 ) diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c index a13e39ae837..73c2be71043 100644 --- a/src/mess/drivers/mycom.c +++ b/src/mess/drivers/mycom.c @@ -420,7 +420,7 @@ WRITE8_MEMBER( mycom_state::mycom_0a_w ) static WRITE8_DEVICE_HANDLER( mycom_rtc_w ) { - mycom_state *state = device->machine().driver_data<mycom_state>(); + mycom_state *state = space.machine().driver_data<mycom_state>(); state->m_rtc->address_w(data & 0x0f); diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c index 78be141a360..313856b3763 100644 --- a/src/mess/drivers/mz2000.c +++ b/src/mess/drivers/mz2000.c @@ -290,7 +290,7 @@ WRITE8_MEMBER(mz2000_state::mz2000_gvram_bank_w) static READ8_DEVICE_HANDLER( mz2000_wd17xx_r ) { - mz2000_state *state = device->machine().driver_data<mz2000_state>(); + mz2000_state *state = space.machine().driver_data<mz2000_state>(); if(state->m_has_fdc) return wd17xx_r(device, space, offset) ^ 0xff; @@ -300,7 +300,7 @@ static READ8_DEVICE_HANDLER( mz2000_wd17xx_r ) static WRITE8_DEVICE_HANDLER( mz2000_wd17xx_w ) { - mz2000_state *state = device->machine().driver_data<mz2000_state>(); + mz2000_state *state = space.machine().driver_data<mz2000_state>(); if(state->m_has_fdc) wd17xx_w(device, space, offset, data ^ 0xff); @@ -573,7 +573,7 @@ static READ8_DEVICE_HANDLER( mz2000_porta_r ) static READ8_DEVICE_HANDLER( mz2000_portb_r ) { - mz2000_state *state = device->machine().driver_data<mz2000_state>(); + mz2000_state *state = space.machine().driver_data<mz2000_state>(); /* x--- ---- break key -x-- ---- read tape data @@ -593,7 +593,7 @@ static READ8_DEVICE_HANDLER( mz2000_portb_r ) else res |= 0x20; - res |= (device->machine().primary_screen->vblank()) ? 0x00 : 0x01; + res |= (space.machine().primary_screen->vblank()) ? 0x00 : 0x01; return res; } @@ -617,7 +617,7 @@ static WRITE8_DEVICE_HANDLER( mz2000_porta_w ) ---- --x- tape ff ---- ---x tape rewind */ - mz2000_state *state = device->machine().driver_data<mz2000_state>(); + mz2000_state *state = space.machine().driver_data<mz2000_state>(); if((state->m_tape_ctrl & 0x80) == 0 && data & 0x80) { @@ -673,7 +673,7 @@ static WRITE8_DEVICE_HANDLER( mz2000_portb_w ) static WRITE8_DEVICE_HANDLER( mz2000_portc_w ) { - mz2000_state *state = device->machine().driver_data<mz2000_state>(); + mz2000_state *state = space.machine().driver_data<mz2000_state>(); /* x--- ---- tape data write -x-- ---- tape rec @@ -692,10 +692,10 @@ static WRITE8_DEVICE_HANDLER( mz2000_portc_w ) { state->m_ipl_enable = 0; /* correct? */ - device->machine().device("maincpu")->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE); + space.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE); } - beep_set_state(device->machine().device(BEEPER_TAG),data & 0x04); + beep_set_state(space.machine().device(BEEPER_TAG),data & 0x04); state->m_old_portc = data; } @@ -712,7 +712,7 @@ static I8255_INTERFACE( ppi8255_intf ) static WRITE8_DEVICE_HANDLER( mz2000_pio1_porta_w ) { - mz2000_state *state = device->machine().driver_data<mz2000_state>(); + mz2000_state *state = space.machine().driver_data<mz2000_state>(); state->m_tvram_enable = ((data & 0xc0) == 0xc0); state->m_gvram_enable = ((data & 0xc0) == 0x80); state->m_width80 = ((data & 0x20) >> 5); @@ -723,7 +723,7 @@ static WRITE8_DEVICE_HANDLER( mz2000_pio1_porta_w ) static READ8_DEVICE_HANDLER( mz2000_pio1_portb_r ) { - mz2000_state *state = device->machine().driver_data<mz2000_state>(); + mz2000_state *state = space.machine().driver_data<mz2000_state>(); static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5", "KEY6", "KEY7", "KEY8", "KEY9", "KEYA", "KEYB", @@ -735,17 +735,17 @@ static READ8_DEVICE_HANDLER( mz2000_pio1_portb_r ) res = 0xff; for(i=0;i<0xe;i++) - res &= device->machine().root_device().ioport(keynames[i])->read(); + res &= space.machine().root_device().ioport(keynames[i])->read(); return res; } - return device->machine().root_device().ioport(keynames[state->m_key_mux & 0xf])->read(); + return space.machine().root_device().ioport(keynames[state->m_key_mux & 0xf])->read(); } static READ8_DEVICE_HANDLER( mz2000_pio1_porta_r ) { - mz2000_state *state = device->machine().driver_data<mz2000_state>(); + mz2000_state *state = space.machine().driver_data<mz2000_state>(); return state->m_porta_latch; } diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c index 88da6555839..9f945293e2d 100644 --- a/src/mess/drivers/mz2500.c +++ b/src/mess/drivers/mz2500.c @@ -1253,13 +1253,13 @@ WRITE8_MEMBER(mz2500_state::palette4096_io_w) static READ8_DEVICE_HANDLER( mz2500_wd17xx_r ) { - mz2500_state *state = device->machine().driver_data<mz2500_state>(); + mz2500_state *state = space.machine().driver_data<mz2500_state>(); return wd17xx_r(device, space, offset) ^ state->m_fdc_reverse; } static WRITE8_DEVICE_HANDLER( mz2500_wd17xx_w ) { - mz2500_state *state = device->machine().driver_data<mz2500_state>(); + mz2500_state *state = space.machine().driver_data<mz2500_state>(); wd17xx_w(device, space, offset, data ^ state->m_fdc_reverse); } @@ -1841,7 +1841,7 @@ static READ8_DEVICE_HANDLER( mz2500_portb_r ) { UINT8 vblank_bit; - vblank_bit = device->machine().primary_screen->vblank() ? 0 : 1; //Guess: NOBO wants this bit to be high/low + vblank_bit = space.machine().primary_screen->vblank() ? 0 : 1; //Guess: NOBO wants this bit to be high/low return 0xfe | vblank_bit; } @@ -1865,7 +1865,7 @@ static WRITE8_DEVICE_HANDLER( mz2500_portb_w ) static WRITE8_DEVICE_HANDLER( mz2500_portc_w ) { - mz2500_state *state = device->machine().driver_data<mz2500_state>(); + mz2500_state *state = space.machine().driver_data<mz2500_state>(); /* ---- x--- 0->1 transition = IPL reset ---- -x-- beeper state @@ -1877,7 +1877,7 @@ static WRITE8_DEVICE_HANDLER( mz2500_portc_w ) { mz2500_reset(state, WRAM_RESET); /* correct? */ - device->machine().device("maincpu")->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE); + space.machine().device("maincpu")->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE); } /* bit 2 is speaker */ @@ -1888,7 +1888,7 @@ static WRITE8_DEVICE_HANDLER( mz2500_portc_w ) state->m_old_portc = data; - beep_set_state(device->machine().device(BEEPER_TAG),data & 0x04); + beep_set_state(space.machine().device(BEEPER_TAG),data & 0x04); if(data & ~0x0e) logerror("PPI PORTC W %02x\n",data & ~0x0e); @@ -1906,14 +1906,14 @@ static I8255_INTERFACE( ppi8255_intf ) static WRITE8_DEVICE_HANDLER( mz2500_pio1_porta_w ) { - mz2500_state *state = device->machine().driver_data<mz2500_state>(); + mz2500_state *state = space.machine().driver_data<mz2500_state>(); // printf("%02x\n",data); if(state->m_prev_col_val != ((data & 0x20) >> 5)) { state->m_text_col_size = ((data & 0x20) >> 5); state->m_prev_col_val = state->m_text_col_size; - mz2500_reconfigure_screen(device->machine()); + mz2500_reconfigure_screen(space.machine()); } state->m_key_mux = data & 0x1f; } @@ -1921,7 +1921,7 @@ static WRITE8_DEVICE_HANDLER( mz2500_pio1_porta_w ) static READ8_DEVICE_HANDLER( mz2500_pio1_porta_r ) { - mz2500_state *state = device->machine().driver_data<mz2500_state>(); + mz2500_state *state = space.machine().driver_data<mz2500_state>(); static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5", "KEY6", "KEY7", "KEY8", "KEY9", "KEYA", "KEYB", @@ -1933,22 +1933,22 @@ static READ8_DEVICE_HANDLER( mz2500_pio1_porta_r ) res = 0xff; for(i=0;i<0xe;i++) - res &= device->machine().root_device().ioport(keynames[i])->read(); + res &= space.machine().root_device().ioport(keynames[i])->read(); state->m_pio_latchb = res; return res; } - state->m_pio_latchb = device->machine().root_device().ioport(keynames[state->m_key_mux & 0xf])->read(); + state->m_pio_latchb = space.machine().root_device().ioport(keynames[state->m_key_mux & 0xf])->read(); - return device->machine().root_device().ioport(keynames[state->m_key_mux & 0xf])->read(); + return space.machine().root_device().ioport(keynames[state->m_key_mux & 0xf])->read(); } #if 0 static READ8_DEVICE_HANDLER( mz2500_pio1_portb_r ) { - mz2500_state *state = device->machine().driver_data<mz2500_state>(); + mz2500_state *state = space.machine().driver_data<mz2500_state>(); return state->m_pio_latchb; } #endif @@ -1967,13 +1967,13 @@ static Z80PIO_INTERFACE( mz2500_pio1_intf ) static READ8_DEVICE_HANDLER( opn_porta_r ) { - mz2500_state *state = device->machine().driver_data<mz2500_state>(); + mz2500_state *state = space.machine().driver_data<mz2500_state>(); return state->m_ym_porta; } static WRITE8_DEVICE_HANDLER( opn_porta_w ) { - mz2500_state *state = device->machine().driver_data<mz2500_state>(); + mz2500_state *state = space.machine().driver_data<mz2500_state>(); /* ---- x--- mouse select ---- -x-- palette bit (16/4096 colors) diff --git a/src/mess/drivers/nanos.c b/src/mess/drivers/nanos.c index 06c9493dada..af5b9cbf630 100644 --- a/src/mess/drivers/nanos.c +++ b/src/mess/drivers/nanos.c @@ -308,7 +308,7 @@ UINT32 nanos_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c static READ8_DEVICE_HANDLER (nanos_port_a_r) { - nanos_state *state = device->machine().driver_data<nanos_state>(); + nanos_state *state = space.machine().driver_data<nanos_state>(); UINT8 retVal; if (state->m_key_command==0) { return state->m_key_pressed; @@ -327,12 +327,12 @@ static READ8_DEVICE_HANDLER (nanos_port_b_r) static WRITE8_DEVICE_HANDLER (nanos_port_b_w) { - nanos_state *state = device->machine().driver_data<nanos_state>(); + nanos_state *state = space.machine().driver_data<nanos_state>(); state->m_key_command = BIT(data,1); if (BIT(data,7)) { state->membank("bank1")->set_base(state->memregion("maincpu")->base()); } else { - state->membank("bank1")->set_base(device->machine().device<ram_device>(RAM_TAG)->pointer()); + state->membank("bank1")->set_base(space.machine().device<ram_device>(RAM_TAG)->pointer()); } } diff --git a/src/mess/drivers/osbexec.c b/src/mess/drivers/osbexec.c index 7b05635aef2..beea7d061c0 100644 --- a/src/mess/drivers/osbexec.c +++ b/src/mess/drivers/osbexec.c @@ -349,7 +349,7 @@ UINT32 osbexec_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, static READ8_DEVICE_HANDLER( osbexec_pia0_a_r ) { - osbexec_state *state = device->machine().driver_data<osbexec_state>(); + osbexec_state *state = space.machine().driver_data<osbexec_state>(); return state->m_pia0_porta; } @@ -357,19 +357,19 @@ static READ8_DEVICE_HANDLER( osbexec_pia0_a_r ) static WRITE8_DEVICE_HANDLER( osbexec_pia0_a_w ) { - osbexec_state *state = device->machine().driver_data<osbexec_state>(); + osbexec_state *state = space.machine().driver_data<osbexec_state>(); logerror("osbexec_pia0_a_w: %02x\n", data ); state->m_pia0_porta = data; - state->set_banks(device->machine()); + state->set_banks(space.machine()); } static READ8_DEVICE_HANDLER( osbexec_pia0_b_r ) { - osbexec_state *state = device->machine().driver_data<osbexec_state>(); + osbexec_state *state = space.machine().driver_data<osbexec_state>(); return state->m_pia0_portb; } @@ -377,7 +377,7 @@ static READ8_DEVICE_HANDLER( osbexec_pia0_b_r ) static WRITE8_DEVICE_HANDLER( osbexec_pia0_b_w ) { - osbexec_state *state = device->machine().driver_data<osbexec_state>(); + osbexec_state *state = space.machine().driver_data<osbexec_state>(); state->m_pia0_portb = data; diff --git a/src/mess/drivers/p8k.c b/src/mess/drivers/p8k.c index e60c46226f6..51c7381624d 100644 --- a/src/mess/drivers/p8k.c +++ b/src/mess/drivers/p8k.c @@ -513,12 +513,12 @@ static WRITE16_DEVICE_HANDLER( p8k_16_pio_w ) static READ16_DEVICE_HANDLER( p8k_16_ctc_r ) { - return (UINT16)downcast<z80ctc_device *>(device)->read(device->machine().driver_data()->generic_space(),(offset & 0x06) >> 1); + return (UINT16)downcast<z80ctc_device *>(device)->read(space.machine().driver_data()->generic_space(),(offset & 0x06) >> 1); } static WRITE16_DEVICE_HANDLER( p8k_16_ctc_w ) { - downcast<z80ctc_device *>(device)->write(device->machine().driver_data()->generic_space(), (offset & 0x06) >> 1, (UINT8)(data & 0xff)); + downcast<z80ctc_device *>(device)->write(space.machine().driver_data()->generic_space(), (offset & 0x06) >> 1, (UINT8)(data & 0xff)); } READ16_MEMBER( p8k_state::portff82_r ) diff --git a/src/mess/drivers/palm.c b/src/mess/drivers/palm.c index 2a3b975342d..10e144e841f 100644 --- a/src/mess/drivers/palm.c +++ b/src/mess/drivers/palm.c @@ -73,7 +73,7 @@ INPUT_CHANGED_MEMBER(palm_state::button_check) static WRITE8_DEVICE_HANDLER( palm_port_f_out ) { - palm_state *state = device->machine().driver_data<palm_state>(); + palm_state *state = space.machine().driver_data<palm_state>(); state->m_port_f_latch = data; } @@ -84,19 +84,19 @@ static READ8_DEVICE_HANDLER( palm_port_c_in ) static READ8_DEVICE_HANDLER( palm_port_f_in ) { - palm_state *state = device->machine().driver_data<palm_state>(); + palm_state *state = space.machine().driver_data<palm_state>(); return state->m_port_f_latch; } static WRITE16_DEVICE_HANDLER( palm_spim_out ) { - palm_state *state = device->machine().driver_data<palm_state>(); + palm_state *state = space.machine().driver_data<palm_state>(); state->m_spim_data = data; } static READ16_DEVICE_HANDLER( palm_spim_in ) { - palm_state *state = device->machine().driver_data<palm_state>(); + palm_state *state = space.machine().driver_data<palm_state>(); return state->m_spim_data; } @@ -159,7 +159,7 @@ ADDRESS_MAP_END static WRITE8_DEVICE_HANDLER( palm_dac_transition ) { - palm_state *state = device->machine().driver_data<palm_state>(); + palm_state *state = space.machine().driver_data<palm_state>(); state->m_dac->write_unsigned8(0x7f * data ); } diff --git a/src/mess/drivers/palmz22.c b/src/mess/drivers/palmz22.c index e11e934ab5f..6376d9001af 100644 --- a/src/mess/drivers/palmz22.c +++ b/src/mess/drivers/palmz22.c @@ -112,30 +112,30 @@ public: static WRITE8_DEVICE_HANDLER( s3c2410_nand_command_w ) { - palmz22_state *state = device->machine().driver_data<palmz22_state>(); - verboselog( device->machine(), 9, "s3c2410_nand_command_w %02X\n", data); + palmz22_state *state = space.machine().driver_data<palmz22_state>(); + verboselog( space.machine(), 9, "s3c2410_nand_command_w %02X\n", data); state->m_nand->command_w(data); } static WRITE8_DEVICE_HANDLER( s3c2410_nand_address_w ) { - palmz22_state *state = device->machine().driver_data<palmz22_state>(); - verboselog( device->machine(), 9, "s3c2410_nand_address_w %02X\n", data); + palmz22_state *state = space.machine().driver_data<palmz22_state>(); + verboselog( space.machine(), 9, "s3c2410_nand_address_w %02X\n", data); state->m_nand->address_w(data); } static READ8_DEVICE_HANDLER( s3c2410_nand_data_r ) { - palmz22_state *state = device->machine().driver_data<palmz22_state>(); + palmz22_state *state = space.machine().driver_data<palmz22_state>(); UINT8 data = state->m_nand->data_r(); - verboselog( device->machine(), 9, "s3c2410_nand_data_r %02X\n", data); + verboselog( space.machine(), 9, "s3c2410_nand_data_r %02X\n", data); return data; } static WRITE8_DEVICE_HANDLER( s3c2410_nand_data_w ) { - palmz22_state *state = device->machine().driver_data<palmz22_state>(); - verboselog( device->machine(), 9, "s3c2410_nand_data_w %02X\n", data); + palmz22_state *state = space.machine().driver_data<palmz22_state>(); + verboselog( space.machine(), 9, "s3c2410_nand_data_w %02X\n", data); state->m_nand->data_w(data); } @@ -217,10 +217,10 @@ static READ32_DEVICE_HANDLER( s3c2410_adc_data_r ) { case 0 + 0 : data = 0x2EE + (PALM_Z22_BATTERY_LEVEL * 0xFF / 100); break; case 0 + 1 : data = 0; break; - case 2 + 0 : data = device->machine().root_device().ioport( "PENX")->read(); break; - case 2 + 1 : data = 0x3FF - device->machine().root_device().ioport( "PENY")->read(); break; + case 2 + 0 : data = space.machine().root_device().ioport( "PENX")->read(); break; + case 2 + 1 : data = 0x3FF - space.machine().root_device().ioport( "PENY")->read(); break; } - verboselog( device->machine(), 5, "s3c2410_adc_data_r %08X\n", data); + verboselog( space.machine(), 5, "s3c2410_adc_data_r %08X\n", data); return data; } diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c index c84bd1cdef8..cd45bcdabce 100644 --- a/src/mess/drivers/pc8801.c +++ b/src/mess/drivers/pc8801.c @@ -1820,16 +1820,16 @@ ADDRESS_MAP_END static READ8_DEVICE_HANDLER( cpu_8255_c_r ) { - pc8801_state *state = device->machine().driver_data<pc8801_state>(); -// device->machine().scheduler().synchronize(); // force resync + pc8801_state *state = space.machine().driver_data<pc8801_state>(); +// space.machine().scheduler().synchronize(); // force resync return state->m_i8255_1_pc >> 4; } static WRITE8_DEVICE_HANDLER( cpu_8255_c_w ) { - pc8801_state *state = device->machine().driver_data<pc8801_state>(); -// device->machine().scheduler().synchronize(); // force resync + pc8801_state *state = space.machine().driver_data<pc8801_state>(); +// space.machine().scheduler().synchronize(); // force resync state->m_i8255_0_pc = data; } @@ -1847,16 +1847,16 @@ static I8255A_INTERFACE( master_fdd_intf ) static READ8_DEVICE_HANDLER( fdc_8255_c_r ) { - pc8801_state *state = device->machine().driver_data<pc8801_state>(); -// device->machine().scheduler().synchronize(); // force resync + pc8801_state *state = space.machine().driver_data<pc8801_state>(); +// space.machine().scheduler().synchronize(); // force resync return state->m_i8255_0_pc >> 4; } static WRITE8_DEVICE_HANDLER( fdc_8255_c_w ) { - pc8801_state *state = device->machine().driver_data<pc8801_state>(); -// device->machine().scheduler().synchronize(); // force resync + pc8801_state *state = space.machine().driver_data<pc8801_state>(); +// space.machine().scheduler().synchronize(); // force resync state->m_i8255_1_pc = data; } @@ -2569,9 +2569,9 @@ static const struct upd765_interface pc8801_upd765_interface = static READ8_DEVICE_HANDLER( opn_porta_r ) { - pc8801_state *state = device->machine().driver_data<pc8801_state>(); + pc8801_state *state = space.machine().driver_data<pc8801_state>(); - if(device->machine().root_device().ioport("BOARD_CONFIG")->read() & 2) + if(space.machine().root_device().ioport("BOARD_CONFIG")->read() & 2) { UINT8 shift,res; @@ -2583,7 +2583,7 @@ static READ8_DEVICE_HANDLER( opn_porta_r ) return ((res >> shift) & 0x0f) | 0xf0; } - return device->machine().root_device().ioport("OPN_PA")->read(); + return space.machine().root_device().ioport("OPN_PA")->read(); } static READ8_DEVICE_HANDLER( opn_portb_r ) { return device->machine().root_device().ioport("OPN_PB")->read(); } diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c index 84b44d883d4..2fc235369f2 100644 --- a/src/mess/drivers/pc88va.c +++ b/src/mess/drivers/pc88va.c @@ -1398,14 +1398,14 @@ GFXDECODE_END static READ8_DEVICE_HANDLER( cpu_8255_c_r ) { - pc88va_state *state = device->machine().driver_data<pc88va_state>(); + pc88va_state *state = space.machine().driver_data<pc88va_state>(); return state->m_i8255_1_pc >> 4; } static WRITE8_DEVICE_HANDLER( cpu_8255_c_w ) { - pc88va_state *state = device->machine().driver_data<pc88va_state>(); + pc88va_state *state = space.machine().driver_data<pc88va_state>(); state->m_i8255_0_pc = data; } @@ -1422,14 +1422,14 @@ static I8255A_INTERFACE( master_fdd_intf ) static READ8_DEVICE_HANDLER( fdc_8255_c_r ) { - pc88va_state *state = device->machine().driver_data<pc88va_state>(); + pc88va_state *state = space.machine().driver_data<pc88va_state>(); return state->m_i8255_0_pc >> 4; } static WRITE8_DEVICE_HANDLER( fdc_8255_c_w ) { - pc88va_state *state = device->machine().driver_data<pc88va_state>(); + pc88va_state *state = space.machine().driver_data<pc88va_state>(); state->m_i8255_1_pc = data; } @@ -1448,11 +1448,11 @@ static READ8_DEVICE_HANDLER( r232_ctrl_porta_r ) { UINT8 sw5, sw4, sw3, sw2,speed_sw; - speed_sw = (device->machine().root_device().ioport("SPEED_SW")->read() & 1) ? 0x20 : 0x00; - sw5 = (device->machine().root_device().ioport("DSW")->read() & 0x10); - sw4 = (device->machine().root_device().ioport("DSW")->read() & 0x08); - sw3 = (device->machine().root_device().ioport("DSW")->read() & 0x04); - sw2 = (device->machine().root_device().ioport("DSW")->read() & 0x02); + speed_sw = (space.machine().root_device().ioport("SPEED_SW")->read() & 1) ? 0x20 : 0x00; + sw5 = (space.machine().root_device().ioport("DSW")->read() & 0x10); + sw4 = (space.machine().root_device().ioport("DSW")->read() & 0x08); + sw3 = (space.machine().root_device().ioport("DSW")->read() & 0x04); + sw2 = (space.machine().root_device().ioport("DSW")->read() & 0x02); return 0xc1 | sw5 | sw4 | sw3 | sw2 | speed_sw; } @@ -1461,7 +1461,7 @@ static READ8_DEVICE_HANDLER( r232_ctrl_portb_r ) { UINT8 xsw1; - xsw1 = (device->machine().root_device().ioport("DSW")->read() & 1) ? 0 : 8; + xsw1 = (space.machine().root_device().ioport("DSW")->read() & 1) ? 0 : 8; return 0xf7 | xsw1; } @@ -1510,7 +1510,7 @@ static WRITE_LINE_DEVICE_HANDLER( pc88va_pic_irq ) static READ8_DEVICE_HANDLER( get_slave_ack ) { if (offset==7) { // IRQ = 7 - return pic8259_acknowledge(device->machine().device( "pic8259_slave")); + return pic8259_acknowledge(space.machine().device( "pic8259_slave")); } return 0x00; } diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c index 3d2ff84e4a7..7f70ce08eab 100644 --- a/src/mess/drivers/pc9801.c +++ b/src/mess/drivers/pc9801.c @@ -2207,7 +2207,7 @@ static WRITE_LINE_DEVICE_HANDLER( pc9801_master_set_int_line ) static READ8_DEVICE_HANDLER( get_slave_ack ) { if (offset==7) { // IRQ = 7 - return pic8259_acknowledge( device->machine().device( "pic8259_slave" )); + return pic8259_acknowledge( space.machine().device( "pic8259_slave" )); } return 0x00; } @@ -2348,7 +2348,7 @@ static READ8_DEVICE_HANDLER( ppi_prn_portb_r ) { return device->machine().root_d static WRITE8_DEVICE_HANDLER( ppi_sys_portc_w ) { - beep_set_state(device->machine().device(BEEPER_TAG),!(data & 0x08)); + beep_set_state(space.machine().device(BEEPER_TAG),!(data & 0x08)); } static I8255A_INTERFACE( ppi_system_intf ) @@ -2378,17 +2378,17 @@ static READ8_DEVICE_HANDLER( ppi_fdd_porta_r ) static READ8_DEVICE_HANDLER( ppi_fdd_portb_r ) { - return 0xff; //upd765_status_r(device->machine().device("upd765_2dd"),space, 0); + return 0xff; //upd765_status_r(space.machine().device("upd765_2dd"),space, 0); } static READ8_DEVICE_HANDLER( ppi_fdd_portc_r ) { - return 0xff; //upd765_data_r(device->machine().device("upd765_2dd"),space, 0); + return 0xff; //upd765_data_r(space.machine().device("upd765_2dd"),space, 0); } static WRITE8_DEVICE_HANDLER( ppi_fdd_portc_w ) { - //upd765_data_w(device->machine().device("upd765_2dd"),space, 0,data); + //upd765_data_w(space.machine().device("upd765_2dd"),space, 0,data); } static I8255A_INTERFACE( ppi_fdd_intf ) diff --git a/src/mess/drivers/pes.c b/src/mess/drivers/pes.c index beaf7c8dda9..dd6626eb48b 100644 --- a/src/mess/drivers/pes.c +++ b/src/mess/drivers/pes.c @@ -67,7 +67,7 @@ Address map: /* Devices */ static WRITE8_DEVICE_HANDLER( pes_kbd_input ) { - pes_state *state = device->machine().driver_data<pes_state>(); + pes_state *state = space.machine().driver_data<pes_state>(); #ifdef DEBUG_FIFO fprintf(stderr,"keyboard input: %c, ", data); #endif @@ -87,8 +87,8 @@ static WRITE8_DEVICE_HANDLER( pes_kbd_input ) fprintf(stderr,"kb input fifo fullness: %d\n",(state->m_infifo_head_ptr-state->m_infifo_tail_ptr)&0x1F); #endif // todo: following two should be set so clear happens after one cpu cycle - device->machine().device("maincpu")->execute().set_input_line(MCS51_RX_LINE, ASSERT_LINE); - device->machine().device("maincpu")->execute().set_input_line(MCS51_RX_LINE, CLEAR_LINE); + space.machine().device("maincpu")->execute().set_input_line(MCS51_RX_LINE, ASSERT_LINE); + space.machine().device("maincpu")->execute().set_input_line(MCS51_RX_LINE, CLEAR_LINE); } static GENERIC_TERMINAL_INTERFACE( pes_terminal_intf ) diff --git a/src/mess/drivers/pk8000.c b/src/mess/drivers/pk8000.c index 4ccb94e2e43..d0ff985aacc 100644 --- a/src/mess/drivers/pk8000.c +++ b/src/mess/drivers/pk8000.c @@ -102,30 +102,30 @@ static void pk8000_set_bank(running_machine &machine,UINT8 data) } static WRITE8_DEVICE_HANDLER(pk8000_80_porta_w) { - pk8000_set_bank(device->machine(),data); + pk8000_set_bank(space.machine(),data); } static READ8_DEVICE_HANDLER(pk8000_80_portb_r) { - pk8000_state *state = device->machine().driver_data<pk8000_state>(); + pk8000_state *state = space.machine().driver_data<pk8000_state>(); static const char *const keynames[] = { "LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6", "LINE7", "LINE8", "LINE9" }; if(state->m_keyboard_line>9) { return 0xff; } - return device->machine().root_device().ioport(keynames[state->m_keyboard_line])->read(); + return space.machine().root_device().ioport(keynames[state->m_keyboard_line])->read(); } static WRITE8_DEVICE_HANDLER(pk8000_80_portc_w) { - pk8000_state *state = device->machine().driver_data<pk8000_state>(); + pk8000_state *state = space.machine().driver_data<pk8000_state>(); state->m_keyboard_line = data & 0x0f; - speaker_level_w(device->machine().device(SPEAKER_TAG), BIT(data,7)); + speaker_level_w(space.machine().device(SPEAKER_TAG), BIT(data,7)); - cassette_device_image(device->machine())->change_state( + cassette_device_image(space.machine())->change_state( (BIT(data,4)) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR); - cassette_device_image(device->machine())->output((BIT(data,6)) ? +1.0 : 0.0); + cassette_device_image(space.machine())->output((BIT(data,6)) ? +1.0 : 0.0); } static I8255_INTERFACE( pk8000_ppi8255_interface_1 ) diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c index c5a0e9869b8..cc174efa0ab 100644 --- a/src/mess/drivers/portfoli.c +++ b/src/mess/drivers/portfoli.c @@ -658,7 +658,7 @@ void portfolio_state::palette_init() static READ8_DEVICE_HANDLER( hd61830_rd_r ) { UINT16 address = ((offset & 0xff) << 3) | ((offset >> 12) & 0x07); - UINT8 data = device->machine().root_device().memregion(HD61830_TAG)->base()[address]; + UINT8 data = space.machine().root_device().memregion(HD61830_TAG)->base()[address]; return data; } diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c index 282c6fe589d..ee0f700d36c 100644 --- a/src/mess/drivers/samcoupe.c +++ b/src/mess/drivers/samcoupe.c @@ -267,25 +267,25 @@ READ8_MEMBER(samcoupe_state::samcoupe_attributes_r) static READ8_DEVICE_HANDLER( samcoupe_lpt1_busy_r ) { - centronics_device *centronics = device->machine().device<centronics_device>("lpt1"); + centronics_device *centronics = space.machine().device<centronics_device>("lpt1"); return centronics->busy_r(); } static WRITE8_DEVICE_HANDLER( samcoupe_lpt1_strobe_w ) { - centronics_device *centronics = device->machine().device<centronics_device>("lpt1"); + centronics_device *centronics = space.machine().device<centronics_device>("lpt1"); centronics->strobe_w(data); } static READ8_DEVICE_HANDLER( samcoupe_lpt2_busy_r ) { - centronics_device *centronics = device->machine().device<centronics_device>("lpt2"); + centronics_device *centronics = space.machine().device<centronics_device>("lpt2"); return centronics->busy_r(); } static WRITE8_DEVICE_HANDLER( samcoupe_lpt2_strobe_w ) { - centronics_device *centronics = device->machine().device<centronics_device>("lpt2"); + centronics_device *centronics = space.machine().device<centronics_device>("lpt2"); centronics->strobe_w(data); } diff --git a/src/mess/drivers/sgi_ip2.c b/src/mess/drivers/sgi_ip2.c index 22ffda25fec..4d41927bc90 100644 --- a/src/mess/drivers/sgi_ip2.c +++ b/src/mess/drivers/sgi_ip2.c @@ -359,7 +359,7 @@ WRITE16_MEMBER(sgi_ip2_state::sgi_ip2_stklmt_w) static WRITE8_DEVICE_HANDLER( sgi_kbd_put ) { - duart68681_rx_data(device->machine().device("duart68681a"), 1, data); + duart68681_rx_data(space.machine().device("duart68681a"), 1, data); } static GENERIC_TERMINAL_INTERFACE( sgi_terminal_intf ) diff --git a/src/mess/drivers/spc1000.c b/src/mess/drivers/spc1000.c index b2834eead53..a90725db65d 100644 --- a/src/mess/drivers/spc1000.c +++ b/src/mess/drivers/spc1000.c @@ -100,7 +100,7 @@ READ8_MEMBER(spc1000_state::spc1000_keyboard_r){ static WRITE8_DEVICE_HANDLER(spc1000_gmode_w) { - spc1000_state *state = device->machine().driver_data<spc1000_state>(); + spc1000_state *state = space.machine().driver_data<spc1000_state>(); state->m_GMODE = data; // state->m_GMODE layout: CSS|NA|PS2|PS1|~A/G|GM0|GM1|NA @@ -113,7 +113,7 @@ static WRITE8_DEVICE_HANDLER(spc1000_gmode_w) static READ8_DEVICE_HANDLER(spc1000_gmode_r) { - spc1000_state *state = device->machine().driver_data<spc1000_state>(); + spc1000_state *state = space.machine().driver_data<spc1000_state>(); return state->m_GMODE; } @@ -244,7 +244,7 @@ void spc1000_state::machine_reset() static READ8_DEVICE_HANDLER( spc1000_mc6847_videoram_r ) { - spc1000_state *state = device->machine().driver_data<spc1000_state>(); + spc1000_state *state = space.machine().driver_data<spc1000_state>(); if (offset == ~0) return 0xff; // state->m_GMODE layout: CSS|NA|PS2|PS1|~A/G|GM0|GM1|NA diff --git a/src/mess/drivers/ssystem3.c b/src/mess/drivers/ssystem3.c index 367ede0f39e..b51589b8c75 100644 --- a/src/mess/drivers/ssystem3.c +++ b/src/mess/drivers/ssystem3.c @@ -119,49 +119,49 @@ static void ssystem3_playfield_read(running_machine &machine, int *on, int *read static WRITE8_DEVICE_HANDLER(ssystem3_via_write_a) { - ssystem3_state *state = device->machine().driver_data<ssystem3_state>(); + ssystem3_state *state = space.machine().driver_data<ssystem3_state>(); state->m_porta=data; // logerror("%.4x via port a write %02x\n",(int)activecpu_get_pc(), data); } static READ8_DEVICE_HANDLER(ssystem3_via_read_a) { - ssystem3_state *state = device->machine().driver_data<ssystem3_state>(); + ssystem3_state *state = space.machine().driver_data<ssystem3_state>(); UINT8 data=0xff; #if 1 // time switch - if (!(state->m_porta&0x10)) data&=device->machine().root_device().ioport("matrix1")->read()|0xf1; - if (!(state->m_porta&0x20)) data&=device->machine().root_device().ioport("matrix2")->read()|0xf1; - if (!(state->m_porta&0x40)) data&=device->machine().root_device().ioport("matrix3")->read()|0xf1; - if (!(state->m_porta&0x80)) data&=device->machine().root_device().ioport("matrix4")->read()|0xf1; + if (!(state->m_porta&0x10)) data&=space.machine().root_device().ioport("matrix1")->read()|0xf1; + if (!(state->m_porta&0x20)) data&=space.machine().root_device().ioport("matrix2")->read()|0xf1; + if (!(state->m_porta&0x40)) data&=space.machine().root_device().ioport("matrix3")->read()|0xf1; + if (!(state->m_porta&0x80)) data&=space.machine().root_device().ioport("matrix4")->read()|0xf1; #else - if (!(state->m_porta&0x10)) data&=device->machine().root_device().ioport("matrix1")->read()|0xf0; - if (!(state->m_porta&0x20)) data&=device->machine().root_device().ioport("matrix2")->read()|0xf0; - if (!(state->m_porta&0x40)) data&=device->machine().root_device().ioport("matrix3")->read()|0xf0; - if (!(state->m_porta&0x80)) data&=device->machine().root_device().ioport("matrix4")->read()|0xf0; + if (!(state->m_porta&0x10)) data&=space.machine().root_device().ioport("matrix1")->read()|0xf0; + if (!(state->m_porta&0x20)) data&=space.machine().root_device().ioport("matrix2")->read()|0xf0; + if (!(state->m_porta&0x40)) data&=space.machine().root_device().ioport("matrix3")->read()|0xf0; + if (!(state->m_porta&0x80)) data&=space.machine().root_device().ioport("matrix4")->read()|0xf0; #endif if (!(state->m_porta&1)) { - if (!(device->machine().root_device().ioport("matrix1")->read()&1)) data&=~0x10; - if (!(device->machine().root_device().ioport("matrix2")->read()&1)) data&=~0x20; - if (!(device->machine().root_device().ioport("matrix3")->read()&1)) data&=~0x40; + if (!(space.machine().root_device().ioport("matrix1")->read()&1)) data&=~0x10; + if (!(space.machine().root_device().ioport("matrix2")->read()&1)) data&=~0x20; + if (!(space.machine().root_device().ioport("matrix3")->read()&1)) data&=~0x40; if (!(state->ioport("matrix4")->read()&1)) data&=~0x80; } if (!(state->m_porta&2)) { - if (!(device->machine().root_device().ioport("matrix1")->read()&2)) data&=~0x10; - if (!(device->machine().root_device().ioport("matrix2")->read()&2)) data&=~0x20; - if (!(device->machine().root_device().ioport("matrix3")->read()&2)) data&=~0x40; - if (!(device->machine().root_device().ioport("matrix4")->read()&2)) data&=~0x80; + if (!(space.machine().root_device().ioport("matrix1")->read()&2)) data&=~0x10; + if (!(space.machine().root_device().ioport("matrix2")->read()&2)) data&=~0x20; + if (!(space.machine().root_device().ioport("matrix3")->read()&2)) data&=~0x40; + if (!(space.machine().root_device().ioport("matrix4")->read()&2)) data&=~0x80; } if (!(state->m_porta&4)) { - if (!(device->machine().root_device().ioport("matrix1")->read()&4)) data&=~0x10; - if (!(device->machine().root_device().ioport("matrix2")->read()&4)) data&=~0x20; - if (!(device->machine().root_device().ioport("matrix3")->read()&4)) data&=~0x40; - if (!(device->machine().root_device().ioport("matrix4")->read()&4)) data&=~0x80; + if (!(space.machine().root_device().ioport("matrix1")->read()&4)) data&=~0x10; + if (!(space.machine().root_device().ioport("matrix2")->read()&4)) data&=~0x20; + if (!(space.machine().root_device().ioport("matrix3")->read()&4)) data&=~0x40; + if (!(space.machine().root_device().ioport("matrix4")->read()&4)) data&=~0x80; } if (!(state->m_porta&8)) { - if (!(device->machine().root_device().ioport("matrix1")->read()&8)) data&=~0x10; - if (!(device->machine().root_device().ioport("matrix2")->read()&8)) data&=~0x20; - if (!(device->machine().root_device().ioport("matrix3")->read()&8)) data&=~0x40; - if (!(device->machine().root_device().ioport("matrix4")->read()&8)) data&=~0x80; + if (!(space.machine().root_device().ioport("matrix1")->read()&8)) data&=~0x10; + if (!(space.machine().root_device().ioport("matrix2")->read()&8)) data&=~0x20; + if (!(space.machine().root_device().ioport("matrix3")->read()&8)) data&=~0x40; + if (!(space.machine().root_device().ioport("matrix4")->read()&8)) data&=~0x80; } // logerror("%.4x via port a read %02x\n",(int)activecpu_get_pc(), data); return data; @@ -193,7 +193,7 @@ static READ8_DEVICE_HANDLER(ssystem3_via_read_b) { UINT8 data=0xff; int on, ready; - ssystem3_playfield_read(device->machine(), &on, &ready); + ssystem3_playfield_read(space.machine(), &on, &ready); if (!on) data&=~0x20; if (!ready) data&=~0x10; return data; @@ -201,11 +201,11 @@ static READ8_DEVICE_HANDLER(ssystem3_via_read_b) static WRITE8_DEVICE_HANDLER(ssystem3_via_write_b) { - via6522_device *via_0 = device->machine().device<via6522_device>("via6522_0"); + via6522_device *via_0 = space.machine().device<via6522_device>("via6522_0"); UINT8 d; - ssystem3_playfield_write(device->machine(), data&1, data&8); - ssystem3_lcd_write(device->machine(), data&4, data&2); + ssystem3_playfield_write(space.machine(), data&1, data&8); + ssystem3_lcd_write(space.machine(), data&4, data&2); d=ssystem3_via_read_b(via_0, space, 0, mem_mask)&~0x40; if (data&0x80) d|=0x40; diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c index fcc9d5a35bb..f7f0c48ec0d 100644 --- a/src/mess/drivers/v1050.c +++ b/src/mess/drivers/v1050.c @@ -701,8 +701,8 @@ WRITE8_MEMBER( v1050_state::misc_ppi_pa_w ) static WRITE8_DEVICE_HANDLER( misc_ppi_pb_w ) { - centronics_device *centronics = device->machine().device<centronics_device>(CENTRONICS_TAG); - centronics->write( device->machine().driver_data()->generic_space() , 0, ~data & 0xff); + centronics_device *centronics = space.machine().device<centronics_device>(CENTRONICS_TAG); + centronics->write( space.machine().driver_data()->generic_space() , 0, ~data & 0xff); } static READ8_DEVICE_HANDLER( misc_ppi_pc_r ) @@ -723,7 +723,7 @@ static READ8_DEVICE_HANDLER( misc_ppi_pc_r ) */ UINT8 data = 0; - centronics_device *centronics = device->machine().device<centronics_device>(CENTRONICS_TAG); + centronics_device *centronics = space.machine().device<centronics_device>(CENTRONICS_TAG); data |= centronics->not_busy_r() << 4; data |= centronics->pe_r() << 5; diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c index 71322afad10..a42fed806b7 100644 --- a/src/mess/drivers/vtech1.c +++ b/src/mess/drivers/vtech1.c @@ -482,14 +482,14 @@ static const floppy_interface vtech1_floppy_interface = static READ8_DEVICE_HANDLER( vtech1_printer_r ) { - centronics_device *centronics = device->machine().device<centronics_device>("centronics"); + centronics_device *centronics = space.machine().device<centronics_device>("centronics"); return 0xfe | centronics->busy_r(); } /* TODO: figure out how this really works */ static WRITE8_DEVICE_HANDLER( vtech1_strobe_w ) { - centronics_device *centronics = device->machine().device<centronics_device>("centronics"); + centronics_device *centronics = space.machine().device<centronics_device>("centronics"); centronics->strobe_w(TRUE); centronics->strobe_w(FALSE); } @@ -613,7 +613,7 @@ WRITE8_MEMBER(vtech1_state::vtech1_video_bank_w) static READ8_DEVICE_HANDLER( vtech1_mc6847_videoram_r ) { - vtech1_state *vtech1 = device->machine().driver_data<vtech1_state>(); + vtech1_state *vtech1 = space.machine().driver_data<vtech1_state>(); if (offset == ~0) return 0xff; vtech1->m_mc6847->inv_w(BIT(vtech1->m_videoram[offset], 6)); vtech1->m_mc6847->as_w(BIT(vtech1->m_videoram[offset], 7)); diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c index a2d4537f91c..73df7848ddc 100644 --- a/src/mess/drivers/x68k.c +++ b/src/mess/drivers/x68k.c @@ -868,8 +868,8 @@ static UINT8 xpd1lr_r(device_t* device, int port) // Judging from the XM6 source code, PPI ports A and B are joystick inputs static READ8_DEVICE_HANDLER( ppi_port_a_r ) { - x68k_state *state = device->machine().driver_data<x68k_state>(); - int ctrl = device->machine().root_device().ioport("ctrltype")->read() & 0x0f; + x68k_state *state = space.machine().driver_data<x68k_state>(); + int ctrl = space.machine().root_device().ioport("ctrltype")->read() & 0x0f; switch(ctrl) { @@ -891,8 +891,8 @@ static READ8_DEVICE_HANDLER( ppi_port_a_r ) static READ8_DEVICE_HANDLER( ppi_port_b_r ) { - x68k_state *state = device->machine().driver_data<x68k_state>(); - int ctrl = device->machine().root_device().ioport("ctrltype")->read() & 0xf0; + x68k_state *state = space.machine().driver_data<x68k_state>(); + int ctrl = space.machine().root_device().ioport("ctrltype")->read() & 0xf0; switch(ctrl) { @@ -914,7 +914,7 @@ static READ8_DEVICE_HANDLER( ppi_port_b_r ) static READ8_DEVICE_HANDLER( ppi_port_c_r ) { - x68k_state *state = device->machine().driver_data<x68k_state>(); + x68k_state *state = space.machine().driver_data<x68k_state>(); return state->m_ppi_port[2]; } @@ -928,16 +928,16 @@ static READ8_DEVICE_HANDLER( ppi_port_c_r ) */ static WRITE8_DEVICE_HANDLER( ppi_port_c_w ) { - x68k_state *state = device->machine().driver_data<x68k_state>(); + x68k_state *state = space.machine().driver_data<x68k_state>(); // ADPCM / Joystick control - device_t *oki = device->machine().device("okim6258"); + device_t *oki = space.machine().device("okim6258"); state->m_ppi_port[2] = data; if((data & 0x0f) != (state->m_ppi_prev & 0x0f)) { state->m_adpcm.pan = data & 0x03; state->m_adpcm.rate = data & 0x0c; - x68k_set_adpcm(device->machine()); + x68k_set_adpcm(space.machine()); okim6258_set_divider(oki, (data >> 2) & 3); } @@ -947,7 +947,7 @@ static WRITE8_DEVICE_HANDLER( ppi_port_c_w ) if((state->m_ppi_prev & 0x10) == 0x00 && (data & 0x10) == 0x10) { state->m_mdctrl.seq1++; - state->m_mdctrl.io_timeout1->adjust(device->machine().device<cpu_device>("maincpu")->cycles_to_attotime(8192)); + state->m_mdctrl.io_timeout1->adjust(space.machine().device<cpu_device>("maincpu")->cycles_to_attotime(8192)); } state->m_joy.joy2_enable = data & 0x20; @@ -955,7 +955,7 @@ static WRITE8_DEVICE_HANDLER( ppi_port_c_w ) if((state->m_ppi_prev & 0x20) == 0x00 && (data & 0x20) == 0x20) { state->m_mdctrl.seq2++; - state->m_mdctrl.io_timeout2->adjust(device->machine().device<cpu_device>("maincpu")->cycles_to_attotime(8192)); + state->m_mdctrl.io_timeout2->adjust(space.machine().device<cpu_device>("maincpu")->cycles_to_attotime(8192)); } state->m_ppi_prev = data; @@ -1141,16 +1141,16 @@ static READ16_HANDLER( x68k_fm_r ) static WRITE8_DEVICE_HANDLER( x68k_ct_w ) { - x68k_state *state = device->machine().driver_data<x68k_state>(); - device_t *fdc = device->machine().device("upd72065"); - device_t *okim = device->machine().device("okim6258"); + x68k_state *state = space.machine().driver_data<x68k_state>(); + device_t *fdc = space.machine().device("upd72065"); + device_t *okim = space.machine().device("okim6258"); // CT1 and CT2 bits from YM2151 port 0x1b // CT1 - ADPCM clock - 0 = 8MHz, 1 = 4MHz // CT2 - 1 = Set ready state of FDC upd765_ready_w(fdc,data & 0x01); state->m_adpcm.clock = data & 0x02; - x68k_set_adpcm(device->machine()); + x68k_set_adpcm(space.machine()); okim6258_set_clock(okim, data & 0x02 ? 4000000 : 8000000); } diff --git a/src/mess/drivers/xor100.c b/src/mess/drivers/xor100.c index 34a9330e8af..4705b3cf9a9 100644 --- a/src/mess/drivers/xor100.c +++ b/src/mess/drivers/xor100.c @@ -417,7 +417,7 @@ static const i8251_interface terminal_8251_intf = static READ8_DEVICE_HANDLER( i8255_pc_r ) { - centronics_device *centronics = device->machine().device<centronics_device>("centronics"); + centronics_device *centronics = space.machine().device<centronics_device>("centronics"); /* bit description |