summaryrefslogtreecommitdiffstats
path: root/src/mame/machine
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine')
-rw-r--r--src/mame/machine/ajax.cpp18
-rw-r--r--src/mame/machine/atarifb.cpp4
-rw-r--r--src/mame/machine/galaxold.cpp2
-rw-r--r--src/mame/machine/irobot.cpp4
-rw-r--r--src/mame/machine/mhavoc.cpp8
-rw-r--r--src/mame/machine/pc1512kb.cpp8
-rw-r--r--src/mame/machine/pc1512kb.h2
-rw-r--r--src/mame/machine/pmd85.cpp8
-rw-r--r--src/mame/machine/tandy2kb.cpp8
-rw-r--r--src/mame/machine/tandy2kb.h2
-rw-r--r--src/mame/machine/trs80m2kb.cpp8
-rw-r--r--src/mame/machine/trs80m2kb.h2
-rw-r--r--src/mame/machine/victor9k_fdc.cpp8
-rw-r--r--src/mame/machine/victor9k_fdc.h2
-rw-r--r--src/mame/machine/wangpckb.cpp6
-rw-r--r--src/mame/machine/wangpckb.h2
-rw-r--r--src/mame/machine/xevious.cpp4
17 files changed, 48 insertions, 48 deletions
diff --git a/src/mame/machine/ajax.cpp b/src/mame/machine/ajax.cpp
index c278cc7b3cc..6ac648670e2 100644
--- a/src/mame/machine/ajax.cpp
+++ b/src/mame/machine/ajax.cpp
@@ -79,14 +79,14 @@ WRITE8_MEMBER(ajax_state::bankswitch_w)
WRITE8_MEMBER(ajax_state::lamps_w)
{
- m_lamp[1] = BIT(data, 1); /* super weapon lamp */
- m_lamp[2] = BIT(data, 2); /* power up lamps */
- m_lamp[5] = BIT(data, 2); /* power up lamps */
- m_lamp[0] = BIT(data, 5); /* start lamp */
- m_lamp[3] = BIT(data, 6); /* game over lamps */
- m_lamp[6] = BIT(data, 6); /* game over lamps */
- m_lamp[4] = BIT(data, 7); /* game over lamps */
- m_lamp[7] = BIT(data, 7); /* game over lamps */
+ m_lamps[1] = BIT(data, 1); /* super weapon lamp */
+ m_lamps[2] = BIT(data, 2); /* power up lamps */
+ m_lamps[5] = BIT(data, 2); /* power up lamps */
+ m_lamps[0] = BIT(data, 5); /* start lamp */
+ m_lamps[3] = BIT(data, 6); /* game over lamps */
+ m_lamps[6] = BIT(data, 6); /* game over lamps */
+ m_lamps[4] = BIT(data, 7); /* game over lamps */
+ m_lamps[7] = BIT(data, 7); /* game over lamps */
}
/* ajax_ls138_f10:
@@ -199,7 +199,7 @@ void ajax_state::machine_start()
uint8_t *MAIN = memregion("maincpu")->base();
uint8_t *SUB = memregion("sub")->base();
- m_lamp.resolve();
+ m_lamps.resolve();
membank("mainbank")->configure_entries(0, 4, &MAIN[0x00000], 0x2000);
membank("mainbank")->configure_entries(4, 8, &MAIN[0x10000], 0x2000);
membank("subbank")->configure_entries(0, 9, &SUB[0x00000], 0x2000);
diff --git a/src/mame/machine/atarifb.cpp b/src/mame/machine/atarifb.cpp
index 5ab2efca34f..2c6969e4004 100644
--- a/src/mame/machine/atarifb.cpp
+++ b/src/mame/machine/atarifb.cpp
@@ -76,8 +76,8 @@ WRITE8_MEMBER(atarifb_state::soccer_out1_w)
m_discrete->write(space, ATARIFB_ATTRACT_EN, data & 0x10); // Attract
m_discrete->write(space, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
-// m_led[0] = BIT(data, 4); // !!!!!!!!!! Is this correct????
- m_led[1] = BIT(data, 7);
+// m_leds[0] = BIT(data, 4); // !!!!!!!!!! Is this correct????
+ m_leds[1] = BIT(data, 7);
}
diff --git a/src/mame/machine/galaxold.cpp b/src/mame/machine/galaxold.cpp
index f8fab4ba017..0f5036bb1db 100644
--- a/src/mame/machine/galaxold.cpp
+++ b/src/mame/machine/galaxold.cpp
@@ -109,7 +109,7 @@ WRITE8_MEMBER(galaxold_state::galaxold_coin_counter_2_w)
WRITE8_MEMBER(galaxold_state::galaxold_leds_w)
{
- m_led[offset] = BIT(data, 0);
+ m_leds[offset] = BIT(data, 0);
}
READ8_MEMBER(galaxold_state::scramblb_protection_1_r)
diff --git a/src/mame/machine/irobot.cpp b/src/mame/machine/irobot.cpp
index c16cba0571d..3bfb2152b4b 100644
--- a/src/mame/machine/irobot.cpp
+++ b/src/mame/machine/irobot.cpp
@@ -140,8 +140,8 @@ WRITE8_MEMBER(irobot_state::irobot_rom_banksel_w)
membank("bank1")->set_base(&RAM[0x1A000]);
break;
}
- m_led[0] = BIT(data, 4);
- m_led[1] = BIT(data, 5);
+ m_leds[0] = BIT(data, 4);
+ m_leds[1] = BIT(data, 5);
}
TIMER_CALLBACK_MEMBER(irobot_state::scanline_callback)
diff --git a/src/mame/machine/mhavoc.cpp b/src/mame/machine/mhavoc.cpp
index 23183d12f55..232406de97d 100644
--- a/src/mame/machine/mhavoc.cpp
+++ b/src/mame/machine/mhavoc.cpp
@@ -65,7 +65,7 @@ WRITE8_MEMBER(mhavoc_state::mhavoc_gamma_irq_ack_w)
void mhavoc_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
save_item(NAME(m_alpha_data));
save_item(NAME(m_alpha_rcvd));
@@ -269,17 +269,17 @@ WRITE8_MEMBER(mhavoc_state::mhavoc_out_0_w)
/* this is the unpopulated processor in the corner of the pcb farthest from the quad pokey, not used on shipping boards */
/* Bit 0 = Roller light (Blinks on fatal errors) */
- m_lamp[0] = BIT(data, 0);
+ m_lamps[0] = BIT(data, 0);
}
WRITE8_MEMBER(mhavoc_state::alphaone_out_0_w)
{
/* Bit 5 = P2 lamp */
- m_lamp[0] = BIT(~data, 5);
+ m_lamps[0] = BIT(~data, 5);
/* Bit 4 = P1 lamp */
- m_lamp[1] = BIT(~data, 4);
+ m_lamps[1] = BIT(~data, 4);
/* Bit 1 = right coin counter */
machine().bookkeeping().coin_counter_w(1, data & 0x02);
diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp
index fd158211230..f5b543f0c4e 100644
--- a/src/mame/machine/pc1512kb.cpp
+++ b/src/mame/machine/pc1512kb.cpp
@@ -204,7 +204,7 @@ pc1512_keyboard_device::pc1512_keyboard_device(const machine_config &mconfig, co
m_maincpu(*this, I8048_TAG),
m_joy(*this, "joy"),
m_y(*this, "Y%u", 1),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_write_clock(*this),
m_write_data(*this),
m_data_in(1),
@@ -223,7 +223,7 @@ pc1512_keyboard_device::pc1512_keyboard_device(const machine_config &mconfig, co
void pc1512_keyboard_device::device_start()
{
- m_led.resolve();
+ m_leds.resolve();
// allocate timers
m_reset_timer = timer_alloc();
@@ -442,10 +442,10 @@ WRITE8_MEMBER( pc1512_keyboard_device::kb_p2_w )
m_write_clock(BIT(data, 1));
// CAPS LOCK
- m_led[LED_CAPS] = BIT(data, 2);
+ m_leds[LED_CAPS] = BIT(data, 2);
// NUM LOCK
- m_led[LED_NUM] = BIT(data, 3);
+ m_leds[LED_NUM] = BIT(data, 3);
// keyboard row
m_kb_y = (((data >> 4) & 0x07) << 8) | (m_kb_y & 0xff);
diff --git a/src/mame/machine/pc1512kb.h b/src/mame/machine/pc1512kb.h
index 903a98ba1bf..fe5f7c5b30a 100644
--- a/src/mame/machine/pc1512kb.h
+++ b/src/mame/machine/pc1512kb.h
@@ -79,7 +79,7 @@ private:
required_device<vcs_control_port_device> m_joy;
required_ioport_array<11> m_y;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
devcb_write_line m_write_clock;
devcb_write_line m_write_data;
diff --git a/src/mame/machine/pmd85.cpp b/src/mame/machine/pmd85.cpp
index 40b4b21752b..ca16cd117fa 100644
--- a/src/mame/machine/pmd85.cpp
+++ b/src/mame/machine/pmd85.cpp
@@ -257,8 +257,8 @@ WRITE8_MEMBER(pmd85_state::pmd85_ppi_0_portb_w)
WRITE8_MEMBER(pmd85_state::pmd85_ppi_0_portc_w)
{
m_ppi_port_outputs[0][2] = data;
- m_led[PMD85_LED_2] = BIT(data, 3);
- m_led[PMD85_LED_3] = BIT(data, 2);
+ m_leds[PMD85_LED_2] = BIT(data, 3);
+ m_leds[PMD85_LED_3] = BIT(data, 2);
}
/*******************************************************************************
@@ -290,8 +290,8 @@ READ8_MEMBER(pmd85_state::mato_ppi_0_portc_r)
WRITE8_MEMBER(pmd85_state::mato_ppi_0_portc_w)
{
m_ppi_port_outputs[0][2] = data;
- m_led[PMD85_LED_2] = BIT(data, 3);
- m_led[PMD85_LED_3] = BIT(data, 2);
+ m_leds[PMD85_LED_2] = BIT(data, 3);
+ m_leds[PMD85_LED_3] = BIT(data, 2);
}
/*******************************************************************************
diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp
index 9c11fbeb046..de753eefef5 100644
--- a/src/mame/machine/tandy2kb.cpp
+++ b/src/mame/machine/tandy2kb.cpp
@@ -210,7 +210,7 @@ tandy2k_keyboard_device::tandy2k_keyboard_device(const machine_config &mconfig,
device_t(mconfig, TANDY2K_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8048_TAG),
m_y(*this, "Y%u", 0),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_write_clock(*this),
m_write_data(*this),
m_keylatch(0xffff),
@@ -226,7 +226,7 @@ tandy2k_keyboard_device::tandy2k_keyboard_device(const machine_config &mconfig,
void tandy2k_keyboard_device::device_start()
{
- m_led.resolve();
+ m_leds.resolve();
// resolve callbacks
m_write_clock.resolve_safe();
m_write_data.resolve_safe();
@@ -371,8 +371,8 @@ WRITE8_MEMBER( tandy2k_keyboard_device::kb_p2_w )
m_keylatch = ((data & 0x0f) << 8) | (m_keylatch & 0xff);
// led output
- m_led[LED_2] = BIT(~data, 4);
- m_led[LED_1] = BIT(~data, 5);
+ m_leds[LED_2] = BIT(~data, 4);
+ m_leds[LED_1] = BIT(~data, 5);
// keyboard clock
int clock = BIT(data, 6);
diff --git a/src/mame/machine/tandy2kb.h b/src/mame/machine/tandy2kb.h
index ecc9c16cf81..39ecdace66f 100644
--- a/src/mame/machine/tandy2kb.h
+++ b/src/mame/machine/tandy2kb.h
@@ -73,7 +73,7 @@ private:
required_device<cpu_device> m_maincpu;
required_ioport_array<12> m_y;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
devcb_write_line m_write_clock;
devcb_write_line m_write_data;
diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp
index 09a7a7d1592..60af2d67f54 100644
--- a/src/mame/machine/trs80m2kb.cpp
+++ b/src/mame/machine/trs80m2kb.cpp
@@ -211,7 +211,7 @@ trs80m2_keyboard_device::trs80m2_keyboard_device(const machine_config &mconfig,
device_t(mconfig, TRS80M2_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8021_TAG),
m_y(*this, "Y%u", 0),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_write_clock(*this),
m_busy(1),
m_data(1),
@@ -226,7 +226,7 @@ trs80m2_keyboard_device::trs80m2_keyboard_device(const machine_config &mconfig,
void trs80m2_keyboard_device::device_start()
{
- m_led.resolve();
+ m_leds.resolve();
// resolve callbacks
m_write_clock.resolve_safe();
@@ -323,8 +323,8 @@ WRITE8_MEMBER( trs80m2_keyboard_device::kb_p1_w )
m_clk = clk;
}
- m_led[LED_0] = BIT(data, 2);
- m_led[LED_1] = BIT(data, 4);
+ m_leds[LED_0] = BIT(data, 2);
+ m_leds[LED_1] = BIT(data, 4);
}
diff --git a/src/mame/machine/trs80m2kb.h b/src/mame/machine/trs80m2kb.h
index 2859bdbf1ce..9637f240601 100644
--- a/src/mame/machine/trs80m2kb.h
+++ b/src/mame/machine/trs80m2kb.h
@@ -68,7 +68,7 @@ private:
required_device<cpu_device> m_maincpu;
required_ioport_array<12> m_y;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
devcb_write_line m_write_clock;
diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp
index c5af61c9060..46b531f6f06 100644
--- a/src/mame/machine/victor9k_fdc.cpp
+++ b/src/mame/machine/victor9k_fdc.cpp
@@ -216,7 +216,7 @@ victor_9000_fdc_device::victor_9000_fdc_device(const machine_config &mconfig, co
m_floppy0(*this, I8048_TAG":0"),
m_floppy1(*this, I8048_TAG":1"),
m_gcr_rom(*this, "gcr"),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_da(0),
m_da0(0),
m_da1(0),
@@ -261,7 +261,7 @@ victor_9000_fdc_device::victor_9000_fdc_device(const machine_config &mconfig, co
void victor_9000_fdc_device::device_start()
{
- m_led.resolve();
+ m_leds.resolve();
// resolve callbacks
m_irq_cb.resolve_safe();
@@ -895,10 +895,10 @@ WRITE8_MEMBER( victor_9000_fdc_device::via6_pa_w )
*/
// LED, drive A
- m_led[LED_A] = BIT(data, 0);
+ m_leds[LED_A] = BIT(data, 0);
// LED, drive B
- m_led[LED_B] = BIT(data, 2);
+ m_leds[LED_B] = BIT(data, 2);
bool sync = false;
diff --git a/src/mame/machine/victor9k_fdc.h b/src/mame/machine/victor9k_fdc.h
index 942c8038ac4..649598af50c 100644
--- a/src/mame/machine/victor9k_fdc.h
+++ b/src/mame/machine/victor9k_fdc.h
@@ -132,7 +132,7 @@ private:
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_memory_region m_gcr_rom;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
void update_stepper_motor(floppy_image_device *floppy, int stp, int old_st, int st);
void update_spindle_motor(floppy_image_device *floppy, emu_timer *t_tach, bool start, bool stop, bool sel, uint8_t &da);
diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp
index ea4daf5fcb3..add912f2b74 100644
--- a/src/mame/machine/wangpckb.cpp
+++ b/src/mame/machine/wangpckb.cpp
@@ -371,7 +371,7 @@ wangpc_keyboard_device::wangpc_keyboard_device(const machine_config &mconfig, co
m_maincpu(*this, I8051_TAG),
m_y(*this, "Y%u", 0),
m_txd_handler(*this),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_keylatch(0),
m_rxd(1)
{
@@ -385,7 +385,7 @@ wangpc_keyboard_device::wangpc_keyboard_device(const machine_config &mconfig, co
void wangpc_keyboard_device::device_start()
{
m_txd_handler.resolve_safe();
- m_led.resolve();
+ m_leds.resolve();
set_data_frame(1, 8, PARITY_NONE, STOP_BITS_2);
@@ -535,7 +535,7 @@ WRITE8_MEMBER( wangpc_keyboard_device::kb_p1_w )
for (int i = 0; i < 6; i++)
{
- m_led[i] = BIT(~data, i);
+ m_leds[i] = BIT(~data, i);
}
//if (LOG) logerror("P1 %02x\n", data);
diff --git a/src/mame/machine/wangpckb.h b/src/mame/machine/wangpckb.h
index d22fb31e08d..c5b3d59a92f 100644
--- a/src/mame/machine/wangpckb.h
+++ b/src/mame/machine/wangpckb.h
@@ -81,7 +81,7 @@ private:
required_device<i8051_device> m_maincpu;
required_ioport_array<16> m_y;
devcb_write_line m_txd_handler;
- output_finder<6> m_led;
+ output_finder<6> m_leds;
uint8_t m_keylatch;
int m_rxd;
diff --git a/src/mame/machine/xevious.cpp b/src/mame/machine/xevious.cpp
index 1bd65aa5937..385dc424191 100644
--- a/src/mame/machine/xevious.cpp
+++ b/src/mame/machine/xevious.cpp
@@ -138,8 +138,8 @@ WRITE8_MEMBER( xevious_state::battles_customio_data3_w )
WRITE8_MEMBER( xevious_state::battles_CPU4_coin_w )
{
- m_led[0] = BIT(data, 1); // Start 1
- m_led[1] = BIT(data, 0); // Start 2
+ m_leds[0] = BIT(data, 1); // Start 1
+ m_leds[1] = BIT(data, 0); // Start 2
machine().bookkeeping().coin_counter_w(0,data & 0x20);
machine().bookkeeping().coin_counter_w(1,data & 0x10);