summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/includes
diff options
context:
space:
mode:
Diffstat (limited to 'src/mess/includes')
-rw-r--r--src/mess/includes/amstrad.h8
-rw-r--r--src/mess/includes/apple1.h4
-rw-r--r--src/mess/includes/bebox.h4
-rw-r--r--src/mess/includes/c64_legacy.h4
-rw-r--r--src/mess/includes/c65.h12
-rw-r--r--src/mess/includes/cgenie.h4
-rw-r--r--src/mess/includes/channelf.h4
-rw-r--r--src/mess/includes/compis.h20
-rw-r--r--src/mess/includes/concept.h4
-rw-r--r--src/mess/includes/cxhumax.h8
-rw-r--r--src/mess/includes/cybiko.h8
-rw-r--r--src/mess/includes/dgn_beta.h4
-rw-r--r--src/mess/includes/electron.h4
-rw-r--r--src/mess/includes/fm7.h16
-rw-r--r--src/mess/includes/gamecom.h12
-rw-r--r--src/mess/includes/gamepock.h4
-rw-r--r--src/mess/includes/gb.h4
-rw-r--r--src/mess/includes/gmaster.h8
-rw-r--r--src/mess/includes/gp32.h20
-rw-r--r--src/mess/includes/hp48.h4
-rw-r--r--src/mess/includes/intv.h4
-rw-r--r--src/mess/includes/lynx.h20
-rw-r--r--src/mess/includes/mbc55x.h8
-rw-r--r--src/mess/includes/msx_slot.h16
-rw-r--r--src/mess/includes/nascom1.h8
-rw-r--r--src/mess/includes/nes.h8
-rw-r--r--src/mess/includes/odyssey2.h4
-rw-r--r--src/mess/includes/oric.h8
-rw-r--r--src/mess/includes/pce.h4
-rw-r--r--src/mess/includes/pet.h4
-rw-r--r--src/mess/includes/pokemini.h8
-rw-r--r--src/mess/includes/rmnimbus.h32
-rw-r--r--src/mess/includes/sorcerer.h4
-rw-r--r--src/mess/includes/spectrum.h4
-rw-r--r--src/mess/includes/ssystem3.h8
-rw-r--r--src/mess/includes/svi318.h8
-rw-r--r--src/mess/includes/svision.h12
-rw-r--r--src/mess/includes/vc4000.h12
-rw-r--r--src/mess/includes/wswan.h16
-rw-r--r--src/mess/includes/x07.h4
-rw-r--r--src/mess/includes/x1.h12
-rw-r--r--src/mess/includes/z80ne.h8
42 files changed, 184 insertions, 184 deletions
diff --git a/src/mess/includes/amstrad.h b/src/mess/includes/amstrad.h
index ba85d6d7961..ab3f7fa5406 100644
--- a/src/mess/includes/amstrad.h
+++ b/src/mess/includes/amstrad.h
@@ -23,7 +23,7 @@
/****************************
* Gate Array data (CPC) -
****************************/
-typedef struct
+struct gate_array_t
{
bitmap_ind16 *bitmap; /* The bitmap we work on */
UINT8 pen_selected; /* Pen selection */
@@ -55,12 +55,12 @@ typedef struct
UINT16 line_ticks;
UINT8 colour_ticks;
UINT8 max_colour_ticks;
-} gate_array_t;
+};
/****************************
* ASIC data (CPC plus)
****************************/
-typedef struct
+struct asic_t
{
UINT8 *ram; /* pointer to RAM used for the CPC+ ASIC memory-mapped registers */
UINT8 enabled; /* Are CPC plus features enabled/unlocked */
@@ -85,7 +85,7 @@ typedef struct
UINT16 dma_addr[3]; /* DMA channel address */
UINT16 dma_loopcount[3]; /* Count loops taken on this channel */
UINT16 dma_pause[3]; /* DMA pause count */
-} asic_t;
+};
class amstrad_state : public driver_device
diff --git a/src/mess/includes/apple1.h b/src/mess/includes/apple1.h
index 37a8412b6b0..727adf972e2 100644
--- a/src/mess/includes/apple1.h
+++ b/src/mess/includes/apple1.h
@@ -12,7 +12,7 @@
typedef short termchar_t;
-typedef struct
+struct terminal_t
{
tilemap_t *tm;
int gfx;
@@ -24,7 +24,7 @@ typedef struct
int cur_offset;
int cur_hidden;
termchar_t mem[1];
-} terminal_t;
+};
class apple1_state : public driver_device
diff --git a/src/mess/includes/bebox.h b/src/mess/includes/bebox.h
index a0f97a33e46..b26cdc07caa 100644
--- a/src/mess/includes/bebox.h
+++ b/src/mess/includes/bebox.h
@@ -13,13 +13,13 @@
#include "machine/8237dma.h"
#include "machine/53c810.h"
-typedef struct
+struct bebox_devices_t
{
device_t *pic8259_master;
device_t *pic8259_slave;
device_t *dma8237_1;
device_t *dma8237_2;
-} bebox_devices_t;
+};
class bebox_state : public driver_device
diff --git a/src/mess/includes/c64_legacy.h b/src/mess/includes/c64_legacy.h
index d9227403115..ca370b2d440 100644
--- a/src/mess/includes/c64_legacy.h
+++ b/src/mess/includes/c64_legacy.h
@@ -19,9 +19,9 @@
#define C64_MAX_ROMBANK 64 // .crt files contain multiple 'CHIPs', i.e. rom banks (of variable size) with headers. Known carts have at most 64 'CHIPs'.
-typedef struct {
+struct C64_ROM {
int addr, size, index, start;
-} C64_ROM;
+};
struct c64_cart_t {
C64_ROM bank[C64_MAX_ROMBANK];
diff --git a/src/mess/includes/c65.h b/src/mess/includes/c65.h
index 1588ba101cb..f29335bc808 100644
--- a/src/mess/includes/c65.h
+++ b/src/mess/includes/c65.h
@@ -10,13 +10,13 @@
#include "includes/c64_legacy.h"
#include "machine/6526cia.h"
-typedef struct
+struct dma_t
{
int version;
UINT8 data[4];
-} dma_t;
+};
-typedef struct
+struct fdc_t
{
int state;
@@ -30,12 +30,12 @@ typedef struct
attotime time;
int head,track,sector;
-} fdc_t;
+};
-typedef struct
+struct expansion_ram_t
{
UINT8 reg;
-} expansion_ram_t;
+};
class c65_state : public legacy_c64_state
{
diff --git a/src/mess/includes/cgenie.h b/src/mess/includes/cgenie.h
index 53353bb54c9..e5d88a615ca 100644
--- a/src/mess/includes/cgenie.h
+++ b/src/mess/includes/cgenie.h
@@ -10,7 +10,7 @@
#include "machine/wd17xx.h"
// CRTC 6845
-typedef struct
+struct CRTC6845
{
UINT8 cursor_address_lo;
UINT8 cursor_address_hi;
@@ -31,7 +31,7 @@ typedef struct
UINT8 idx;
UINT8 cursor_visible;
UINT8 cursor_phase;
-} CRTC6845;
+};
class cgenie_state : public driver_device
diff --git a/src/mess/includes/channelf.h b/src/mess/includes/channelf.h
index 614a09c81e1..17d6996d1d9 100644
--- a/src/mess/includes/channelf.h
+++ b/src/mess/includes/channelf.h
@@ -13,14 +13,14 @@
/* SKR - 2102 RAM chip on carts 10 and 18 I/O ports */
-typedef struct
+struct r2102_t
{
UINT8 d; /* data bit:inverted logic, but reading/writing cancel out */
UINT8 r_w; /* inverted logic: 0 means read, 1 means write */
UINT8 a[10]; /* addr bits: inverted logic, but reading/writing cancel out */
UINT16 addr; /* calculated addr from addr bits */
UINT8 ram[1024]; /* RAM array */
-} r2102_t;
+};
class channelf_state : public driver_device
diff --git a/src/mess/includes/compis.h b/src/mess/includes/compis.h
index 976ba189e70..e49a5947bdb 100644
--- a/src/mess/includes/compis.h
+++ b/src/mess/includes/compis.h
@@ -73,17 +73,17 @@ struct intr_state
UINT16 ext[4];
};
-typedef struct
+struct i186_state
{
struct timer_state timer[3];
struct dma_state dma[2];
struct intr_state intr;
struct mem_state mem;
-} i186_state;
+};
/* Keyboard */
-typedef struct
+struct TYP_COMPIS_KEYBOARD
{
UINT8 nationality; /* Character set, keyboard layout (Swedish) */
UINT8 release_time; /* Autorepeat release time (0.8) */
@@ -99,30 +99,30 @@ typedef struct
UINT8 boot_order[4]; /* Boot device order (FD HD NW PD) */
UINT8 key_code;
UINT8 key_status;
-} TYP_COMPIS_KEYBOARD;
+};
/* USART 8251 */
-typedef struct
+struct TYP_COMPIS_USART
{
UINT8 status;
UINT8 bytes_sent;
-} TYP_COMPIS_USART;
+};
/* Printer */
-typedef struct
+struct TYP_COMPIS_PRINTER
{
UINT8 data;
UINT8 strobe;
-} TYP_COMPIS_PRINTER;
+};
/* Main emulation */
-typedef struct
+struct TYP_COMPIS
{
TYP_COMPIS_PRINTER printer; /* Printer */
TYP_COMPIS_USART usart; /* USART 8251 */
TYP_COMPIS_KEYBOARD keyboard; /* Keyboard */
-} TYP_COMPIS;
+};
class compis_state : public driver_device
diff --git a/src/mess/includes/concept.h b/src/mess/includes/concept.h
index 7f2ee1f0fe9..42196b979ca 100644
--- a/src/mess/includes/concept.h
+++ b/src/mess/includes/concept.h
@@ -21,13 +21,13 @@ enum
MaxKeyMessageLen = 1
};
-typedef struct
+struct expansion_slot_t
{
read8_space_func reg_read;
write8_space_func reg_write;
read8_space_func rom_read;
write8_space_func rom_write;
-} expansion_slot_t;
+};
class concept_state : public driver_device
diff --git a/src/mess/includes/cxhumax.h b/src/mess/includes/cxhumax.h
index 3b63f5eec14..d00fe40f37b 100644
--- a/src/mess/includes/cxhumax.h
+++ b/src/mess/includes/cxhumax.h
@@ -9,20 +9,20 @@
#define MAX_CX_TIMERS 16
-typedef struct
+struct cx_timer_t
{
UINT32 value;
UINT32 limit;
UINT32 mode;
UINT32 timebase;
emu_timer *timer;
-} cx_timer_t;
+};
-typedef struct
+struct cx_timer_regs_t
{
cx_timer_t timer[MAX_CX_TIMERS];
UINT32 timer_irq;
-} cx_timer_regs_t;
+};
class cxhumax_state : public driver_device
{
diff --git a/src/mess/includes/cybiko.h b/src/mess/includes/cybiko.h
index 89674d1edda..769d1208a41 100644
--- a/src/mess/includes/cybiko.h
+++ b/src/mess/includes/cybiko.h
@@ -28,18 +28,18 @@
#include "machine/sst39vfx.h"
#include "machine/ram.h"
-typedef struct
+struct CYBIKO_RS232_PINS
{
int sck; // serial clock
int txd; // transmit data
int rxd; // receive data
-} CYBIKO_RS232_PINS;
+};
-typedef struct
+struct CYBIKO_RS232
{
CYBIKO_RS232_PINS pin;
UINT8 rx_bits, rx_byte, tx_byte, tx_bits;
-} CYBIKO_RS232;
+};
class cybiko_state : public driver_device
{
diff --git a/src/mess/includes/dgn_beta.h b/src/mess/includes/dgn_beta.h
index d9c46e287ac..ac06c04bac4 100644
--- a/src/mess/includes/dgn_beta.h
+++ b/src/mess/includes/dgn_beta.h
@@ -74,11 +74,11 @@ typedef enum
#define iosize (0xfEFF-0xfc00)
-typedef struct
+struct PageReg
{
int value; /* Value of the page register */
UINT8 *memory; /* The memory it actually points to */
-} PageReg;
+};
class dgn_beta_state : public driver_device
diff --git a/src/mess/includes/electron.h b/src/mess/includes/electron.h
index 4bf7dde2c35..e86692f8685 100644
--- a/src/mess/includes/electron.h
+++ b/src/mess/includes/electron.h
@@ -23,7 +23,7 @@
/* ULA context */
-typedef struct
+struct ULA
{
UINT8 interrupt_status;
UINT8 interrupt_control;
@@ -48,7 +48,7 @@ typedef struct
int stop_bit;
int tape_running;
UINT8 tape_byte;
-} ULA;
+};
class electron_state : public driver_device
diff --git a/src/mess/includes/fm7.h b/src/mess/includes/fm7.h
index 04a1ff95a04..c41d0302310 100644
--- a/src/mess/includes/fm7.h
+++ b/src/mess/includes/fm7.h
@@ -30,7 +30,7 @@
#define KEY_MODE_FM16B 1 // FM-16B (FM-77AV and later only)
#define KEY_MODE_SCAN 2 // Scancode Make/Break (PC-like)
-typedef struct
+struct fm7_encoder_t
{
UINT8 buffer[12];
UINT8 tx_count;
@@ -40,18 +40,18 @@ typedef struct
UINT8 latch; // 0=ready to receive
UINT8 ack;
UINT8 position;
-} fm7_encoder_t;
+};
-typedef struct
+struct fm7_mmr_t
{
UINT8 bank_addr[8][16];
UINT8 segment;
UINT8 window_offset;
UINT8 enabled;
UINT8 mode;
-} fm7_mmr_t;
+};
-typedef struct
+struct fm7_video_t
{
UINT8 sub_busy;
UINT8 sub_halt;
@@ -75,9 +75,9 @@ typedef struct
UINT8 active_video_page;
UINT8 display_video_page;
UINT8 vsync_flag;
-} fm7_video_t;
+};
-typedef struct
+struct fm7_alu_t
{
UINT8 command;
UINT8 lcolour;
@@ -95,7 +95,7 @@ typedef struct
UINT16 y0;
UINT16 y1;
UINT8 busy;
-} fm7_alu_t;
+};
class fm7_state : public driver_device
diff --git a/src/mess/includes/gamecom.h b/src/mess/includes/gamecom.h
index 93e2bfd8ce8..a10b95567de 100644
--- a/src/mess/includes/gamecom.h
+++ b/src/mess/includes/gamecom.h
@@ -149,7 +149,7 @@ enum
SM8521_SG1W15 = 0x7F
};
-typedef struct
+struct GAMECOM_DMA
{
int enabled;
int transfer_mode;
@@ -180,17 +180,17 @@ typedef struct
unsigned int dest_current;
unsigned int dest_line;
unsigned int dest_mask;
-} GAMECOM_DMA;
+};
-typedef struct
+struct GAMECOM_TIMER
{
int enabled;
int state_count;
int state_limit;
int check_value;
-} GAMECOM_TIMER;
+};
-typedef struct
+struct gamecom_sound_t
{
UINT8 sgc;
UINT8 sg0l;
@@ -202,7 +202,7 @@ typedef struct
UINT8 sgda;
UINT8 sg0w[16];
UINT8 sg1w[16];
-} gamecom_sound_t;
+};
class gamecom_state : public driver_device
diff --git a/src/mess/includes/gamepock.h b/src/mess/includes/gamepock.h
index 5188a45f7ad..4130d1f7255 100644
--- a/src/mess/includes/gamepock.h
+++ b/src/mess/includes/gamepock.h
@@ -1,13 +1,13 @@
#ifndef _GAMEPOCK_H_
#define _GAMEPOCK_H_
-typedef struct {
+struct HD44102CH {
UINT8 enabled;
UINT8 start_page;
UINT8 address;
UINT8 y_inc;
UINT8 ram[256]; /* There are actually 50 x 4 x 8 bits. This just makes addressing easier. */
-} HD44102CH;
+};
class gamepock_state : public driver_device
{
diff --git a/src/mess/includes/gb.h b/src/mess/includes/gb.h
index c6829ac5e4a..f7a348a6d83 100644
--- a/src/mess/includes/gb.h
+++ b/src/mess/includes/gb.h
@@ -51,7 +51,7 @@ struct layer_struct {
INT16 bgline;
};
-typedef struct {
+struct gb_lcd_t {
int window_lines_drawn;
UINT8 gb_vid_regs[_NR_GB_VID_REGS];
@@ -101,7 +101,7 @@ typedef struct {
UINT8 *gbc_chrgen; /* CGB Character generator */
UINT8 *gbc_bgdtab; /* CGB Background character table */
UINT8 *gbc_wndtab; /* CGB Window character table */
-} gb_lcd_t;
+};
diff --git a/src/mess/includes/gmaster.h b/src/mess/includes/gmaster.h
index 932ebd76fab..f1d5a91d166 100644
--- a/src/mess/includes/gmaster.h
+++ b/src/mess/includes/gmaster.h
@@ -1,7 +1,7 @@
#ifndef __GMASTER_H__
#define __GMASTER_H__
-typedef struct
+struct GMASTER_VIDEO
{
UINT8 data[8];
int index;
@@ -9,12 +9,12 @@ typedef struct
/*bool*/int mode; // true read does not increase address
/*bool*/int delayed;
UINT8 pixels[8][64/*>=62 sure*/];
-} GMASTER_VIDEO;
+};
-typedef struct
+struct GMASTER_MACHINE
{
UINT8 ports[5];
-} GMASTER_MACHINE;
+};
class gmaster_state : public driver_device
diff --git a/src/mess/includes/gp32.h b/src/mess/includes/gp32.h
index a7dd86e035b..e6fbb8ff291 100644
--- a/src/mess/includes/gp32.h
+++ b/src/mess/includes/gp32.h
@@ -34,7 +34,7 @@
#define INT_EINT1 1
#define INT_EINT0 0
-typedef struct
+struct s3c240x_lcd_t
{
UINT32 vramaddr_cur;
UINT32 vramaddr_max;
@@ -45,9 +45,9 @@ typedef struct
UINT32 bswp, hwswp;
UINT32 hozval, lineval;
int vpos, hpos;
-} s3c240x_lcd_t;
+};
-typedef struct
+struct smc_t
{
int add_latch;
int chip;
@@ -59,27 +59,27 @@ typedef struct
int busy;
UINT8 datarx;
UINT8 datatx;
-} smc_t;
+};
-typedef struct
+struct i2s_t
{
int l3d;
int l3m;
int l3c;
-} i2s_t;
+};
-typedef struct
+struct s3c240x_iic_t
{
UINT8 data[4];
int data_index;
UINT16 address;
-} s3c240x_iic_t;
+};
-typedef struct
+struct s3c240x_iis_t
{
UINT16 fifo[16/2];
int fifo_index;
-} s3c240x_iis_t;
+};
class gp32_state : public driver_device
diff --git a/src/mess/includes/hp48.h b/src/mess/includes/hp48.h
index 3b457859d3d..9b0ea2804d2 100644
--- a/src/mess/includes/hp48.h
+++ b/src/mess/includes/hp48.h
@@ -20,7 +20,7 @@ typedef enum {
} hp48_models;
/* memory module configuration */
-typedef struct
+struct hp48_module
{
/* static part */
UINT32 off_mask; /* offset bit-mask, indicates the real size */
@@ -36,7 +36,7 @@ typedef struct
UINT32 base; /* base address */
UINT32 mask; /* often improperly called size, it is an address select mask */
-} hp48_module;
+};
/* screen image averaging */
diff --git a/src/mess/includes/intv.h b/src/mess/includes/intv.h
index 2641cd7c41b..1192688187c 100644
--- a/src/mess/includes/intv.h
+++ b/src/mess/includes/intv.h
@@ -7,7 +7,7 @@
#ifndef INTV_H_
#define INTV_H_
-typedef struct
+struct intv_sprite_type
{
int visible;
int xpos;
@@ -25,7 +25,7 @@ typedef struct
int color;
int doubleyres;
int dirty;
-} intv_sprite_type;
+};
class intv_state : public driver_device
{
diff --git a/src/mess/includes/lynx.h b/src/mess/includes/lynx.h
index e43c9da8d1b..bc803c04f61 100644
--- a/src/mess/includes/lynx.h
+++ b/src/mess/includes/lynx.h
@@ -15,7 +15,7 @@
class lynx_state;
-typedef struct
+struct BLITTER
{
UINT8 *mem;
// global
@@ -52,18 +52,18 @@ typedef struct
int vstretch;
int lefthanded;
int busy;
-} BLITTER;
+};
-typedef struct
+struct UART
{
UINT8 serctl;
UINT8 data_received, data_to_send, buffer;
int received;
int sending;
int buffer_loaded;
-} UART;
+};
-typedef struct
+struct SUZY
{
UINT8 data[0x100];
UINT8 high;
@@ -71,16 +71,16 @@ typedef struct
int signed_math;
int accumulate;
int accumulate_overflow;
-} SUZY;
+};
-typedef struct
+struct MIKEY
{
UINT8 data[0x100];
UINT16 disp_addr;
UINT8 vb_rest;
-} MIKEY;
+};
-typedef struct
+struct LYNX_TIMER
{
UINT8 bakup;
UINT8 cntrl1;
@@ -88,7 +88,7 @@ typedef struct
UINT8 counter;
emu_timer *timer;
int timer_active;
-} LYNX_TIMER;
+};
#define NR_LYNX_TIMERS 8
diff --git a/src/mess/includes/mbc55x.h b/src/mess/includes/mbc55x.h
index e236c1d39e3..9b7dc32e41f 100644
--- a/src/mess/includes/mbc55x.h
+++ b/src/mess/includes/mbc55x.h
@@ -75,13 +75,13 @@
#define FDC_TAG "wd1793"
-typedef struct
+struct keyboard_t
{
UINT8 keyrows[MBC55X_KEYROWS];
emu_timer *keyscan_timer;
UINT8 key_special;
-} keyboard_t;
+};
class mbc55x_state : public driver_device
@@ -161,9 +161,9 @@ public:
/* IO chips */
-typedef struct
+struct msm_rx_t
{
-} msm_rx_t;
+};
/*----------- defined in drivers/mbc55x.c -----------*/
diff --git a/src/mess/includes/msx_slot.h b/src/mess/includes/msx_slot.h
index b8889207282..535180c4076 100644
--- a/src/mess/includes/msx_slot.h
+++ b/src/mess/includes/msx_slot.h
@@ -15,12 +15,12 @@ enum {
MSX_LAYOUT_LAST
};
-typedef struct {
+struct msx_slot_layout {
int entry;
int type;
int slot_primary, slot_secondary, slot_page, page_extent;
int size, option;
-} msx_slot_layout;
+};
#define MSX_LAYOUT_INIT(msx) \
static const msx_slot_layout msx_slot_layout_##msx[] = {
@@ -112,7 +112,7 @@ enum msx_mem_type {
MSX_MEM_HANDLER
};
-typedef struct {
+struct slot_state {
int m_type;
int m_start_page;
int m_bank_mask;
@@ -143,9 +143,9 @@ typedef struct {
int mode;
} sccp;
} m_cart;
-} slot_state;
+};
-typedef struct {
+struct msx_slot {
int slot_type;
int mem_type;
char name[32];
@@ -155,7 +155,7 @@ typedef struct {
void (*write)(running_machine &machine, slot_state*, UINT16, UINT8);
int (*loadsram)(running_machine &machine, slot_state*);
int (*savesram)(running_machine &machine, slot_state*);
-} msx_slot;
+};
extern const msx_slot msx_slot_list[];
@@ -239,10 +239,10 @@ const msx_slot msx_slot_list[] = {
#define MSX_SLOT_SAVESRAM(nm) \
static int slot_##nm##_savesram (running_machine &machine, slot_state *state)
-typedef struct {
+struct msx_driver_struct {
char name[9];
const msx_slot_layout *layout;
-} msx_driver_struct;
+};
extern const msx_driver_struct msx_driver_list[];
diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h
index 232b5e010c2..3f6abe0ed2b 100644
--- a/src/mess/includes/nascom1.h
+++ b/src/mess/includes/nascom1.h
@@ -10,18 +10,18 @@
#include "imagedev/snapquik.h"
#include "machine/wd17xx.h"
-typedef struct
+struct nascom1_portstat_t
{
UINT8 stat_flags;
UINT8 stat_count;
-} nascom1_portstat_t;
+};
-typedef struct
+struct nascom2_fdc_t
{
UINT8 select;
UINT8 irq;
UINT8 drq;
-} nascom2_fdc_t;
+};
class nascom1_state : public driver_device
diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h
index 3985fb97934..5e4c271ff7a 100644
--- a/src/mess/includes/nes.h
+++ b/src/mess/includes/nes.h
@@ -35,12 +35,12 @@ struct nes_input
#define CHRROM 0
#define CHRRAM 1
-typedef struct
+struct chr_bank
{
int source; //defines source of base pointer
int origin; //defines offset of 0x400 byte segment at base pointer
UINT8* access; //source translated + origin -> valid pointer!
-} chr_bank;
+};
/*PPU nametable fast banking constants and structures */
@@ -53,13 +53,13 @@ typedef struct
#define NES_BATTERY 0
#define NES_WRAM 1
-typedef struct
+struct name_table
{
int source; /* defines source of base pointer */
int origin; /* defines offset of 0x400 byte segment at base pointer */
int writable; /* ExRAM, at least, can be write-protected AND used as nametable */
UINT8* access; /* direct access when possible */
-} name_table;
+};
typedef void (*nes_prg_callback)(running_machine &machine, int start, int bank);
typedef void (*nes_chr_callback)(running_machine &machine, int start, int bank, int source);
diff --git a/src/mess/includes/odyssey2.h b/src/mess/includes/odyssey2.h
index 0c385146796..2dd88787ee9 100644
--- a/src/mess/includes/odyssey2.h
+++ b/src/mess/includes/odyssey2.h
@@ -54,7 +54,7 @@ typedef union {
} s;
} o2_vdc_t;
-typedef struct
+struct ef9341_t
{
UINT8 X;
UINT8 Y;
@@ -65,7 +65,7 @@ typedef struct
UINT8 TB;
UINT8 busy;
UINT8 ram[1024];
-} ef9341_t;
+};
class odyssey2_state : public driver_device
diff --git a/src/mess/includes/oric.h b/src/mess/includes/oric.h
index b6da858749a..3646d382459 100644
--- a/src/mess/includes/oric.h
+++ b/src/mess/includes/oric.h
@@ -30,17 +30,17 @@ enum
TELESTRAT_MEM_BLOCK_ROM
};
-typedef struct
+struct telestrat_mem_block
{
int MemType;
unsigned char *ptr;
-} telestrat_mem_block;
+};
/* current state of the display */
/* some attributes persist until they are turned off.
This structure holds this persistant information */
-typedef struct
+struct oric_vh_state
{
/* foreground and background colour used for rendering */
/* if flash attribute is set, these two will both be equal to background colour */
@@ -63,7 +63,7 @@ typedef struct
/* if (1<<3), display graphics, if 0, hide graphics */
/* current count */
UINT8 flash_count;
-} oric_vh_state;
+};
class oric_state : public driver_device
diff --git a/src/mess/includes/pce.h b/src/mess/includes/pce.h
index ea2b9f8c247..9df0e86b795 100644
--- a/src/mess/includes/pce.h
+++ b/src/mess/includes/pce.h
@@ -31,7 +31,7 @@
/* the largest possible cartridge image (street fighter 2 - 2.5MB) */
#define PCE_ROM_MAXSIZE 0x280000
-typedef struct
+struct pce_cd_t
{
UINT8 regs[16];
UINT8 *bram;
@@ -101,7 +101,7 @@ typedef struct
emu_timer *adpcm_fadeout_timer;
emu_timer *adpcm_fadein_timer;
double adpcm_volume;
-} pce_cd_t;
+};
class pce_state : public driver_device
diff --git a/src/mess/includes/pet.h b/src/mess/includes/pet.h
index 1b12111aaac..0c1d3b2d2fa 100644
--- a/src/mess/includes/pet.h
+++ b/src/mess/includes/pet.h
@@ -13,11 +13,11 @@
#include "machine/ieee488.h"
#include "imagedev/cartslot.h"
-typedef struct
+struct spet_t
{
int bank; /* rambank to be switched in 0x9000 */
int rom; /* rom socket 6502? at 0x9000 */
-} spet_t;
+};
class pet_state : public driver_device
diff --git a/src/mess/includes/pokemini.h b/src/mess/includes/pokemini.h
index 351b88df110..0e549d2a3c2 100644
--- a/src/mess/includes/pokemini.h
+++ b/src/mess/includes/pokemini.h
@@ -14,7 +14,7 @@
#include "rendlay.h"
-typedef struct
+struct PRC
{
UINT8 colors_inverted;
UINT8 background_enabled;
@@ -28,10 +28,10 @@ typedef struct
UINT32 spr_tiles;
UINT8 count;
emu_timer *count_timer;
-} PRC;
+};
-typedef struct
+struct TIMERS
{
emu_timer *seconds_timer;
emu_timer *hz256_timer;
@@ -41,7 +41,7 @@ typedef struct
emu_timer *timer2_hi; /* Timer 2 high */
emu_timer *timer3; /* Timer 3 low or 16bit */
emu_timer *timer3_hi; /* Timer 3 high */
-} TIMERS;
+};
class pokemini_state : public driver_device
diff --git a/src/mess/includes/rmnimbus.h b/src/mess/includes/rmnimbus.h
index 30351f2435f..7d25dbfeacc 100644
--- a/src/mess/includes/rmnimbus.h
+++ b/src/mess/includes/rmnimbus.h
@@ -26,16 +26,16 @@
/* Nimbus sub-bios structures for debugging */
-typedef struct
+struct t_area_params
{
UINT16 ofs_brush;
UINT16 seg_brush;
UINT16 ofs_data;
UINT16 seg_data;
UINT16 count;
-} t_area_params;
+};
-typedef struct
+struct t_plot_string_params
{
UINT16 ofs_font;
UINT16 seg_font;
@@ -44,9 +44,9 @@ typedef struct
UINT16 x;
UINT16 y;
UINT16 length;
-} t_plot_string_params;
+};
-typedef struct
+struct t_nimbus_brush
{
UINT16 style;
UINT16 style_index;
@@ -56,7 +56,7 @@ typedef struct
UINT16 boundary_spec;
UINT16 boundary_colour;
UINT16 save_colour;
-} t_nimbus_brush;
+};
#define SCREEN_WIDTH_PIXELS 640
#define SCREEN_HEIGHT_LINES 250
@@ -110,25 +110,25 @@ struct intr_state
UINT16 ext_vector[2]; // external vectors, when in cascade mode
};
-typedef struct
+struct i186_state
{
struct timer_state timer[3];
struct dma_state dma[2];
struct intr_state intr;
struct mem_state mem;
-} i186_state;
+};
-typedef struct
+struct keyboard_t
{
UINT8 keyrows[NIMBUS_KEYROWS];
emu_timer *keyscan_timer;
UINT8 queue[KEYBOARD_QUEUE_SIZE];
UINT8 head;
UINT8 tail;
-} keyboard_t;
+};
// Static data related to Floppy and SCSI hard disks
-typedef struct
+struct nimbus_drives_t
{
UINT8 reg400;
UINT8 reg410_in;
@@ -137,10 +137,10 @@ typedef struct
UINT8 drq_ff;
UINT8 int_ff;
-} nimbus_drives_t;
+};
/* 8031 Peripheral controler */
-typedef struct
+struct ipc_interface_t
{
UINT8 ipc_in;
UINT8 ipc_out;
@@ -149,10 +149,10 @@ typedef struct
UINT8 int_8c_pending;
UINT8 int_8e_pending;
UINT8 int_8f_pending;
-} ipc_interface_t;
+};
/* Mouse/Joystick */
-typedef struct
+struct _mouse_joy_state
{
UINT8 m_mouse_px;
UINT8 m_mouse_py;
@@ -169,7 +169,7 @@ typedef struct
UINT8 m_reg0a4;
emu_timer *m_mouse_timer;
-} _mouse_joy_state;
+};
class rmnimbus_state : public driver_device
diff --git a/src/mess/includes/sorcerer.h b/src/mess/includes/sorcerer.h
index 6f46bddb0ea..b45501a4aae 100644
--- a/src/mess/includes/sorcerer.h
+++ b/src/mess/includes/sorcerer.h
@@ -23,7 +23,7 @@
#define SORCERER_USING_RS232 0
-typedef struct {
+struct cass_data_t {
struct {
int length; /* time cassette level is at input.level */
int level; /* cassette level */
@@ -34,7 +34,7 @@ typedef struct {
int level; /* cassette level */
int bit; /* bit to to output */
} output;
-} cass_data_t;
+};
class sorcerer_state : public driver_device
diff --git a/src/mess/includes/spectrum.h b/src/mess/includes/spectrum.h
index abe808ee4de..5aa120b689b 100644
--- a/src/mess/includes/spectrum.h
+++ b/src/mess/includes/spectrum.h
@@ -51,7 +51,7 @@
#define TS2068_RIGHT_BORDER 96 /* Number of right hand border pixels */
#define TS2068_SCREEN_WIDTH (TS2068_LEFT_BORDER + TS2068_DISPLAY_XSIZE + TS2068_RIGHT_BORDER)
-typedef struct
+struct EVENT_LIST_ITEM
{
/* driver defined ID for this write */
int Event_ID;
@@ -59,7 +59,7 @@ typedef struct
int Event_Data;
/* time at which this write occurred */
int Event_Time;
-} EVENT_LIST_ITEM;
+};
class spectrum_state : public driver_device
diff --git a/src/mess/includes/ssystem3.h b/src/mess/includes/ssystem3.h
index c10854ad723..9cf33903358 100644
--- a/src/mess/includes/ssystem3.h
+++ b/src/mess/includes/ssystem3.h
@@ -8,7 +8,7 @@
#define SSYSTEM3_H_
-typedef struct
+struct playfield_t
{
int signal;
// int on;
@@ -24,14 +24,14 @@ typedef struct
} s;
UINT8 data[7+8*8/2+5];
} u;
-} playfield_t;
+};
-typedef struct
+struct lcd_t
{
UINT8 data[5];
int clock;
int count;
-} lcd_t;
+};
class ssystem3_state : public driver_device
diff --git a/src/mess/includes/svi318.h b/src/mess/includes/svi318.h
index 5a02887c2aa..9689851b8df 100644
--- a/src/mess/includes/svi318.h
+++ b/src/mess/includes/svi318.h
@@ -13,7 +13,7 @@
#include "machine/ins8250.h"
#include "machine/wd17xx.h"
-typedef struct
+struct SVI_318
{
/* general */
UINT8 svi318; /* Are we dealing with an SVI-318 or a SVI-328 model. 0 = 328, 1 = 318 */
@@ -35,15 +35,15 @@ typedef struct
UINT8 svi806_ram_enabled;
memory_region *svi806_ram;
UINT8 *svi806_gfx;
-} SVI_318;
+};
-typedef struct
+struct SVI318_FDC_STRUCT
{
UINT8 driveselect;
int drq;
int irq;
UINT8 heads[2];
-} SVI318_FDC_STRUCT;
+};
class svi318_state : public driver_device
diff --git a/src/mess/includes/svision.h b/src/mess/includes/svision.h
index 6a908abd9a9..68defb725d7 100644
--- a/src/mess/includes/svision.h
+++ b/src/mess/includes/svision.h
@@ -7,25 +7,25 @@
#ifndef SVISION_H_
#define SVISION_H_
-typedef struct
+struct svision_t
{
emu_timer *timer1;
int timer_shot;
-} svision_t;
+};
-typedef struct
+struct svision_pet_t
{
int state;
int on, clock, data;
UINT8 input;
emu_timer *timer;
-} svision_pet_t;
+};
-typedef struct
+struct tvlink_t
{
UINT32 palette[4/*0x40?*/]; /* rgb8 */
int palette_on;
-} tvlink_t;
+};
class svision_state : public driver_device
diff --git a/src/mess/includes/vc4000.h b/src/mess/includes/vc4000.h
index 09a65132e2d..391124593eb 100644
--- a/src/mess/includes/vc4000.h
+++ b/src/mess/includes/vc4000.h
@@ -19,12 +19,12 @@
#define ANALOG_HACK
-typedef struct
+struct SPRITE_HELPER
{
UINT8 bitmap[10],x1,x2,y1,y2, res1, res2;
-} SPRITE_HELPER;
+};
-typedef struct
+struct SPRITE
{
const SPRITE_HELPER *data;
int mask;
@@ -35,9 +35,9 @@ typedef struct
UINT8 scolor;
int finished;
int finished_now;
-} SPRITE;
+};
-typedef struct
+struct vc4000_video_t
{
SPRITE sprites[4];
int line;
@@ -66,7 +66,7 @@ typedef struct
UINT8 sprite_collision;
} d;
} reg;
-} vc4000_video_t;
+} ;
class vc4000_state : public driver_device
{
diff --git a/src/mess/includes/wswan.h b/src/mess/includes/wswan.h
index 1f5a8786d88..cea55dc27cb 100644
--- a/src/mess/includes/wswan.h
+++ b/src/mess/includes/wswan.h
@@ -40,7 +40,7 @@
#include "machine/nvram.h"
-typedef struct
+struct EEPROM
{
UINT8 mode; /* eeprom mode */
UINT16 address; /* Read/write address */
@@ -50,9 +50,9 @@ typedef struct
int size; /* size of eeprom/sram area */
UINT8 *data; /* pointer to start of sram/eeprom data */
UINT8 *page; /* pointer to current sram/eeprom page */
-} EEPROM;
+};
-typedef struct
+struct RTC
{
UINT8 present; /* Is an RTC present */
UINT8 setting; /* Timer setting byte */
@@ -64,16 +64,16 @@ typedef struct
UINT8 minute; /* Minute */
UINT8 second; /* Second */
UINT8 index; /* index for reading/writing of current of alarm time */
-} RTC;
+};
-typedef struct
+struct SoundDMA
{
UINT32 source; /* Source address */
UINT16 size; /* Size */
UINT8 enable; /* Enabled */
-} SoundDMA;
+};
-typedef struct
+struct VDP
{
UINT8 layer_bg_enable; /* Background layer on/off */
UINT8 layer_fg_enable; /* Foreground layer on/off */
@@ -117,7 +117,7 @@ typedef struct
UINT8 *palette_vram; /* pointer to start of palette area in ram/vram (set by MACHINE_RESET), WSC only */
int main_palette[8];
emu_timer *timer;
-} VDP;
+};
class wswan_state : public driver_device
{
diff --git a/src/mess/includes/x07.h b/src/mess/includes/x07.h
index 0879825cd7a..99f63fbcbfd 100644
--- a/src/mess/includes/x07.h
+++ b/src/mess/includes/x07.h
@@ -86,12 +86,12 @@ static const UINT8 t6834_cmd_len[0x47] =
0x01, 0x09, 0x01, 0x03, 0x03, 0x01, 0x01
};
-typedef struct
+struct x07_kb
{
const char *tag; //input port tag
UINT8 mask; //bit mask
UINT8 codes[7]; //port codes
-} x07_kb;
+};
static const x07_kb x07_keycodes[56] =
{
diff --git a/src/mess/includes/x1.h b/src/mess/includes/x1.h
index dd50c71c1c7..cbf251285cf 100644
--- a/src/mess/includes/x1.h
+++ b/src/mess/includes/x1.h
@@ -44,7 +44,7 @@ private:
virtual void z80daisy_irq_reti();
};
-typedef struct
+struct scrn_reg_t
{
UINT8 gfx_bank;
UINT8 disp_bank;
@@ -54,20 +54,20 @@ typedef struct
UINT8 pri;
UINT8 blackclip; // x1 turbo specific
-} scrn_reg_t;
+};
-typedef struct
+struct turbo_reg_t
{
UINT8 pal;
UINT8 gfx_pal;
UINT8 txt_pal[8];
UINT8 txt_disp;
-} turbo_reg_t;
+};
-typedef struct
+struct x1_rtc_t
{
UINT8 sec, min, hour, day, wday, month, year;
-} x1_rtc_t;
+};
class x1_state : public driver_device
diff --git a/src/mess/includes/z80ne.h b/src/mess/includes/z80ne.h
index da2bb0bd011..1b7ddaa44d2 100644
--- a/src/mess/includes/z80ne.h
+++ b/src/mess/includes/z80ne.h
@@ -33,7 +33,7 @@ typedef enum
TAPE_1200BPS = 1200 /* 1200 bps */
} z80netape_speed;
-typedef struct {
+struct cass_data_t {
struct {
int length; /* time cassette level is at input.level */
int level; /* cassette level */
@@ -49,14 +49,14 @@ typedef struct {
int wave_length;
int wave_short;
int wave_long;
-} cass_data_t;
+};
-typedef struct {
+struct wd17xx_state_t {
int drq;
int intrq;
UINT8 drive; /* current drive */
UINT8 head; /* current head */
-} wd17xx_state_t;
+};
class z80ne_state : public driver_device