Previous 199869 Revisions Next

r25428 Thursday 26th September, 2013 at 01:02:39 UTC by David Haywood
fix a romset naming conflict pointed out on my site (nw)
[src/mess/machine]shark.c shark.h

trunk/src/mess/machine/shark.c
r25427r25428
2424//  DEVICE DEFINITIONS
2525//**************************************************************************
2626
27const device_type SHARK = &device_creator<shark_device>;
27const device_type SHARK = &device_creator<mshark_device>;
2828
2929
3030//-------------------------------------------------
31//  ROM( shark )
31//  ROM( mshark )
3232//-------------------------------------------------
3333
34ROM_START( shark )
34ROM_START( mshark )
3535   ROM_REGION( 0x5000, I8085_TAG, 0 )
3636   ROM_LOAD( "pch488 3450 v22.1 #1", 0x0000, 0x1000, CRC(03bff9d7) SHA1(ac506df6509e1b2185a69f9f8f44b8b456aa9834) )
3737   ROM_LOAD( "pch488 3450 v22.1 #2", 0x1000, 0x1000, CRC(c14fa5fe) SHA1(bcfd1dd65d692c76b90e6134b85f22c39c049430) )
r25427r25428
4848//  rom_region - device-specific ROM region
4949//-------------------------------------------------
5050
51const rom_entry *shark_device::device_rom_region() const
51const rom_entry *mshark_device::device_rom_region() const
5252{
53   return ROM_NAME( shark );
53   return ROM_NAME( mshark );
5454}
5555
5656
5757//-------------------------------------------------
58//  ADDRESS_MAP( shark_mem )
58//  ADDRESS_MAP( mshark_mem )
5959//-------------------------------------------------
6060
61static ADDRESS_MAP_START( shark_mem, AS_PROGRAM, 8, shark_device )
61static ADDRESS_MAP_START( mshark_mem, AS_PROGRAM, 8, mshark_device )
6262   AM_RANGE(0x0000, 0x4fff) AM_ROM AM_REGION(I8085_TAG, 0)
6363ADDRESS_MAP_END
6464
6565
6666//-------------------------------------------------
67//  ADDRESS_MAP( shark_io )
67//  ADDRESS_MAP( mshark_io )
6868//-------------------------------------------------
6969
70static ADDRESS_MAP_START( shark_io, AS_IO, 8, shark_device )
70static ADDRESS_MAP_START( mshark_io, AS_IO, 8, mshark_device )
7171ADDRESS_MAP_END
7272
7373
r25427r25428
8686
8787
8888//-------------------------------------------------
89//  MACHINE_CONFIG_FRAGMENT( shark )
89//  MACHINE_CONFIG_FRAGMENT( mshark )
9090//-------------------------------------------------
9191
92static MACHINE_CONFIG_FRAGMENT( shark )
92static MACHINE_CONFIG_FRAGMENT( mshark )
9393   // basic machine hardware
9494   MCFG_CPU_ADD(I8085_TAG, I8085A, 1000000)
95   MCFG_CPU_PROGRAM_MAP(shark_mem)
96   MCFG_CPU_IO_MAP(shark_io)
95   MCFG_CPU_PROGRAM_MAP(mshark_mem)
96   MCFG_CPU_IO_MAP(mshark_io)
9797
9898   // devices
9999   MCFG_HARDDISK_ADD("harddisk1")
r25427r25428
106106//  machine configurations
107107//-------------------------------------------------
108108
109machine_config_constructor shark_device::device_mconfig_additions() const
109machine_config_constructor mshark_device::device_mconfig_additions() const
110110{
111   return MACHINE_CONFIG_NAME( shark );
111   return MACHINE_CONFIG_NAME( mshark );
112112}
113113
114114
115115//-------------------------------------------------
116//  INPUT_PORTS( shark )
116//  INPUT_PORTS( mshark )
117117//-------------------------------------------------
118118
119INPUT_PORTS_START( shark )
119INPUT_PORTS_START( mshark )
120120INPUT_PORTS_END
121121
122122
r25427r25428
124124//  input_ports - device-specific input ports
125125//-------------------------------------------------
126126
127ioport_constructor shark_device::device_input_ports() const
127ioport_constructor mshark_device::device_input_ports() const
128128{
129   return INPUT_PORTS_NAME( shark );
129   return INPUT_PORTS_NAME( mshark );
130130}
131131
132132
r25427r25428
136136//**************************************************************************
137137
138138//-------------------------------------------------
139//  shark_device - constructor
139//  mshark_device - constructor
140140//-------------------------------------------------
141141
142shark_device::shark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
143   : device_t(mconfig, SHARK, "Mator SHARK", tag, owner, clock, "shark", __FILE__),
142mshark_device::mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
143   : device_t(mconfig, SHARK, "Mator SHARK", tag, owner, clock, "mshark", __FILE__),
144144      device_ieee488_interface(mconfig, *this),
145145      m_maincpu(*this, I8085_TAG)
146146{
r25427r25428
151151//  device_start - device-specific startup
152152//-------------------------------------------------
153153
154void shark_device::device_start()
154void mshark_device::device_start()
155155{
156156}
trunk/src/mess/machine/shark.h
r25427r25428
2626//  TYPE DEFINITIONS
2727//**************************************************************************
2828
29// ======================> shark_device
29// ======================> mshark_device
3030
31class shark_device :  public device_t,
31class mshark_device :  public device_t,
3232                  public device_ieee488_interface
3333{
3434public:
3535   // construction/destruction
36   shark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
36   mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
3737
3838   // optional information overrides
3939   virtual const rom_entry *device_rom_region() const;

Previous 199869 Revisions Next


© 1997-2024 The MAME Team