diff --git a/src/emu/bus/nes_ctrl/arkpaddle.c b/src/emu/bus/nes_ctrl/arkpaddle.c index 61dd183603c..14faf6a2a43 100644 --- a/src/emu/bus/nes_ctrl/arkpaddle.c +++ b/src/emu/bus/nes_ctrl/arkpaddle.c @@ -54,7 +54,7 @@ nes_vaus_device::nes_vaus_device(const machine_config &mconfig, device_type type } nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, NES_ARKPADDLE, "Arkanoid Vaus NES Controller", tag, owner, clock, "nes_vaus", __FILE__), + device_t(mconfig, NES_ARKPADDLE, "NES Arkanoid Vaus Controller", tag, owner, clock, "nes_vaus", __FILE__), device_nes_control_port_interface(mconfig, *this), m_paddle(*this, "PADDLE"), m_button(*this, "BUTTON") @@ -62,7 +62,7 @@ nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, } nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - nes_vaus_device(mconfig, NES_ARKPADDLE_FC, "Arkanoid Vaus FC Controller", tag, owner, clock, "nes_vausfc", __FILE__) + nes_vaus_device(mconfig, NES_ARKPADDLE_FC, "FC Arkanoid Vaus Controller", tag, owner, clock, "nes_vausfc", __FILE__) { } diff --git a/src/emu/bus/nes_ctrl/joypad.c b/src/emu/bus/nes_ctrl/joypad.c index 2688e5e61e5..538235e7cf5 100644 --- a/src/emu/bus/nes_ctrl/joypad.c +++ b/src/emu/bus/nes_ctrl/joypad.c @@ -194,12 +194,12 @@ nes_fcpad2_device::nes_fcpad2_device(const machine_config &mconfig, const char * } nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - nes_joypad_device(mconfig, NES_CCPAD_LEFT, "Crazy Climber Left Pad", tag, owner, clock, "nes_ccpadl", __FILE__) + nes_joypad_device(mconfig, NES_CCPAD_LEFT, "FC Crazy Climber Left Pad", tag, owner, clock, "nes_ccpadl", __FILE__) { } nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - nes_joypad_device(mconfig, NES_CCPAD_RIGHT, "Crazy Climber Right Pad", tag, owner, clock, "nes_ccpadr", __FILE__) + nes_joypad_device(mconfig, NES_CCPAD_RIGHT, "FC Crazy Climber Right Pad", tag, owner, clock, "nes_ccpadr", __FILE__) { } diff --git a/src/emu/bus/nes_ctrl/suborkey.c b/src/emu/bus/nes_ctrl/suborkey.c index eb937120d1c..dc05f2fb236 100644 --- a/src/emu/bus/nes_ctrl/suborkey.c +++ b/src/emu/bus/nes_ctrl/suborkey.c @@ -162,7 +162,7 @@ ioport_constructor nes_suborkey_device::device_input_ports() const //------------------------------------------------- nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, NES_SUBORKEYBOARD, "FC Subor Keyboard", tag, owner, clock, "nes_suborkey", __FILE__), + device_t(mconfig, NES_SUBORKEYBOARD, "Subor FC Keyboard", tag, owner, clock, "nes_suborkey", __FILE__), device_nes_control_port_interface(mconfig, *this), m_kbd(*this, "SUBOR") { diff --git a/src/emu/bus/sms_ctrl/graphic.c b/src/emu/bus/sms_ctrl/graphic.c index a04b9c59473..00a6bd027c9 100644 --- a/src/emu/bus/sms_ctrl/graphic.c +++ b/src/emu/bus/sms_ctrl/graphic.c @@ -77,7 +77,7 @@ ioport_constructor sms_graphic_device::device_input_ports() const //------------------------------------------------- sms_graphic_device::sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, SMS_GRAPHIC, "Graphic Board", tag, owner, clock, "sms_graphic", __FILE__) + : device_t(mconfig, SMS_GRAPHIC, "Sega SMS Graphic Board", tag, owner, clock, "sms_graphic", __FILE__) , device_sms_control_port_interface(mconfig, *this) , m_buttons(*this, "BUTTONS") , m_x(*this, "X") diff --git a/src/emu/bus/sms_ctrl/joypad.c b/src/emu/bus/sms_ctrl/joypad.c index e7a0f3607bd..c42de757e44 100644 --- a/src/emu/bus/sms_ctrl/joypad.c +++ b/src/emu/bus/sms_ctrl/joypad.c @@ -51,7 +51,7 @@ ioport_constructor sms_joypad_device::device_input_ports() const //------------------------------------------------- sms_joypad_device::sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, SMS_JOYPAD, "Control Pad", tag, owner, clock, "sms_joypad", __FILE__), + device_t(mconfig, SMS_JOYPAD, "Sega SMS Control Pad", tag, owner, clock, "sms_joypad", __FILE__), device_sms_control_port_interface(mconfig, *this), m_joypad(*this, "JOYPAD") { diff --git a/src/emu/bus/sms_ctrl/lphaser.c b/src/emu/bus/sms_ctrl/lphaser.c index 8736657cae6..792e8d03721 100644 --- a/src/emu/bus/sms_ctrl/lphaser.c +++ b/src/emu/bus/sms_ctrl/lphaser.c @@ -70,7 +70,7 @@ ioport_constructor sms_light_phaser_device::device_input_ports() const //------------------------------------------------- sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, SMS_LIGHT_PHASER, "Light Phaser", tag, owner, clock, "sms_light_phaser", __FILE__), + device_t(mconfig, SMS_LIGHT_PHASER, "Sega SMS Light Phaser", tag, owner, clock, "sms_light_phaser", __FILE__), device_video_interface(mconfig, *this), device_sms_control_port_interface(mconfig, *this), m_lphaser_pins(*this, "CTRL_PORT"), diff --git a/src/emu/bus/sms_ctrl/multitap.c b/src/emu/bus/sms_ctrl/multitap.c index 6f27588889c..45d93733493 100644 --- a/src/emu/bus/sms_ctrl/multitap.c +++ b/src/emu/bus/sms_ctrl/multitap.c @@ -29,7 +29,7 @@ const device_type SMS_MULTITAP = &device_creator; //------------------------------------------------- sms_multitap_device::sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, SMS_MULTITAP, "Multitap", tag, owner, clock, "sms_multitap", __FILE__), + device_t(mconfig, SMS_MULTITAP, "Sega SMS Multitap", tag, owner, clock, "sms_multitap", __FILE__), device_sms_control_port_interface(mconfig, *this), m_subctrl1_port(*this, "ctrl1"), m_subctrl2_port(*this, "ctrl2"), diff --git a/src/emu/bus/sms_ctrl/paddle.c b/src/emu/bus/sms_ctrl/paddle.c index affe7456ab3..41a79ecf0be 100644 --- a/src/emu/bus/sms_ctrl/paddle.c +++ b/src/emu/bus/sms_ctrl/paddle.c @@ -73,7 +73,7 @@ ioport_constructor sms_paddle_device::device_input_ports() const //------------------------------------------------- sms_paddle_device::sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, SMS_PADDLE, "Paddle", tag, owner, clock, "sms_paddle", __FILE__), + device_t(mconfig, SMS_PADDLE, "Sega SMS Paddle", tag, owner, clock, "sms_paddle", __FILE__), device_sms_control_port_interface(mconfig, *this), m_paddle_pins(*this, "CTRL_PORT"), m_paddle_x(*this, "PADDLE_X"), diff --git a/src/emu/bus/sms_ctrl/rfu.c b/src/emu/bus/sms_ctrl/rfu.c index c04ca1f8a84..99dfcdbd615 100644 --- a/src/emu/bus/sms_ctrl/rfu.c +++ b/src/emu/bus/sms_ctrl/rfu.c @@ -51,7 +51,7 @@ ioport_constructor sms_rapid_fire_device::device_input_ports() const //------------------------------------------------- sms_rapid_fire_device::sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, SMS_RAPID_FIRE, "Rapid Fire", tag, owner, clock, "sms_rapid_fire", __FILE__), + device_t(mconfig, SMS_RAPID_FIRE, "Sega SMS Rapid Fire", tag, owner, clock, "sms_rapid_fire", __FILE__), device_sms_control_port_interface(mconfig, *this), m_rfire_sw(*this, "rfu_sw"), m_subctrl_port(*this, "ctrl"), diff --git a/src/emu/bus/sms_ctrl/sports.c b/src/emu/bus/sms_ctrl/sports.c index 81bf836dd8e..a32ce734b4d 100644 --- a/src/emu/bus/sms_ctrl/sports.c +++ b/src/emu/bus/sms_ctrl/sports.c @@ -112,7 +112,7 @@ ioport_constructor sms_sports_pad_device::device_input_ports() const //------------------------------------------------- sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, SMS_SPORTS_PAD, "Sports Pad US", tag, owner, clock, "sms_sports_pad", __FILE__), + device_t(mconfig, SMS_SPORTS_PAD, "Sega SMS Sports Pad US", tag, owner, clock, "sms_sports_pad", __FILE__), device_sms_control_port_interface(mconfig, *this), m_sports_in(*this, "SPORTS_IN"), m_sports_out(*this, "SPORTS_OUT"), diff --git a/src/emu/bus/sms_ctrl/sportsjp.c b/src/emu/bus/sms_ctrl/sportsjp.c index 4fc166ccd3d..2d89a73772e 100644 --- a/src/emu/bus/sms_ctrl/sportsjp.c +++ b/src/emu/bus/sms_ctrl/sportsjp.c @@ -87,7 +87,7 @@ ioport_constructor sms_sports_pad_jp_device::device_input_ports() const //------------------------------------------------- sms_sports_pad_jp_device::sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, SMS_SPORTS_PAD_JP, "Sports Pad JP", tag, owner, clock, "sms_sports_pad_jp", __FILE__), + device_t(mconfig, SMS_SPORTS_PAD_JP, "Sega SMS Sports Pad JP", tag, owner, clock, "sms_sports_pad_jp", __FILE__), device_sms_control_port_interface(mconfig, *this), m_sports_jp_in(*this, "SPORTS_JP_IN"), m_sports_jp_x(*this, "SPORTS_JP_X"), diff --git a/src/emu/bus/vcs_ctrl/joybooster.c b/src/emu/bus/vcs_ctrl/joybooster.c index e2654968dc8..22b892f4bf7 100644 --- a/src/emu/bus/vcs_ctrl/joybooster.c +++ b/src/emu/bus/vcs_ctrl/joybooster.c @@ -58,7 +58,7 @@ ioport_constructor vcs_joystick_booster_device::device_input_ports() const //------------------------------------------------- vcs_joystick_booster_device::vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, VCS_JOYSTICK_BOOSTER, "Digital joystick with Boostergrip", tag, owner, clock, "vcs_joystick_booster", __FILE__), + device_t(mconfig, VCS_JOYSTICK_BOOSTER, "Atari / CBM Digital joystick with Boostergrip", tag, owner, clock, "vcs_joystick_booster", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_joy(*this, "JOY"), m_potx(*this, "POTX"), diff --git a/src/emu/bus/vcs_ctrl/joystick.c b/src/emu/bus/vcs_ctrl/joystick.c index 3ef46b0246c..f2c83ffa7f1 100644 --- a/src/emu/bus/vcs_ctrl/joystick.c +++ b/src/emu/bus/vcs_ctrl/joystick.c @@ -51,7 +51,7 @@ ioport_constructor vcs_joystick_device::device_input_ports() const //------------------------------------------------- vcs_joystick_device::vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, VCS_JOYSTICK, "Digital joystick", tag, owner, clock, "vcs_joystick", __FILE__), + device_t(mconfig, VCS_JOYSTICK, "Atari / CBM Digital joystick", tag, owner, clock, "vcs_joystick", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_joy(*this, "JOY") { diff --git a/src/emu/bus/vcs_ctrl/keypad.c b/src/emu/bus/vcs_ctrl/keypad.c index a41db6d400a..57929788e49 100644 --- a/src/emu/bus/vcs_ctrl/keypad.c +++ b/src/emu/bus/vcs_ctrl/keypad.c @@ -55,7 +55,7 @@ ioport_constructor vcs_keypad_device::device_input_ports() const //------------------------------------------------- vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, VCS_KEYPAD, "Keypad", tag, owner, clock, "vcs_keypad", __FILE__), + device_t(mconfig, VCS_KEYPAD, "Atari / CBM Keypad", tag, owner, clock, "vcs_keypad", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_keypad(*this, "KEYPAD") { diff --git a/src/emu/bus/vcs_ctrl/lightpen.c b/src/emu/bus/vcs_ctrl/lightpen.c index bf5a82997c0..9fefb29b31b 100644 --- a/src/emu/bus/vcs_ctrl/lightpen.c +++ b/src/emu/bus/vcs_ctrl/lightpen.c @@ -60,7 +60,7 @@ ioport_constructor vcs_lightpen_device::device_input_ports() const //------------------------------------------------- vcs_lightpen_device::vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, VCS_LIGHTPEN, "Light Pen", tag, owner, clock, "vcs_lightpen", __FILE__), + device_t(mconfig, VCS_LIGHTPEN, "Atari / CBM Light Pen", tag, owner, clock, "vcs_lightpen", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_joy(*this, "JOY"), m_lightx(*this, "LIGHTX"), diff --git a/src/emu/bus/vcs_ctrl/paddles.c b/src/emu/bus/vcs_ctrl/paddles.c index 61bc71c8bdf..98f4f8990cc 100644 --- a/src/emu/bus/vcs_ctrl/paddles.c +++ b/src/emu/bus/vcs_ctrl/paddles.c @@ -54,7 +54,7 @@ ioport_constructor vcs_paddles_device::device_input_ports() const //------------------------------------------------- vcs_paddles_device::vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, VCS_PADDLES, "Digital paddles", tag, owner, clock, "vcs_paddles", __FILE__), + device_t(mconfig, VCS_PADDLES, "Atari / CBM Digital paddles", tag, owner, clock, "vcs_paddles", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_joy(*this, "JOY"), m_potx(*this, "POTX"), diff --git a/src/emu/bus/vcs_ctrl/wheel.c b/src/emu/bus/vcs_ctrl/wheel.c index ee8b6cb2987..61111ecd033 100644 --- a/src/emu/bus/vcs_ctrl/wheel.c +++ b/src/emu/bus/vcs_ctrl/wheel.c @@ -48,7 +48,7 @@ ioport_constructor vcs_wheel_device::device_input_ports() const //------------------------------------------------- vcs_wheel_device::vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, VCS_WHEEL, "Driving Wheel", tag, owner, clock, "vcs_wheel", __FILE__), + device_t(mconfig, VCS_WHEEL, "Atari / CBM Driving Wheel", tag, owner, clock, "vcs_wheel", __FILE__), device_vcs_control_port_interface(mconfig, *this), m_joy(*this, "JOY"), m_wheel(*this, "WHEEL")