diff options
author | 2012-09-17 06:49:13 +0000 | |
---|---|---|
committer | 2012-09-17 06:49:13 +0000 | |
commit | e25c13f2532730ebf50d0cffa0147393fd8e0228 (patch) | |
tree | a6c25d1de7041f26afed559dbc6670fa550e6b41 /src/mess/machine | |
parent | f97e8f00818bd8d898facc206ed33ab72cf10a75 (diff) |
Clean-ups and version bumpmame0147
note: hoarded dump removed too from coco_cart.xml, this will not be tolerated
Diffstat (limited to 'src/mess/machine')
55 files changed, 150 insertions, 150 deletions
diff --git a/src/mess/machine/990_hd.c b/src/mess/machine/990_hd.c index 27aa6cab4ba..495829c28d0 100644 --- a/src/mess/machine/990_hd.c +++ b/src/mess/machine/990_hd.c @@ -40,7 +40,7 @@ for TI990. */ /* We can use MAME's harddisk.c image format instead. */ /* machine-independent big-endian 32-bit integer */ -struct UINT32BE +struct UINT32BE { UINT8 bytes[4]; }; @@ -61,7 +61,7 @@ INLINE void set_UINT32BE(UINT32BE *word, UINT32 data) #endif /* disk image header */ -struct disk_image_header +struct disk_image_header { UINT32BE cylinders; /* number of cylinders on hard disk (big-endian) */ UINT32BE heads; /* number of heads on hard disk (big-endian) */ @@ -81,7 +81,7 @@ enum format_t }; /* disk drive unit descriptor */ -struct hd_unit_t +struct hd_unit_t { device_image_interface *img; /* image descriptor */ format_t format; @@ -94,7 +94,7 @@ struct hd_unit_t }; /* disk controller */ -struct hdc_t +struct hdc_t { UINT16 w[8]; diff --git a/src/mess/machine/990_tap.c b/src/mess/machine/990_tap.c index ccc280f8e59..ad47cdc98e2 100644 --- a/src/mess/machine/990_tap.c +++ b/src/mess/machine/990_tap.c @@ -36,7 +36,7 @@ static void update_interrupt(device_t *device); #define MAX_TAPE_UNIT 4 -struct tape_unit_t +struct tape_unit_t { device_image_interface *img; /* image descriptor */ unsigned int bot : 1; /* TRUE if we are at the beginning of tape */ diff --git a/src/mess/machine/a2cffa.c b/src/mess/machine/a2cffa.c index f18caa8e7a6..b8f7b5c8994 100644 --- a/src/mess/machine/a2cffa.c +++ b/src/mess/machine/a2cffa.c @@ -31,10 +31,10 @@ const device_type A2BUS_CFFA2_6502 = &device_creator<a2bus_cffa2_6502_device>; #define CFFA2_ROM_REGION "cffa2_rom" #define CFFA2_IDE_TAG "cffa2_ide" -static const ide_config ide_intf = +static const ide_config ide_intf = { - NULL, - NULL, + NULL, + NULL, 0 }; diff --git a/src/mess/machine/amigacrt.c b/src/mess/machine/amigacrt.c index 258c5f029b1..cccaa5f24b5 100644 --- a/src/mess/machine/amigacrt.c +++ b/src/mess/machine/amigacrt.c @@ -24,7 +24,7 @@ enum ACTION_REPLAY_MKIII }; -struct amigacrt_t +struct amigacrt_t { int cart_type; int ar1_spurious; diff --git a/src/mess/machine/amigakbd.c b/src/mess/machine/amigakbd.c index 9ff1fd6718b..3e80467efbb 100644 --- a/src/mess/machine/amigakbd.c +++ b/src/mess/machine/amigakbd.c @@ -13,7 +13,7 @@ #define KEYBOARD_BUFFER_SIZE 256 -struct amigakbd_t +struct amigakbd_t { UINT8 *buf; int buf_pos; diff --git a/src/mess/machine/apollo_net.c b/src/mess/machine/apollo_net.c index a16c3b8771f..bf3775d4199 100644 --- a/src/mess/machine/apollo_net.c +++ b/src/mess/machine/apollo_net.c @@ -27,7 +27,7 @@ struct ethernet_header { UINT16 proto; }; -struct ip_header +struct ip_header { UINT8 version; UINT8 tos; diff --git a/src/mess/machine/applefdc.c b/src/mess/machine/applefdc.c index a5300b02d1c..f7401326636 100644 --- a/src/mess/machine/applefdc.c +++ b/src/mess/machine/applefdc.c @@ -58,7 +58,7 @@ #define IWM_Q6 0x40 #define IWM_Q7 0x80 -enum applefdc_t +enum applefdc_t { APPLEFDC_APPLE2, /* classic Apple II disk controller (pre-IWM) */ APPLEFDC_IWM, /* Integrated Woz Machine */ diff --git a/src/mess/machine/at45dbxx.c b/src/mess/machine/at45dbxx.c index b97d0468e55..d9c1c67921f 100644 --- a/src/mess/machine/at45dbxx.c +++ b/src/mess/machine/at45dbxx.c @@ -36,7 +36,7 @@ enum TYPE DEFINITIONS ***************************************************************************/ -struct AT45DBXX_PINS +struct AT45DBXX_PINS { int cs; // chip select int sck; // serial clock @@ -47,12 +47,12 @@ struct AT45DBXX_PINS int busy; // busy }; -struct AT45DBXX_CMD +struct AT45DBXX_CMD { UINT8 data[8], size; }; -struct AT45DBXX_IO +struct AT45DBXX_IO { UINT8 *data; UINT32 size, pos; diff --git a/src/mess/machine/ay31015.c b/src/mess/machine/ay31015.c index 30dbb2a8d5f..7a2867895d7 100644 --- a/src/mess/machine/ay31015.c +++ b/src/mess/machine/ay31015.c @@ -72,7 +72,7 @@ Start bit (low), Bit 0, Bit 1... highest bit, Parity bit (if enabled), 1-2 stop #include "emu.h" #include "ay31015.h" -enum state_t +enum state_t { IDLE, START_BIT, diff --git a/src/mess/machine/ay31015.h b/src/mess/machine/ay31015.h index b7b8dbc18e1..d36d13597ff 100644 --- a/src/mess/machine/ay31015.h +++ b/src/mess/machine/ay31015.h @@ -12,7 +12,7 @@ ***************************************************************************/ -enum ay31015_type_t +enum ay31015_type_t { /* For AY-3-1014A, AY-3-1015(D) and HD6402 variants */ AY_3_1015, @@ -22,7 +22,7 @@ enum ay31015_type_t }; -enum ay31015_input_pin_t +enum ay31015_input_pin_t { AY31015_SWE=16, /* -SWE - Pin 16 - Status word enable */ AY31015_RDAV=18, /* -RDAV - Pin 18 - Reset data available */ @@ -37,7 +37,7 @@ enum ay31015_input_pin_t }; -enum ay31015_output_pin_t +enum ay31015_output_pin_t { AY31015_PE=13, /* PE - Pin 13 - Parity error */ AY31015_FE=14, /* FE - Pin 14 - Framing error */ @@ -49,7 +49,7 @@ enum ay31015_output_pin_t }; -struct ay31015_config +struct ay31015_config { ay31015_type_t type; /* Type of chip */ double transmitter_clock; /* TCP - pin 40 */ diff --git a/src/mess/machine/c128.c b/src/mess/machine/c128.c index cbaa6f38d38..809efae4107 100644 --- a/src/mess/machine/c128.c +++ b/src/mess/machine/c128.c @@ -139,12 +139,12 @@ READ8_MEMBER( c128_state::cia1_pb_r ) value &= cbm_common_cia0_port_b_r(m_cia1, cia0porta); /* - if (!intf->k0_r()) - value &= m_keyline[0]; - if (!intf->k1_r()) - value &= m_keyline[1]; - if (!intf->k2_r()) - value &= m_keyline[2]; + if (!intf->k0_r()) + value &= m_keyline[0]; + if (!intf->k1_r()) + value &= m_keyline[1]; + if (!intf->k2_r()) + value &= m_keyline[2]; */ return value; } diff --git a/src/mess/machine/c1541.c b/src/mess/machine/c1541.c index a1588ee014c..a2a7c10e5d6 100644 --- a/src/mess/machine/c1541.c +++ b/src/mess/machine/c1541.c @@ -810,18 +810,18 @@ WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_w ) WRITE8_MEMBER( c1541_prologic_dos_classic_device::pia_pa_w ) { /* - + bit description - + 0 1/2 MHz - 1 - 2 + 1 + 2 3 35/40 tracks - 4 - 5 - 6 + 4 + 5 + 6 7 Hi - + */ } diff --git a/src/mess/machine/c64_ide64.c b/src/mess/machine/c64_ide64.c index 349cc59fc02..95f76b4890b 100644 --- a/src/mess/machine/c64_ide64.c +++ b/src/mess/machine/c64_ide64.c @@ -45,10 +45,10 @@ const device_type C64_IDE64 = &device_creator<c64_ide64_cartridge_device>; //------------------------------------------------- // MACHINE_CONFIG_FRAGMENT( c64_ide64 ) //------------------------------------------------- -static const ide_config ide_intf = +static const ide_config ide_intf = { - NULL, - NULL, + NULL, + NULL, 0 }; diff --git a/src/mess/machine/cbmiec.c b/src/mess/machine/cbmiec.c index a0d90c40d1e..96ac04001e8 100644 --- a/src/mess/machine/cbmiec.c +++ b/src/mess/machine/cbmiec.c @@ -192,9 +192,9 @@ C64 SERIAL BUS /* - TODO: + TODO: - - refactor into an actual daisy chain instead of this convenient hack + - refactor into an actual daisy chain instead of this convenient hack */ diff --git a/src/mess/machine/coco_fdc.h b/src/mess/machine/coco_fdc.h index 0200ed1c359..3a96e1e2f06 100644 --- a/src/mess/machine/coco_fdc.h +++ b/src/mess/machine/coco_fdc.h @@ -13,7 +13,7 @@ // ======================> coco_rtc_type_t -enum coco_rtc_type_t +enum coco_rtc_type_t { RTC_DISTO = 0x00, RTC_CLOUD9 = 0x01, diff --git a/src/mess/machine/diag264_lb_iec.h b/src/mess/machine/diag264_lb_iec.h index d9be2dc568b..57abd0c9adf 100644 --- a/src/mess/machine/diag264_lb_iec.h +++ b/src/mess/machine/diag264_lb_iec.h @@ -25,7 +25,7 @@ // ======================> diag264_serial_loopback_device class diag264_serial_loopback_device : public device_t, - public device_cbm_iec_interface + public device_cbm_iec_interface { public: // construction/destruction diff --git a/src/mess/machine/diag264_lb_user.h b/src/mess/machine/diag264_lb_user.h index 75eae2b04a1..24cb6c621d6 100644 --- a/src/mess/machine/diag264_lb_user.h +++ b/src/mess/machine/diag264_lb_user.h @@ -25,7 +25,7 @@ // ======================> diag264_user_port_loopback_device class diag264_user_port_loopback_device : public device_t, - public device_plus4_user_port_interface + public device_plus4_user_port_interface { public: // construction/destruction diff --git a/src/mess/machine/ds1315.c b/src/mess/machine/ds1315.c index a6f0023a0ed..1faf507def5 100644 --- a/src/mess/machine/ds1315.c +++ b/src/mess/machine/ds1315.c @@ -15,7 +15,7 @@ TYPE DEFINITIONS ***************************************************************************/ -enum ds1315_mode_t +enum ds1315_mode_t { DS_SEEK_MATCHING, DS_CALENDAR_IO diff --git a/src/mess/machine/i8271.c b/src/mess/machine/i8271.c index 4ee54be8e0d..dcce3878156 100644 --- a/src/mess/machine/i8271.c +++ b/src/mess/machine/i8271.c @@ -89,7 +89,7 @@ struct i8271_t emu_timer *command_complete_timer; }; -enum I8271_STATE_t +enum I8271_STATE_t { I8271_STATE_EXECUTION_READ = 0, I8271_STATE_EXECUTION_WRITE diff --git a/src/mess/machine/i8271.h b/src/mess/machine/i8271.h index 7bcefc6e2cd..6e942c5989b 100644 --- a/src/mess/machine/i8271.h +++ b/src/mess/machine/i8271.h @@ -36,7 +36,7 @@ extern const device_type I8271; TYPE DEFINITIONS ***************************************************************************/ -struct i8271_interface +struct i8271_interface { void (*interrupt)(device_t *device, int state); void (*dma_request)(device_t *device, int state, int read_); diff --git a/src/mess/machine/isa_ide.c b/src/mess/machine/isa_ide.c index d77c4f7e922..b410a361644 100644 --- a/src/mess/machine/isa_ide.c +++ b/src/mess/machine/isa_ide.c @@ -40,10 +40,10 @@ static void ide_interrupt(device_t *device, int state) } } -static const ide_config ide_intf = +static const ide_config ide_intf = { - ide_interrupt, - NULL, + ide_interrupt, + NULL, 0 }; diff --git a/src/mess/machine/isa_sblaster.c b/src/mess/machine/isa_sblaster.c index 181f4f89e04..eedec5cb56b 100644 --- a/src/mess/machine/isa_sblaster.c +++ b/src/mess/machine/isa_sblaster.c @@ -497,7 +497,7 @@ void sb_device::process_fifo(UINT8 cmd) m_dsp.dma_throttled = false; drq_w(1); m_dsp.flags = ADPCM3; - break; + break; case 0xda: // stop 8-bit autoinit m_dsp.dma_autoinit = 0; break; @@ -911,7 +911,7 @@ void sb_device::device_reset() m_dsp.fifo_r_ptr = 0; m_dsp.wbuf_status = 0; m_dsp.rbuf_status = 0; - m_dsp.frequency = 8000; // per stereo-fx + m_dsp.frequency = 8000; // per stereo-fx m_dsp.irq_active = 0; m_mixer_index = 0; m_dsp.dma_no_irq = false; @@ -919,7 +919,7 @@ void sb_device::device_reset() UINT8 sb_device::dack_r(int line) { - m_dsp.adc_transferred++; + m_dsp.adc_transferred++; if(m_dsp.adc_transferred >= m_dsp.adc_length) { drq_w(0); @@ -1057,12 +1057,12 @@ void sb_device::device_timer(emu_timer &timer, device_timer_id tid, int param, v case 0: // 8-bit unsigned mono m_dacl->write_unsigned8(m_dsp.data[m_dsp.d_rptr]); m_dacr->write_unsigned8(m_dsp.data[m_dsp.d_rptr]); - m_dsp.data[m_dsp.d_rptr++] = 0x80; + m_dsp.data[m_dsp.d_rptr++] = 0x80; break; case SIGNED: // 8-bit signed mono m_dacl->write_unsigned8(m_dsp.data[m_dsp.d_rptr] + 128); m_dacr->write_unsigned8(m_dsp.data[m_dsp.d_rptr] + 128); - m_dsp.data[m_dsp.d_rptr++] = 0x00; + m_dsp.data[m_dsp.d_rptr++] = 0x00; break; case STEREO: // 8-bit unsigned stereo m_dacl->write_unsigned8(m_dsp.data[m_dsp.d_rptr]); @@ -1078,37 +1078,37 @@ void sb_device::device_timer(emu_timer &timer, device_timer_id tid, int param, v break; case SIXTEENBIT: // 16-bit unsigned mono lsample = m_dsp.data[m_dsp.d_rptr] | (m_dsp.data[m_dsp.d_rptr+1] << 8); - m_dsp.data[m_dsp.d_rptr++] = 0x00; - m_dsp.data[m_dsp.d_rptr++] = 0x80; + m_dsp.data[m_dsp.d_rptr++] = 0x00; + m_dsp.data[m_dsp.d_rptr++] = 0x80; m_dacl->write_unsigned16(lsample); m_dacr->write_unsigned16(lsample); break; case SIXTEENBIT | SIGNED: // 16-bit signed mono lsample = m_dsp.data[m_dsp.d_rptr] | (m_dsp.data[m_dsp.d_rptr+1] << 8); - m_dsp.data[m_dsp.d_rptr++] = 0x00; - m_dsp.data[m_dsp.d_rptr++] = 0x00; + m_dsp.data[m_dsp.d_rptr++] = 0x00; + m_dsp.data[m_dsp.d_rptr++] = 0x00; m_dacl->write_unsigned16(lsample + 32768); m_dacr->write_unsigned16(lsample + 32768); break; case SIXTEENBIT | STEREO: // 16-bit unsigned stereo lsample = m_dsp.data[m_dsp.d_rptr] | (m_dsp.data[m_dsp.d_rptr+1] << 8); m_dsp.data[m_dsp.d_rptr++] = 0x00; - m_dsp.data[m_dsp.d_rptr++] = 0x80; + m_dsp.data[m_dsp.d_rptr++] = 0x80; m_dsp.d_rptr %= 128; rsample = m_dsp.data[m_dsp.d_rptr] | (m_dsp.data[m_dsp.d_rptr+1] << 8); - m_dsp.data[m_dsp.d_rptr++] = 0x00; - m_dsp.data[m_dsp.d_rptr++] = 0x80; + m_dsp.data[m_dsp.d_rptr++] = 0x00; + m_dsp.data[m_dsp.d_rptr++] = 0x80; m_dacl->write_unsigned16(lsample); m_dacr->write_unsigned16(rsample); break; - case SIXTEENBIT | SIGNED | STEREO: // 16-bit signed stereo + case SIXTEENBIT | SIGNED | STEREO: // 16-bit signed stereo lsample = m_dsp.data[m_dsp.d_rptr] | (m_dsp.data[m_dsp.d_rptr+1] << 8); m_dsp.data[m_dsp.d_rptr++] = 0x00; - m_dsp.data[m_dsp.d_rptr++] = 0x00; - m_dsp.d_rptr %= 128; + m_dsp.data[m_dsp.d_rptr++] = 0x00; + m_dsp.d_rptr %= 128; rsample = m_dsp.data[m_dsp.d_rptr] | (m_dsp.data[m_dsp.d_rptr+1] << 8); - m_dsp.data[m_dsp.d_rptr++] = 0x00; - m_dsp.data[m_dsp.d_rptr++] = 0x00; + m_dsp.data[m_dsp.d_rptr++] = 0x00; + m_dsp.data[m_dsp.d_rptr++] = 0x00; m_dacl->write_unsigned16(lsample + 32768); m_dacr->write_unsigned16(rsample + 32768); break; @@ -1148,7 +1148,7 @@ void sb_device::device_timer(emu_timer &timer, device_timer_id tid, int param, v m_dacl->write_unsigned8(m_dsp.adpcm_ref); m_dacr->write_unsigned8(m_dsp.adpcm_ref); break; - } + } lsample = m_dsp.data[m_dsp.d_rptr]; switch(m_dsp.adpcm_count++) { @@ -1173,7 +1173,7 @@ void sb_device::device_timer(emu_timer &timer, device_timer_id tid, int param, v m_dacl->write_unsigned8(m_dsp.adpcm_ref); m_dacr->write_unsigned8(m_dsp.adpcm_ref); break; - } + } lsample = m_dsp.data[m_dsp.d_rptr]; switch(m_dsp.adpcm_count++) { diff --git a/src/mess/machine/isa_stereo_fx.c b/src/mess/machine/isa_stereo_fx.c index 791d39c47ff..d735bc569a5 100644 --- a/src/mess/machine/isa_stereo_fx.c +++ b/src/mess/machine/isa_stereo_fx.c @@ -56,7 +56,7 @@ WRITE8_MEMBER( stereo_fx_device::raise_drq_w ) } /* port 0x20 - in ROM (usually) stored in RAM 0x22 - * bit0 - + * bit0 - * bit1 - * bit2 - * bit3 - diff --git a/src/mess/machine/kay_kbd.c b/src/mess/machine/kay_kbd.c index 1a12077e8a0..7ac43f62248 100644 --- a/src/mess/machine/kay_kbd.c +++ b/src/mess/machine/kay_kbd.c @@ -64,7 +64,7 @@ * - "Keypad ," is not mapped */ -struct kay_kbd_t +struct kay_kbd_t { device_t *beeper; UINT8 buff[16]; diff --git a/src/mess/machine/kc_d004.c b/src/mess/machine/kc_d004.c index 6842ae1d98a..95508996fe3 100644 --- a/src/mess/machine/kc_d004.c +++ b/src/mess/machine/kc_d004.c @@ -122,10 +122,10 @@ static MACHINE_CONFIG_FRAGMENT(kc_d004) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(kc_d004_floppy_interface) MACHINE_CONFIG_END -static const ide_config ide_intf = +static const ide_config ide_intf = { - NULL, - NULL, + NULL, + NULL, 0 }; diff --git a/src/mess/machine/kr2376.h b/src/mess/machine/kr2376.h index 0b53c5760f3..c847343bdd1 100644 --- a/src/mess/machine/kr2376.h +++ b/src/mess/machine/kr2376.h @@ -66,13 +66,13 @@ extern const device_type KR2376; /* * Input pins */ -enum kr2376_input_pin_t +enum kr2376_input_pin_t { KR2376_DSII=20, /* DSII - Pin 20 - Data & Strobe Invert Input */ KR2376_PII=6 /* PII - Pin 6 - Parity Invert Input */ }; -enum kr2376_output_pin_t +enum kr2376_output_pin_t { KR2376_SO=16, /* SO - Pin 16 - Strobe Output */ KR2376_PO=7 /* PO - Pin 7 - Parity Output */ diff --git a/src/mess/machine/mc68328.h b/src/mess/machine/mc68328.h index 4d004b7343b..0750b2c5475 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_ -struct mc68328_regs_t +struct mc68328_regs_t { // $(FF)FFF000 UINT8 scr; // System Control Register @@ -203,7 +203,7 @@ struct mc68328_regs_t UINT8 unused42[1260]; }; -struct mc68328_t +struct mc68328_t { const mc68328_interface* iface; diff --git a/src/mess/machine/mc6843.c b/src/mess/machine/mc6843.c index 08ea6f6afed..d5788a07b33 100644 --- a/src/mess/machine/mc6843.c +++ b/src/mess/machine/mc6843.c @@ -42,7 +42,7 @@ /******************* internal chip data structure ******************/ -struct mc6843_t +struct mc6843_t { /* interface */ diff --git a/src/mess/machine/mc6846.c b/src/mess/machine/mc6846.c index 23c9c712ec3..320b65e1084 100644 --- a/src/mess/machine/mc6846.c +++ b/src/mess/machine/mc6846.c @@ -28,7 +28,7 @@ /******************* internal chip data structure ******************/ -struct mc6846_t +struct mc6846_t { const mc6846_interface* iface; diff --git a/src/mess/machine/mc6854.c b/src/mess/machine/mc6854.c index d2d10a5e710..918ac72c583 100644 --- a/src/mess/machine/mc6854.c +++ b/src/mess/machine/mc6854.c @@ -57,7 +57,7 @@ /******************* internal chip data structure ******************/ -struct mc6854_t +struct mc6854_t { devcb_resolved_write_line out_irq_func; devcb_resolved_read_line in_rxd_func; diff --git a/src/mess/machine/mos8722.c b/src/mess/machine/mos8722.c index 0c1cf2ec6cd..5c80c12ee64 100644 --- a/src/mess/machine/mos8722.c +++ b/src/mess/machine/mos8722.c @@ -24,7 +24,7 @@ enum CR = 0, PCRA, LCRA = PCRA, PCRB, LCRB = PCRB, - PCRC, LCRC = PCRC, + PCRC, LCRC = PCRC, PCRD, LCRD = PCRD, MCR, RCR, @@ -69,7 +69,7 @@ enum // RAM configuration register static const offs_t RCR_BOTTOM_ADDRESS[4] = { 0x0400, 0x1000, 0x0400, 0x1000 }; -static const offs_t RCR_TOP_ADDRESS[4] = { 0xf000, 0xf000, 0xe000, 0xc000 }; +static const offs_t RCR_TOP_ADDRESS[4] = { 0xf000, 0xf000, 0xe000, 0xc000 }; enum { @@ -337,7 +337,7 @@ offs_t mos8722_device::ta_r(offs_t offset, int aec, int *ms0, int *ms1, int *ms2 *cas1 = P1H_A16 ? 0 : 1; } } - + if ((RCR_BOTTOM && offset < RCR_BOTTOM_ADDRESS[RCR_SHARE]) || (RCR_TOP && offset >= RCR_TOP_ADDRESS[RCR_SHARE])) { diff --git a/src/mess/machine/nes_unif.c b/src/mess/machine/nes_unif.c index 3a374983d99..318698edd12 100644 --- a/src/mess/machine/nes_unif.c +++ b/src/mess/machine/nes_unif.c @@ -9,7 +9,7 @@ ****************************************************************************************/ -struct unif +struct unif { const char *board; /* UNIF board */ diff --git a/src/mess/machine/petcass.h b/src/mess/machine/petcass.h index d915c2c68f1..98e2d97dba3 100644 --- a/src/mess/machine/petcass.h +++ b/src/mess/machine/petcass.h @@ -65,8 +65,8 @@ struct pet_datassette_port_interface class device_pet_datassette_port_interface; class pet_datassette_port_device : public device_t, - public pet_datassette_port_interface, - public device_slot_interface + public pet_datassette_port_interface, + public device_slot_interface { public: // construction/destruction diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c index fd621684400..73780c9d6a4 100644 --- a/src/mess/machine/rmnimbus.c +++ b/src/mess/machine/rmnimbus.c @@ -1970,7 +1970,7 @@ static const struct nimbus_meminfo memmap[] = { 0xE0000, 0xEFFFF } }; -struct nimbus_block +struct nimbus_block { int blockbase; int blocksize; diff --git a/src/mess/machine/s3c44b0.h b/src/mess/machine/s3c44b0.h index 98b741f5c3c..2fdfba2a832 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 *******************************************************************************/ -struct s3c44b0_memcon_regs_t +struct s3c44b0_memcon_regs_t { UINT32 data[0x34/4]; }; -struct s3c44b0_irq_regs_t +struct s3c44b0_irq_regs_t { UINT32 intcon; UINT32 intpnd; @@ -395,7 +395,7 @@ struct s3c44b0_irq_regs_t UINT32 f_ispc; }; -struct s3c44b0_dma_regs_t +struct s3c44b0_dma_regs_t { UINT32 dcon; UINT32 disrc; @@ -406,7 +406,7 @@ struct s3c44b0_dma_regs_t UINT32 dccnt; }; -struct s3c44b0_clkpow_regs_t +struct s3c44b0_clkpow_regs_t { UINT32 pllcon; UINT32 clkcon; @@ -414,7 +414,7 @@ struct s3c44b0_clkpow_regs_t UINT32 locktime; }; -struct s3c44b0_lcd_regs_t +struct s3c44b0_lcd_regs_t { UINT32 lcdcon1; UINT32 lcdcon2; @@ -429,7 +429,7 @@ struct s3c44b0_lcd_regs_t UINT32 dithmode; }; -struct s3c44b0_uart_regs_t +struct s3c44b0_uart_regs_t { UINT32 ulcon; UINT32 ucon; @@ -444,7 +444,7 @@ struct s3c44b0_uart_regs_t UINT32 ubrdiv; }; -struct s3c44b0_sio_regs_t +struct s3c44b0_sio_regs_t { UINT32 siocon; UINT32 siodat; @@ -453,7 +453,7 @@ struct s3c44b0_sio_regs_t UINT32 dcntz; }; -struct s3c44b0_pwm_regs_t +struct s3c44b0_pwm_regs_t { UINT32 tcfg0; UINT32 tcfg1; @@ -477,14 +477,14 @@ struct s3c44b0_pwm_regs_t UINT32 tcnto5; }; -struct s3c44b0_wdt_regs_t +struct s3c44b0_wdt_regs_t { UINT32 wtcon; UINT32 wtdat; UINT32 wtcnt; }; -struct s3c44b0_iic_regs_t +struct s3c44b0_iic_regs_t { UINT32 iiccon; UINT32 iicstat; @@ -492,7 +492,7 @@ struct s3c44b0_iic_regs_t UINT32 iicds; }; -struct s3c44b0_iis_regs_t +struct s3c44b0_iis_regs_t { UINT32 iiscon; UINT32 iismod; @@ -501,7 +501,7 @@ struct s3c44b0_iis_regs_t UINT32 iisfifo; }; -struct s3c44b0_gpio_regs_t +struct s3c44b0_gpio_regs_t { UINT32 gpacon; UINT32 gpadat; @@ -527,7 +527,7 @@ struct s3c44b0_gpio_regs_t UINT32 extintpnd; }; -struct s3c44b0_rtc_regs_t +struct s3c44b0_rtc_regs_t { UINT32 rtccon; UINT32 reserved[3]; @@ -549,48 +549,48 @@ struct s3c44b0_rtc_regs_t UINT32 ticnt; }; -struct s3c44b0_adc_regs_t +struct s3c44b0_adc_regs_t { UINT32 adccon; UINT32 adcpsr; UINT32 adcdat; }; -struct s3c44b0_cpuwrap_regs_t +struct s3c44b0_cpuwrap_regs_t { UINT32 syscfg; UINT32 ncachbe0; UINT32 ncachbe1; }; -struct s3c44b0_memcon_t +struct s3c44b0_memcon_t { s3c44b0_memcon_regs_t regs; }; -struct s3c44b0_irq_t +struct s3c44b0_irq_t { s3c44b0_irq_regs_t regs; int line_irq, line_fiq; }; -struct s3c44b0_dma_t +struct s3c44b0_dma_t { s3c44b0_dma_regs_t regs; emu_timer *timer; }; -struct s3c44b0_clkpow_t +struct s3c44b0_clkpow_t { s3c44b0_clkpow_regs_t regs; }; -struct rectangle_t +struct rectangle_t { int x1, y1, x2, y2; }; -struct s3c44b0_lcd_t +struct s3c44b0_lcd_t { s3c44b0_lcd_regs_t regs; emu_timer *timer; @@ -609,19 +609,19 @@ struct s3c44b0_lcd_t attoseconds_t frame_period, pixeltime, scantime; }; -struct s3c44b0_uart_t +struct s3c44b0_uart_t { s3c44b0_uart_regs_t regs; emu_timer *timer; }; -struct s3c44b0_sio_t +struct s3c44b0_sio_t { s3c44b0_sio_regs_t regs; emu_timer *timer; }; -struct s3c44b0_pwm_t +struct s3c44b0_pwm_t { s3c44b0_pwm_regs_t regs; emu_timer *timer[6]; @@ -630,20 +630,20 @@ struct s3c44b0_pwm_t UINT32 freq[6]; }; -struct s3c44b0_wdt_t +struct s3c44b0_wdt_t { s3c44b0_wdt_regs_t regs; emu_timer *timer; }; -struct s3c44b0_iic_t +struct s3c44b0_iic_t { s3c44b0_iic_regs_t regs; emu_timer *timer; int count; }; -struct s3c44b0_iis_t +struct s3c44b0_iis_t { s3c44b0_iis_regs_t regs; emu_timer *timer; @@ -651,30 +651,30 @@ struct s3c44b0_iis_t int fifo_index; }; -struct s3c44b0_gpio_t +struct s3c44b0_gpio_t { s3c44b0_gpio_regs_t regs; }; -struct s3c44b0_rtc_t +struct s3c44b0_rtc_t { s3c44b0_rtc_regs_t regs; emu_timer *timer_tick_count; emu_timer *timer_update; }; -struct s3c44b0_adc_t +struct s3c44b0_adc_t { s3c44b0_adc_regs_t regs; emu_timer *timer; }; -struct s3c44b0_cpuwrap_t +struct s3c44b0_cpuwrap_t { s3c44b0_cpuwrap_regs_t regs; }; -struct s3c44b0_t +struct s3c44b0_t { const s3c44b0_interface *iface; address_space* space; diff --git a/src/mess/machine/sgi.c b/src/mess/machine/sgi.c index 1b446969662..bf4e9611a62 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, } } -struct MC_t +struct MC_t { emu_timer *tUpdateTimer; UINT32 nCPUControl0; diff --git a/src/mess/machine/smartmed.c b/src/mess/machine/smartmed.c index 1d1251dfdc2..adcaa4f4a6b 100644 --- a/src/mess/machine/smartmed.c +++ b/src/mess/machine/smartmed.c @@ -27,7 +27,7 @@ #define MAX_SMARTMEDIA 1 /* machine-independent big-endian 32-bit integer */ -struct UINT32BE +struct UINT32BE { UINT8 bytes[4]; }; @@ -48,7 +48,7 @@ INLINE void set_UINT32BE(UINT32BE *word, UINT32 data) #endif /* SmartMedia image header */ -struct disk_image_header +struct disk_image_header { UINT8 version; UINT32BE page_data_size; @@ -57,7 +57,7 @@ struct disk_image_header UINT32BE log2_pages_per_block; }; -struct disk_image_format_2_header +struct disk_image_format_2_header { UINT8 data1[3]; UINT8 padding1[256-3]; diff --git a/src/mess/machine/smc92x4.h b/src/mess/machine/smc92x4.h index 3c3b73832e9..0d942fd8773 100644 --- a/src/mess/machine/smc92x4.h +++ b/src/mess/machine/smc92x4.h @@ -36,7 +36,7 @@ extern const device_type SMC92X4; #define DS_READY 0x02 /* drive ready bit */ #define DS_WRFAULT 0x01 /* write fault */ -struct smc92x4_interface +struct smc92x4_interface { // Disk format support. This flag allows to choose between the full // FM/MFM format and an abbreviated track layout. The difference results diff --git a/src/mess/machine/strata.c b/src/mess/machine/strata.c index 06dad0ab893..772eee3368b 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 }; -struct strata_t +struct strata_t { fm_mode_t mode; // current operation mode int hard_unlock; // 1 if RP* pin is at Vhh (not fully implemented) @@ -229,7 +229,7 @@ int strataflash_save(device_t *device, emu_file *file) } /* bus width for 8/16-bit handlers */ -enum bus_width_t +enum bus_width_t { bw_8, bw_16 diff --git a/src/mess/machine/thomson.c b/src/mess/machine/thomson.c index d9ffb02d6db..a2030b70dc5 100644 --- a/src/mess/machine/thomson.c +++ b/src/mess/machine/thomson.c @@ -681,7 +681,7 @@ const pia6821_interface to7_pia6821_sys = -enum to7_io_dev +enum to7_io_dev { TO7_IO_NONE, TO7_IO_CENTRONICS, diff --git a/src/mess/machine/ti99/datamux.h b/src/mess/machine/ti99/datamux.h index 3575f2c2ce7..1ea731fac3f 100644 --- a/src/mess/machine/ti99/datamux.h +++ b/src/mess/machine/ti99/datamux.h @@ -23,7 +23,7 @@ extern const device_type DATAMUX; if the HGSPL expansion card is used, the GROMs in the console must be removed. */ -struct dmux_device_list_entry +struct dmux_device_list_entry { const char *name; // Name of the device (used for looking up the device) UINT16 select; // State of the address line bits when addressing this device @@ -37,7 +37,7 @@ struct dmux_device_list_entry #define DMUX_CONFIG(name) \ const datamux_config(name) = -struct datamux_config +struct datamux_config { devcb_write_line ready; const dmux_device_list_entry *devlist; diff --git a/src/mess/machine/ti99/genboard.h b/src/mess/machine/ti99/genboard.h index 0d55611f071..5e991aa002e 100644 --- a/src/mess/machine/ti99/genboard.h +++ b/src/mess/machine/ti99/genboard.h @@ -44,7 +44,7 @@ private: /*****************************************************************************/ -struct geneve_keyboard_config +struct geneve_keyboard_config { devcb_write_line interrupt; }; @@ -110,7 +110,7 @@ private: /*****************************************************************************/ -struct geneve_mapper_config +struct geneve_mapper_config { devcb_write_line ready; }; diff --git a/src/mess/machine/ti99/grom.h b/src/mess/machine/ti99/grom.h index d8b5b864db5..2c33aecd093 100644 --- a/src/mess/machine/ti99/grom.h +++ b/src/mess/machine/ti99/grom.h @@ -13,7 +13,7 @@ #include "ti99defs.h" -struct ti99grom_config +struct ti99grom_config { bool writable; int ident; diff --git a/src/mess/machine/ti99/gromport.h b/src/mess/machine/ti99/gromport.h index 43df56c3a01..80d21cd6897 100644 --- a/src/mess/machine/ti99/gromport.h +++ b/src/mess/machine/ti99/gromport.h @@ -18,7 +18,7 @@ extern const device_type GROMPORT; #define GROMPORT_CONFIG(name) \ const gromport_config(name) = -struct gromport_config +struct gromport_config { devcb_write_line ready; devcb_write_line reset; @@ -366,7 +366,7 @@ private: }; -struct pcb_type +struct pcb_type { int id; const char* name; diff --git a/src/mess/machine/ti99/joyport.h b/src/mess/machine/ti99/joyport.h index 9e9a2caa78a..5d6de759713 100644 --- a/src/mess/machine/ti99/joyport.h +++ b/src/mess/machine/ti99/joyport.h @@ -22,7 +22,7 @@ extern const device_type JOYPORT; -struct joyport_config +struct joyport_config { devcb_write_line interrupt; int vdp_clock; diff --git a/src/mess/machine/ti99/mapper8.h b/src/mess/machine/ti99/mapper8.h index 53bf2a1ca67..035637d1ebe 100644 --- a/src/mess/machine/ti99/mapper8.h +++ b/src/mess/machine/ti99/mapper8.h @@ -36,7 +36,7 @@ extern const device_type MAPPER8; #define SRAM_SIZE 2048 #define DRAM_SIZE 65536 -struct mapper8_list_entry +struct mapper8_list_entry { const char* name; // Name of the device (used for looking up the device) int mode; // Mode of the system which applies to this entry @@ -49,7 +49,7 @@ struct mapper8_list_entry #define MAPPER8_CONFIG(name) \ const mapper8_config(name) = -struct mapper8_config +struct mapper8_config { devcb_write_line ready; const mapper8_list_entry *devlist; diff --git a/src/mess/machine/ti99/peribox.h b/src/mess/machine/ti99/peribox.h index 2ba6bb47b5d..6b5c7deb2f0 100644 --- a/src/mess/machine/ti99/peribox.h +++ b/src/mess/machine/ti99/peribox.h @@ -23,7 +23,7 @@ extern const device_type PERIBOX_GEN; #define DSRROM "dsrrom" -struct peribox_config +struct peribox_config { devcb_write_line inta; devcb_write_line intb; diff --git a/src/mess/machine/ti99/speech8.h b/src/mess/machine/ti99/speech8.h index c50324c6428..30c4af9dd71 100644 --- a/src/mess/machine/ti99/speech8.h +++ b/src/mess/machine/ti99/speech8.h @@ -21,7 +21,7 @@ extern const device_type TI99_SPEECH8; #define SPEECH8_CONFIG(name) \ const speech8_config(name) = -struct speech8_config +struct speech8_config { devcb_write_line ready; }; diff --git a/src/mess/machine/ti99/ti99_hd.h b/src/mess/machine/ti99/ti99_hd.h index 1457eb25299..bde3d1bd641 100644 --- a/src/mess/machine/ti99/ti99_hd.h +++ b/src/mess/machine/ti99/ti99_hd.h @@ -25,7 +25,7 @@ extern const device_type TI99_MFMHD; Needed to adapt to higher cylinder numbers. Floppies do not have such high numbers. */ -struct chrn_id_hd +struct chrn_id_hd { UINT16 C; UINT8 H; diff --git a/src/mess/machine/ti99/tn_ide.c b/src/mess/machine/ti99/tn_ide.c index 558fe5f76e8..5b532dfc363 100644 --- a/src/mess/machine/ti99/tn_ide.c +++ b/src/mess/machine/ti99/tn_ide.c @@ -334,10 +334,10 @@ static const rtc65271_interface ide_rtc_cfg = DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, nouspikel_ide_interface_device, clock_interrupt_callback) }; -static const ide_config ide_intf = +static const ide_config ide_intf = { - ide_interrupt_callback, - NULL, + ide_interrupt_callback, + NULL, 0 }; diff --git a/src/mess/machine/ti99/videowrp.h b/src/mess/machine/ti99/videowrp.h index f0e765eb42f..1cc9feea7ff 100644 --- a/src/mess/machine/ti99/videowrp.h +++ b/src/mess/machine/ti99/videowrp.h @@ -77,7 +77,7 @@ extern const device_type V9938VIDEO; extern const device_type TISOUND_94624; extern const device_type TISOUND_76496; -struct ti_sound_config +struct ti_sound_config { devcb_write_line ready; }; diff --git a/src/mess/machine/upd765.c b/src/mess/machine/upd765.c index 74615c56119..d8abaa3c81f 100644 --- a/src/mess/machine/upd765.c +++ b/src/mess/machine/upd765.c @@ -30,7 +30,7 @@ #include "machine/upd765.h" -enum UPD765_PHASE +enum UPD765_PHASE { UPD765_COMMAND_PHASE_FIRST_BYTE, UPD765_COMMAND_PHASE_BYTES, @@ -40,7 +40,7 @@ enum UPD765_PHASE }; /* supported versions */ -enum UPD765_VERSION +enum UPD765_VERSION { TYPE_UPD765A = 0, TYPE_UPD765B = 1, diff --git a/src/mess/machine/upd765.h b/src/mess/machine/upd765.h index 23ce05cf78f..291dda6868a 100644 --- a/src/mess/machine/upd765.h +++ b/src/mess/machine/upd765.h @@ -78,7 +78,7 @@ extern const device_type UPD72065; ***************************************************************************/ /* RDY pin connected state */ -enum UPD765_RDY_PIN +enum UPD765_RDY_PIN { UPD765_RDY_PIN_NOT_CONNECTED = 0, UPD765_RDY_PIN_CONNECTED = 1 @@ -91,7 +91,7 @@ typedef device_t *(*upd765_get_image_func)(device_t *device, int floppy_index); #define UPD765_GET_IMAGE(name) device_t *name(device_t *device, int floppy_index ) -struct upd765_interface +struct upd765_interface { /* interrupt issued */ devcb_write_line out_int_func; diff --git a/src/mess/machine/vp620.c b/src/mess/machine/vp620.c index df2d6595bff..10f89981145 100644 --- a/src/mess/machine/vp620.c +++ b/src/mess/machine/vp620.c @@ -25,10 +25,10 @@ const device_type VP620 = &device_creator<vp620_device>; WRITE8_MEMBER( vp620_device::kb_w ) { m_keydata = data; - + m_slot->inst_w(0); m_slot->inst_w(1); - + m_keystb = ASSERT_LINE; } diff --git a/src/mess/machine/wangpc_mvc.c b/src/mess/machine/wangpc_mvc.c index ff49c1a2365..f79baa6905f 100644 --- a/src/mess/machine/wangpc_mvc.c +++ b/src/mess/machine/wangpc_mvc.c @@ -47,7 +47,7 @@ #define ATTR_SUBSCRIPT BIT(attr, 6) #define ATTR_SUPERSCRIPT BIT(attr, 7) -static const rgb_t PALETTE[] = +static const rgb_t PALETTE[] = { RGB_BLACK, MAKE_RGB(0x00, 0x80, 0x00), |