Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-27 10:43:07 +03:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Fix device duplicated name/descriptions (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2013-06-21 17:58:03 +00:00
parent a1814a25e5
commit e8521322b2
19 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/emu/cpu/psx/sio.c
View File

@ -26,17 +26,17 @@ const device_type PSX_SIO0 = &device_creator<psxsio0_device>;
const device_type PSX_SIO1 = &device_creator<psxsio1_device>;
psxsio0_device::psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
psxsio_device(mconfig, PSX_SIO0, tag, owner, clock, "psxsio0", __FILE__)
psxsio_device(mconfig, PSX_SIO0, "PSX SIO-0", tag, owner, clock, "psxsio0", __FILE__)
{
}
psxsio1_device::psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
psxsio_device(mconfig, PSX_SIO1, tag, owner, clock, "psxsio1", __FILE__)
psxsio_device(mconfig, PSX_SIO1, "PSX SIO-1", tag, owner, clock, "psxsio1", __FILE__)
{
}
psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, "PSX SIO", tag, owner, clock, shortname, source),
psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_irq_handler(*this)
{
}

2
src/emu/cpu/psx/sio.h
View File

@ -38,7 +38,7 @@ extern const device_type PSX_SIO1;
class psxsio_device : public device_t
{
public:
psxsio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
psxsio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxsio_device &>(device).m_irq_handler.set_callback(object); }

2
src/emu/machine/mc146818.c
View File

@ -112,7 +112,7 @@ const device_type MC146818 = &device_creator<mc146818_device>;
//-------------------------------------------------
mc146818_device::mc146818_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, MC146818, "NVRAM", tag, owner, clock, "mc146818", __FILE__),
: device_t(mconfig, MC146818, "MC146818", tag, owner, clock, "mc146818", __FILE__),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
m_write_irq(*this),

2
src/emu/machine/pci.c
View File

@ -88,7 +88,7 @@ const device_type PCI_BUS_LEGACY = &device_creator<pci_bus_legacy_device>;
// pci_bus_legacy_device - constructor
//-------------------------------------------------
pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus_legacy", __FILE__),
device_t(mconfig, PCI_BUS, "PCI Bus Legacy", tag, owner, clock, "pci_bus_legacy", __FILE__),
m_father(NULL)
{
for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++) {

2
src/emu/sound/nes_apu.c
View File

@ -769,7 +769,7 @@ static DEVICE_START( nesapu )
const device_type NES = &device_creator<nesapu_device>;
nesapu_device::nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, NES, "N2A03", tag, owner, clock, "nesapu", __FILE__),
: device_t(mconfig, NES, "N2A03 APU", tag, owner, clock, "nesapu", __FILE__),
device_sound_interface(mconfig, *this)
{
m_token = global_alloc_clear(nesapu_state);

2
src/emu/sound/sn76496.h
View File

@ -144,7 +144,7 @@ class gamegear_device : public sn76496_base_device
{
public:
gamegear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sn76496_base_device(mconfig, GAMEGEAR, "Game Gear PSG", tag, 0x8000, 0x01, 0x08, true, true, 8, false, owner, clock, "gamegear", __FILE__)
: sn76496_base_device(mconfig, GAMEGEAR, "Game Gear PSG", tag, 0x8000, 0x01, 0x08, true, true, 8, false, owner, clock, "gamegear_psg", __FILE__)
{ }
};

2
src/emu/sound/wave.c
View File

@ -85,7 +85,7 @@ static DEVICE_START( wave )
const device_type WAVE = &device_creator<wave_device>;
wave_device::wave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, WAVE, "Cassette", tag, owner, clock, "wawe", __FILE__),
: device_t(mconfig, WAVE, "Wave", tag, owner, clock, "wawe", __FILE__),
device_sound_interface(mconfig, *this)
{
}

8
src/mame/machine/mega32x.c
View File

@ -214,8 +214,8 @@ int fifo_block_b_full;
const device_type SEGA_32X_NTSC = &device_creator<sega_32x_ntsc_device>;
const device_type SEGA_32X_PAL = &device_creator<sega_32x_pal_device>;
sega_32x_device::sega_32x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type, const char *shortname, const char *source)
: device_t(mconfig, type, "sega_32x_device", tag, owner, clock, shortname, source),
sega_32x_device::sega_32x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_master_cpu(*this, "32x_master_sh2"),
m_slave_cpu(*this, "32x_slave_sh2"),
m_lch_pwm(*this, "lch_pwm"),
@ -224,12 +224,12 @@ sega_32x_device::sega_32x_device(const machine_config &mconfig, const char *tag,
}
sega_32x_ntsc_device::sega_32x_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sega_32x_device(mconfig, tag, owner, clock, SEGA_32X_NTSC, "sega_32x_ntsc", __FILE__)
: sega_32x_device(mconfig, SEGA_32X_NTSC, "sega_32x_ntsc", tag, owner, clock, "sega_32x_ntsc", __FILE__)
{
}
sega_32x_pal_device::sega_32x_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sega_32x_device(mconfig, tag, owner, clock, SEGA_32X_PAL, "sega_32x_pal", __FILE__)
: sega_32x_device(mconfig, SEGA_32X_PAL, "sega_32x_pal", tag, owner, clock, "sega_32x_pal", __FILE__)
{
}

2
src/mame/machine/mega32x.h
View File

@ -25,7 +25,7 @@
class sega_32x_device : public device_t
{
public:
sega_32x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type, const char *shortname, const char *source);
sega_32x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
required_device<cpu_device> m_master_cpu;
required_device<cpu_device> m_slave_cpu;

10
src/mame/machine/megacd.c
View File

@ -22,24 +22,24 @@ const device_type SEGA_SEGACD_US = &device_creator<sega_segacd_us_device>;
const device_type SEGA_SEGACD_JAPAN = &device_creator<sega_segacd_japan_device>;
const device_type SEGA_SEGACD_EUROPE = &device_creator<sega_segacd_europe_device>;
sega_segacd_device::sega_segacd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type, const char *shortname, const char *source)
: device_t(mconfig, type, "sega_segacd_device", tag, owner, clock, shortname, source),
sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_scdcpu(*this, "segacd_68k")
{
}
sega_segacd_us_device::sega_segacd_us_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sega_segacd_device(mconfig, tag, owner, clock, SEGA_SEGACD_US, "sega_segacd_us", __FILE__)
: sega_segacd_device(mconfig, SEGA_SEGACD_US, "sega_segacd_us", tag, owner, clock, "sega_segacd_us", __FILE__)
{
}
sega_segacd_japan_device::sega_segacd_japan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sega_segacd_device(mconfig, tag, owner, clock, SEGA_SEGACD_JAPAN, "sega_segacd_japan", __FILE__)
: sega_segacd_device(mconfig, SEGA_SEGACD_JAPAN, "sega_segacd_japan", tag, owner, clock, "sega_segacd_japan", __FILE__)
{
}
sega_segacd_europe_device::sega_segacd_europe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sega_segacd_device(mconfig, tag, owner, clock, SEGA_SEGACD_EUROPE, "sega_segacd_europe", __FILE__)
: sega_segacd_device(mconfig, SEGA_SEGACD_EUROPE, "sega_segacd_europe", tag, owner, clock, "sega_segacd_europe", __FILE__)
{
}

2
src/mame/machine/megacd.h
View File

@ -198,7 +198,7 @@ _32x32_END
class sega_segacd_device : public device_t
{
public:
sega_segacd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type, const char *shortname, const char *source);
sega_segacd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
required_device<cpu_device> m_scdcpu;
lc89510_temp_device *lc89510_temp;

8
src/mame/video/ppu2c0x.c
View File

@ -181,22 +181,22 @@ ppu2c07_device::ppu2c07_device(const machine_config &mconfig, const char *tag, d
// The PPU_2C05 variants have different protection value, set at DEVICE_START, but otherwise are all the same...
// Vs. Unisystem (Ninja Jajamaru Kun)
ppu2c05_01_device::ppu2c05_01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_01, "2C05 PPU", tag, owner, clock, "ppu2c05_01", __FILE__)
ppu2c05_01_device::ppu2c05_01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_01, "2C05_01 PPU", tag, owner, clock, "ppu2c05_01", __FILE__)
{
m_security_value = 0x1b; // game (jajamaru) doesn't seem to ever actually check it
}
// Vs. Unisystem (Mighty Bomb Jack)
ppu2c05_02_device::ppu2c05_02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_02, "2C05 PPU", tag, owner, clock, "ppu2c05_02", __FILE__)
ppu2c05_02_device::ppu2c05_02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_02, "2C05_02 PPU", tag, owner, clock, "ppu2c05_02", __FILE__)
{
m_security_value = 0x3d;
}
// Vs. Unisystem (Gumshoe)
ppu2c05_03_device::ppu2c05_03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_03, "2C05 PPU", tag, owner, clock, "ppu2c05_03", __FILE__)
ppu2c05_03_device::ppu2c05_03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_03, "2C05_03 PPU", tag, owner, clock, "ppu2c05_03", __FILE__)
{
m_security_value = 0x1c;
}
// Vs. Unisystem (Top Gun)
ppu2c05_04_device::ppu2c05_04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_04, "2C05 PPU", tag, owner, clock, "ppu2c05_04", __FILE__)
ppu2c05_04_device::ppu2c05_04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ppu2c0x_device(mconfig, PPU_2C05_04, "2C05_04 PPU", tag, owner, clock, "ppu2c05_04", __FILE__)
{
m_security_value = 0x1b;
}

2
src/mame/video/vrender0.c
View File

@ -602,7 +602,7 @@ static DEVICE_RESET( vr0video )
const device_type VIDEO_VRENDER0 = &device_creator<vr0video_device>;
vr0video_device::vr0video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, VIDEO_VRENDER0, "VRender0", tag, owner, clock, "vr0video", __FILE__)
: device_t(mconfig, VIDEO_VRENDER0, "VRender0 Video", tag, owner, clock, "vr0video", __FILE__)
{
m_token = global_alloc_clear(vr0video_state);
}

4
src/mess/machine/a2eauxslot.c
View File

@ -25,7 +25,7 @@ const device_type A2EAUXSLOT_SLOT = &device_creator<a2eauxslot_slot_device>;
// a2eauxslot_slot_device - constructor
//-------------------------------------------------
a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2EAUXSLOT_SLOT, "Apple II Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__),
device_t(mconfig, A2EAUXSLOT_SLOT, "Apple IIe AUX Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__),
device_slot_interface(mconfig, *this)
{
}
@ -98,7 +98,7 @@ void a2eauxslot_device::device_config_complete()
//-------------------------------------------------
a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
device_t(mconfig, A2EAUXSLOT, "Apple II Bus", tag, owner, clock, "a2eauxslot", __FILE__)
device_t(mconfig, A2EAUXSLOT, "Apple IIe AUX Bus", tag, owner, clock, "a2eauxslot", __FILE__)
{
}

2
src/mess/machine/psxcd.c
View File

@ -90,7 +90,7 @@ static struct cdrom_interface psx_cdrom =
};
psxcd_device::psxcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
cdrom_image_device(mconfig, PSXCD, "Cdrom", tag, owner, clock, "psx_cd", __FILE__),
cdrom_image_device(mconfig, PSXCD, "PSX Cdrom", tag, owner, clock, "psx_cd", __FILE__),
m_irq_handler(*this)
{
static_set_static_config(*this, &psx_cdrom);

2
src/mess/machine/thomson.c
View File

@ -670,7 +670,7 @@ const device_type TO7_IO_LINE = &device_creator<to7_io_line_device>;
//-------------------------------------------------
to7_io_line_device::to7_io_line_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: device_t(mconfig, TO7_IO_LINE, "Serial source", tag, owner, clock, "to7_io_line", __FILE__),
: device_t(mconfig, TO7_IO_LINE, "T07 Serial source", tag, owner, clock, "to7_io_line", __FILE__),
device_serial_interface(mconfig, *this)
{
}

10
src/mess/machine/ti99/peribox.c
View File

@ -227,8 +227,8 @@ peribox_device::peribox_device(const machine_config &mconfig, const char *tag, d
for (int i=2; i <= 8; i++) m_slot[i] = NULL;
}
peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, shortname, source)
peribox_device::peribox_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source)
{
for (int i=2; i <= 8; i++) m_slot[i] = NULL;
}
@ -436,7 +436,7 @@ machine_config_constructor peribox_device::device_mconfig_additions() const
*****************************************************************************/
peribox_gen_device::peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, tag, owner, clock, "peribox_gen", __FILE__)
: peribox_device(mconfig, PERIBOX_GEN, "Peripheral expansion box Generic", tag, owner, clock, "peribox_gen", __FILE__)
{
};
@ -473,7 +473,7 @@ machine_config_constructor peribox_gen_device::device_mconfig_additions() const
*****************************************************************************/
peribox_sg_device::peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, tag, owner, clock, "peribox_sg", __FILE__)
: peribox_device(mconfig, PERIBOX_SG, "Peripheral expansion box SGCPU", tag, owner, clock, "peribox_sg", __FILE__)
{
};
@ -517,7 +517,7 @@ machine_config_constructor peribox_sg_device::device_mconfig_additions() const
*****************************************************************************/
peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: peribox_device(mconfig, tag, owner, clock, "peribox_ev", __FILE__)
: peribox_device(mconfig, PERIBOX_EV, "Peripheral expansion box EVPC", tag, owner, clock, "peribox_ev", __FILE__)
{
};

2
src/mess/machine/ti99/peribox.h
View File

@ -47,7 +47,7 @@ class peribox_device : public bus8z_device
friend class peribox_slot_device;
public:
peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
peribox_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// Next six methods are called from the console
DECLARE_READ8Z_MEMBER(readz);

4
src/mess/machine/ti99/videowrp.c
View File

@ -31,12 +31,12 @@ ti_video_device::ti_video_device(const machine_config &mconfig, device_type type
}
ti_std_video_device::ti_std_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ti_video_device(mconfig, TI99VIDEO, "Video subsystem", tag, owner, clock, "ti99_video", __FILE__)
: ti_video_device(mconfig, TI99VIDEO, "TI99 STD Video subsystem", tag, owner, clock, "ti99_video", __FILE__)
{
}
ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ti_video_device(mconfig, V9938VIDEO, "Video subsystem", tag, owner, clock, "v9938_video", __FILE__)
: ti_video_device(mconfig, V9938VIDEO, "TI99 EXP Video subsystem", tag, owner, clock, "v9938_video", __FILE__)
{
}