Previous 199869 Revisions Next

r23845 Friday 21st June, 2013 at 17:58:03 UTC by Miodrag Milanović
Fix device duplicated name/descriptions (nw)
[src/emu/cpu/psx]sio.c sio.h
[src/emu/machine]mc146818.c pci.c
[src/emu/sound]nes_apu.c sn76496.h wave.c
[src/mame/machine]mega32x.c mega32x.h megacd.c megacd.h
[src/mame/video]ppu2c0x.c vrender0.c
[src/mess/machine]a2eauxslot.c psxcd.c thomson.c
[src/mess/machine/ti99]peribox.c peribox.h videowrp.c

trunk/src/emu/sound/nes_apu.c
r23844r23845
769769const device_type NES = &device_creator<nesapu_device>;
770770
771771nesapu_device::nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
772   : device_t(mconfig, NES, "N2A03", tag, owner, clock, "nesapu", __FILE__),
772   : device_t(mconfig, NES, "N2A03 APU", tag, owner, clock, "nesapu", __FILE__),
773773      device_sound_interface(mconfig, *this)
774774{
775775   m_token = global_alloc_clear(nesapu_state);
trunk/src/emu/sound/wave.c
r23844r23845
8585const device_type WAVE = &device_creator<wave_device>;
8686
8787wave_device::wave_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
88   : device_t(mconfig, WAVE, "Cassette", tag, owner, clock, "wawe", __FILE__),
88   : device_t(mconfig, WAVE, "Wave", tag, owner, clock, "wawe", __FILE__),
8989      device_sound_interface(mconfig, *this)
9090{
9191}
trunk/src/emu/sound/sn76496.h
r23844r23845
144144{
145145public:
146146   gamegear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
147   :  sn76496_base_device(mconfig, GAMEGEAR, "Game Gear PSG", tag, 0x8000, 0x01, 0x08, true, true, 8, false, owner, clock, "gamegear", __FILE__)
147   :  sn76496_base_device(mconfig, GAMEGEAR, "Game Gear PSG", tag, 0x8000, 0x01, 0x08, true, true, 8, false, owner, clock, "gamegear_psg", __FILE__)
148148   { }
149149};
150150
trunk/src/emu/cpu/psx/sio.c
r23844r23845
2626const device_type PSX_SIO1 = &device_creator<psxsio1_device>;
2727
2828psxsio0_device::psxsio0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
29   psxsio_device(mconfig, PSX_SIO0, tag, owner, clock, "psxsio0", __FILE__)
29   psxsio_device(mconfig, PSX_SIO0, "PSX SIO-0", tag, owner, clock, "psxsio0", __FILE__)
3030{
3131}
3232
3333psxsio1_device::psxsio1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
34   psxsio_device(mconfig, PSX_SIO1, tag, owner, clock, "psxsio1", __FILE__)
34   psxsio_device(mconfig, PSX_SIO1, "PSX SIO-1", tag, owner, clock, "psxsio1", __FILE__)
3535{
3636}
3737
38psxsio_device::psxsio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
39   device_t(mconfig, type, "PSX SIO", tag, owner, clock, shortname, source),
38psxsio_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) :
39   device_t(mconfig, type, name, tag, owner, clock, shortname, source),
4040   m_irq_handler(*this)
4141{
4242}
trunk/src/emu/cpu/psx/sio.h
r23844r23845
3838class psxsio_device : public device_t
3939{
4040public:
41   psxsio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
41   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);
4242
4343   // static configuration helpers
4444   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); }
trunk/src/emu/machine/pci.c
r23844r23845
8888//  pci_bus_legacy_device - constructor
8989//-------------------------------------------------
9090pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
91      device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus_legacy", __FILE__),
91      device_t(mconfig, PCI_BUS, "PCI Bus Legacy", tag, owner, clock, "pci_bus_legacy", __FILE__),
9292      m_father(NULL)
9393{
9494   for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++) {
trunk/src/emu/machine/mc146818.c
r23844r23845
112112//-------------------------------------------------
113113
114114mc146818_device::mc146818_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
115   : device_t(mconfig, MC146818, "NVRAM", tag, owner, clock, "mc146818", __FILE__),
115   : device_t(mconfig, MC146818, "MC146818", tag, owner, clock, "mc146818", __FILE__),
116116      device_rtc_interface(mconfig, *this),
117117      device_nvram_interface(mconfig, *this),
118118      m_write_irq(*this),
trunk/src/mess/machine/ti99/videowrp.c
r23844r23845
3131}
3232
3333ti_std_video_device::ti_std_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
34   : ti_video_device(mconfig, TI99VIDEO, "Video subsystem", tag, owner, clock, "ti99_video", __FILE__)
34   : ti_video_device(mconfig, TI99VIDEO, "TI99 STD Video subsystem", tag, owner, clock, "ti99_video", __FILE__)
3535{
3636}
3737
3838ti_exp_video_device::ti_exp_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
39   : ti_video_device(mconfig, V9938VIDEO, "Video subsystem", tag, owner, clock, "v9938_video", __FILE__)
39   : ti_video_device(mconfig, V9938VIDEO, "TI99 EXP Video subsystem", tag, owner, clock, "v9938_video", __FILE__)
4040{
4141}
4242
trunk/src/mess/machine/ti99/peribox.c
r23844r23845
227227   for (int i=2; i <= 8; i++) m_slot[i] = NULL;
228228}
229229
230peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
231: bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, shortname, source)
230peribox_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)
231: bus8z_device(mconfig, type, name, tag, owner, clock, shortname, source)
232232{
233233   for (int i=2; i <= 8; i++) m_slot[i] = NULL;
234234}
r23844r23845
436436*****************************************************************************/
437437
438438peribox_gen_device::peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
439: peribox_device(mconfig, tag, owner, clock, "peribox_gen", __FILE__)
439: peribox_device(mconfig, PERIBOX_GEN, "Peripheral expansion box Generic", tag, owner, clock, "peribox_gen", __FILE__)
440440{
441441};
442442
r23844r23845
473473*****************************************************************************/
474474
475475peribox_sg_device::peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
476: peribox_device(mconfig, tag, owner, clock, "peribox_sg", __FILE__)
476: peribox_device(mconfig, PERIBOX_SG, "Peripheral expansion box SGCPU", tag, owner, clock, "peribox_sg", __FILE__)
477477{
478478};
479479
r23844r23845
517517*****************************************************************************/
518518
519519peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
520: peribox_device(mconfig, tag, owner, clock, "peribox_ev", __FILE__)
520: peribox_device(mconfig, PERIBOX_EV, "Peripheral expansion box EVPC", tag, owner, clock, "peribox_ev", __FILE__)
521521{
522522};
523523
trunk/src/mess/machine/ti99/peribox.h
r23844r23845
4747   friend class peribox_slot_device;
4848public:
4949   peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
50   peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
50   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);
5151
5252   // Next six methods are called from the console
5353   DECLARE_READ8Z_MEMBER(readz);
trunk/src/mess/machine/thomson.c
r23844r23845
670670//-------------------------------------------------
671671
672672to7_io_line_device::to7_io_line_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
673   : device_t(mconfig, TO7_IO_LINE, "Serial source", tag, owner, clock, "to7_io_line", __FILE__),
673   : device_t(mconfig, TO7_IO_LINE, "T07 Serial source", tag, owner, clock, "to7_io_line", __FILE__),
674674      device_serial_interface(mconfig, *this)
675675{
676676}
trunk/src/mess/machine/a2eauxslot.c
r23844r23845
2525//  a2eauxslot_slot_device - constructor
2626//-------------------------------------------------
2727a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
28      device_t(mconfig, A2EAUXSLOT_SLOT, "Apple II Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__),
28      device_t(mconfig, A2EAUXSLOT_SLOT, "Apple IIe AUX Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__),
2929      device_slot_interface(mconfig, *this)
3030{
3131}
r23844r23845
9898//-------------------------------------------------
9999
100100a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
101      device_t(mconfig, A2EAUXSLOT, "Apple II Bus", tag, owner, clock, "a2eauxslot", __FILE__)
101      device_t(mconfig, A2EAUXSLOT, "Apple IIe AUX Bus", tag, owner, clock, "a2eauxslot", __FILE__)
102102{
103103}
104104
trunk/src/mess/machine/psxcd.c
r23844r23845
9090};
9191
9292psxcd_device::psxcd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
93   cdrom_image_device(mconfig, PSXCD, "Cdrom", tag, owner, clock, "psx_cd", __FILE__),
93   cdrom_image_device(mconfig, PSXCD, "PSX Cdrom", tag, owner, clock, "psx_cd", __FILE__),
9494   m_irq_handler(*this)
9595{
9696   static_set_static_config(*this, &psx_cdrom);
trunk/src/mame/video/vrender0.c
r23844r23845
602602const device_type VIDEO_VRENDER0 = &device_creator<vr0video_device>;
603603
604604vr0video_device::vr0video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
605   : device_t(mconfig, VIDEO_VRENDER0, "VRender0", tag, owner, clock, "vr0video", __FILE__)
605   : device_t(mconfig, VIDEO_VRENDER0, "VRender0 Video", tag, owner, clock, "vr0video", __FILE__)
606606{
607607   m_token = global_alloc_clear(vr0video_state);
608608}
trunk/src/mame/video/ppu2c0x.c
r23844r23845
181181
182182// The PPU_2C05 variants have different protection value, set at DEVICE_START, but otherwise are all the same...
183183// Vs. Unisystem (Ninja Jajamaru Kun)
184ppu2c05_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__)
184ppu2c05_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__)
185185{
186186   m_security_value = 0x1b;    // game (jajamaru) doesn't seem to ever actually check it
187187}
188188// Vs. Unisystem (Mighty Bomb Jack)
189ppu2c05_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__)
189ppu2c05_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__)
190190{
191191   m_security_value = 0x3d;
192192}
193193// Vs. Unisystem (Gumshoe)
194ppu2c05_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__)
194ppu2c05_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__)
195195{
196196   m_security_value = 0x1c;
197197}
198198// Vs. Unisystem (Top Gun)
199ppu2c05_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__)
199ppu2c05_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__)
200200{
201201   m_security_value = 0x1b;
202202}
trunk/src/mame/machine/mega32x.c
r23844r23845
214214const device_type SEGA_32X_NTSC = &device_creator<sega_32x_ntsc_device>;
215215const device_type SEGA_32X_PAL = &device_creator<sega_32x_pal_device>;
216216
217sega_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)
218   : device_t(mconfig, type, "sega_32x_device", tag, owner, clock, shortname, source),
217sega_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)
218   : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
219219      m_master_cpu(*this, "32x_master_sh2"),
220220      m_slave_cpu(*this, "32x_slave_sh2"),
221221      m_lch_pwm(*this, "lch_pwm"),
r23844r23845
224224}
225225
226226sega_32x_ntsc_device::sega_32x_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
227   : sega_32x_device(mconfig, tag, owner, clock, SEGA_32X_NTSC, "sega_32x_ntsc", __FILE__)
227   : sega_32x_device(mconfig, SEGA_32X_NTSC, "sega_32x_ntsc", tag, owner, clock, "sega_32x_ntsc", __FILE__)
228228{
229229}
230230
231231sega_32x_pal_device::sega_32x_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
232   : sega_32x_device(mconfig, tag, owner, clock, SEGA_32X_PAL, "sega_32x_pal", __FILE__)
232   : sega_32x_device(mconfig, SEGA_32X_PAL, "sega_32x_pal", tag, owner, clock, "sega_32x_pal", __FILE__)
233233{
234234}
235235
trunk/src/mame/machine/mega32x.h
r23844r23845
2525class sega_32x_device : public device_t
2626{
2727public:
28   sega_32x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type, const char *shortname, const char *source);
28   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);
2929
3030   required_device<cpu_device> m_master_cpu;
3131   required_device<cpu_device> m_slave_cpu;
trunk/src/mame/machine/megacd.c
r23844r23845
2222const device_type SEGA_SEGACD_JAPAN = &device_creator<sega_segacd_japan_device>;
2323const device_type SEGA_SEGACD_EUROPE = &device_creator<sega_segacd_europe_device>;
2424
25sega_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)
26   : device_t(mconfig, type, "sega_segacd_device", tag, owner, clock, shortname, source),
25sega_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)
26   : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
2727      m_scdcpu(*this, "segacd_68k")
2828{
2929}
3030
3131sega_segacd_us_device::sega_segacd_us_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
32   : sega_segacd_device(mconfig, tag, owner, clock, SEGA_SEGACD_US, "sega_segacd_us", __FILE__)
32   : sega_segacd_device(mconfig, SEGA_SEGACD_US, "sega_segacd_us", tag, owner, clock, "sega_segacd_us", __FILE__)
3333{
3434}
3535
3636sega_segacd_japan_device::sega_segacd_japan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
37   : sega_segacd_device(mconfig, tag, owner, clock, SEGA_SEGACD_JAPAN, "sega_segacd_japan", __FILE__)
37   : sega_segacd_device(mconfig, SEGA_SEGACD_JAPAN, "sega_segacd_japan", tag, owner, clock, "sega_segacd_japan", __FILE__)
3838{
3939}
4040
4141sega_segacd_europe_device::sega_segacd_europe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
42   : sega_segacd_device(mconfig, tag, owner, clock, SEGA_SEGACD_EUROPE, "sega_segacd_europe", __FILE__)
42   : sega_segacd_device(mconfig, SEGA_SEGACD_EUROPE, "sega_segacd_europe", tag, owner, clock, "sega_segacd_europe", __FILE__)
4343{
4444}
4545
trunk/src/mame/machine/megacd.h
r23844r23845
198198class sega_segacd_device : public device_t
199199{
200200public:
201   sega_segacd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type, const char *shortname, const char *source);
201   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);
202202
203203   required_device<cpu_device> m_scdcpu;
204204   lc89510_temp_device *lc89510_temp;

Previous 199869 Revisions Next

© 1997-2024 The MAME Team