diff options
Diffstat (limited to 'src/emu/machine')
36 files changed, 80 insertions, 137 deletions
diff --git a/src/emu/machine/6525tpi.c b/src/emu/machine/6525tpi.c index 000fee687fb..98ce60c6679 100644 --- a/src/emu/machine/6525tpi.c +++ b/src/emu/machine/6525tpi.c @@ -106,8 +106,7 @@ TYPE DEFINITIONS ***************************************************************************/ -typedef struct _tpi6525_state tpi6525_state; -struct _tpi6525_state +struct tpi6525_state { devcb_resolved_write_line out_irq_func; devcb_resolved_read8 in_pa_func; diff --git a/src/emu/machine/6525tpi.h b/src/emu/machine/6525tpi.h index 01b42253523..548dd4b4532 100644 --- a/src/emu/machine/6525tpi.h +++ b/src/emu/machine/6525tpi.h @@ -34,8 +34,7 @@ TYPE DEFINITIONS ***************************************************************************/ -typedef struct _tpi6525_interface tpi6525_interface; -struct _tpi6525_interface +struct tpi6525_interface { devcb_write_line out_irq_func; diff --git a/src/emu/machine/68681.h b/src/emu/machine/68681.h index a8084d3b167..6de4665ded5 100644 --- a/src/emu/machine/68681.h +++ b/src/emu/machine/68681.h @@ -3,8 +3,7 @@ #include "devlegcy.h" -typedef struct _duart68681_config duart68681_config; -struct _duart68681_config +struct duart68681_config { void (*irq_handler)(device_t *device, int state, UINT8 vector); void (*tx_callback)(device_t *device, int channel, UINT8 data); diff --git a/src/emu/machine/74148.c b/src/emu/machine/74148.c index 2bb59b429de..1979e9e8ce2 100644 --- a/src/emu/machine/74148.c +++ b/src/emu/machine/74148.c @@ -42,8 +42,7 @@ #include "machine/74148.h" -typedef struct _ttl74148_state ttl74148_state; -struct _ttl74148_state +struct ttl74148_state { /* callback */ void (*output_cb)(device_t *device); diff --git a/src/emu/machine/74148.h b/src/emu/machine/74148.h index ac3d55a097a..0ba2177284e 100644 --- a/src/emu/machine/74148.h +++ b/src/emu/machine/74148.h @@ -44,8 +44,7 @@ #include "devlegcy.h" -typedef struct _ttl74148_config ttl74148_config; -struct _ttl74148_config +struct ttl74148_config { void (*output_cb)(device_t *device); }; diff --git a/src/emu/machine/74153.c b/src/emu/machine/74153.c index 199b0203d3b..3d161c8f6c1 100644 --- a/src/emu/machine/74153.c +++ b/src/emu/machine/74153.c @@ -37,8 +37,7 @@ #include "machine/74153.h" -typedef struct _ttl74153_state ttl74153_state; -struct _ttl74153_state +struct ttl74153_state { /* callback */ void (*output_cb)(device_t *device); diff --git a/src/emu/machine/74153.h b/src/emu/machine/74153.h index acae556036e..95a01a48aea 100644 --- a/src/emu/machine/74153.h +++ b/src/emu/machine/74153.h @@ -39,8 +39,7 @@ #include "devlegcy.h" -typedef struct _ttl74153_config ttl74153_config; -struct _ttl74153_config +struct ttl74153_config { void (*output_cb)(device_t *device); }; diff --git a/src/emu/machine/adc083x.c b/src/emu/machine/adc083x.c index b813c6decba..d8486ab028d 100644 --- a/src/emu/machine/adc083x.c +++ b/src/emu/machine/adc083x.c @@ -44,8 +44,7 @@ enum TYPE DEFINITIONS ***************************************************************************/ -typedef struct _adc0831_state adc0831_state; -struct _adc0831_state +struct adc0831_state { adc083x_input_convert_func input_callback_r; diff --git a/src/emu/machine/adc083x.h b/src/emu/machine/adc083x.h index 59bce8f8c9c..11dd66be889 100644 --- a/src/emu/machine/adc083x.h +++ b/src/emu/machine/adc083x.h @@ -101,8 +101,7 @@ extern const device_type ADC0838; typedef double (*adc083x_input_convert_func)(device_t *device, UINT8 input); -typedef struct _adc083x_interface adc083x_interface; -struct _adc083x_interface +struct adc083x_interface { adc083x_input_convert_func input_callback_r; }; diff --git a/src/emu/machine/adc1038.c b/src/emu/machine/adc1038.c index 350a2e09acb..7a8e248a8db 100644 --- a/src/emu/machine/adc1038.c +++ b/src/emu/machine/adc1038.c @@ -14,8 +14,7 @@ TYPE DEFINITIONS ***************************************************************************/ -typedef struct _adc1038_state adc1038_state; -struct _adc1038_state +struct adc1038_state { int cycle; int clk; diff --git a/src/emu/machine/adc1038.h b/src/emu/machine/adc1038.h index a154af090e9..3f261f9a325 100644 --- a/src/emu/machine/adc1038.h +++ b/src/emu/machine/adc1038.h @@ -19,8 +19,7 @@ typedef int (*adc1038_input_read_func)(device_t *device, int input); -typedef struct _adc1038_interface adc1038_interface; -struct _adc1038_interface +struct adc1038_interface { int gticlub_hack; adc1038_input_read_func input_callback_r; diff --git a/src/emu/machine/adc1213x.c b/src/emu/machine/adc1213x.c index d123dced2a2..8633d7305c0 100644 --- a/src/emu/machine/adc1213x.c +++ b/src/emu/machine/adc1213x.c @@ -20,8 +20,7 @@ TYPE DEFINITIONS ***************************************************************************/ -typedef struct _adc12138_state adc12138_state; -struct _adc12138_state +struct adc12138_state { adc1213x_input_convert_func input_callback_r; diff --git a/src/emu/machine/adc1213x.h b/src/emu/machine/adc1213x.h index 538ed54510f..d0a2d39c814 100644 --- a/src/emu/machine/adc1213x.h +++ b/src/emu/machine/adc1213x.h @@ -73,8 +73,7 @@ extern const device_type ADC12132; typedef double (*adc1213x_input_convert_func)(device_t *device, UINT8 input); -typedef struct _adc12138_interface adc12138_interface; -struct _adc12138_interface +struct adc12138_interface { adc1213x_input_convert_func input_callback_r; }; diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c index fdec7134531..38eb23d55a4 100644 --- a/src/emu/machine/generic.c +++ b/src/emu/machine/generic.c @@ -28,7 +28,7 @@ static void counters_save(running_machine &machine, int config_type, xml_data_no TYPE DEFINITIONS ***************************************************************************/ -struct _generic_machine_private +struct generic_machine_private { /* tickets and coin counters */ UINT32 dispensed_tickets; diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c index 6d732f7bcd7..19f42d76d0b 100644 --- a/src/emu/machine/idectrl.c +++ b/src/emu/machine/idectrl.c @@ -103,8 +103,7 @@ /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ -typedef struct _ide_device ide_device; -struct _ide_device +struct ide_device { UINT16 cur_cylinder; UINT8 cur_sector; @@ -115,8 +114,7 @@ struct _ide_device }; -typedef struct _ide_state ide_state; -struct _ide_state +struct ide_state { device_t *device; diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h index 61af4c81648..d45b652f8f7 100644 --- a/src/emu/machine/idectrl.h +++ b/src/emu/machine/idectrl.h @@ -130,8 +130,7 @@ extern const device_type IDE_HARDDISK_IMAGE; TYPE DEFINITIONS ***************************************************************************/ -typedef struct _ide_config ide_config; -struct _ide_config +struct ide_config { void (*interrupt)(device_t *device, int state); const char *bmcpu; /* name of bus master CPU */ diff --git a/src/emu/machine/k053252.c b/src/emu/machine/k053252.c index 8b019a24517..cd81fff253c 100644 --- a/src/emu/machine/k053252.c +++ b/src/emu/machine/k053252.c @@ -55,8 +55,7 @@ TODO: #include "emu.h" #include "k053252.h" -typedef struct _k053252_state k053252_state; -struct _k053252_state +struct k053252_state { UINT8 regs[16]; UINT16 hc,hfp,hbp; diff --git a/src/emu/machine/k053252.h b/src/emu/machine/k053252.h index 1c6d526dc8e..9b714d1c123 100644 --- a/src/emu/machine/k053252.h +++ b/src/emu/machine/k053252.h @@ -30,8 +30,7 @@ extern const device_type K053252; -typedef struct _k053252_interface k053252_interface; -struct _k053252_interface +struct k053252_interface { const char *screen; devcb_write_line int1_en; diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c index 6a40e336d92..193ad9abf61 100644 --- a/src/emu/machine/latch8.c +++ b/src/emu/machine/latch8.c @@ -10,8 +10,7 @@ #include "sound/discrete.h" #include "latch8.h" -typedef struct _latch8_t latch8_t; -struct _latch8_t +struct latch8_t { latch8_config *intf; UINT8 value; diff --git a/src/emu/machine/latch8.h b/src/emu/machine/latch8.h index 7f4f0aa11cb..2bd23c04ebf 100644 --- a/src/emu/machine/latch8.h +++ b/src/emu/machine/latch8.h @@ -21,8 +21,7 @@ TYPE DEFINITIONS ***************************************************************************/ -typedef struct _latch8_devread latch8_devread; -struct _latch8_devread +struct latch8_devread { /* only for byte reads, does not affect bit reads and node_map */ UINT32 from_bit; @@ -31,8 +30,7 @@ struct _latch8_devread read8_space_func read_handler; }; -typedef struct _latch8_config latch8_config; -struct _latch8_config +struct latch8_config { /* only for byte reads, does not affect bit reads and node_map */ UINT32 maskout; diff --git a/src/emu/machine/mb14241.c b/src/emu/machine/mb14241.c index cb14b53008d..e1fd7fe6e2a 100644 --- a/src/emu/machine/mb14241.c +++ b/src/emu/machine/mb14241.c @@ -7,8 +7,7 @@ #include "emu.h" #include "machine/mb14241.h" -typedef struct _mb14241_state mb14241_state; -struct _mb14241_state +struct mb14241_state { UINT16 shift_data; /* 15 bits only */ UINT8 shift_count; /* 3 bits */ diff --git a/src/emu/machine/mb87078.c b/src/emu/machine/mb87078.c index de48be6633c..234296d08b1 100644 --- a/src/emu/machine/mb87078.c +++ b/src/emu/machine/mb87078.c @@ -71,8 +71,7 @@ #include "emu.h" #include "machine/mb87078.h" -typedef struct _mb87078_state mb87078_state; -struct _mb87078_state +struct mb87078_state { int gain[4]; /* gain index 0-63,64,65 */ int channel_latch; /* current channel */ diff --git a/src/emu/machine/mb87078.h b/src/emu/machine/mb87078.h index 8b86a5189da..345b30ed920 100644 --- a/src/emu/machine/mb87078.h +++ b/src/emu/machine/mb87078.h @@ -18,8 +18,7 @@ typedef void (*mb87078_gain_changed_cb)(running_machine &machine, int channel, int percent /*, float decibels*/); -typedef struct _mb87078_interface mb87078_interface; -struct _mb87078_interface +struct mb87078_interface { mb87078_gain_changed_cb gain_changed_cb; }; diff --git a/src/emu/machine/msm6242.h b/src/emu/machine/msm6242.h index 21b57dc1f5e..25e8b5f82bd 100644 --- a/src/emu/machine/msm6242.h +++ b/src/emu/machine/msm6242.h @@ -25,8 +25,7 @@ // ======================> msm6242_interface -typedef struct _msm6242_interface msm6242_interface; -struct _msm6242_interface +struct msm6242_interface { devcb_write_line m_out_int_cb; }; diff --git a/src/emu/machine/pd4990a.c b/src/emu/machine/pd4990a.c index 7c244bb75b6..c34a5f273ea 100644 --- a/src/emu/machine/pd4990a.c +++ b/src/emu/machine/pd4990a.c @@ -48,8 +48,7 @@ TYPE DEFINITIONS ***************************************************************************/ -typedef struct _upd4990a_state upd4990a_state; -struct _upd4990a_state +struct upd4990a_state { int seconds; /* seconds BCD */ int minutes; /* minutes BCD */ diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c index 25681190933..dfbe2b3df70 100644 --- a/src/emu/machine/pit8253.c +++ b/src/emu/machine/pit8253.c @@ -82,12 +82,11 @@ struct pit8253_timer UINT32 cycles_to_output; /* cycles until output callback called */ }; -typedef struct _pit8253_t pit8253_t; -struct _pit8253_t +struct pit8253_t { - const struct pit8253_config *config; + const pit8253_config *config; int device_type; - struct pit8253_timer timers[MAX_TIMER]; + pit8253_timer timers[MAX_TIMER]; }; #define CTRL_ACCESS(control) (((control) >> 4) & 0x03) @@ -111,7 +110,7 @@ INLINE pit8253_t *get_safe_token(device_t *device) } -static struct pit8253_timer *get_timer(struct _pit8253_t *pit,int which) +static pit8253_timer *get_timer(pit8253_t *pit,int which) { which &= 3; if (which < MAX_TIMER) @@ -120,7 +119,7 @@ static struct pit8253_timer *get_timer(struct _pit8253_t *pit,int which) } -static int pit8253_gate(struct pit8253_timer *timer) +static int pit8253_gate(pit8253_timer *timer) { if (!timer->in_gate_func.isnull()) return timer->in_gate_func(); @@ -159,7 +158,7 @@ static UINT32 adjusted_count(int bcd,UINT16 val) /* This function subtracts 1 from timer->value "cycles" times, taking into account binary or BCD operation, and wrapping around from 0 to 0xFFFF or 0x9999 as necessary. */ -static void decrease_counter_value(struct pit8253_timer *timer,UINT64 cycles) +static void decrease_counter_value(pit8253_timer *timer,UINT64 cycles) { UINT16 value; int units, tens, hundreds, thousands; @@ -215,7 +214,7 @@ static void decrease_counter_value(struct pit8253_timer *timer,UINT64 cycles) /* Counter loading: transfer of a count from the CR to the CE */ -static void load_counter_value(device_t *device, struct pit8253_timer *timer) +static void load_counter_value(device_t *device, pit8253_timer *timer) { timer->value = timer->count; timer->null_count = 1; @@ -224,7 +223,7 @@ static void load_counter_value(device_t *device, struct pit8253_timer *timer) } -static void set_output(device_t *device, struct pit8253_timer *timer,int output) +static void set_output(device_t *device, pit8253_timer *timer,int output) { if (output != timer->output) { @@ -236,7 +235,7 @@ static void set_output(device_t *device, struct pit8253_timer *timer,int output) /* This emulates timer "timer" for "elapsed_cycles" cycles and assumes no callbacks occur during that time. */ -static void simulate2(device_t *device, struct pit8253_timer *timer, INT64 elapsed_cycles) +static void simulate2(device_t *device, pit8253_timer *timer, INT64 elapsed_cycles) { UINT32 adjusted_value; int bcd = CTRL_BCD(timer->control); @@ -639,7 +638,7 @@ static void simulate2(device_t *device, struct pit8253_timer *timer, INT64 elaps inaccurate by more than one cycle, and the output changed multiple times during the discrepancy. In practice updates should still be O(1). */ -static void simulate(device_t *device, struct pit8253_timer *timer, INT64 elapsed_cycles) +static void simulate(device_t *device, pit8253_timer *timer, INT64 elapsed_cycles) { if ( elapsed_cycles > 0 ) simulate2(device, timer, elapsed_cycles); @@ -650,7 +649,7 @@ static void simulate(device_t *device, struct pit8253_timer *timer, INT64 elapse /* This brings timer "timer" up to date */ -static void update(device_t *device, struct pit8253_timer *timer) +static void update(device_t *device, pit8253_timer *timer) { /* With the 82C54's maximum clockin of 10MHz, 64 bits is nearly 60,000 years of time. Should be enough for now. */ @@ -677,7 +676,7 @@ static TIMER_CALLBACK( update_timer_cb ) { device_t *device = (device_t *)ptr; pit8253_t *pit8253 = get_safe_token(device); - struct pit8253_timer *timer = get_timer(pit8253,param); + pit8253_timer *timer = get_timer(pit8253,param); LOG2(("pit8253: output_changed(): timer %d\n",param)); @@ -688,7 +687,7 @@ static TIMER_CALLBACK( update_timer_cb ) /* We recycle bit 0 of timer->value to hold the phase in mode 3 when count is odd. Since read commands in mode 3 always return even numbers, we need to mask this bit off. */ -static UINT16 masked_value(struct pit8253_timer *timer) +static UINT16 masked_value(pit8253_timer *timer) { LOG2(("pit8253: masked_value\n")); @@ -705,7 +704,7 @@ static UINT16 masked_value(struct pit8253_timer *timer) READ8_DEVICE_HANDLER( pit8253_r ) { pit8253_t *pit8253 = get_safe_token(device); - struct pit8253_timer *timer = get_timer(pit8253,offset); + pit8253_timer *timer = get_timer(pit8253,offset); UINT8 data; UINT16 value; @@ -773,7 +772,7 @@ READ8_DEVICE_HANDLER( pit8253_r ) /* Loads a new value from the bus to the count register (CR) */ -static void load_count(device_t *device, struct pit8253_timer *timer, UINT16 newcount) +static void load_count(device_t *device, pit8253_timer *timer, UINT16 newcount) { int mode = CTRL_MODE(timer->control); @@ -806,7 +805,7 @@ static void load_count(device_t *device, struct pit8253_timer *timer, UINT16 new } -static void readback(device_t *device, struct pit8253_timer *timer,int command) +static void readback(device_t *device, pit8253_timer *timer,int command) { UINT16 value; update(device, timer); @@ -861,7 +860,7 @@ static void readback(device_t *device, struct pit8253_timer *timer,int command) WRITE8_DEVICE_HANDLER( pit8253_w ) { pit8253_t *pit8253 = get_safe_token(device); - struct pit8253_timer *timer = get_timer(pit8253,offset); + pit8253_timer *timer = get_timer(pit8253,offset); int read_command; LOG2(("pit8253_w(): offset=%d data=0x%02x\n", offset, data)); @@ -984,7 +983,7 @@ WRITE8_DEVICE_HANDLER( pit8253_w ) static void pit8253_gate_w(device_t *device, int gate, int state) { pit8253_t *pit8253 = get_safe_token(device); - struct pit8253_timer *timer = get_timer(pit8253, gate); + pit8253_timer *timer = get_timer(pit8253, gate); LOG2(("pit8253_gate_w(): gate=%d state=%d\n", gate, state)); @@ -1022,7 +1021,7 @@ WRITE_LINE_DEVICE_HANDLER( pit8253_gate2_w ) { pit8253_gate_w(device, 2, state); int pit8253_get_output(device_t *device, int timerno) { pit8253_t *pit8253 = get_safe_token(device); - struct pit8253_timer *timer = get_timer(pit8253,timerno); + pit8253_timer *timer = get_timer(pit8253,timerno); int result; update(device, timer); @@ -1036,7 +1035,7 @@ int pit8253_get_output(device_t *device, int timerno) void pit8253_set_clockin(device_t *device, int timerno, double new_clockin) { pit8253_t *pit8253 = get_safe_token(device); - struct pit8253_timer *timer = get_timer(pit8253,timerno); + pit8253_timer *timer = get_timer(pit8253,timerno); LOG2(("pit8253_set_clockin(): PIT timer=%d, clockin = %lf\n", timerno,new_clockin)); @@ -1049,7 +1048,7 @@ void pit8253_set_clockin(device_t *device, int timerno, double new_clockin) static void pit8253_set_clock_signal(device_t *device, int timerno, int state) { pit8253_t *pit8253 = get_safe_token(device); - struct pit8253_timer *timer = get_timer(pit8253,timerno); + pit8253_timer *timer = get_timer(pit8253,timerno); LOG2(("pit8253_set_clock_signal(): PIT timer=%d, state = %d\n", timerno, state)); @@ -1077,7 +1076,7 @@ static void common_start( device_t *device, int device_type ) { /* register for state saving */ for (timerno = 0; timerno < MAX_TIMER; timerno++) { - struct pit8253_timer *timer = get_timer(pit8253, timerno); + pit8253_timer *timer = get_timer(pit8253, timerno); /* initialize timer */ timer->clockin = pit8253->config->timer[timerno].clockin; @@ -1127,7 +1126,7 @@ static DEVICE_RESET( pit8253 ) { for (i = 0; i < MAX_TIMER; i++) { - struct pit8253_timer *timer = get_timer(pit,i); + pit8253_timer *timer = get_timer(pit,i); /* According to Intel's 8254 docs, the state of a timer is undefined until the first mode control word is written. Here we define this undefined behaviour */ diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c index 16c51ca0f78..35e3f3fae5b 100644 --- a/src/emu/machine/rp5h01.c +++ b/src/emu/machine/rp5h01.c @@ -29,8 +29,7 @@ enum { TYPE DEFINITIONS ***************************************************************************/ -typedef struct _rp5h01_state rp5h01_state; -struct _rp5h01_state +struct rp5h01_state { int counter; int counter_mode; /* test pin */ diff --git a/src/emu/machine/s3c2400.h b/src/emu/machine/s3c2400.h index dadbc39a119..7cf177f41aa 100644 --- a/src/emu/machine/s3c2400.h +++ b/src/emu/machine/s3c2400.h @@ -65,48 +65,41 @@ typedef void (*s3c24xx_gpio_port_w_func)( device_t *device, int port, UINT32 mas typedef int (*s3c24xx_core_pin_r_func)( device_t *device, int pin); typedef void (*s3c24xx_core_pin_w_func)( device_t *device, int pin, int data); -typedef struct _s3c2400_interface_core s3c2400_interface_core; -struct _s3c2400_interface_core +struct s3c2400_interface_core { s3c24xx_core_pin_r_func pin_r; s3c24xx_core_pin_w_func pin_w; }; -typedef struct _s3c2400_interface_gpio s3c2400_interface_gpio; -struct _s3c2400_interface_gpio +struct s3c2400_interface_gpio { s3c24xx_gpio_port_r_func port_r; s3c24xx_gpio_port_w_func port_w; }; -typedef struct _s3c2400_interface_i2c s3c2400_interface_i2c; -struct _s3c2400_interface_i2c +struct s3c2400_interface_i2c { write_line_device_func scl_w; read_line_device_func sda_r; write_line_device_func sda_w; }; -typedef struct _s3c2400_interface_adc s3c2400_interface_adc; -struct _s3c2400_interface_adc +struct s3c2400_interface_adc { read32_device_func data_r; }; -typedef struct _s3c2400_interface_i2s s3c2400_interface_i2s; -struct _s3c2400_interface_i2s +struct s3c2400_interface_i2s { write16_device_func data_w; }; -typedef struct _s3c2400_interface_lcd s3c2400_interface_lcd; -struct _s3c2400_interface_lcd +struct s3c2400_interface_lcd { int flags; }; -typedef struct _s3c2400_interface s3c2400_interface; -struct _s3c2400_interface +struct s3c2400_interface { s3c2400_interface_core core; s3c2400_interface_gpio gpio; diff --git a/src/emu/machine/s3c2410.h b/src/emu/machine/s3c2410.h index 338a1f0645d..b446f970194 100644 --- a/src/emu/machine/s3c2410.h +++ b/src/emu/machine/s3c2410.h @@ -75,42 +75,36 @@ typedef void (*s3c24xx_gpio_port_w_func)( device_t *device, int port, UINT32 mas typedef int (*s3c24xx_core_pin_r_func)( device_t *device, int pin); typedef void (*s3c24xx_core_pin_w_func)( device_t *device, int pin, int data); -typedef struct _s3c2410_interface_core s3c2410_interface_core; -struct _s3c2410_interface_core +struct s3c2410_interface_core { s3c24xx_core_pin_r_func pin_r; s3c24xx_core_pin_w_func pin_w; }; -typedef struct _s3c2410_interface_gpio s3c2410_interface_gpio; -struct _s3c2410_interface_gpio +struct s3c2410_interface_gpio { s3c24xx_gpio_port_r_func port_r; s3c24xx_gpio_port_w_func port_w; }; -typedef struct _s3c2410_interface_i2c s3c2410_interface_i2c; -struct _s3c2410_interface_i2c +struct s3c2410_interface_i2c { write_line_device_func scl_w; read_line_device_func sda_r; write_line_device_func sda_w; }; -typedef struct _s3c2410_interface_adc s3c2410_interface_adc; -struct _s3c2410_interface_adc +struct s3c2410_interface_adc { read32_device_func data_r; }; -typedef struct _s3c2410_interface_i2s s3c2410_interface_i2s; -struct _s3c2410_interface_i2s +struct s3c2410_interface_i2s { write16_device_func data_w; }; -typedef struct _s3c2410_interface_nand s3c2410_interface_nand; -struct _s3c2410_interface_nand +struct s3c2410_interface_nand { write8_device_func command_w; write8_device_func address_w; @@ -118,14 +112,12 @@ struct _s3c2410_interface_nand write8_device_func data_w; }; -typedef struct _s3c2410_interface_lcd s3c2410_interface_lcd; -struct _s3c2410_interface_lcd +struct s3c2410_interface_lcd { int flags; }; -typedef struct _s3c2410_interface s3c2410_interface; -struct _s3c2410_interface +struct s3c2410_interface { s3c2410_interface_core core; s3c2410_interface_gpio gpio; diff --git a/src/emu/machine/s3c2440.h b/src/emu/machine/s3c2440.h index 21568d85728..26994b73d38 100644 --- a/src/emu/machine/s3c2440.h +++ b/src/emu/machine/s3c2440.h @@ -73,42 +73,36 @@ typedef void (*s3c24xx_gpio_port_w_func)( device_t *device, int port, UINT32 mas typedef int (*s3c24xx_core_pin_r_func)( device_t *device, int pin); typedef void (*s3c24xx_core_pin_w_func)( device_t *device, int pin, int data); -typedef struct _s3c2440_interface_core s3c2440_interface_core; -struct _s3c2440_interface_core +struct s3c2440_interface_core { s3c24xx_core_pin_r_func pin_r; s3c24xx_core_pin_w_func pin_w; }; -typedef struct _s3c2440_interface_gpio s3c2440_interface_gpio; -struct _s3c2440_interface_gpio +struct s3c2440_interface_gpio { s3c24xx_gpio_port_r_func port_r; s3c24xx_gpio_port_w_func port_w; }; -typedef struct _s3c2440_interface_i2c s3c2440_interface_i2c; -struct _s3c2440_interface_i2c +struct s3c2440_interface_i2c { write_line_device_func scl_w; read_line_device_func sda_r; write_line_device_func sda_w; }; -typedef struct _s3c2440_interface_adc s3c2440_interface_adc; -struct _s3c2440_interface_adc +struct s3c2440_interface_adc { read32_device_func data_r; }; -typedef struct _s3c2440_interface_i2s s3c2440_interface_i2s; -struct _s3c2440_interface_i2s +struct s3c2440_interface_i2s { write16_device_func data_w; }; -typedef struct _s3c2440_interface_nand s3c2440_interface_nand; -struct _s3c2440_interface_nand +struct s3c2440_interface_nand { write8_device_func command_w; write8_device_func address_w; @@ -116,14 +110,12 @@ struct _s3c2440_interface_nand write8_device_func data_w; }; -typedef struct _s3c2440_interface_lcd s3c2440_interface_lcd; -struct _s3c2440_interface_lcd +struct s3c2440_interface_lcd { int flags; }; -typedef struct _s3c2440_interface s3c2440_interface; -struct _s3c2440_interface +struct s3c2440_interface { s3c2440_interface_core core; s3c2440_interface_gpio gpio; diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c index 90f5878c967..e8084aefdde 100644 --- a/src/emu/machine/smc91c9x.c +++ b/src/emu/machine/smc91c9x.c @@ -106,8 +106,7 @@ static const char *const ethernet_regname[64] = TYPE DEFINITIONS ***************************************************************************/ -typedef struct _smc91c9x_state smc91c9x_state; -struct _smc91c9x_state +struct smc91c9x_state { device_t *device; smc91c9x_irq_func irq_handler; diff --git a/src/emu/machine/smc91c9x.h b/src/emu/machine/smc91c9x.h index 9f8161f32b1..038b3cc4000 100644 --- a/src/emu/machine/smc91c9x.h +++ b/src/emu/machine/smc91c9x.h @@ -19,8 +19,7 @@ typedef void (*smc91c9x_irq_func)(device_t *device, int state); -typedef struct _smc91c9x_config smc91c9x_config; -struct _smc91c9x_config +struct smc91c9x_config { smc91c9x_irq_func interrupt; }; diff --git a/src/emu/machine/tms6100.c b/src/emu/machine/tms6100.c index c7569dd3053..d003fd799c3 100644 --- a/src/emu/machine/tms6100.c +++ b/src/emu/machine/tms6100.c @@ -73,8 +73,7 @@ #define TMS6100_READ_PENDING 0x01 #define TMS6100_NEXT_READ_IS_DUMMY 0x02 -typedef struct _tms6100_state tms6100_state; -struct _tms6100_state +struct tms6100_state { /* Rom interface */ UINT32 address; diff --git a/src/emu/machine/upd4701.c b/src/emu/machine/upd4701.c index 4c3ad6b0467..f7894d87799 100644 --- a/src/emu/machine/upd4701.c +++ b/src/emu/machine/upd4701.c @@ -15,8 +15,7 @@ TYPE DEFINITIONS ***************************************************************************/ -typedef struct _upd4701_state upd4701_state; -struct _upd4701_state +struct upd4701_state { int cs; int xy; diff --git a/src/emu/machine/wd17xx.c b/src/emu/machine/wd17xx.c index 37567be3e1d..f40569ec4ec 100644 --- a/src/emu/machine/wd17xx.c +++ b/src/emu/machine/wd17xx.c @@ -287,8 +287,7 @@ static const UINT8 track_SD[][2] = { TYPE DEFINITIONS ***************************************************************************/ -typedef struct _wd1770_state wd1770_state; -struct _wd1770_state +struct wd1770_state { /* callbacks */ devcb_resolved_read_line in_dden_func; diff --git a/src/emu/machine/wd17xx.h b/src/emu/machine/wd17xx.h index bc7add9f89d..80d85987b80 100644 --- a/src/emu/machine/wd17xx.h +++ b/src/emu/machine/wd17xx.h @@ -233,8 +233,7 @@ extern const device_type MB8877; ***************************************************************************/ /* Interface */ -typedef struct _wd17xx_interface wd17xx_interface; -struct _wd17xx_interface +struct wd17xx_interface { devcb_read_line in_dden_func; devcb_write_line out_intrq_func; |