diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2013-02-11 07:44:56 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2013-02-11 07:44:56 +0000 |
commit | a440a8e0200a36491ae540f6f00beae59c148549 (patch) | |
tree | b4c31ebadaa2857396c37178674086420bf1658f /src/mess/includes | |
parent | 4b0b4e6b2fa7eb5105859f561354662d479f53be (diff) |
Cleanups and version bumpmame0148u1
Diffstat (limited to 'src/mess/includes')
-rw-r--r-- | src/mess/includes/abc1600.h | 2 | ||||
-rw-r--r-- | src/mess/includes/abc80x.h | 4 | ||||
-rw-r--r-- | src/mess/includes/amstrad.h | 2 | ||||
-rw-r--r-- | src/mess/includes/apple2.h | 2 | ||||
-rw-r--r-- | src/mess/includes/apple2gs.h | 50 | ||||
-rw-r--r-- | src/mess/includes/aquarius.h | 32 | ||||
-rw-r--r-- | src/mess/includes/atarist.h | 4 | ||||
-rw-r--r-- | src/mess/includes/cbm2.h | 2 | ||||
-rw-r--r-- | src/mess/includes/gb.h | 8 | ||||
-rw-r--r-- | src/mess/includes/md.h | 12 | ||||
-rw-r--r-- | src/mess/includes/nes.h | 2 | ||||
-rw-r--r-- | src/mess/includes/pc1512.h | 6 | ||||
-rw-r--r-- | src/mess/includes/pcw16.h | 18 | ||||
-rw-r--r-- | src/mess/includes/pet2001.h | 12 | ||||
-rw-r--r-- | src/mess/includes/plus4.h | 4 | ||||
-rw-r--r-- | src/mess/includes/portfoli.h | 2 | ||||
-rw-r--r-- | src/mess/includes/psion.h | 2 | ||||
-rw-r--r-- | src/mess/includes/sapi1.h | 2 | ||||
-rw-r--r-- | src/mess/includes/tiki100.h | 2 | ||||
-rw-r--r-- | src/mess/includes/trs80m2.h | 4 | ||||
-rw-r--r-- | src/mess/includes/wangpc.h | 2 |
21 files changed, 87 insertions, 87 deletions
diff --git a/src/mess/includes/abc1600.h b/src/mess/includes/abc1600.h index f86e0454233..13cc2d1e140 100644 --- a/src/mess/includes/abc1600.h +++ b/src/mess/includes/abc1600.h @@ -157,7 +157,7 @@ public: DECLARE_WRITE8_MEMBER( cio_pc_w ); DECLARE_WRITE_LINE_MEMBER( nmi_w ); - + IRQ_CALLBACK_MEMBER( abc1600_int_ack ); void fdc_intrq_w(bool state); diff --git a/src/mess/includes/abc80x.h b/src/mess/includes/abc80x.h index 99127862d30..ea6cf283ad6 100644 --- a/src/mess/includes/abc80x.h +++ b/src/mess/includes/abc80x.h @@ -59,8 +59,8 @@ #define Z80SIO_TAG "z80sio" #define Z80DART_TAG "z80dart" #define DISCRETE_TAG "discrete" -#define RS232_A_TAG "rs232a" -#define RS232_B_TAG "rs232b" +#define RS232_A_TAG "rs232a" +#define RS232_B_TAG "rs232b" //************************************************************************** diff --git a/src/mess/includes/amstrad.h b/src/mess/includes/amstrad.h index c1f1963c8c8..30c1c6b8873 100644 --- a/src/mess/includes/amstrad.h +++ b/src/mess/includes/amstrad.h @@ -189,7 +189,7 @@ public: void aleste_interrupt(bool state); DECLARE_FLOPPY_FORMATS( floppy_formats ); - + IRQ_CALLBACK_MEMBER(amstrad_cpu_acknowledge_int); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( amstrad_plus_cartridge ); diff --git a/src/mess/includes/apple2.h b/src/mess/includes/apple2.h index 4c629fce510..6ab58783080 100644 --- a/src/mess/includes/apple2.h +++ b/src/mess/includes/apple2.h @@ -75,7 +75,7 @@ enum machine_type_t { APPLE_II, // Apple II/II+ - APPLE_IIE, // Apple IIe with aux slots + APPLE_IIE, // Apple IIe with aux slots APPLE_IIEPLUS, // Apple IIc/IIgs/IIc+ with permanent aux memory TK2000, // Microdigital TK2000 LASER128, // Laser 128/128EX/128EX2 diff --git a/src/mess/includes/apple2gs.h b/src/mess/includes/apple2gs.h index 35f73381100..0bd2e3ffec4 100644 --- a/src/mess/includes/apple2gs.h +++ b/src/mess/includes/apple2gs.h @@ -18,7 +18,7 @@ #include "cpu/m6502/m5074x.h" #endif -#define ADBMICRO_TAG "adbmicro" +#define ADBMICRO_TAG "adbmicro" // IIgs clocks as marked on the schematics #define APPLE2GS_28M (XTAL_28_63636MHz) // IIGS master clock @@ -33,27 +33,27 @@ // these are numbered as seen from the MCU enum glu_reg_names { - GLU_KEY_DATA = 0, // MCU W - GLU_COMMAND, // MCU R - GLU_MOUSEX, // MCU W - GLU_MOUSEY, // MCU W - GLU_KG_STATUS, // MCU R - GLU_ANY_KEY_DOWN, // MCU W - GLU_KEYMOD, // MCU W - GLU_DATA, // MCU W - - GLU_C000, // 816 R - GLU_C010, // 816 RW - GLU_SYSSTAT // 816 R/(limited) W + GLU_KEY_DATA = 0, // MCU W + GLU_COMMAND, // MCU R + GLU_MOUSEX, // MCU W + GLU_MOUSEY, // MCU W + GLU_KG_STATUS, // MCU R + GLU_ANY_KEY_DOWN, // MCU W + GLU_KEYMOD, // MCU W + GLU_DATA, // MCU W + + GLU_C000, // 816 R + GLU_C010, // 816 RW + GLU_SYSSTAT // 816 R/(limited) W }; -enum glu_kg_status +enum glu_kg_status { - KGS_ANY_KEY_DOWN = 0x01, - KGS_KEYSTROBE = 0x10, - KGS_DATA_FULL = 0x20, - KGS_COMMAND_FULL = 0x40, - KGS_MOUSEX_FULL = 0x80 + KGS_ANY_KEY_DOWN = 0x01, + KGS_KEYSTROBE = 0x10, + KGS_DATA_FULL = 0x20, + KGS_COMMAND_FULL = 0x40, + KGS_MOUSEX_FULL = 0x80 }; enum apple2gs_clock_mode @@ -194,15 +194,15 @@ public: DECLARE_WRITE8_MEMBER(a2bus_inh_w); DECLARE_READ8_MEMBER(apple2gs_read_vector); - // ADB MCU and ADB GLU stuff + // ADB MCU and ADB GLU stuff #if RUN_ADB_MICRO - UINT8 m_glu_regs[8], m_glu_bus, m_glu_sysstat; - bool m_glu_mcu_read_kgs, m_glu_816_read_dstat, m_glu_mouse_read_stat, m_adb_line; + UINT8 m_glu_regs[8], m_glu_bus, m_glu_sysstat; + bool m_glu_mcu_read_kgs, m_glu_816_read_dstat, m_glu_mouse_read_stat, m_adb_line; UINT8 keyglu_mcu_read(UINT8 offset); - void keyglu_mcu_write(UINT8 offset, UINT8 data); - UINT8 keyglu_816_read(UINT8 offset); - void keyglu_816_write(UINT8 offset, UINT8 data); + void keyglu_mcu_write(UINT8 offset, UINT8 data); + UINT8 keyglu_816_read(UINT8 offset); + void keyglu_816_write(UINT8 offset, UINT8 data); DECLARE_READ8_MEMBER(adbmicro_p0_in); DECLARE_READ8_MEMBER(adbmicro_p1_in); diff --git a/src/mess/includes/aquarius.h b/src/mess/includes/aquarius.h index 4ebe80df8f5..75ac5b72720 100644 --- a/src/mess/includes/aquarius.h +++ b/src/mess/includes/aquarius.h @@ -20,22 +20,22 @@ class aquarius_state : public driver_device public: aquarius_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_cassette(*this, CASSETTE_TAG), - m_speaker(*this, SPEAKER_TAG), - m_screen(*this, "screen"), - m_ram(*this, RAM_TAG), - m_rom(*this, "maincpu"), - m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"), - m_y0(*this, "Y0"), - m_y1(*this, "Y1"), - m_y2(*this, "Y2"), - m_y3(*this, "Y3"), - m_y4(*this, "Y4"), - m_y5(*this, "Y5"), - m_y6(*this, "Y6"), - m_y7(*this, "Y7") + m_maincpu(*this, "maincpu"), + m_cassette(*this, CASSETTE_TAG), + m_speaker(*this, SPEAKER_TAG), + m_screen(*this, "screen"), + m_ram(*this, RAM_TAG), + m_rom(*this, "maincpu"), + m_videoram(*this, "videoram"), + m_colorram(*this, "colorram"), + m_y0(*this, "Y0"), + m_y1(*this, "Y1"), + m_y2(*this, "Y2"), + m_y3(*this, "Y3"), + m_y4(*this, "Y4"), + m_y5(*this, "Y5"), + m_y6(*this, "Y6"), + m_y7(*this, "Y7") { } required_device<legacy_cpu_device> m_maincpu; diff --git a/src/mess/includes/atarist.h b/src/mess/includes/atarist.h index ed86ac27c99..f55c8f3c31c 100644 --- a/src/mess/includes/atarist.h +++ b/src/mess/includes/atarist.h @@ -315,7 +315,7 @@ public: TIMER_CALLBACK_MEMBER(atarist_shifter_tick); TIMER_CALLBACK_MEMBER(atarist_glue_tick); TIMER_CALLBACK_MEMBER(atarist_blitter_tick); - IRQ_CALLBACK_MEMBER(atarist_int_ack); + IRQ_CALLBACK_MEMBER(atarist_int_ack); }; class megast_state : public st_state @@ -371,7 +371,7 @@ public: TIMER_CALLBACK_MEMBER(atariste_dmasound_tick); TIMER_CALLBACK_MEMBER(atariste_microwire_tick); - + void dmasound_set_state(int level); void dmasound_tick(); void microwire_shift(); diff --git a/src/mess/includes/cbm2.h b/src/mess/includes/cbm2.h index e1c751db863..7fbda2bfa54 100644 --- a/src/mess/includes/cbm2.h +++ b/src/mess/includes/cbm2.h @@ -44,7 +44,7 @@ #define SCREEN_TAG "screen" #define CONTROL1_TAG "joy1" #define CONTROL2_TAG "joy2" -#define RS232_TAG "rs232" +#define RS232_TAG "rs232" #define EXT_I8088_TAG "ext_u1" #define EXT_I8087_TAG "ext_u4" diff --git a/src/mess/includes/gb.h b/src/mess/includes/gb.h index 185ba6c486a..391c05059d3 100644 --- a/src/mess/includes/gb.h +++ b/src/mess/includes/gb.h @@ -157,7 +157,7 @@ public: UINT8 *m_GBC_RAMMap[8]; /* (CGB) Addresses of internal RAM banks */ UINT8 m_GBC_RAMBank; /* (CGB) Current CGB RAM bank */ - + gb_lcd_t m_lcd; void (gb_state::*update_scanline) (); bool m_bios_disable; @@ -240,7 +240,7 @@ public: , m_maincpu(*this, "maincpu") , m_inputs(*this, "INPUTS") { } - + DECLARE_READ8_MEMBER(megaduck_video_r); DECLARE_WRITE8_MEMBER(megaduck_video_w); DECLARE_WRITE8_MEMBER(megaduck_sound_w1); @@ -250,12 +250,12 @@ public: DECLARE_MACHINE_START(megaduck); DECLARE_MACHINE_RESET(megaduck); DECLARE_PALETTE_INIT(megaduck); - + DECLARE_READ8_MEMBER(cart_r); DECLARE_WRITE8_MEMBER(bank1_w); DECLARE_WRITE8_MEMBER(bank2_w); optional_device<megaduck_cart_slot_device> m_cartslot; - + protected: required_device<lr35902_cpu_device> m_maincpu; required_ioport m_inputs; diff --git a/src/mess/includes/md.h b/src/mess/includes/md.h index 72c1cf8ca0a..b32194529fa 100644 --- a/src/mess/includes/md.h +++ b/src/mess/includes/md.h @@ -13,13 +13,13 @@ public: md_cons_state(const machine_config &mconfig, device_type type, const char *tag) : md_base_state(mconfig, type, tag), m_slotcart(*this, "mdslot") - { } - + { } + emu_timer *m_mess_io_timeout[3]; int m_mess_io_stage[3]; - + optional_device<md_cart_slot_device> m_slotcart; - + DECLARE_DRIVER_INIT(mess_md_common); DECLARE_DRIVER_INIT(genesis); DECLARE_DRIVER_INIT(md_eur); @@ -31,7 +31,7 @@ class mdsvp_state : public md_cons_state public: mdsvp_state(const machine_config &mconfig, device_type type, const char *tag) : md_cons_state(mconfig, type, tag) { } - + UINT8 *m_iram; // IRAM (0-0x7ff) UINT8 *m_dram; // [0x20000]; UINT32 m_pmac_read[6]; // read modes/addrs for PM0-PM5 @@ -48,7 +48,7 @@ public: pico_state(const machine_config &mconfig, device_type type, const char *tag) : md_cons_state(mconfig, type, tag), m_picocart(*this, "picoslot") { } - + optional_device<pico_cart_slot_device> m_picocart; UINT8 m_page_register; }; diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h index 7707bc933cf..95f9087d09f 100644 --- a/src/mess/includes/nes.h +++ b/src/mess/includes/nes.h @@ -143,7 +143,7 @@ public: ioport_port *m_io_zapper2_x; ioport_port *m_io_zapper2_y; ioport_port *m_io_paddle; - + private: /* devices */ // cpu_device *m_maincpu; diff --git a/src/mess/includes/pc1512.h b/src/mess/includes/pc1512.h index bc3395a7e1e..c811ad49b72 100644 --- a/src/mess/includes/pc1512.h +++ b/src/mess/includes/pc1512.h @@ -59,7 +59,7 @@ public: m_bus(*this, ISA_BUS_TAG), m_char_rom(*this, AMS40041_TAG), m_video_ram(*this, "video_ram"), - m_lk(*this, "LK"), + m_lk(*this, "LK"), m_pit1(0), m_pit2(0), m_status1(0), @@ -221,8 +221,8 @@ class pc1640_state : public pc1512_state public: pc1640_state(const machine_config &mconfig, device_type type, const char *tag) : pc1512_state(mconfig, type, tag), - m_sw(*this, "SW"), - m_opt(0) + m_sw(*this, "SW"), + m_opt(0) { } virtual void machine_start(); diff --git a/src/mess/includes/pcw16.h b/src/mess/includes/pcw16.h index fa40ce35bf4..e8816688ad1 100644 --- a/src/mess/includes/pcw16.h +++ b/src/mess/includes/pcw16.h @@ -34,15 +34,15 @@ class pcw16_state : public driver_device public: pcw16_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_flash0(*this, "flash0"), - m_flash1(*this, "flash1"), - m_fdc(*this, "fdc"), - m_uart2(*this, "ns16550_2"), - m_speaker(*this, BEEPER_TAG), - m_ram(*this, RAM_TAG), - m_region_rom(*this, "maincpu"), - m_io_extra(*this, "EXTRA") + m_maincpu(*this, "maincpu"), + m_flash0(*this, "flash0"), + m_flash1(*this, "flash1"), + m_fdc(*this, "fdc"), + m_uart2(*this, "ns16550_2"), + m_speaker(*this, BEEPER_TAG), + m_ram(*this, RAM_TAG), + m_region_rom(*this, "maincpu"), + m_io_extra(*this, "EXTRA") { } required_device<legacy_cpu_device> m_maincpu; diff --git a/src/mess/includes/pet2001.h b/src/mess/includes/pet2001.h index 5a4cd8942d3..d92b7cb7a23 100644 --- a/src/mess/includes/pet2001.h +++ b/src/mess/includes/pet2001.h @@ -17,12 +17,12 @@ #include "sound/speaker.h" #include "video/mc6845.h" -#define M6502_TAG "f3" -#define M6522_TAG "a5" -#define M6520_1_TAG "g8" -#define M6520_2_TAG "b8" -#define MC6845_TAG "ub13" -#define SCREEN_TAG "screen" +#define M6502_TAG "f3" +#define M6522_TAG "a5" +#define M6520_1_TAG "g8" +#define M6520_2_TAG "b8" +#define MC6845_TAG "ub13" +#define SCREEN_TAG "screen" class pet_state : public driver_device { diff --git a/src/mess/includes/plus4.h b/src/mess/includes/plus4.h index aefa2504a2a..d496904fa98 100644 --- a/src/mess/includes/plus4.h +++ b/src/mess/includes/plus4.h @@ -28,8 +28,8 @@ #define MOS8706_TAG "mos8706" #define PLA_TAG "u19" #define SCREEN_TAG "screen" -#define CONTROL1_TAG "joy1" -#define CONTROL2_TAG "joy2" +#define CONTROL1_TAG "joy1" +#define CONTROL2_TAG "joy2" class plus4_state : public driver_device { diff --git a/src/mess/includes/portfoli.h b/src/mess/includes/portfoli.h index 0c24bfb0f99..f2b6edc8cef 100644 --- a/src/mess/includes/portfoli.h +++ b/src/mess/includes/portfoli.h @@ -66,7 +66,7 @@ public: required_ioport m_y6; required_ioport m_y7; required_ioport m_battery; - + virtual void machine_start(); virtual void machine_reset(); diff --git a/src/mess/includes/psion.h b/src/mess/includes/psion.h index f05f6cf23b8..9b195ce133f 100644 --- a/src/mess/includes/psion.h +++ b/src/mess/includes/psion.h @@ -69,7 +69,7 @@ public: virtual void palette_init(); DECLARE_INPUT_CHANGED_MEMBER(psion_on); TIMER_DEVICE_CALLBACK_MEMBER(nmi_timer); - + static HD44780_PIXEL_UPDATE(lz_pixel_update); }; diff --git a/src/mess/includes/sapi1.h b/src/mess/includes/sapi1.h index 3bb9bbddca6..44849610c90 100644 --- a/src/mess/includes/sapi1.h +++ b/src/mess/includes/sapi1.h @@ -53,7 +53,7 @@ public: UINT32 screen_update_sapizps3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); protected: - optional_memory_bank m_bank1; // Only for sapi3 + optional_memory_bank m_bank1; // Only for sapi3 required_ioport m_line0; required_ioport m_line1; required_ioport m_line2; diff --git a/src/mess/includes/tiki100.h b/src/mess/includes/tiki100.h index 1d0973a7edd..3b096d5c3df 100644 --- a/src/mess/includes/tiki100.h +++ b/src/mess/includes/tiki100.h @@ -54,7 +54,7 @@ public: m_y9(*this, "Y9"), m_y10(*this, "Y10"), m_y11(*this, "Y11"), - m_y12(*this, "Y12") + m_y12(*this, "Y12") { } required_device<cpu_device> m_maincpu; diff --git a/src/mess/includes/trs80m2.h b/src/mess/includes/trs80m2.h index 390128c2d5c..77b41a28409 100644 --- a/src/mess/includes/trs80m2.h +++ b/src/mess/includes/trs80m2.h @@ -125,7 +125,7 @@ public: int m_rtc_int; int m_enable_rtc_int; - TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick); + TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick); }; class trs80m16_state : public trs80m2_state @@ -144,7 +144,7 @@ public: DECLARE_WRITE8_MEMBER( ual_w ); DECLARE_WRITE8_MEMBER( tcl_w ); - + IRQ_CALLBACK_MEMBER(trs80m16_irq_callback); UINT16 m_ual; diff --git a/src/mess/includes/wangpc.h b/src/mess/includes/wangpc.h index ee23d971eba..0d6270c8afd 100644 --- a/src/mess/includes/wangpc.h +++ b/src/mess/includes/wangpc.h @@ -165,7 +165,7 @@ public: DECLARE_WRITE_LINE_MEMBER( bus_irq2_w ); DECLARE_FLOPPY_FORMATS( floppy_formats ); - + IRQ_CALLBACK_MEMBER(wangpc_irq_callback); void fdc_irq(bool state); |