diff options
Diffstat (limited to 'src/emu/bus/odyssey2')
| -rw-r--r-- | src/emu/bus/odyssey2/chess.h | 5 | ||||
| -rw-r--r-- | src/emu/bus/odyssey2/rom.c | 5 | ||||
| -rw-r--r-- | src/emu/bus/odyssey2/rom.h | 12 | ||||
| -rw-r--r-- | src/emu/bus/odyssey2/slot.c | 5 | ||||
| -rw-r--r-- | src/emu/bus/odyssey2/slot.h | 5 | ||||
| -rw-r--r-- | src/emu/bus/odyssey2/voice.c | 2 | ||||
| -rw-r--r-- | src/emu/bus/odyssey2/voice.h | 2 |
7 files changed, 16 insertions, 20 deletions
diff --git a/src/emu/bus/odyssey2/chess.h b/src/emu/bus/odyssey2/chess.h index 8b71f56ed93..66015c033cb 100644 --- a/src/emu/bus/odyssey2/chess.h +++ b/src/emu/bus/odyssey2/chess.h @@ -12,10 +12,9 @@ class o2_chess_device : public o2_rom_device { - virtual machine_config_constructor device_mconfig_additions() const; -// virtual const rom_entry *device_rom_region() const; - +// virtual const rom_entry *device_rom_region() const; + public: // construction/destruction o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/emu/bus/odyssey2/rom.c b/src/emu/bus/odyssey2/rom.c index da0f02f6941..d741dcdd802 100644 --- a/src/emu/bus/odyssey2/rom.c +++ b/src/emu/bus/odyssey2/rom.c @@ -50,12 +50,12 @@ o2_rom16_device::o2_rom16_device(const machine_config &mconfig, const char *tag, //------------------------------------------------- void o2_rom_device::device_start() -{ +{ save_item(NAME(m_bank_base)); } void o2_rom_device::device_reset() -{ +{ m_bank_base = 0; } @@ -94,4 +94,3 @@ READ8_MEMBER(o2_rom16_device::read_rom0c) { return m_rom[offset + 0xc00 + (m_bank_base & 0x03) * 0x1000]; } - diff --git a/src/emu/bus/odyssey2/rom.h b/src/emu/bus/odyssey2/rom.h index 52b08a0e5e4..7a4af0a32b5 100644 --- a/src/emu/bus/odyssey2/rom.h +++ b/src/emu/bus/odyssey2/rom.h @@ -15,17 +15,17 @@ public: // construction/destruction o2_rom_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); o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + // device-level overrides virtual void device_start(); virtual void device_reset(); - + // reading and writing virtual DECLARE_READ8_MEMBER(read_rom04); virtual DECLARE_READ8_MEMBER(read_rom0c); - + virtual void write_bank(int bank); - + protected: int m_bank_base; }; @@ -37,7 +37,7 @@ class o2_rom12_device : public o2_rom_device public: // construction/destruction o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + // reading and writing virtual DECLARE_READ8_MEMBER(read_rom04); virtual DECLARE_READ8_MEMBER(read_rom0c); @@ -50,7 +50,7 @@ class o2_rom16_device : public o2_rom_device public: // construction/destruction o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + // reading and writing virtual DECLARE_READ8_MEMBER(read_rom04); virtual DECLARE_READ8_MEMBER(read_rom0c); diff --git a/src/emu/bus/odyssey2/slot.c b/src/emu/bus/odyssey2/slot.c index 12bde81adc1..c8dc8e053f5 100644 --- a/src/emu/bus/odyssey2/slot.c +++ b/src/emu/bus/odyssey2/slot.c @@ -166,7 +166,7 @@ bool o2_cart_slot_device::call_load() { UINT32 size = (software_entry() == NULL) ? length() : get_software_region_length("rom"); m_cart->rom_alloc(size, tag()); - + if (software_entry() == NULL) fread(m_cart->get_rom_base(), size); else @@ -223,7 +223,7 @@ void o2_cart_slot_device::get_default_card_software(astring &result) type = O2_ROM12; if (size == 16384) type = O2_ROM16; - + slot_string = o2_get_slot(type); //printf("type: %s\n", slot_string); @@ -278,4 +278,3 @@ SLOT_INTERFACE_START(o2_cart) SLOT_INTERFACE_INTERNAL("o2_chess", O2_ROM_CHESS) SLOT_INTERFACE_INTERNAL("o2_voice", O2_ROM_VOICE) SLOT_INTERFACE_END - diff --git a/src/emu/bus/odyssey2/slot.h b/src/emu/bus/odyssey2/slot.h index 4de4d26b9b0..fad028fc10a 100644 --- a/src/emu/bus/odyssey2/slot.h +++ b/src/emu/bus/odyssey2/slot.h @@ -92,7 +92,7 @@ public: virtual DECLARE_WRITE8_MEMBER(io_write); virtual DECLARE_READ8_MEMBER(t0_read) { if (m_cart) return m_cart->t0_read(space, offset); else return 0; } - virtual void write_bank(int bank) { if (m_cart) m_cart->write_bank(bank); } + virtual void write_bank(int bank) { if (m_cart) m_cart->write_bank(bank); } protected: @@ -114,8 +114,7 @@ extern const device_type O2_CART_SLOT; #define MCFG_O2_CARTRIDGE_ADD(_tag,_slot_intf,_def_slot) \ MCFG_DEVICE_ADD(_tag, O2_CART_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \ - + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) SLOT_INTERFACE_EXTERN(o2_cart); diff --git a/src/emu/bus/odyssey2/voice.c b/src/emu/bus/odyssey2/voice.c index d229ab21934..c3f5fce565e 100644 --- a/src/emu/bus/odyssey2/voice.c +++ b/src/emu/bus/odyssey2/voice.c @@ -33,7 +33,7 @@ o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, void o2_voice_device::device_start() -{ +{ save_item(NAME(m_lrq_state)); } diff --git a/src/emu/bus/odyssey2/voice.h b/src/emu/bus/odyssey2/voice.h index 85339aa699f..83b8c532e1f 100644 --- a/src/emu/bus/odyssey2/voice.h +++ b/src/emu/bus/odyssey2/voice.h @@ -27,7 +27,7 @@ public: virtual DECLARE_READ8_MEMBER(read_rom04) { if (m_subslot->exists()) return m_subslot->read_rom04(space, offset); else return 0xff; } virtual DECLARE_READ8_MEMBER(read_rom0c) { if (m_subslot->exists()) return m_subslot->read_rom0c(space, offset); else return 0xff; } - virtual void write_bank(int bank) { if (m_subslot->exists()) m_subslot->write_bank(bank); } + virtual void write_bank(int bank) { if (m_subslot->exists()) m_subslot->write_bank(bank); } DECLARE_WRITE_LINE_MEMBER(lrq_callback); DECLARE_WRITE8_MEMBER(io_write); |
