diff options
author | 2012-09-15 22:30:30 +0000 | |
---|---|---|
committer | 2012-09-15 22:30:30 +0000 | |
commit | cff1004165c7026532c4809099d4ebca31643cd5 (patch) | |
tree | 745dd217242b32aa6421431ed8bc6271a699f756 /src/mess/machine | |
parent | 000f9d27eddb3edde72bc289d9d0a9ed678f6fbb (diff) |
Pass 2 of struct modernization.
Diffstat (limited to 'src/mess/machine')
-rw-r--r-- | src/mess/machine/3c505.h | 4 | ||||
-rw-r--r-- | src/mess/machine/amigacd.c | 4 | ||||
-rw-r--r-- | src/mess/machine/amigacrt.c | 4 | ||||
-rw-r--r-- | src/mess/machine/amigakbd.c | 4 | ||||
-rw-r--r-- | src/mess/machine/apollo_net.c | 8 | ||||
-rw-r--r-- | src/mess/machine/at45dbxx.c | 12 | ||||
-rw-r--r-- | src/mess/machine/corvushd.c | 16 | ||||
-rw-r--r-- | src/mess/machine/mboard.h | 4 | ||||
-rw-r--r-- | src/mess/machine/mc68328.h | 8 | ||||
-rw-r--r-- | src/mess/machine/mc6843.c | 4 | ||||
-rw-r--r-- | src/mess/machine/mc6846.c | 4 | ||||
-rw-r--r-- | src/mess/machine/mc6854.c | 4 | ||||
-rw-r--r-- | src/mess/machine/rmnimbus.c | 4 | ||||
-rw-r--r-- | src/mess/machine/s3c44b0.h | 128 | ||||
-rw-r--r-- | src/mess/machine/sgi.c | 4 | ||||
-rw-r--r-- | src/mess/machine/strata.c | 4 |
16 files changed, 108 insertions, 108 deletions
diff --git a/src/mess/machine/3c505.h b/src/mess/machine/3c505.h index fa1f4781f46..3d764181149 100644 --- a/src/mess/machine/3c505.h +++ b/src/mess/machine/3c505.h @@ -126,7 +126,7 @@ struct Memdump between the host and the adapter is done with these. (Except for the actual Ethernet data, which has different packaging.) */ -typedef struct +struct pcb_struct { UINT8 command; UINT8 length; @@ -147,7 +147,7 @@ typedef struct struct Memdump memdump; UINT8 raw[62]; } data; -} pcb_struct; +}; // ======================> threecom3c505_device diff --git a/src/mess/machine/amigacd.c b/src/mess/machine/amigacd.c index a0aba92fb52..802ea4390e0 100644 --- a/src/mess/machine/amigacd.c +++ b/src/mess/machine/amigacd.c @@ -59,7 +59,7 @@ DMAC controller. #define ISTR_FF_FLG (1<<1) /* FIFO-Full Flag */ #define ISTR_FE_FLG (1<<0) /* FIFO-Empty Flag */ -typedef struct +struct _dmac_data { UINT16 istr; /* Interrupt Status Register (R) */ UINT16 cntr; /* Control Register (RW) */ @@ -67,7 +67,7 @@ typedef struct UINT32 acr; /* Address Count Register (RW) */ UINT16 dawr; /* DACK Width Register (W) */ emu_timer *dma_timer; -} _dmac_data; +}; static _dmac_data dmac_data; diff --git a/src/mess/machine/amigacrt.c b/src/mess/machine/amigacrt.c index 84de5897c9a..258c5f029b1 100644 --- a/src/mess/machine/amigacrt.c +++ b/src/mess/machine/amigacrt.c @@ -24,12 +24,12 @@ enum ACTION_REPLAY_MKIII }; -typedef struct +struct amigacrt_t { int cart_type; int ar1_spurious; UINT16 ar23_mode; -} amigacrt_t; +}; static amigacrt_t amigacrt; /*************************************************************************** diff --git a/src/mess/machine/amigakbd.c b/src/mess/machine/amigakbd.c index 15044cf7106..9ff1fd6718b 100644 --- a/src/mess/machine/amigakbd.c +++ b/src/mess/machine/amigakbd.c @@ -13,13 +13,13 @@ #define KEYBOARD_BUFFER_SIZE 256 -typedef struct +struct amigakbd_t { UINT8 *buf; int buf_pos; int cur_pos; emu_timer *timer; -} amigakbd_t; +}; static amigakbd_t kbd; static void kbd_sendscancode( running_machine &machine, UINT8 scancode ) diff --git a/src/mess/machine/apollo_net.c b/src/mess/machine/apollo_net.c index ad3d068c2df..a16c3b8771f 100644 --- a/src/mess/machine/apollo_net.c +++ b/src/mess/machine/apollo_net.c @@ -21,13 +21,13 @@ #include "includes/apollo.h" #include "machine/3c505.h" -typedef struct { +struct ethernet_header { UINT8 dest[6]; UINT8 source[6]; UINT16 proto; -} ethernet_header; +}; -typedef struct +struct ip_header { UINT8 version; UINT8 tos; @@ -39,7 +39,7 @@ typedef struct UINT16 check; UINT32 saddr; UINT32 daddr; -} ip_header; +}; #define ETHERNET_HEADER_SIZE sizeof(ethernet_header) diff --git a/src/mess/machine/at45dbxx.c b/src/mess/machine/at45dbxx.c index a81ac23df94..b97d0468e55 100644 --- a/src/mess/machine/at45dbxx.c +++ b/src/mess/machine/at45dbxx.c @@ -36,7 +36,7 @@ enum TYPE DEFINITIONS ***************************************************************************/ -typedef struct +struct AT45DBXX_PINS { int cs; // chip select int sck; // serial clock @@ -45,18 +45,18 @@ typedef struct int wp; // write protect int reset; // reset int busy; // busy -} AT45DBXX_PINS; +}; -typedef struct +struct AT45DBXX_CMD { UINT8 data[8], size; -} AT45DBXX_CMD; +}; -typedef struct +struct AT45DBXX_IO { UINT8 *data; UINT32 size, pos; -} AT45DBXX_IO; +}; struct at45dbxx_t { diff --git a/src/mess/machine/corvushd.c b/src/mess/machine/corvushd.c index 8d963348067..51168e85fc1 100644 --- a/src/mess/machine/corvushd.c +++ b/src/mess/machine/corvushd.c @@ -89,14 +89,14 @@ // // Sector addressing scheme for Rev B/H drives used in various commands (Called a DADR in the docs) -typedef struct { +struct dadr_t { UINT8 address_msn_and_drive;// Most significant nibble: Most signficant nibble of sector address, Least significant nibble: Drive # UINT8 address_lsb; // Least significant byte of sector address UINT8 address_mid; // Middle byte of sector address -} dadr_t; +}; // Controller structure -typedef struct { +struct corvus_hdc_t { UINT8 status; // Controller status byte (DIRECTION + BUSY/READY) char prep_mode; // Whether the controller is in Prep Mode or not // Physical drive info @@ -317,7 +317,7 @@ typedef struct { UINT8 pattern[512]; // Pattern to be written } format_drive_revbh_command; } buffer; -} corvus_hdc_t; +}; // Structure of Block #1, the Disk Parameter Block typedef struct { @@ -340,7 +340,7 @@ typedef struct { } disk_parameter_block_t; // Structure of Block #3, the Constellation Parameter Block -typedef struct { +struct constellation_parameter_block_t { UINT8 mux_parameters[12]; UINT8 pipe_name_table_ptr[2]; UINT8 pipe_ptr_table_ptr[2]; @@ -348,7 +348,7 @@ typedef struct { UINT8 reserved[470]; UINT8 software_protection[12]; UINT8 serial_number[12]; -} constellation_parameter_block_t; +}; // Structure of Block #7, the Semaphore Table Block typedef struct { @@ -362,10 +362,10 @@ typedef struct { } semaphore_table_block_t; // Command size structure (number of bytes to xmit and recv for each command) -typedef struct { +struct corvus_cmd_t { UINT16 recv_bytes; // Number of bytes from host for this command UINT16 xmit_bytes; // Number of bytes to return to host -} corvus_cmd_t; +}; // // Prototypes diff --git a/src/mess/machine/mboard.h b/src/mess/machine/mboard.h index 4aab4790f84..f3d4dd4b5f5 100644 --- a/src/mess/machine/mboard.h +++ b/src/mess/machine/mboard.h @@ -42,11 +42,11 @@ enum TYPE DEFINITIONS ***************************************************************************/ -typedef struct { +struct MOUSE_HOLD { int border_piece; UINT8 from; UINT8 piece; -} MOUSE_HOLD; +}; /*************************************************************************** FUNCTION PROTOTYPES diff --git a/src/mess/machine/mc68328.h b/src/mess/machine/mc68328.h index 86163504517..4d004b7343b 100644 --- a/src/mess/machine/mc68328.h +++ b/src/mess/machine/mc68328.h @@ -10,7 +10,7 @@ #ifndef __MC68328_PRIVATE_H_ #define __MC68328_PRIVATE_H_ -typedef struct +struct mc68328_regs_t { // $(FF)FFF000 UINT8 scr; // System Control Register @@ -201,9 +201,9 @@ typedef struct UINT16 rtcienr; // RTC Interrupt Enable Register UINT16 stpwtch; // Stopwatch Minutes UINT8 unused42[1260]; -} mc68328_regs_t; +}; -typedef struct +struct mc68328_t { const mc68328_interface* iface; @@ -212,7 +212,7 @@ typedef struct emu_timer *gptimer[2]; emu_timer *rtc; emu_timer *pwm; -} mc68328_t; +}; #define SCR_BETO 0x80 #define SCR_WPV 0x40 diff --git a/src/mess/machine/mc6843.c b/src/mess/machine/mc6843.c index c7914ae8cdf..08ea6f6afed 100644 --- a/src/mess/machine/mc6843.c +++ b/src/mess/machine/mc6843.c @@ -42,7 +42,7 @@ /******************* internal chip data structure ******************/ -typedef struct +struct mc6843_t { /* interface */ @@ -72,7 +72,7 @@ typedef struct /* trigger delayed actions (bottom halves) */ emu_timer* timer_cont; -} mc6843_t; +}; diff --git a/src/mess/machine/mc6846.c b/src/mess/machine/mc6846.c index 48bfb93692d..23c9c712ec3 100644 --- a/src/mess/machine/mc6846.c +++ b/src/mess/machine/mc6846.c @@ -28,7 +28,7 @@ /******************* internal chip data structure ******************/ -typedef struct +struct mc6846_t { const mc6846_interface* iface; @@ -61,7 +61,7 @@ typedef struct int old_cif; int old_cto; -} mc6846_t; +}; diff --git a/src/mess/machine/mc6854.c b/src/mess/machine/mc6854.c index 3cee6d399f0..d2d10a5e710 100644 --- a/src/mess/machine/mc6854.c +++ b/src/mess/machine/mc6854.c @@ -57,7 +57,7 @@ /******************* internal chip data structure ******************/ -typedef struct +struct mc6854_t { devcb_resolved_write_line out_irq_func; devcb_resolved_read_line in_rxd_func; @@ -91,7 +91,7 @@ typedef struct UINT8 frame[MAX_FRAME_LENGTH]; UINT32 flen, fpos; -} mc6854_t; +}; /* meaning of tstate / rtate: 0 = idle / waiting for frame flag diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c index 0599dfbb7c1..f1cac74b308 100644 --- a/src/mess/machine/rmnimbus.c +++ b/src/mess/machine/rmnimbus.c @@ -1970,11 +1970,11 @@ static const struct nimbus_meminfo memmap[] = { 0xE0000, 0xEFFFF } }; -typedef struct +struct nimbus_block { int blockbase; int blocksize; -} nimbus_block; +}; typedef nimbus_block nimbus_blocks[3]; diff --git a/src/mess/machine/s3c44b0.h b/src/mess/machine/s3c44b0.h index b0864be4079..98b741f5c3c 100644 --- a/src/mess/machine/s3c44b0.h +++ b/src/mess/machine/s3c44b0.h @@ -373,12 +373,12 @@ void s3c44b0_request_eint( device_t *device, UINT32 number); TYPE DEFINITIONS *******************************************************************************/ -typedef struct +struct s3c44b0_memcon_regs_t { UINT32 data[0x34/4]; -} s3c44b0_memcon_regs_t; +}; -typedef struct +struct s3c44b0_irq_regs_t { UINT32 intcon; UINT32 intpnd; @@ -393,9 +393,9 @@ typedef struct UINT32 reserved[4]; UINT32 f_ispr; UINT32 f_ispc; -} s3c44b0_irq_regs_t; +}; -typedef struct +struct s3c44b0_dma_regs_t { UINT32 dcon; UINT32 disrc; @@ -404,17 +404,17 @@ typedef struct UINT32 dcsrc; UINT32 dcdst; UINT32 dccnt; -} s3c44b0_dma_regs_t; +}; -typedef struct +struct s3c44b0_clkpow_regs_t { UINT32 pllcon; UINT32 clkcon; UINT32 clkslow; UINT32 locktime; -} s3c44b0_clkpow_regs_t; +}; -typedef struct +struct s3c44b0_lcd_regs_t { UINT32 lcdcon1; UINT32 lcdcon2; @@ -427,9 +427,9 @@ typedef struct UINT32 reserved[8]; UINT32 lcdcon3; UINT32 dithmode; -} s3c44b0_lcd_regs_t; +}; -typedef struct +struct s3c44b0_uart_regs_t { UINT32 ulcon; UINT32 ucon; @@ -442,18 +442,18 @@ typedef struct UINT32 utxh; UINT32 urxh; UINT32 ubrdiv; -} s3c44b0_uart_regs_t; +}; -typedef struct +struct s3c44b0_sio_regs_t { UINT32 siocon; UINT32 siodat; UINT32 sbrdr; UINT32 itvcnt; UINT32 dcntz; -} s3c44b0_sio_regs_t; +}; -typedef struct +struct s3c44b0_pwm_regs_t { UINT32 tcfg0; UINT32 tcfg1; @@ -475,33 +475,33 @@ typedef struct UINT32 tcnto4; UINT32 tcntb5; UINT32 tcnto5; -} s3c44b0_pwm_regs_t; +}; -typedef struct +struct s3c44b0_wdt_regs_t { UINT32 wtcon; UINT32 wtdat; UINT32 wtcnt; -} s3c44b0_wdt_regs_t; +}; -typedef struct +struct s3c44b0_iic_regs_t { UINT32 iiccon; UINT32 iicstat; UINT32 iicadd; UINT32 iicds; -} s3c44b0_iic_regs_t; +}; -typedef struct +struct s3c44b0_iis_regs_t { UINT32 iiscon; UINT32 iismod; UINT32 iispsr; UINT32 iisfcon; UINT32 iisfifo; -} s3c44b0_iis_regs_t; +}; -typedef struct +struct s3c44b0_gpio_regs_t { UINT32 gpacon; UINT32 gpadat; @@ -525,9 +525,9 @@ typedef struct UINT32 spucr; UINT32 extint; UINT32 extintpnd; -} s3c44b0_gpio_regs_t; +}; -typedef struct +struct s3c44b0_rtc_regs_t { UINT32 rtccon; UINT32 reserved[3]; @@ -547,50 +547,50 @@ typedef struct UINT32 bcdmon; UINT32 bcdyear; UINT32 ticnt; -} s3c44b0_rtc_regs_t; +}; -typedef struct +struct s3c44b0_adc_regs_t { UINT32 adccon; UINT32 adcpsr; UINT32 adcdat; -} s3c44b0_adc_regs_t; +}; -typedef struct +struct s3c44b0_cpuwrap_regs_t { UINT32 syscfg; UINT32 ncachbe0; UINT32 ncachbe1; -} s3c44b0_cpuwrap_regs_t; +}; -typedef struct +struct s3c44b0_memcon_t { s3c44b0_memcon_regs_t regs; -} s3c44b0_memcon_t; +}; -typedef struct +struct s3c44b0_irq_t { s3c44b0_irq_regs_t regs; int line_irq, line_fiq; -} s3c44b0_irq_t; +}; -typedef struct +struct s3c44b0_dma_t { s3c44b0_dma_regs_t regs; emu_timer *timer; -} s3c44b0_dma_t; +}; -typedef struct +struct s3c44b0_clkpow_t { s3c44b0_clkpow_regs_t regs; -} s3c44b0_clkpow_t; +}; -typedef struct +struct rectangle_t { int x1, y1, x2, y2; -} rectangle_t; +}; -typedef struct +struct s3c44b0_lcd_t { s3c44b0_lcd_regs_t regs; emu_timer *timer; @@ -607,74 +607,74 @@ typedef struct UINT32 hpos_min, hpos_max, hpos_end, vpos_min, vpos_max, vpos_end; attotime frame_time; attoseconds_t frame_period, pixeltime, scantime; -} s3c44b0_lcd_t; +}; -typedef struct +struct s3c44b0_uart_t { s3c44b0_uart_regs_t regs; emu_timer *timer; -} s3c44b0_uart_t; +}; -typedef struct +struct s3c44b0_sio_t { s3c44b0_sio_regs_t regs; emu_timer *timer; -} s3c44b0_sio_t; +}; -typedef struct +struct s3c44b0_pwm_t { s3c44b0_pwm_regs_t regs; emu_timer *timer[6]; UINT32 cnt[6]; UINT32 cmp[6]; UINT32 freq[6]; -} s3c44b0_pwm_t; +}; -typedef struct +struct s3c44b0_wdt_t { s3c44b0_wdt_regs_t regs; emu_timer *timer; -} s3c44b0_wdt_t; +}; -typedef struct +struct s3c44b0_iic_t { s3c44b0_iic_regs_t regs; emu_timer *timer; int count; -} s3c44b0_iic_t; +}; -typedef struct +struct s3c44b0_iis_t { s3c44b0_iis_regs_t regs; emu_timer *timer; UINT16 fifo[16/2]; int fifo_index; -} s3c44b0_iis_t; +}; -typedef struct +struct s3c44b0_gpio_t { s3c44b0_gpio_regs_t regs; -} s3c44b0_gpio_t; +}; -typedef struct +struct s3c44b0_rtc_t { s3c44b0_rtc_regs_t regs; emu_timer *timer_tick_count; emu_timer *timer_update; -} s3c44b0_rtc_t; +}; -typedef struct +struct s3c44b0_adc_t { s3c44b0_adc_regs_t regs; emu_timer *timer; -} s3c44b0_adc_t; +}; -typedef struct +struct s3c44b0_cpuwrap_t { s3c44b0_cpuwrap_regs_t regs; -} s3c44b0_cpuwrap_t; +}; -typedef struct +struct s3c44b0_t { const s3c44b0_interface *iface; address_space* space; @@ -695,6 +695,6 @@ typedef struct s3c44b0_rtc_t rtc; s3c44b0_adc_t adc; s3c44b0_cpuwrap_t cpuwrap; -} s3c44b0_t; +}; #endif diff --git a/src/mess/machine/sgi.c b/src/mess/machine/sgi.c index 7c1d532e04e..1b446969662 100644 --- a/src/mess/machine/sgi.c +++ b/src/mess/machine/sgi.c @@ -24,7 +24,7 @@ INLINE void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_level, } } -typedef struct +struct MC_t { emu_timer *tUpdateTimer; UINT32 nCPUControl0; @@ -68,7 +68,7 @@ typedef struct UINT32 nDMAMode; UINT32 nDMAZoomByteCnt; UINT32 nDMARunning; -} MC_t; +}; static MC_t *pMC; READ32_HANDLER( sgi_mc_r ) diff --git a/src/mess/machine/strata.c b/src/mess/machine/strata.c index 6fa6dd99f4c..b0f190c8a2e 100644 --- a/src/mess/machine/strata.c +++ b/src/mess/machine/strata.c @@ -44,7 +44,7 @@ enum fm_mode_t FM_CONFPART1, // first half of configuration, awaiting second FM_WRPROTPART1 // first half of protection program, awaiting second }; -typedef struct +struct strata_t { fm_mode_t mode; // current operation mode int hard_unlock; // 1 if RP* pin is at Vhh (not fully implemented) @@ -57,7 +57,7 @@ typedef struct UINT8 *data_ptr; // main FEEPROM area UINT8 *blocklock; // block lock flags UINT8 *prot_regs; // protection registers -} strata_t; +}; /* accessors for individual block lock flags */ #define READ_BLOCKLOCK(strata, block) (((strata)->blocklock[(block) >> 3] >> ((block) & 7)) & 1) |