Previous 199869 Revisions Next

r34646 Tuesday 27th January, 2015 at 08:03:49 UTC by Fabio Priuli
make sure that controller devices don't get duplicate descriptions
in listxml output. nw.
[src/emu/bus/nes_ctrl]arkpaddle.c joypad.c suborkey.c
[src/emu/bus/sms_ctrl]graphic.c joypad.c lphaser.c multitap.c paddle.c rfu.c sports.c sportsjp.c
[src/emu/bus/vcs_ctrl]joybooster.c joystick.c keypad.c lightpen.c paddles.c wheel.c

trunk/src/emu/bus/nes_ctrl/arkpaddle.c
r243157r243158
5454}
5555
5656nes_vaus_device::nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
57               device_t(mconfig, NES_ARKPADDLE, "Arkanoid Vaus NES Controller", tag, owner, clock, "nes_vaus", __FILE__),
57               device_t(mconfig, NES_ARKPADDLE, "NES Arkanoid Vaus Controller", tag, owner, clock, "nes_vaus", __FILE__),
5858               device_nes_control_port_interface(mconfig, *this),
5959               m_paddle(*this, "PADDLE"),
6060               m_button(*this, "BUTTON")
r243157r243158
6262}
6363
6464nes_vausfc_device::nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
65               nes_vaus_device(mconfig, NES_ARKPADDLE_FC, "Arkanoid Vaus FC Controller", tag, owner, clock, "nes_vausfc", __FILE__)
65               nes_vaus_device(mconfig, NES_ARKPADDLE_FC, "FC Arkanoid Vaus Controller", tag, owner, clock, "nes_vausfc", __FILE__)
6666{
6767}
6868
trunk/src/emu/bus/nes_ctrl/joypad.c
r243157r243158
194194}
195195
196196nes_ccpadl_device::nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
197               nes_joypad_device(mconfig, NES_CCPAD_LEFT, "Crazy Climber Left Pad", tag, owner, clock, "nes_ccpadl", __FILE__)
197               nes_joypad_device(mconfig, NES_CCPAD_LEFT, "FC Crazy Climber Left Pad", tag, owner, clock, "nes_ccpadl", __FILE__)
198198{
199199}
200200
201201nes_ccpadr_device::nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
202               nes_joypad_device(mconfig, NES_CCPAD_RIGHT, "Crazy Climber Right Pad", tag, owner, clock, "nes_ccpadr", __FILE__)
202               nes_joypad_device(mconfig, NES_CCPAD_RIGHT, "FC Crazy Climber Right Pad", tag, owner, clock, "nes_ccpadr", __FILE__)
203203{
204204}
205205
trunk/src/emu/bus/nes_ctrl/suborkey.c
r243157r243158
162162//-------------------------------------------------
163163
164164nes_suborkey_device::nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
165               device_t(mconfig, NES_SUBORKEYBOARD, "FC Subor Keyboard", tag, owner, clock, "nes_suborkey", __FILE__),
165               device_t(mconfig, NES_SUBORKEYBOARD, "Subor FC Keyboard", tag, owner, clock, "nes_suborkey", __FILE__),
166166               device_nes_control_port_interface(mconfig, *this),
167167               m_kbd(*this, "SUBOR")
168168{
trunk/src/emu/bus/sms_ctrl/graphic.c
r243157r243158
7777//-------------------------------------------------
7878
7979sms_graphic_device::sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
80   : device_t(mconfig, SMS_GRAPHIC, "Graphic Board", tag, owner, clock, "sms_graphic", __FILE__)
80   : device_t(mconfig, SMS_GRAPHIC, "Sega SMS Graphic Board", tag, owner, clock, "sms_graphic", __FILE__)
8181   , device_sms_control_port_interface(mconfig, *this)
8282   , m_buttons(*this, "BUTTONS")
8383   , m_x(*this, "X")
trunk/src/emu/bus/sms_ctrl/joypad.c
r243157r243158
5151//-------------------------------------------------
5252
5353sms_joypad_device::sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
54   device_t(mconfig, SMS_JOYPAD, "Control Pad", tag, owner, clock, "sms_joypad", __FILE__),
54   device_t(mconfig, SMS_JOYPAD, "Sega SMS Control Pad", tag, owner, clock, "sms_joypad", __FILE__),
5555   device_sms_control_port_interface(mconfig, *this),
5656   m_joypad(*this, "JOYPAD")
5757{
trunk/src/emu/bus/sms_ctrl/lphaser.c
r243157r243158
7070//-------------------------------------------------
7171
7272sms_light_phaser_device::sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
73   device_t(mconfig, SMS_LIGHT_PHASER, "Light Phaser", tag, owner, clock, "sms_light_phaser", __FILE__),
73   device_t(mconfig, SMS_LIGHT_PHASER, "Sega SMS Light Phaser", tag, owner, clock, "sms_light_phaser", __FILE__),
7474   device_video_interface(mconfig, *this),
7575   device_sms_control_port_interface(mconfig, *this),
7676   m_lphaser_pins(*this, "CTRL_PORT"),
trunk/src/emu/bus/sms_ctrl/multitap.c
r243157r243158
2929//-------------------------------------------------
3030
3131sms_multitap_device::sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
32   device_t(mconfig, SMS_MULTITAP, "Multitap", tag, owner, clock, "sms_multitap", __FILE__),
32   device_t(mconfig, SMS_MULTITAP, "Sega SMS Multitap", tag, owner, clock, "sms_multitap", __FILE__),
3333   device_sms_control_port_interface(mconfig, *this),
3434   m_subctrl1_port(*this, "ctrl1"),
3535   m_subctrl2_port(*this, "ctrl2"),
trunk/src/emu/bus/sms_ctrl/paddle.c
r243157r243158
7373//-------------------------------------------------
7474
7575sms_paddle_device::sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
76   device_t(mconfig, SMS_PADDLE, "Paddle", tag, owner, clock, "sms_paddle", __FILE__),
76   device_t(mconfig, SMS_PADDLE, "Sega SMS Paddle", tag, owner, clock, "sms_paddle", __FILE__),
7777   device_sms_control_port_interface(mconfig, *this),
7878   m_paddle_pins(*this, "CTRL_PORT"),
7979   m_paddle_x(*this, "PADDLE_X"),
trunk/src/emu/bus/sms_ctrl/rfu.c
r243157r243158
5151//-------------------------------------------------
5252
5353sms_rapid_fire_device::sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
54   device_t(mconfig, SMS_RAPID_FIRE, "Rapid Fire", tag, owner, clock, "sms_rapid_fire", __FILE__),
54   device_t(mconfig, SMS_RAPID_FIRE, "Sega SMS Rapid Fire", tag, owner, clock, "sms_rapid_fire", __FILE__),
5555   device_sms_control_port_interface(mconfig, *this),
5656   m_rfire_sw(*this, "rfu_sw"),
5757   m_subctrl_port(*this, "ctrl"),
trunk/src/emu/bus/sms_ctrl/sports.c
r243157r243158
112112//-------------------------------------------------
113113
114114sms_sports_pad_device::sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
115   device_t(mconfig, SMS_SPORTS_PAD, "Sports Pad US", tag, owner, clock, "sms_sports_pad", __FILE__),
115   device_t(mconfig, SMS_SPORTS_PAD, "Sega SMS Sports Pad US", tag, owner, clock, "sms_sports_pad", __FILE__),
116116   device_sms_control_port_interface(mconfig, *this),
117117   m_sports_in(*this, "SPORTS_IN"),
118118   m_sports_out(*this, "SPORTS_OUT"),
trunk/src/emu/bus/sms_ctrl/sportsjp.c
r243157r243158
8787//-------------------------------------------------
8888
8989sms_sports_pad_jp_device::sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
90   device_t(mconfig, SMS_SPORTS_PAD_JP, "Sports Pad JP", tag, owner, clock, "sms_sports_pad_jp", __FILE__),
90   device_t(mconfig, SMS_SPORTS_PAD_JP, "Sega SMS Sports Pad JP", tag, owner, clock, "sms_sports_pad_jp", __FILE__),
9191   device_sms_control_port_interface(mconfig, *this),
9292   m_sports_jp_in(*this, "SPORTS_JP_IN"),
9393   m_sports_jp_x(*this, "SPORTS_JP_X"),
trunk/src/emu/bus/vcs_ctrl/joybooster.c
r243157r243158
5858//-------------------------------------------------
5959
6060vcs_joystick_booster_device::vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
61   device_t(mconfig, VCS_JOYSTICK_BOOSTER, "Digital joystick with Boostergrip", tag, owner, clock, "vcs_joystick_booster", __FILE__),
61   device_t(mconfig, VCS_JOYSTICK_BOOSTER, "Atari / CBM Digital joystick with Boostergrip", tag, owner, clock, "vcs_joystick_booster", __FILE__),
6262   device_vcs_control_port_interface(mconfig, *this),
6363   m_joy(*this, "JOY"),
6464   m_potx(*this, "POTX"),
trunk/src/emu/bus/vcs_ctrl/joystick.c
r243157r243158
5151//-------------------------------------------------
5252
5353vcs_joystick_device::vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
54   device_t(mconfig, VCS_JOYSTICK, "Digital joystick", tag, owner, clock, "vcs_joystick", __FILE__),
54   device_t(mconfig, VCS_JOYSTICK, "Atari / CBM Digital joystick", tag, owner, clock, "vcs_joystick", __FILE__),
5555   device_vcs_control_port_interface(mconfig, *this),
5656   m_joy(*this, "JOY")
5757{
trunk/src/emu/bus/vcs_ctrl/keypad.c
r243157r243158
5555//-------------------------------------------------
5656
5757vcs_keypad_device::vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
58   device_t(mconfig, VCS_KEYPAD, "Keypad", tag, owner, clock, "vcs_keypad", __FILE__),
58   device_t(mconfig, VCS_KEYPAD, "Atari / CBM Keypad", tag, owner, clock, "vcs_keypad", __FILE__),
5959   device_vcs_control_port_interface(mconfig, *this),
6060   m_keypad(*this, "KEYPAD")
6161{
trunk/src/emu/bus/vcs_ctrl/lightpen.c
r243157r243158
6060//-------------------------------------------------
6161
6262vcs_lightpen_device::vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
63   device_t(mconfig, VCS_LIGHTPEN, "Light Pen", tag, owner, clock, "vcs_lightpen", __FILE__),
63   device_t(mconfig, VCS_LIGHTPEN, "Atari / CBM Light Pen", tag, owner, clock, "vcs_lightpen", __FILE__),
6464   device_vcs_control_port_interface(mconfig, *this),
6565   m_joy(*this, "JOY"),
6666   m_lightx(*this, "LIGHTX"),
trunk/src/emu/bus/vcs_ctrl/paddles.c
r243157r243158
5454//-------------------------------------------------
5555
5656vcs_paddles_device::vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
57   device_t(mconfig, VCS_PADDLES, "Digital paddles", tag, owner, clock, "vcs_paddles", __FILE__),
57   device_t(mconfig, VCS_PADDLES, "Atari / CBM Digital paddles", tag, owner, clock, "vcs_paddles", __FILE__),
5858   device_vcs_control_port_interface(mconfig, *this),
5959   m_joy(*this, "JOY"),
6060   m_potx(*this, "POTX"),
trunk/src/emu/bus/vcs_ctrl/wheel.c
r243157r243158
4848//-------------------------------------------------
4949
5050vcs_wheel_device::vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
51   device_t(mconfig, VCS_WHEEL, "Driving Wheel", tag, owner, clock, "vcs_wheel", __FILE__),
51   device_t(mconfig, VCS_WHEEL, "Atari / CBM Driving Wheel", tag, owner, clock, "vcs_wheel", __FILE__),
5252   device_vcs_control_port_interface(mconfig, *this),
5353   m_joy(*this, "JOY"),
5454   m_wheel(*this, "WHEEL")

https://github.com/mamedev/mame/commit/a7b55252fdc8acce70145fc91c6af5bcf20d3915

Previous 199869 Revisions Next

© 1997-2024 The MAME Team