summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-01-10 19:21:43 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-01-10 19:21:43 +0100
commit2e5f16013ceeba6f22657208c64d85562de39733 (patch)
tree5c2be045ee49d3976b9cea0c7aba36ea1ac994d5
parentc678902d0b36d3274a678b35610a21fe880ed53c (diff)
fixes (nw)
-rw-r--r--src/mame/drivers/pc2000.cpp14
-rw-r--r--src/mame/drivers/segas16b.cpp6
-rw-r--r--src/mame/drivers/segas32.cpp82
-rw-r--r--src/mame/drivers/segaxbd.cpp8
-rw-r--r--src/mame/drivers/svmu.cpp8
-rw-r--r--src/mame/drivers/tamag1.cpp6
-rw-r--r--src/mame/machine/amiga.cpp2
-rw-r--r--src/mame/machine/amigakbd.cpp2
-rw-r--r--src/mame/machine/bfm_bd1.cpp2
-rw-r--r--src/mame/machine/bfm_bda.cpp4
-rw-r--r--src/mame/machine/compiskb.cpp2
-rw-r--r--src/mame/machine/dec_lk201.cpp8
-rw-r--r--src/mame/machine/esqvfd.cpp2
-rw-r--r--src/mame/machine/harddriv.cpp2
-rw-r--r--src/mame/machine/megacd.cpp4
-rw-r--r--src/mame/machine/nb1413m3.cpp6
-rw-r--r--src/mame/machine/pc1512kb.cpp4
-rw-r--r--src/mame/machine/tandy2kb.cpp4
-rw-r--r--src/mame/machine/ticket.cpp4
-rw-r--r--src/mame/machine/trs80m2kb.cpp4
-rw-r--r--src/mame/machine/v1050kb.cpp2
-rw-r--r--src/mame/machine/victor9k_fdc.cpp4
-rw-r--r--src/mame/machine/wangpckb.cpp2
-rw-r--r--src/mame/machine/wpc_lamp.cpp2
-rw-r--r--src/mame/machine/wpc_out.cpp4
-rw-r--r--src/mame/machine/x68k_kbd.cpp14
-rw-r--r--src/mame/video/bfm_dm01.cpp2
27 files changed, 102 insertions, 102 deletions
diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp
index b2590397ffa..03bb62f79e9 100644
--- a/src/mame/drivers/pc2000.cpp
+++ b/src/mame/drivers/pc2000.cpp
@@ -255,10 +255,10 @@ SED1520_UPDATE_CB(gl3000s_screen_update_left)
else if ((x == 75 || x == 77 || x == 79) && yi == 5) points[y][dpos] |= (state << 4);
else if ((x == 75 || x == 77 || x == 79) && yi == 6) points[y][dpos] |= (state << 3);
- else if (y == 1 && x >= 65 && x <= 68 && yi == 7) device.output().set_indexed_value("LEV", x - 64, state);
- else if (x >= 59 && x <= 60 && yi == 7) device.output().set_indexed_value("TRY", x - 58 + (y ? 0 : 1), state);
- else if (y == 1 && x >= 61 && x <= 64 && yi == 7) device.output().set_indexed_value("TICK", x - 59, state);
- else if (y == 0 && x >= 61 && x <= 64 && yi == 7) device.output().set_indexed_value("TICK", 62 - x + (x >= 63 ? 8 : 0), state);
+ else if (y == 1 && x >= 65 && x <= 68 && yi == 7) device.machine().output().set_indexed_value("LEV", x - 64, state);
+ else if (x >= 59 && x <= 60 && yi == 7) device.machine().output().set_indexed_value("TRY", x - 58 + (y ? 0 : 1), state);
+ else if (y == 1 && x >= 61 && x <= 64 && yi == 7) device.machine().output().set_indexed_value("TICK", x - 59, state);
+ else if (y == 0 && x >= 61 && x <= 64 && yi == 7) device.machine().output().set_indexed_value("TICK", 62 - x + (x >= 63 ? 8 : 0), state);
else if (x < 74 && yi < 7)
{
@@ -270,9 +270,9 @@ SED1520_UPDATE_CB(gl3000s_screen_update_left)
for(int i=0; i < 3; i++)
{
- device.output().set_indexed_value("TIME", i, sec[i]);
- device.output().set_indexed_value("P1", i, points[1][i]);
- device.output().set_indexed_value("P2", i, points[0][i]);
+ device.machine().output().set_indexed_value("TIME", i, sec[i]);
+ device.machine().output().set_indexed_value("P1", i, points[1][i]);
+ device.machine().output().set_indexed_value("P2", i, points[0][i]);
}
return gl3000s_sed1520_screen_update(device, bitmap, cliprect, vram, start_line, adc, 58);
diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp
index 97ef07be91b..585af25cf3b 100644
--- a/src/mame/drivers/segas16b.cpp
+++ b/src/mame/drivers/segas16b.cpp
@@ -1600,9 +1600,9 @@ WRITE16_MEMBER( segas16b_state::hwchamp_custom_io_w )
// bit 4 is GONG
// if (data & 0x10) popmessage("GONG");
// are the following really lamps?
- // space.output().set_led_value(1,data & 0x20);
- // space.output().set_led_value(2,data & 0x40);
- // space.output().set_led_value(3,data & 0x80);
+ // output().set_led_value(1,data & 0x20);
+ // output().set_led_value(2,data & 0x40);
+ // output().set_led_value(3,data & 0x80);
break;
}
break;
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index 034fad35bf4..db1fb7a3d24 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -4945,15 +4945,15 @@ void segas32_state::segas32_common_init(read16_delegate custom_r, write16_delega
void segas32_state::radm_sw1_output( int which, UINT16 data )
{
if (which == 0)
- output().set_value("Start_lamp", BIT(data, 2));
+ machine().output().set_value("Start_lamp", BIT(data, 2));
}
void segas32_state::radm_sw2_output( int which, UINT16 data )
{
if (which == 0)
{
- output().set_value("Wiper_lamp", BIT(data, 0));
- output().set_value("Lights_lamp", BIT(data, 1));
+ machine().output().set_value("Wiper_lamp", BIT(data, 0));
+ machine().output().set_value("Lights_lamp", BIT(data, 1));
}
}
@@ -4961,8 +4961,8 @@ void segas32_state::radr_sw2_output( int which, UINT16 data )
{
if (which == 0)
{
- output().set_value("Entry_lamp", BIT(data, 0));
- output().set_value("Winner_lamp", BIT(data, 1));
+ machine().output().set_value("Entry_lamp", BIT(data, 0));
+ machine().output().set_value("Winner_lamp", BIT(data, 1));
}
}
@@ -4970,8 +4970,8 @@ void segas32_state::alien3_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output().set_value("Player1_Gun_Recoil", BIT(data, 2));
- output().set_value("Player2_Gun_Recoil", BIT(data, 3));
+ machine().output().set_value("Player1_Gun_Recoil", BIT(data, 2));
+ machine().output().set_value("Player2_Gun_Recoil", BIT(data, 3));
}
}
@@ -4979,8 +4979,8 @@ void segas32_state::arescue_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output().set_value("Start_lamp", BIT(data, 2));
- output().set_value("Back_lamp", BIT(data, 4));
+ machine().output().set_value("Start_lamp", BIT(data, 2));
+ machine().output().set_value("Back_lamp", BIT(data, 4));
}
}
@@ -4988,8 +4988,8 @@ void segas32_state::f1lap_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output().set_value("lamp0", BIT(data, 2));
- output().set_value("lamp1", BIT(data, 3));
+ machine().output().set_value("lamp0", BIT(data, 2));
+ machine().output().set_value("lamp1", BIT(data, 3));
}
}
@@ -4997,8 +4997,8 @@ void segas32_state::jpark_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output().set_value("Left_lamp", BIT(data, 2));
- output().set_value("Right_lamp", BIT(data, 3));
+ machine().output().set_value("Left_lamp", BIT(data, 2));
+ machine().output().set_value("Right_lamp", BIT(data, 3));
}
}
@@ -5007,15 +5007,15 @@ void segas32_state::orunners_sw1_output( int which, UINT16 data )
/* note ma = monitor A and mb = Monitor B */
if (which == 0)
{
- output().set_value("MA_Check_Point_lamp", BIT(data, 1));
- output().set_value("MA_Race_Leader_lamp", BIT(data, 3));
- output().set_value("MA_Steering_Wheel_motor", BIT(data, 4));
+ machine().output().set_value("MA_Check_Point_lamp", BIT(data, 1));
+ machine().output().set_value("MA_Race_Leader_lamp", BIT(data, 3));
+ machine().output().set_value("MA_Steering_Wheel_motor", BIT(data, 4));
}
else
{
- output().set_value("MB_Check_Point_lamp", BIT(data, 1));
- output().set_value("MB_Race_Leader_lamp", BIT(data, 3));
- output().set_value("MB_Steering_Wheel_motor", BIT(data, 4));
+ machine().output().set_value("MB_Check_Point_lamp", BIT(data, 1));
+ machine().output().set_value("MB_Race_Leader_lamp", BIT(data, 3));
+ machine().output().set_value("MB_Steering_Wheel_motor", BIT(data, 4));
}
}
@@ -5026,13 +5026,13 @@ void segas32_state::orunners_sw2_output( int which, UINT16 data )
/* the bijokkoy driver might be used as an example for handling these outputs */
if (which == 0)
{
- output().set_value("MA_DJ_Music_lamp", BIT(data, 0));
- output().set_value("MA_<<_>>_lamp", BIT(data, 1));
+ machine().output().set_value("MA_DJ_Music_lamp", BIT(data, 0));
+ machine().output().set_value("MA_<<_>>_lamp", BIT(data, 1));
}
else
{
- output().set_value("MB_DJ_Music_lamp", BIT(data, 0));
- output().set_value("MB_<<_>>_lamp", BIT(data, 1));
+ machine().output().set_value("MB_DJ_Music_lamp", BIT(data, 0));
+ machine().output().set_value("MB_<<_>>_lamp", BIT(data, 1));
}
}
@@ -5040,68 +5040,68 @@ void segas32_state::harddunk_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output().set_value("1P_Start_lamp", BIT(data, 2));
- output().set_value("2P_Start_lamp", BIT(data, 3));
+ machine().output().set_value("1P_Start_lamp", BIT(data, 2));
+ machine().output().set_value("2P_Start_lamp", BIT(data, 3));
}
else
{
- output().set_value("4P_Start_lamp", BIT(data, 2));
- output().set_value("5P_Start_lamp", BIT(data, 3));
+ machine().output().set_value("4P_Start_lamp", BIT(data, 2));
+ machine().output().set_value("5P_Start_lamp", BIT(data, 3));
}
}
void segas32_state::harddunk_sw2_output( int which, UINT16 data )
{
if (which == 0)
- output().set_value("Left_Winner_lamp", BIT(data, 0));
+ machine().output().set_value("Left_Winner_lamp", BIT(data, 0));
else
- output().set_value("Right_Winner_lamp", BIT(data, 0));
+ machine().output().set_value("Right_Winner_lamp", BIT(data, 0));
}
void segas32_state::harddunk_sw3_output( int which, UINT16 data )
{
- output().set_value("3P_Start_lamp", BIT(data, 4));
- output().set_value("6P_Start_lamp", BIT(data, 5));
+ machine().output().set_value("3P_Start_lamp", BIT(data, 4));
+ machine().output().set_value("6P_Start_lamp", BIT(data, 5));
}
void segas32_state::titlef_sw1_output( int which, UINT16 data )
{
if (which == 0)
{
- output().set_value("Blue_Button_1P_lamp", BIT(data, 2));
- output().set_value("Blue_Button_2P_lamp", BIT(data, 3));
+ machine().output().set_value("Blue_Button_1P_lamp", BIT(data, 2));
+ machine().output().set_value("Blue_Button_2P_lamp", BIT(data, 3));
}
else
{
- output().set_value("Red_Button_1P_lamp", BIT(data, 2));
- output().set_value("Red_Button_2P_lamp", BIT(data, 3));
+ machine().output().set_value("Red_Button_1P_lamp", BIT(data, 2));
+ machine().output().set_value("Red_Button_2P_lamp", BIT(data, 3));
}
}
void segas32_state::titlef_sw2_output( int which, UINT16 data )
{
if (which == 0)
- output().set_value("Blue_Corner_lamp", BIT(data, 0));
+ machine().output().set_value("Blue_Corner_lamp", BIT(data, 0));
else
- output().set_value("Red_Corner_lamp", BIT(data, 0));
+ machine().output().set_value("Red_Corner_lamp", BIT(data, 0));
}
void segas32_state::scross_sw1_output( int which, UINT16 data )
{
/* note ma = monitor A and mb = Monitor B */
if (which == 0)
- output().set_value("MA_Start_lamp", BIT(data, 2));
+ machine().output().set_value("MA_Start_lamp", BIT(data, 2));
else
- output().set_value("MB_Start_lamp", BIT(data, 2));
+ machine().output().set_value("MB_Start_lamp", BIT(data, 2));
}
void segas32_state::scross_sw2_output( int which, UINT16 data )
{
/* Note: I'm not an expert on digits, so I didn't know the right map to use, I just added it manually and it seems to work fine. */
if (which == 0)
- output().set_value("MA_Digit", data);
+ machine().output().set_value("MA_Digit", data);
else
- output().set_value("MB_Digit", data);
+ machine().output().set_value("MB_Digit", data);
}
/*************************************
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index 127e0c5f547..8366d3b10b2 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -864,10 +864,10 @@ void segaxbd_state::generic_iochip0_lamps_w(UINT8 data)
// d6: danger lamp
// in clone aburner, lamps work only in testmode?
- output().set_lamp_value(0, (data >> 5) & 0x01);
- output().set_lamp_value(1, (data >> 6) & 0x01);
- output().set_lamp_value(2, (data >> 1) & 0x01);
- output().set_lamp_value(3, (data >> 2) & 0x01);
+ machine().output().set_lamp_value(0, (data >> 5) & 0x01);
+ machine().output().set_lamp_value(1, (data >> 6) & 0x01);
+ machine().output().set_lamp_value(2, (data >> 1) & 0x01);
+ machine().output().set_lamp_value(3, (data >> 2) & 0x01);
}
diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp
index f0e62d9a8e4..da2ff7e3765 100644
--- a/src/mame/drivers/svmu.cpp
+++ b/src/mame/drivers/svmu.cpp
@@ -174,10 +174,10 @@ static LC8670_LCD_UPDATE( svmu_lcd_update )
bitmap.fill(0, cliprect);
}
- device.output().set_value("file_icon" , lcd_enabled ? BIT(vram[0xc1],6) : 0);
- device.output().set_value("game_icon" , lcd_enabled ? BIT(vram[0xc2],4) : 0);
- device.output().set_value("clock_icon", lcd_enabled ? BIT(vram[0xc3],2) : 0);
- device.output().set_value("flash_icon", lcd_enabled ? BIT(vram[0xc4],0) : 0);
+ device.machine().output().set_value("file_icon" , lcd_enabled ? BIT(vram[0xc1],6) : 0);
+ device.machine().output().set_value("game_icon" , lcd_enabled ? BIT(vram[0xc2],4) : 0);
+ device.machine().output().set_value("clock_icon", lcd_enabled ? BIT(vram[0xc3],2) : 0);
+ device.machine().output().set_value("flash_icon", lcd_enabled ? BIT(vram[0xc4],0) : 0);
return 0;
}
diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp
index 3a29886ecb0..1275d33f0c7 100644
--- a/src/mame/drivers/tamag1.cpp
+++ b/src/mame/drivers/tamag1.cpp
@@ -63,14 +63,14 @@ static E0C6S46_PIXEL_UPDATE_CB(tama_pixel_update)
// they are on pin SEG8(x=35) + COM0-3, pin SEG28(x=36) + COM12-15
if (x == 35 && y < 4)
- device.output().set_lamp_value(y, state);
+ device.machine().output().set_lamp_value(y, state);
else if (x == 36 && y >= 12)
- device.output().set_lamp_value(y-8, state);
+ device.machine().output().set_lamp_value(y-8, state);
// output for svg2lay
char buf[0x10];
sprintf(buf, "%d.%d", y, x);
- device.output().set_value(buf, state);
+ device.machine().output().set_value(buf, state);
}
PALETTE_INIT_MEMBER(tamag1_state, tama)
diff --git a/src/mame/machine/amiga.cpp b/src/mame/machine/amiga.cpp
index 79fa6155c90..f92dcd3fb39 100644
--- a/src/mame/machine/amiga.cpp
+++ b/src/mame/machine/amiga.cpp
@@ -1087,7 +1087,7 @@ WRITE8_MEMBER( amiga_state::cia_0_port_a_write )
m_overlay->set_bank(BIT(data, 0));
// bit 1, power led
- space.output().set_led_value(0, !BIT(data, 1));
+ output().set_led_value(0, !BIT(data, 1));
output().set_value("power_led", !BIT(data, 1));
}
diff --git a/src/mame/machine/amigakbd.cpp b/src/mame/machine/amigakbd.cpp
index 493ed86aaf8..e760cb7de47 100644
--- a/src/mame/machine/amigakbd.cpp
+++ b/src/mame/machine/amigakbd.cpp
@@ -482,7 +482,7 @@ WRITE8_MEMBER( amigakbd_device::port_a_w )
WRITE8_MEMBER( amigakbd_device::port_b_w )
{
// caps lock led
- output().set_value("led0", BIT(data, 7));
+ machine().output().set_value("led0", BIT(data, 7));
}
WRITE8_MEMBER( amigakbd_device::port_c_w )
diff --git a/src/mame/machine/bfm_bd1.cpp b/src/mame/machine/bfm_bd1.cpp
index 4762de31738..78132ae5acf 100644
--- a/src/mame/machine/bfm_bd1.cpp
+++ b/src/mame/machine/bfm_bd1.cpp
@@ -184,7 +184,7 @@ void bfm_bd1_t::update_display()
{
m_outputs[i] = 0;
}
- output().set_indexed_value("vfd", (m_port_val*16) + i, m_outputs[i]);
+ machine().output().set_indexed_value("vfd", (m_port_val*16) + i, m_outputs[i]);
}
}
///////////////////////////////////////////////////////////////////////////
diff --git a/src/mame/machine/bfm_bda.cpp b/src/mame/machine/bfm_bda.cpp
index f20cd3dd57c..0984bf7ecab 100644
--- a/src/mame/machine/bfm_bda.cpp
+++ b/src/mame/machine/bfm_bda.cpp
@@ -153,7 +153,7 @@ void bfm_bda_t::device_post_load()
{
for (int i =0; i<16; i++)
{
- output().set_indexed_value("vfd", (m_port_val*16) + i, m_outputs[i]);
+ machine().output().set_indexed_value("vfd", (m_port_val*16) + i, m_outputs[i]);
}
}
@@ -169,7 +169,7 @@ void bfm_bda_t::update_display()
{
m_outputs[i] = 0;
}
- output().set_indexed_value("vfd", (m_port_val*16) + i, m_outputs[i]);
+ machine().output().set_indexed_value("vfd", (m_port_val*16) + i, m_outputs[i]);
}
}
///////////////////////////////////////////////////////////////////////////
diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp
index 114ae52448f..91709ad925e 100644
--- a/src/mame/machine/compiskb.cpp
+++ b/src/mame/machine/compiskb.cpp
@@ -319,7 +319,7 @@ WRITE8_MEMBER( compis_keyboard_device::bus_w )
m_speaker->level_w(BIT(data, 5));
// LEDs
- output().set_led_value(LED_CAPS, BIT(data, 6));
+ machine().output().set_led_value(LED_CAPS, BIT(data, 6));
// serial data out
m_out_tx_handler(BIT(data, 7));
diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp
index 1c7727f917a..1c2c4fdf552 100644
--- a/src/mame/machine/dec_lk201.cpp
+++ b/src/mame/machine/dec_lk201.cpp
@@ -630,10 +630,10 @@ void lk201_device::send_port(address_space &space, UINT8 offset, UINT8 data)
if (((data & 0x80) == 0) && (ports[offset] & 0x80))
{
// Lower nibble contains the LED values (1 = on, 0 = off)
- output().set_value("led_wait" , (led_data & 0x1) == 0);
- output().set_value("led_compose", (led_data & 0x2) == 0);
- output().set_value("led_hold" , (led_data & 0x4) == 0);
- output().set_value("led_lock" , (led_data & 0x8) == 0);
+ machine().output().set_value("led_wait" , (led_data & 0x1) == 0);
+ machine().output().set_value("led_compose", (led_data & 0x2) == 0);
+ machine().output().set_value("led_hold" , (led_data & 0x4) == 0);
+ machine().output().set_value("led_lock" , (led_data & 0x8) == 0);
}
#endif
diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp
index 617172016ce..a1379238673 100644
--- a/src/mame/machine/esqvfd.cpp
+++ b/src/mame/machine/esqvfd.cpp
@@ -179,7 +179,7 @@ void esqvfd_t::update_display()
segdata |= 0x0008;
}
- output().set_indexed_value("vfd", (row*m_cols) + col, segdata);
+ machine().output().set_indexed_value("vfd", (row*m_cols) + col, segdata);
m_dirty[row][col] = 0;
}
diff --git a/src/mame/machine/harddriv.cpp b/src/mame/machine/harddriv.cpp
index b35e85ddab1..9dc14a34438 100644
--- a/src/mame/machine/harddriv.cpp
+++ b/src/mame/machine/harddriv.cpp
@@ -390,7 +390,7 @@ WRITE16_MEMBER( harddriv_state::hd68k_nwr_w )
{
case 0: /* CR2 */
case 1: /* CR1 */
- space.output().set_led_value(offset, data);
+ machine().output().set_led_value(offset, data);
break;
case 2: /* LC1 */
break;
diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp
index 0e53606590a..a76c07d4f25 100644
--- a/src/mame/machine/megacd.cpp
+++ b/src/mame/machine/megacd.cpp
@@ -1240,8 +1240,8 @@ WRITE16_MEMBER( sega_segacd_device::segacd_sub_led_ready_w )
segacd_redled = (data >> 8)&1;
segacd_greenled = (data >> 9)&1;
- output().set_value("red_led",segacd_redled ^ 1);
- output().set_value("green_led",segacd_greenled ^ 1);
+ machine().output().set_value("red_led",segacd_redled ^ 1);
+ machine().output().set_value("green_led",segacd_greenled ^ 1);
//popmessage("%02x %02x",segacd_greenled,segacd_redled);
}
diff --git a/src/mame/machine/nb1413m3.cpp b/src/mame/machine/nb1413m3.cpp
index 9f8a5136492..b8992261f2c 100644
--- a/src/mame/machine/nb1413m3.cpp
+++ b/src/mame/machine/nb1413m3.cpp
@@ -597,7 +597,7 @@ WRITE8_MEMBER( nb1413m3_device::outcoin_w )
break;
}
- space.output().set_led_value(2, m_outcoin_flag); // out coin
+ space.machine().output().set_led_value(2, m_outcoin_flag); // out coin
}
WRITE8_MEMBER( nb1413m3_device::vcrctrl_w )
@@ -605,11 +605,11 @@ WRITE8_MEMBER( nb1413m3_device::vcrctrl_w )
if (data & 0x08)
{
popmessage(" ** VCR CONTROL ** ");
- space.output().set_led_value(2, 1);
+ space.machine().output().set_led_value(2, 1);
}
else
{
- space.output().set_led_value(2, 0);
+ space.machine().output().set_led_value(2, 0);
}
}
diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp
index d66aeccbd15..262d253d31b 100644
--- a/src/mame/machine/pc1512kb.cpp
+++ b/src/mame/machine/pc1512kb.cpp
@@ -473,10 +473,10 @@ WRITE8_MEMBER( pc1512_keyboard_device::kb_p2_w )
m_write_clock(BIT(data, 1));
// CAPS LOCK
- output().set_led_value(LED_CAPS, BIT(data, 2));
+ machine().output().set_led_value(LED_CAPS, BIT(data, 2));
// NUM LOCK
- output().set_led_value(LED_NUM, BIT(data, 3));
+ machine().output().set_led_value(LED_NUM, BIT(data, 3));
// keyboard row
m_kb_y = (((data >> 4) & 0x07) << 8) | (m_kb_y & 0xff);
diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp
index 102242b9a55..6e0b08351e7 100644
--- a/src/mame/machine/tandy2kb.cpp
+++ b/src/mame/machine/tandy2kb.cpp
@@ -407,8 +407,8 @@ WRITE8_MEMBER( tandy2k_keyboard_device::kb_p2_w )
m_keylatch = ((data & 0x0f) << 8) | (m_keylatch & 0xff);
// led output
- output().set_led_value(LED_2, !BIT(data, 4));
- output().set_led_value(LED_1, !BIT(data, 5));
+ machine().output().set_led_value(LED_2, !BIT(data, 4));
+ machine().output().set_led_value(LED_1, !BIT(data, 5));
// keyboard clock
int clock = BIT(data, 6);
diff --git a/src/mame/machine/ticket.cpp b/src/mame/machine/ticket.cpp
index 9e59cd759bb..3bd90d40e53 100644
--- a/src/mame/machine/ticket.cpp
+++ b/src/mame/machine/ticket.cpp
@@ -141,7 +141,7 @@ WRITE8_MEMBER( ticket_dispenser_device::write )
{
LOG(("%s: Ticket Power Off\n", machine().describe_context()));
m_timer->adjust(attotime::never);
- output().set_led_value(2,0);
+ machine().output().set_led_value(2,0);
m_power = 0;
}
}
@@ -197,7 +197,7 @@ void ticket_dispenser_device::device_timer(emu_timer &timer, device_timer_id id,
}
// update LED status (fixme: should map to an output)
- output().set_led_value(2, (m_status == m_ticketdispensed));
+ machine().output().set_led_value(2, (m_status == m_ticketdispensed));
// if we just dispensed, increment global count
if (m_status == m_ticketdispensed)
diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp
index 177aa0f2ec6..d098a56ae88 100644
--- a/src/mame/machine/trs80m2kb.cpp
+++ b/src/mame/machine/trs80m2kb.cpp
@@ -362,8 +362,8 @@ WRITE8_MEMBER( trs80m2_keyboard_device::kb_p1_w )
m_clk = clk;
}
- output().set_led_value(LED_0, BIT(data, 2));
- output().set_led_value(LED_1, BIT(data, 4));
+ machine().output().set_led_value(LED_0, BIT(data, 2));
+ machine().output().set_led_value(LED_1, BIT(data, 4));
}
diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp
index 167cedca289..d1f06bcdf30 100644
--- a/src/mame/machine/v1050kb.cpp
+++ b/src/mame/machine/v1050kb.cpp
@@ -415,7 +415,7 @@ WRITE8_MEMBER( v1050_keyboard_device::kb_p2_w )
*/
// led output
- output().set_led_value(0, BIT(data, 5));
+ machine().output().set_led_value(0, BIT(data, 5));
// speaker output
m_discrete->write(space, NODE_01, BIT(data, 6));
diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp
index 2f109ddb4b7..61bd336b47e 100644
--- a/src/mame/machine/victor9k_fdc.cpp
+++ b/src/mame/machine/victor9k_fdc.cpp
@@ -867,10 +867,10 @@ WRITE8_MEMBER( victor_9000_fdc_t::via6_pa_w )
*/
// LED, drive A
- output().set_led_value(LED_A, BIT(data, 0));
+ machine().output().set_led_value(LED_A, BIT(data, 0));
// LED, drive B
- output().set_led_value(LED_B, BIT(data, 2));
+ machine().output().set_led_value(LED_B, BIT(data, 2));
bool sync = false;
diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp
index e17f3d4bcd2..679c75862a6 100644
--- a/src/mame/machine/wangpckb.cpp
+++ b/src/mame/machine/wangpckb.cpp
@@ -524,7 +524,7 @@ WRITE8_MEMBER( wangpc_keyboard_device::kb_p1_w )
for (int i = 0; i < 6; i++)
{
- output().set_led_value(i, !BIT(data, i));
+ machine().output().set_led_value(i, !BIT(data, i));
}
if (LOG) logerror("P1 %02x\n", data);
diff --git a/src/mame/machine/wpc_lamp.cpp b/src/mame/machine/wpc_lamp.cpp
index b8097e40447..eba57bb6ced 100644
--- a/src/mame/machine/wpc_lamp.cpp
+++ b/src/mame/machine/wpc_lamp.cpp
@@ -68,7 +68,7 @@ void wpc_lamp_device::device_timer(emu_timer &timer, device_timer_id id, int par
sprintf(buffer, "l:%s", names[i]);
else
sprintf(buffer, "l:%d%d", 1+(i >> 3), 1 + (i & 7));
- output().set_value(buffer, (s & 0xc0) == 0x80);
+ machine().output().set_value(buffer, (s & 0xc0) == 0x80);
}
}
}
diff --git a/src/mame/machine/wpc_out.cpp b/src/mame/machine/wpc_out.cpp
index 88155296844..7268eeeed09 100644
--- a/src/mame/machine/wpc_out.cpp
+++ b/src/mame/machine/wpc_out.cpp
@@ -55,7 +55,7 @@ void wpc_out_device::send_output(int sid, int state)
sprintf(buffer, "u:output %02d", sid);
name = buffer;
}
- output().set_value(name, state);
+ machine().output().set_value(name, state);
if(sid == 41)
machine().bookkeeping().coin_counter_w(0, state);
@@ -108,7 +108,7 @@ WRITE8_MEMBER(wpc_out_device::gi_w)
WRITE8_MEMBER(wpc_out_device::led_w)
{
first_after_led = true;
- output().set_value("L:cpu led", data & 0x80 ? 1 : 0);
+ machine().output().set_value("L:cpu led", data & 0x80 ? 1 : 0);
}
void wpc_out_device::device_start()
diff --git a/src/mame/machine/x68k_kbd.cpp b/src/mame/machine/x68k_kbd.cpp
index 7cebbabbc11..675038414c4 100644
--- a/src/mame/machine/x68k_kbd.cpp
+++ b/src/mame/machine/x68k_kbd.cpp
@@ -50,13 +50,13 @@ void x68k_keyboard_device::write(UINT8 data)
if(data & 0x80) // LED status
{
- output().set_value("key_led_kana",(data & 0x01) ? 0 : 1);
- output().set_value("key_led_romaji",(data & 0x02) ? 0 : 1);
- output().set_value("key_led_code",(data & 0x04) ? 0 : 1);
- output().set_value("key_led_caps",(data & 0x08) ? 0 : 1);
- output().set_value("key_led_insert",(data & 0x10) ? 0 : 1);
- output().set_value("key_led_hiragana",(data & 0x20) ? 0 : 1);
- output().set_value("key_led_fullsize",(data & 0x40) ? 0 : 1);
+ machine().output().set_value("key_led_kana",(data & 0x01) ? 0 : 1);
+ machine().output().set_value("key_led_romaji",(data & 0x02) ? 0 : 1);
+ machine().output().set_value("key_led_code",(data & 0x04) ? 0 : 1);
+ machine().output().set_value("key_led_caps",(data & 0x08) ? 0 : 1);
+ machine().output().set_value("key_led_insert",(data & 0x10) ? 0 : 1);
+ machine().output().set_value("key_led_hiragana",(data & 0x20) ? 0 : 1);
+ machine().output().set_value("key_led_fullsize",(data & 0x40) ? 0 : 1);
logerror("KB: LED status set to %02x\n",data & 0x7f);
}
diff --git a/src/mame/video/bfm_dm01.cpp b/src/mame/video/bfm_dm01.cpp
index fbd03542333..c1977276f00 100644
--- a/src/mame/video/bfm_dm01.cpp
+++ b/src/mame/video/bfm_dm01.cpp
@@ -190,7 +190,7 @@ WRITE8_MEMBER( bfmdm01_device::mux_w )
for (int pos=0;pos<65;pos++)
{
- output().set_indexed_value("dotmatrix", pos +(65*row), m_segbuffer[(pos)]);
+ machine().output().set_indexed_value("dotmatrix", pos +(65*row), m_segbuffer[(pos)]);
}
}
}