diff options
Diffstat (limited to 'src/mess/includes')
-rw-r--r-- | src/mess/includes/c128.h | 4 | ||||
-rw-r--r-- | src/mess/includes/c64.h | 4 | ||||
-rw-r--r-- | src/mess/includes/cbm2.h | 8 | ||||
-rw-r--r-- | src/mess/includes/plus4.h | 9 | ||||
-rw-r--r-- | src/mess/includes/vic10.h | 4 | ||||
-rw-r--r-- | src/mess/includes/vic20.h | 1 |
6 files changed, 13 insertions, 17 deletions
diff --git a/src/mess/includes/c128.h b/src/mess/includes/c128.h index bcc632205f7..bdaebb7380a 100644 --- a/src/mess/includes/c128.h +++ b/src/mess/includes/c128.h @@ -18,7 +18,7 @@ #include "machine/ram.h" #include "machine/vcsctrl.h" #include "sound/dac.h" -#include "sound/sid6581.h" +#include "sound/mos6581.h" #include "video/mos6566.h" #define Z80A_TAG "u10" @@ -105,7 +105,7 @@ public: required_device<mos8721_device> m_pla; required_device<mos8563_device> m_vdc; required_device<mos6566_device> m_vic; - required_device<sid6581_device> m_sid; + required_device<mos6581_device> m_sid; required_device<mos6526_device> m_cia1; required_device<mos6526_device> m_cia2; required_device<cbm_iec_device> m_iec; diff --git a/src/mess/includes/c64.h b/src/mess/includes/c64.h index aaab110519d..5386d6a0408 100644 --- a/src/mess/includes/c64.h +++ b/src/mess/includes/c64.h @@ -16,7 +16,7 @@ #include "machine/ram.h" #include "machine/vcsctrl.h" #include "sound/dac.h" -#include "sound/sid6581.h" +#include "sound/mos6581.h" #include "video/mos6566.h" #define M6510_TAG "u7" @@ -77,7 +77,7 @@ public: required_device<m6510_device> m_maincpu; required_device<pls100_device> m_pla; required_device<mos6566_device> m_vic; - required_device<sid6581_device> m_sid; + required_device<mos6581_device> m_sid; required_device<mos6526_device> m_cia1; required_device<mos6526_device> m_cia2; optional_device<cbm_iec_device> m_iec; diff --git a/src/mess/includes/cbm2.h b/src/mess/includes/cbm2.h index 7fbda2bfa54..954ab8decc1 100644 --- a/src/mess/includes/cbm2.h +++ b/src/mess/includes/cbm2.h @@ -24,7 +24,7 @@ #include "machine/serial.h" #include "machine/vcsctrl.h" #include "sound/dac.h" -#include "sound/sid6581.h" +#include "sound/mos6581.h" #include "video/mc6845.h" #include "video/mos6566.h" @@ -34,7 +34,7 @@ #define MOS6567_TAG "u23" #define MOS6569_TAG "u23" #define MC68B45_TAG "u10" -#define MOS6851_TAG "u4" +#define MOS6581_TAG "u4" #define MOS6525_1_TAG "u20" #define MOS6525_2_TAG "u102" #define MOS6551A_TAG "u19" @@ -60,7 +60,7 @@ public: m_maincpu(*this, M6509_TAG), m_pla1(*this, PLA1_TAG), m_crtc(*this, MC68B45_TAG), - m_sid(*this, MOS6851_TAG), + m_sid(*this, MOS6581_TAG), m_tpi1(*this, MOS6525_1_TAG), m_tpi2(*this, MOS6525_2_TAG), m_acia(*this, MOS6551A_TAG), @@ -115,7 +115,7 @@ public: required_device<cpu_device> m_maincpu; required_device<pls100_device> m_pla1; optional_device<mc6845_device> m_crtc; - required_device<sid6581_device> m_sid; + required_device<mos6581_device> m_sid; required_device<tpi6525_device> m_tpi1; required_device<tpi6525_device> m_tpi2; required_device<mos6551_device> m_acia; diff --git a/src/mess/includes/plus4.h b/src/mess/includes/plus4.h index d496904fa98..d9c025b6c1f 100644 --- a/src/mess/includes/plus4.h +++ b/src/mess/includes/plus4.h @@ -4,7 +4,6 @@ #define __PLUS4__ #include "emu.h" -#include "audio/mos7360.h" #include "cpu/m6502/m7501.h" #include "formats/cbm_snqk.h" #include "machine/cbmiec.h" @@ -17,6 +16,7 @@ #include "machine/plus4exp.h" #include "machine/plus4user.h" #include "machine/ram.h" +#include "sound/mos7360.h" #include "sound/t6721a.h" #define MOS7501_TAG "u2" @@ -99,8 +99,8 @@ public: virtual void machine_reset(); void check_interrupts(); - void bankswitch(offs_t offset, int phi0, int mux, int ras, int *scs, int *phi2, int *user, int *_6551, int *addr_clk, int *keyport, int *kernal, int *cs0, int *cs1); - UINT8 read_memory(address_space &space, offs_t offset, int ba, int scs, int phi2, int user, int _6551, int addr_clk, int keyport, int kernal, int cs0, int cs1); + void bankswitch(offs_t offset, int phi0, int mux, int ras, int *scs, int *phi2, int *user, int *_6551, int *addr_clk, int *keyport, int *kernal); + UINT8 read_memory(address_space &space, offs_t offset, int ba, int scs, int phi2, int user, int _6551, int addr_clk, int keyport, int kernal); UINT8 read_keyboard(UINT8 databus); DECLARE_READ8_MEMBER( read ); @@ -149,9 +149,6 @@ public: // keyboard state UINT8 m_kb; - - INTERRUPT_GEN_MEMBER(c16_raster_interrupt); - INTERRUPT_GEN_MEMBER(c16_frame_interrupt); }; diff --git a/src/mess/includes/vic10.h b/src/mess/includes/vic10.h index eadad6f88f4..27db1534f71 100644 --- a/src/mess/includes/vic10.h +++ b/src/mess/includes/vic10.h @@ -11,7 +11,7 @@ #include "machine/ram.h" #include "machine/vcsctrl.h" #include "sound/dac.h" -#include "sound/sid6581.h" +#include "sound/mos6581.h" #include "video/mos6566.h" #define M6510_TAG "u3" @@ -55,7 +55,7 @@ public: required_device<m6510_device> m_maincpu; required_device<mos6566_device> m_vic; - required_device<sid6581_device> m_sid; + required_device<mos6581_device> m_sid; required_device<mos6526_device> m_cia; required_device<vcs_control_port_device> m_joy1; required_device<vcs_control_port_device> m_joy2; diff --git a/src/mess/includes/vic20.h b/src/mess/includes/vic20.h index 698504af307..877c94e7a0c 100644 --- a/src/mess/includes/vic20.h +++ b/src/mess/includes/vic20.h @@ -113,7 +113,6 @@ public: // keyboard state int m_key_col; - INTERRUPT_GEN_MEMBER(vic20_raster_interrupt); }; #endif |