summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/includes
diff options
context:
space:
mode:
Diffstat (limited to 'src/mess/includes')
-rw-r--r--src/mess/includes/a7800.h2
-rw-r--r--src/mess/includes/advision.h2
-rw-r--r--src/mess/includes/amstrad.h2
-rw-r--r--src/mess/includes/apollo.h8
-rw-r--r--src/mess/includes/apple2gs.h2
-rw-r--r--src/mess/includes/apple3.h6
-rw-r--r--src/mess/includes/apricotf.h2
-rw-r--r--src/mess/includes/aquarius.h2
-rw-r--r--src/mess/includes/atarist.h2
-rw-r--r--src/mess/includes/avigo.h2
-rw-r--r--src/mess/includes/b2m.h2
-rw-r--r--src/mess/includes/bbc.h2
-rw-r--r--src/mess/includes/dm7000.h6
-rw-r--r--src/mess/includes/einstein.h2
-rw-r--r--src/mess/includes/fm7.h2
-rw-r--r--src/mess/includes/genpc.h4
-rw-r--r--src/mess/includes/intv.h2
-rw-r--r--src/mess/includes/kaypro.h2
-rw-r--r--src/mess/includes/lisa.h4
-rw-r--r--src/mess/includes/mc1502.h4
-rw-r--r--src/mess/includes/mikromik.h2
-rw-r--r--src/mess/includes/nascom1.h2
-rw-r--r--src/mess/includes/p2000t.h2
-rw-r--r--src/mess/includes/partner.h4
-rw-r--r--src/mess/includes/pcw.h2
-rw-r--r--src/mess/includes/pocketc.h2
-rw-r--r--src/mess/includes/ql.h132
-rw-r--r--src/mess/includes/rmnimbus.h2
-rw-r--r--src/mess/includes/softbox.h2
-rw-r--r--src/mess/includes/special.h4
-rw-r--r--src/mess/includes/studio2.h2
-rw-r--r--src/mess/includes/super80.h2
-rw-r--r--src/mess/includes/svi318.h2
-rw-r--r--src/mess/includes/swtpc09.h77
-rw-r--r--src/mess/includes/thomson.h2
-rw-r--r--src/mess/includes/tiki100.h2
-rw-r--r--src/mess/includes/tvc.h2
-rw-r--r--src/mess/includes/vc4000.h2
-rw-r--r--src/mess/includes/vector06.h2
-rw-r--r--src/mess/includes/x68k.h2
-rw-r--r--src/mess/includes/z88.h2
-rw-r--r--src/mess/includes/zx.h2
42 files changed, 155 insertions, 158 deletions
diff --git a/src/mess/includes/a7800.h b/src/mess/includes/a7800.h
index c08e895f4fa..6df0af95831 100644
--- a/src/mess/includes/a7800.h
+++ b/src/mess/includes/a7800.h
@@ -114,7 +114,7 @@ protected:
required_ioport m_io_console_buttons;
memory_bank *m_bank10;
memory_bank *m_bank11;
- required_device<screen_device> m_screen;
+ required_device<screen_device> m_screen;
void maria_draw_scanline();
int is_holey(unsigned int addr);
diff --git a/src/mess/includes/advision.h b/src/mess/includes/advision.h
index eed7605f69c..42c0e73b44e 100644
--- a/src/mess/includes/advision.h
+++ b/src/mess/includes/advision.h
@@ -21,7 +21,7 @@ public:
m_maincpu(*this, I8048_TAG),
m_soundcpu(*this, COP411_TAG),
m_dac(*this, "dac"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/amstrad.h b/src/mess/includes/amstrad.h
index 2f83a92dec6..39c89a0c99a 100644
--- a/src/mess/includes/amstrad.h
+++ b/src/mess/includes/amstrad.h
@@ -288,7 +288,7 @@ protected:
optional_ioport m_io_analog4;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
-
+
void amstrad_init_lookups();
void amstrad_vh_update_mode();
void amstrad_plus_dma_parse(int channel);
diff --git a/src/mess/includes/apollo.h b/src/mess/includes/apollo.h
index 479c8a483ba..79c59145fbf 100644
--- a/src/mess/includes/apollo.h
+++ b/src/mess/includes/apollo.h
@@ -301,7 +301,7 @@ public:
apollo_graphics_15i(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type, const char *name, const char *shortname, const char *source);
~apollo_graphics_15i();
- UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
// monochrome control
DECLARE_READ8_MEMBER( apollo_mcr_r );
@@ -314,13 +314,13 @@ public:
// color control
DECLARE_READ8_MEMBER( apollo_ccr_r );
DECLARE_WRITE8_MEMBER( apollo_ccr_w );
-
+
DECLARE_READ16_MEMBER( apollo_mgm_r );
DECLARE_WRITE16_MEMBER( apollo_mgm_w );
DECLARE_READ16_MEMBER( apollo_cgm_r );
DECLARE_WRITE16_MEMBER( apollo_cgm_w );
-
+
void vblank_state_changed(screen_device &screen, bool vblank_state);
int is_mono() { return m_n_planes == 1; }
@@ -347,7 +347,7 @@ protected:
void set_lut_cr(UINT8 data);
void register_vblank_callback();
-
+
UINT32 set_msb0(UINT32 value, UINT8 data)
{
return (value & 0xffffff00) | data;
diff --git a/src/mess/includes/apple2gs.h b/src/mess/includes/apple2gs.h
index 078a8621041..8922cb11a60 100644
--- a/src/mess/includes/apple2gs.h
+++ b/src/mess/includes/apple2gs.h
@@ -99,7 +99,7 @@ public:
#endif
m_adb_mousex(*this, "adb_mouse_x"),
m_adb_mousey(*this, "adb_mouse_y"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/apple3.h b/src/mess/includes/apple3.h
index 8cc31205120..257f39b5f90 100644
--- a/src/mess/includes/apple3.h
+++ b/src/mess/includes/apple3.h
@@ -30,8 +30,8 @@
#define VAR_EXTPOWER 0x0040
#define VAR_EXTSIDE 0x0080
-#define SPEAKER_TAG "a3spkr"
-#define DAC_TAG "a3dac"
+#define SPEAKER_TAG "a3spkr"
+#define DAC_TAG "a3dac"
class apple3_state : public driver_device
{
@@ -50,7 +50,7 @@ public:
m_speaker(*this, SPEAKER_TAG),
m_dac(*this, DAC_TAG),
m_kbspecial(*this, "keyb_special"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{
}
diff --git a/src/mess/includes/apricotf.h b/src/mess/includes/apricotf.h
index 542ca49bcb3..55ed2999a64 100644
--- a/src/mess/includes/apricotf.h
+++ b/src/mess/includes/apricotf.h
@@ -55,7 +55,7 @@ public:
m_sio_int(CLEAR_LINE),
m_p_scrollram(*this, "p_scrollram"),
m_p_paletteram(*this, "p_paletteram"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
virtual void machine_start();
diff --git a/src/mess/includes/aquarius.h b/src/mess/includes/aquarius.h
index 685e5c424da..0da6ce971e1 100644
--- a/src/mess/includes/aquarius.h
+++ b/src/mess/includes/aquarius.h
@@ -57,7 +57,7 @@ public:
required_ioport m_y7;
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
- required_device<palette_device> m_palette;
+ required_device<palette_device> m_palette;
UINT8 m_scrambler;
tilemap_t *m_tilemap;
diff --git a/src/mess/includes/atarist.h b/src/mess/includes/atarist.h
index 9cdfd9fd975..2d4eafefaa3 100644
--- a/src/mess/includes/atarist.h
+++ b/src/mess/includes/atarist.h
@@ -118,7 +118,7 @@ public:
m_ikbd_mouse_pc(0),
m_ikbd_joy(1),
m_monochrome(1),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/avigo.h b/src/mess/includes/avigo.h
index 4099a72bdfe..3fbafa843d2 100644
--- a/src/mess/includes/avigo.h
+++ b/src/mess/includes/avigo.h
@@ -36,7 +36,7 @@ public:
m_speaker(*this, "speaker"),
m_uart(*this, "ns16550"),
m_serport(*this, "serport"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/b2m.h b/src/mess/includes/b2m.h
index 7e6b52cbf72..27d9f9bac6e 100644
--- a/src/mess/includes/b2m.h
+++ b/src/mess/includes/b2m.h
@@ -45,7 +45,7 @@ public:
required_device<pit8253_device> m_pit;
required_device<ram_device> m_ram;
required_device<palette_device> m_palette;
-
+
/* devices */
fd1793_t *m_fdc;
pic8259_device *m_pic;
diff --git a/src/mess/includes/bbc.h b/src/mess/includes/bbc.h
index 0a2de809fb9..ee7a5865426 100644
--- a/src/mess/includes/bbc.h
+++ b/src/mess/includes/bbc.h
@@ -152,7 +152,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(write_dcd_serial);
DECLARE_WRITE_LINE_MEMBER(write_cts_serial);
DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
-
+
DECLARE_WRITE_LINE_MEMBER(bbc_i8271_interrupt);
int exp_rom_load(device_image_interface &image, int index);
diff --git a/src/mess/includes/dm7000.h b/src/mess/includes/dm7000.h
index 4fc8dbdf353..ed7276c4f8a 100644
--- a/src/mess/includes/dm7000.h
+++ b/src/mess/includes/dm7000.h
@@ -41,11 +41,11 @@ public:
DECLARE_WRITE16_MEMBER ( dm7000_enet_w );
DECLARE_READ16_MEMBER ( dm7000_enet_r );
-
+
DECLARE_READ32_MEMBER( dcr_r );
DECLARE_WRITE32_MEMBER( dcr_w );
-
-
+
+
UINT16 m_enet_regs[32];
UINT32 dcr[1024];
diff --git a/src/mess/includes/einstein.h b/src/mess/includes/einstein.h
index c92cfe8e853..d0a60d6008f 100644
--- a/src/mess/includes/einstein.h
+++ b/src/mess/includes/einstein.h
@@ -151,7 +151,7 @@ protected:
required_ioport m_buttons;
required_ioport m_config;
optional_ioport m_80column_dips;
-public:
+public:
optional_device<palette_device> m_palette;
void einstein_scan_keyboard();
diff --git a/src/mess/includes/fm7.h b/src/mess/includes/fm7.h
index 393a5a57e02..2fac366bab5 100644
--- a/src/mess/includes/fm7.h
+++ b/src/mess/includes/fm7.h
@@ -141,7 +141,7 @@ public:
m_joy1(*this, "joy1"),
m_joy2(*this, "joy2"),
m_dsw(*this, "DSW"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{
}
diff --git a/src/mess/includes/genpc.h b/src/mess/includes/genpc.h
index 73a73868b43..f71c3edca5b 100644
--- a/src/mess/includes/genpc.h
+++ b/src/mess/includes/genpc.h
@@ -103,7 +103,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( pc_dack3_w );
DECLARE_WRITE_LINE_MEMBER( pc_speaker_set_spkrdata );
-
+
DECLARE_READ8_MEMBER(pc_page_r);
DECLARE_WRITE8_MEMBER(pc_page_w);
DECLARE_WRITE8_MEMBER(nmi_enable_w);
@@ -175,7 +175,7 @@ protected:
public:
virtual DECLARE_READ8_MEMBER ( pc_ppi_portc_r );
virtual DECLARE_WRITE8_MEMBER( pc_ppi_portb_w );
-
+
virtual DECLARE_WRITE_LINE_MEMBER( keyboard_clock_w );
};
diff --git a/src/mess/includes/intv.h b/src/mess/includes/intv.h
index bb8800cd9a4..8355595b483 100644
--- a/src/mess/includes/intv.h
+++ b/src/mess/includes/intv.h
@@ -142,7 +142,7 @@ protected:
required_ioport m_io_options;
optional_ioport m_io_ecs_cntrlsel;
optional_ioport m_io_test;
-
+
optional_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
diff --git a/src/mess/includes/kaypro.h b/src/mess/includes/kaypro.h
index 5003bc66709..00e26dbd2e8 100644
--- a/src/mess/includes/kaypro.h
+++ b/src/mess/includes/kaypro.h
@@ -101,7 +101,7 @@ private:
required_device<floppy_connector> m_floppy1;
optional_device<mc6845_device> m_crtc;
required_device<beep_device> m_beep;
-public:
+public:
required_device<palette_device> m_palette;
};
diff --git a/src/mess/includes/lisa.h b/src/mess/includes/lisa.h
index d5c65ab7496..cb9be226f52 100644
--- a/src/mess/includes/lisa.h
+++ b/src/mess/includes/lisa.h
@@ -120,7 +120,7 @@ public:
m_io_line7(*this, "LINE7"),
m_io_mouse_x(*this, "MOUSE_X"),
m_io_mouse_y(*this, "MOUSE_Y"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
required_device<m68000_base_device> m_maincpu;
@@ -144,7 +144,7 @@ public:
required_ioport m_io_line7;
required_ioport m_io_mouse_x;
required_ioport m_io_mouse_y;
-
+
required_device<palette_device> m_palette;
UINT8 *m_ram_ptr;
diff --git a/src/mess/includes/mc1502.h b/src/mess/includes/mc1502.h
index d90ffddaf3a..1576dbc313f 100644
--- a/src/mess/includes/mc1502.h
+++ b/src/mess/includes/mc1502.h
@@ -36,7 +36,7 @@ public:
m_ram(*this, RAM_TAG) { }
required_device<cpu_device> m_maincpu;
- required_device<i8251_device> m_upd8251;
+ required_device<i8251_device> m_upd8251;
required_device<pic8259_device> m_pic8259;
required_device<pit8253_device> m_pit8253;
required_device<i8255_device> m_ppi8255n1;
@@ -86,7 +86,7 @@ private:
int fdc_motor_on;
emu_timer *fdc_motor_timer;
} m_motor;
- const char *m_cputag;
+ const char *m_cputag;
*/
};
diff --git a/src/mess/includes/mikromik.h b/src/mess/includes/mikromik.h
index 0bb328e264d..2bfa322e649 100644
--- a/src/mess/includes/mikromik.h
+++ b/src/mess/includes/mikromik.h
@@ -30,7 +30,7 @@
#define RS232_A_TAG "rs232a"
#define RS232_B_TAG "rs232b"
#define RS232_C_TAG "rs232c"
-#define KB_TAG "kb"
+#define KB_TAG "kb"
class mm1_state : public driver_device
{
diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h
index 9b5d80066bb..859079a1a34 100644
--- a/src/mess/includes/nascom1.h
+++ b/src/mess/includes/nascom1.h
@@ -41,7 +41,7 @@ public:
m_ram(*this, RAM_TAG),
m_videoram(*this, "videoram"),
m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/p2000t.h b/src/mess/includes/p2000t.h
index 3c8e13c9985..66146426f9e 100644
--- a/src/mess/includes/p2000t.h
+++ b/src/mess/includes/p2000t.h
@@ -22,7 +22,7 @@ public:
m_speaker(*this, "speaker"),
m_videoram(*this, "videoram"),
m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/partner.h b/src/mess/includes/partner.h
index 2d28dbb3818..9d34642b0b0 100644
--- a/src/mess/includes/partner.h
+++ b/src/mess/includes/partner.h
@@ -31,11 +31,11 @@ public:
DECLARE_MACHINE_RESET(partner);
DECLARE_WRITE_LINE_MEMBER(partner_wd17xx_drq_w);
DECLARE_WRITE_LINE_MEMBER(hrq_w);
-
+
//to remove trampoline once it use new wd17xx core
DECLARE_READ8_MEMBER(partner_fdc_r);
DECLARE_WRITE8_MEMBER(partner_fdc_w);
-
+
void partner_window_1(UINT8 bank_num, UINT16 offset,UINT8 *rom);
void partner_window_2(UINT8 bank_num, UINT16 offset,UINT8 *rom);
void partner_iomap_bank(UINT8 *rom);
diff --git a/src/mess/includes/pcw.h b/src/mess/includes/pcw.h
index 3ee7844ac41..780b41957f2 100644
--- a/src/mess/includes/pcw.h
+++ b/src/mess/includes/pcw.h
@@ -124,7 +124,7 @@ public:
required_device<beep_device> m_beeper;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
-
+
inline void pcw_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color);
void pcw_update_interrupt_counter();
void pcw_update_irqs();
diff --git a/src/mess/includes/pocketc.h b/src/mess/includes/pocketc.h
index bb9193ec36e..442ad41939e 100644
--- a/src/mess/includes/pocketc.h
+++ b/src/mess/includes/pocketc.h
@@ -16,7 +16,7 @@ public:
: driver_device(mconfig, type, tag) { }
DECLARE_PALETTE_INIT(pocketc);
-
+
static const unsigned short pocketc_colortable[8][2];
void pocketc_draw_special(bitmap_ind16 &bitmap,int x, int y, const POCKETC_FIGURE fig, int color);
};
diff --git a/src/mess/includes/ql.h b/src/mess/includes/ql.h
index e3248037467..b1d1b319d28 100644
--- a/src/mess/includes/ql.h
+++ b/src/mess/includes/ql.h
@@ -32,40 +32,40 @@
#define X3 XTAL_4_436MHz
#define X4 XTAL_11MHz
-#define QL_CONFIG_PORT "config"
-#define QIMI_PORT_MASK 0x01
-#define QIMI_NONE 0x00
-#define QIMI_MOUSE 0x01
-#define DISK_TYPE_MASK 0x06
-#define DISK_TYPE_NONE 0x00
-#define DISK_TYPE_TRUMP 0x02
-#define DISK_TYPE_SANDY_SD 0x04
-#define DISK_TYPE_SANDY_SQB 0x06
-#define IS_SANDY_DISK(__dtype__) ((__dtype__ == DISK_TYPE_SANDY_SD) || (__dtype__ == DISK_TYPE_SANDY_SQB))
-
-#define TRUMP_DRIVE1_MASK 0x01
-#define TRUMP_DRIVE0_MASK 0x02
-#define TRUMP_MOTOR_MASK 0x04
-#define TRUMP_SIDE_SHIFT 3
-#define TRUMP_SIDE_MASK (1 << TRUMP_SIDE_SHIFT)
-
-#define CART_ROM_BASE 0x0c000
-#define CART_ROM_END 0x0ffff
-
-#define TRUMP_ROM_MBASE 0x10000
-#define TRUMP_ROM_BASE 0x14000
-#define TRUMP_ROM_LEN 0x08000
-#define TRUMP_ROM_END (TRUMP_ROM_MBASE+(TRUMP_ROM_LEN-1))
-
-#define TRUMP_IO_BASE 0x1c000
-#define TRUMP_IO_LEN 0x04000
-#define TRUMP_IO_END (TRUMP_IO_BASE+(TRUMP_IO_LEN-1))
-
-#define SANDY_ROM_BASE_SD 0x1c000
-#define SANDY_ROM_BASE_SQB 0x20000
-#define SANDY_IO_BASE 0xc3fc0
-#define SANDY_IO_LEN 0x00040
-#define SANDY_IO_END (SANDY_IO_BASE+(SANDY_IO_LEN-1))
+#define QL_CONFIG_PORT "config"
+#define QIMI_PORT_MASK 0x01
+#define QIMI_NONE 0x00
+#define QIMI_MOUSE 0x01
+#define DISK_TYPE_MASK 0x06
+#define DISK_TYPE_NONE 0x00
+#define DISK_TYPE_TRUMP 0x02
+#define DISK_TYPE_SANDY_SD 0x04
+#define DISK_TYPE_SANDY_SQB 0x06
+#define IS_SANDY_DISK(__dtype__) ((__dtype__ == DISK_TYPE_SANDY_SD) || (__dtype__ == DISK_TYPE_SANDY_SQB))
+
+#define TRUMP_DRIVE1_MASK 0x01
+#define TRUMP_DRIVE0_MASK 0x02
+#define TRUMP_MOTOR_MASK 0x04
+#define TRUMP_SIDE_SHIFT 3
+#define TRUMP_SIDE_MASK (1 << TRUMP_SIDE_SHIFT)
+
+#define CART_ROM_BASE 0x0c000
+#define CART_ROM_END 0x0ffff
+
+#define TRUMP_ROM_MBASE 0x10000
+#define TRUMP_ROM_BASE 0x14000
+#define TRUMP_ROM_LEN 0x08000
+#define TRUMP_ROM_END (TRUMP_ROM_MBASE+(TRUMP_ROM_LEN-1))
+
+#define TRUMP_IO_BASE 0x1c000
+#define TRUMP_IO_LEN 0x04000
+#define TRUMP_IO_END (TRUMP_IO_BASE+(TRUMP_IO_LEN-1))
+
+#define SANDY_ROM_BASE_SD 0x1c000
+#define SANDY_ROM_BASE_SQB 0x20000
+#define SANDY_IO_BASE 0xc3fc0
+#define SANDY_IO_LEN 0x00040
+#define SANDY_IO_END (SANDY_IO_BASE+(SANDY_IO_LEN-1))
#define SANDY_DRIVE0_MASK 0x02
#define SANDY_DRIVE1_MASK 0x04
@@ -76,33 +76,33 @@
#define SANDY_DDEN_MASK (1 << SANDY_DDEN_SHIFT)
#define SANDY_PRINTER_STROBE 0x20
#define SANDY_PRINTER_INTMASK 0x40
-#define SANDY_MOUSE_INTMASK 0x80
+#define SANDY_MOUSE_INTMASK 0x80
-#define MOUSEX_TAG "MOUSEX"
-#define MOUSEY_TAG "MOUSEY"
-#define MOUSEB_TAG "MOUSEB"
+#define MOUSEX_TAG "MOUSEX"
+#define MOUSEY_TAG "MOUSEY"
+#define MOUSEB_TAG "MOUSEB"
// Mouse bits in Sandy port order
-#define MOUSE_MIDDLE 0x02
-#define MOUSE_RIGHT 0x04
-#define MOUSE_LEFT 0x08
-#define MOUSE_DIRY 0x10
-#define MOUSE_DIRX 0x20
-#define MOUSE_INTY 0x40
-#define MOUSE_INTX 0x80
-#define MOUSE_INT_MASK (MOUSE_INTX | MOUSE_INTY)
-
-#define QIMI_IO_BASE 0x1bf9c
-#define QIMI_IO_LEN 0x22
-#define QIMI_IO_END (QIMI_IO_BASE + QIMI_IO_LEN )
-
-#define QIMI_INTX 0x04
-#define QIMI_INTY 0x20
-#define QIMI_DIRX 0x10
-#define QIMI_DIRY 0x01
-#define QIMI_LEFT 0x20
-#define QIMI_RIGHT 0x10
-#define QIMI_INT_MASK (QIMI_INTX | QIMI_INTY)
+#define MOUSE_MIDDLE 0x02
+#define MOUSE_RIGHT 0x04
+#define MOUSE_LEFT 0x08
+#define MOUSE_DIRY 0x10
+#define MOUSE_DIRX 0x20
+#define MOUSE_INTY 0x40
+#define MOUSE_INTX 0x80
+#define MOUSE_INT_MASK (MOUSE_INTX | MOUSE_INTY)
+
+#define QIMI_IO_BASE 0x1bf9c
+#define QIMI_IO_LEN 0x22
+#define QIMI_IO_END (QIMI_IO_BASE + QIMI_IO_LEN )
+
+#define QIMI_INTX 0x04
+#define QIMI_INTY 0x20
+#define QIMI_DIRX 0x10
+#define QIMI_DIRY 0x01
+#define QIMI_LEFT 0x20
+#define QIMI_RIGHT 0x10
+#define QIMI_INT_MASK (QIMI_INTX | QIMI_INTY)
class ql_state : public driver_device
@@ -206,7 +206,7 @@ public:
void trump_card_set_control(UINT8 data);
void sandy_set_control(UINT8 data);
void sandy_print_char(UINT8 data);
-
+
UINT8 m_disk_type;
int m_disk_io_base;
UINT8 m_disk_io_byte;
@@ -214,24 +214,24 @@ public:
DECLARE_READ_LINE_MEMBER(disk_io_dden_r);
DECLARE_WRITE_LINE_MEMBER(disk_io_intrq_w);
DECLARE_WRITE_LINE_MEMBER(disk_io_drq_w);
-
+
DECLARE_WRITE_LINE_MEMBER( sandy_printer_busy );
// QIMI or Sandy mouse
void mouse_tick();
-
+
DECLARE_READ8_MEMBER( qimi_io_r );
DECLARE_WRITE8_MEMBER( qimi_io_w );
-
- UINT8 m_mouse_int;
-
+
+ UINT8 m_mouse_int;
+
emu_timer *m_mouse_timer;
-
+
UINT8 m_ql_mouse_x;
UINT8 m_ql_mouse_y;
protected:
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
diff --git a/src/mess/includes/rmnimbus.h b/src/mess/includes/rmnimbus.h
index 5c04bba99d4..378800d4ab1 100644
--- a/src/mess/includes/rmnimbus.h
+++ b/src/mess/includes/rmnimbus.h
@@ -398,7 +398,7 @@ public:
m_eeprom(*this, ER59256_TAG),
m_via(*this, VIA_TAG),
m_centronics(*this, CENTRONICS_TAG),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{
}
diff --git a/src/mess/includes/softbox.h b/src/mess/includes/softbox.h
index de14f94812c..2ad510fa682 100644
--- a/src/mess/includes/softbox.h
+++ b/src/mess/includes/softbox.h
@@ -21,7 +21,7 @@
#define I8255_1_TAG "ic16"
#define COM8116_TAG "ic14"
#define RS232_TAG "rs232"
-#define CORVUS_HDC_TAG "corvus"
+#define CORVUS_HDC_TAG "corvus"
class softbox_state : public driver_device
{
diff --git a/src/mess/includes/special.h b/src/mess/includes/special.h
index c79a275fa12..d341c7ebc32 100644
--- a/src/mess/includes/special.h
+++ b/src/mess/includes/special.h
@@ -169,11 +169,11 @@ class specimx_sound_device : public device_t,
public:
specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
~specimx_sound_device() { }
-
+
DECLARE_WRITE_LINE_MEMBER(set_input_ch0);
DECLARE_WRITE_LINE_MEMBER(set_input_ch1);
DECLARE_WRITE_LINE_MEMBER(set_input_ch2);
-
+
protected:
// device-level overrides
virtual void device_start();
diff --git a/src/mess/includes/studio2.h b/src/mess/includes/studio2.h
index f2e003d6710..6703d6faa05 100644
--- a/src/mess/includes/studio2.h
+++ b/src/mess/includes/studio2.h
@@ -45,7 +45,7 @@ public:
required_ioport m_a;
required_ioport m_b;
required_device<screen_device> m_screen;
-
+
virtual void machine_start();
virtual void machine_reset();
diff --git a/src/mess/includes/super80.h b/src/mess/includes/super80.h
index 09774f43e5b..5cf0b9d0e99 100644
--- a/src/mess/includes/super80.h
+++ b/src/mess/includes/super80.h
@@ -42,7 +42,7 @@ public:
m_io_x6(*this, "X6"),
m_io_x7(*this, "X7"),
m_io_config(*this, "CONFIG"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
DECLARE_READ8_MEMBER( super80v_low_r );
diff --git a/src/mess/includes/svi318.h b/src/mess/includes/svi318.h
index fd1349aa844..a82afd77ed9 100644
--- a/src/mess/includes/svi318.h
+++ b/src/mess/includes/svi318.h
@@ -142,7 +142,7 @@ protected:
required_ioport m_line10;
required_ioport m_joysticks;
required_ioport m_buttons;
-public:
+public:
optional_device<palette_device> m_palette;
protected:
void svi318_set_banks();
diff --git a/src/mess/includes/swtpc09.h b/src/mess/includes/swtpc09.h
index 3d41e4557e9..ecba88b6812 100644
--- a/src/mess/includes/swtpc09.h
+++ b/src/mess/includes/swtpc09.h
@@ -1,6 +1,6 @@
/***************************************************************************
- swtpc09 include file
- Robert Justice ,2009-2014
+ swtpc09 include file
+ Robert Justice ,2009-2014
****************************************************************************/
@@ -32,14 +32,14 @@ public:
swtpc09_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
- m_pia(*this, "pia"),
- m_ptm(*this, "ptm"),
+ m_pia(*this, "pia"),
+ m_ptm(*this, "ptm"),
m_acia(*this, "acia"),
m_fdc(*this, "fdc"),
m_via(*this, "via"),
- m_piaide(*this, "piaide"),
- m_harddisk(*this, "harddisk"),
- m_ide(*this, "ide")
+ m_piaide(*this, "piaide"),
+ m_harddisk(*this, "harddisk"),
+ m_ide(*this, "ide")
{ }
required_device<cpu_device> m_maincpu;
@@ -56,15 +56,15 @@ public:
DECLARE_READ8_MEMBER(pia0_ca1_r);
DECLARE_WRITE_LINE_MEMBER( pia0_irq_a );
- DECLARE_WRITE8_MEMBER( ptm_o1_callback );
- DECLARE_WRITE8_MEMBER( ptm_o3_callback );
- DECLARE_WRITE_LINE_MEMBER( ptm_irq );
+ DECLARE_WRITE8_MEMBER( ptm_o1_callback );
+ DECLARE_WRITE8_MEMBER( ptm_o3_callback );
+ DECLARE_WRITE_LINE_MEMBER( ptm_irq );
DECLARE_WRITE_LINE_MEMBER( acia_interrupt );
DECLARE_WRITE_LINE_MEMBER( write_acia_clock );
- DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w );
- DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
+ DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w );
+ DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
DECLARE_READ8_MEMBER( dmf3_via_read_porta );
DECLARE_READ8_MEMBER( dmf3_via_read_portb );
@@ -74,32 +74,32 @@ public:
DECLARE_READ8_MEMBER(piaide_a_r);
DECLARE_READ8_MEMBER(piaide_b_r);
- DECLARE_WRITE8_MEMBER(piaide_a_w);
- DECLARE_WRITE8_MEMBER(piaide_b_w);
+ DECLARE_WRITE8_MEMBER(piaide_a_w);
+ DECLARE_WRITE8_MEMBER(piaide_b_w);
DECLARE_WRITE8_MEMBER(swtpc09_kbd_put);
- DECLARE_READ8_MEMBER ( dmf2_dma_address_reg_r );
- DECLARE_WRITE8_MEMBER ( dmf2_dma_address_reg_w );
- DECLARE_READ8_MEMBER ( dmf2_control_reg_r );
- DECLARE_WRITE8_MEMBER ( dmf2_control_reg_w );
-
- DECLARE_READ8_MEMBER ( dmf3_dma_address_reg_r );
- DECLARE_WRITE8_MEMBER ( dmf3_dma_address_reg_w );
- DECLARE_READ8_MEMBER ( dmf3_control_reg_r );
- DECLARE_WRITE8_MEMBER ( dmf3_control_reg_w );
-
- DECLARE_WRITE8_MEMBER ( dc4_control_reg_w );
-
- DECLARE_WRITE8_MEMBER(dat_w);
-
- DECLARE_DRIVER_INIT( swtpc09 );
- DECLARE_DRIVER_INIT( swtpc09i );
- DECLARE_DRIVER_INIT( swtpc09u );
- DECLARE_DRIVER_INIT( swtpc09d3 );
-
+ DECLARE_READ8_MEMBER ( dmf2_dma_address_reg_r );
+ DECLARE_WRITE8_MEMBER ( dmf2_dma_address_reg_w );
+ DECLARE_READ8_MEMBER ( dmf2_control_reg_r );
+ DECLARE_WRITE8_MEMBER ( dmf2_control_reg_w );
+
+ DECLARE_READ8_MEMBER ( dmf3_dma_address_reg_r );
+ DECLARE_WRITE8_MEMBER ( dmf3_dma_address_reg_w );
+ DECLARE_READ8_MEMBER ( dmf3_control_reg_r );
+ DECLARE_WRITE8_MEMBER ( dmf3_control_reg_w );
+
+ DECLARE_WRITE8_MEMBER ( dc4_control_reg_w );
+
+ DECLARE_WRITE8_MEMBER(dat_w);
+
+ DECLARE_DRIVER_INIT( swtpc09 );
+ DECLARE_DRIVER_INIT( swtpc09i );
+ DECLARE_DRIVER_INIT( swtpc09u );
+ DECLARE_DRIVER_INIT( swtpc09d3 );
+
void swtpc09_fdc_dma_transfer();
- void swtpc09_irq_handler(UINT8 peripheral, UINT8 state);
+ void swtpc09_irq_handler(UINT8 peripheral, UINT8 state);
UINT8 m_term_data; // terminal keyboard value
UINT8 m_pia_counter; // this is the counter on pia porta
@@ -112,10 +112,10 @@ public:
UINT8 m_piaide_portb;
UINT8 m_active_interrupt;
UINT8 m_interrupt;
-
-
+
+
// TODO: move this in proper device
-
+
/* channel_data structure holds info about each 6844 DMA channel */
typedef struct m6844_channel_data
{
@@ -143,6 +143,3 @@ extern const wd17xx_interface swtpc09_wd17xx_interface;
extern const ptm6840_interface swtpc09_6840_intf;
#endif /* swtpc09_H_ */
-
-
-
diff --git a/src/mess/includes/thomson.h b/src/mess/includes/thomson.h
index 92966ae125a..bf0bbce6027 100644
--- a/src/mess/includes/thomson.h
+++ b/src/mess/includes/thomson.h
@@ -306,7 +306,7 @@ public:
WRITE_LINE_MEMBER( fdc_index_3_w );
void thomson_index_callback(legacy_floppy_image_device *device, int state);
DECLARE_PALETTE_INIT(thom);
-
+
optional_device<mc6854_device> m_mc6854;
DECLARE_WRITE_LINE_MEMBER(write_centronics_perror);
diff --git a/src/mess/includes/tiki100.h b/src/mess/includes/tiki100.h
index 7e036058528..e66d1a6ff65 100644
--- a/src/mess/includes/tiki100.h
+++ b/src/mess/includes/tiki100.h
@@ -67,7 +67,7 @@ public:
m_y10(*this, "Y10"),
m_y11(*this, "Y11"),
m_y12(*this, "Y12"),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/tvc.h b/src/mess/includes/tvc.h
index eb3ff957cf2..66486027e9c 100644
--- a/src/mess/includes/tvc.h
+++ b/src/mess/includes/tvc.h
@@ -38,7 +38,7 @@
// ======================> tvc_sound_device
class tvc_sound_device : public device_t,
- public device_sound_interface
+ public device_sound_interface
{
public:
// construction/destruction
diff --git a/src/mess/includes/vc4000.h b/src/mess/includes/vc4000.h
index ca91a7cc7f2..c6f79cb2d48 100644
--- a/src/mess/includes/vc4000.h
+++ b/src/mess/includes/vc4000.h
@@ -136,7 +136,7 @@ protected:
#else
required_ioport m_joys;
required_ioport m_config;
-#endif
+#endif
inline UINT8 vc4000_joystick_return_to_centre(UINT8 joy);
void vc4000_draw_digit(bitmap_ind16 &bitmap, int x, int y, int d, int line);
inline void vc4000_collision_plot(UINT8 *collision, UINT8 data, UINT8 color, int scale);
diff --git a/src/mess/includes/vector06.h b/src/mess/includes/vector06.h
index 07d00508a17..2eaab4b6826 100644
--- a/src/mess/includes/vector06.h
+++ b/src/mess/includes/vector06.h
@@ -31,7 +31,7 @@ public:
m_ppi(*this, "ppi8255"),
m_ppi2(*this, "ppi8255_2"),
m_ram(*this, RAM_TAG),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/x68k.h b/src/mess/includes/x68k.h
index 0d5b2050f79..df0ffd53c51 100644
--- a/src/mess/includes/x68k.h
+++ b/src/mess/includes/x68k.h
@@ -248,7 +248,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(mfp_irq_callback);
DECLARE_WRITE_LINE_MEMBER(x68k_scsi_irq);
DECLARE_WRITE_LINE_MEMBER(x68k_scsi_drq);
-
+
//dmac
void dma_irq(int channel);
DECLARE_WRITE8_MEMBER(dma_end);
diff --git a/src/mess/includes/z88.h b/src/mess/includes/z88.h
index f51cca800f8..a4f266cbdc1 100644
--- a/src/mess/includes/z88.h
+++ b/src/mess/includes/z88.h
@@ -49,7 +49,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG),
- m_palette(*this, "palette")
+ m_palette(*this, "palette")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/zx.h b/src/mess/includes/zx.h
index 7d58d0632ba..874386a853d 100644
--- a/src/mess/includes/zx.h
+++ b/src/mess/includes/zx.h
@@ -102,7 +102,7 @@ protected:
required_ioport m_io_row7;
optional_ioport m_io_config;
required_device<screen_device> m_screen;
-
+
void zx_ula_r(int offs, memory_region *region, const UINT8 param);
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};