diff options
Diffstat (limited to 'src/mess')
183 files changed, 577 insertions, 577 deletions
diff --git a/src/mess/audio/mea8000.c b/src/mess/audio/mea8000.c index 2f289939a20..5281137b433 100644 --- a/src/mess/audio/mea8000.c +++ b/src/mess/audio/mea8000.c @@ -44,7 +44,7 @@ /* finite machine state controling frames */ -enum mea8000_state +enum mea8000_state { MEA8000_STOPPED, /* nothing to do, timer disabled */ MEA8000_WAIT_FIRST, /* received pitch, wait for first full trame, timer disabled */ @@ -55,7 +55,7 @@ enum mea8000_state ALLOW_SAVE_TYPE( mea8000_state ); -struct filter_t +struct filter_t { #ifdef FLOAT_MODE double fm, last_fm; /* frequency, in Hz */ @@ -70,7 +70,7 @@ struct filter_t -struct mea8000_t +struct mea8000_t { /* configuration parameters */ diff --git a/src/mess/audio/mos7360.c b/src/mess/audio/mos7360.c index 777405a0c95..bf087986852 100644 --- a/src/mess/audio/mos7360.c +++ b/src/mess/audio/mos7360.c @@ -240,7 +240,7 @@ inline UINT8 mos7360_device::read_ram(offs_t offset) m_last_data = space(AS_0)->read_byte(offset); m_rom = rom; - + return m_last_data; } @@ -252,7 +252,7 @@ inline UINT8 mos7360_device::read_rom(offs_t offset) m_last_data = space(AS_0)->read_byte(offset); m_rom = rom; - + return m_last_data; } @@ -550,7 +550,7 @@ void mos7360_device::draw_bitmap(int ybegin, int yend, int ch, int yoff, int xof for (y = ybegin; y <= yend; y++) { code = read_ram(m_bitmapaddr + ch * 8 + y); - + m_bitmap.pix32(y + yoff, 0 + xoff) = PALETTE[m_c16_bitmap[code >> 7]]; m_bitmap.pix32(y + yoff, 1 + xoff) = PALETTE[m_c16_bitmap[(code >> 6) & 1]]; m_bitmap.pix32(y + yoff, 2 + xoff) = PALETTE[m_c16_bitmap[(code >> 5) & 1]]; @@ -569,7 +569,7 @@ void mos7360_device::draw_bitmap_multi(int ybegin, int yend, int ch, int yoff, i for (y = ybegin; y <= yend; y++) { code = read_ram(m_bitmapaddr + ch * 8 + y); - + m_bitmap.pix32(y + yoff, 0 + xoff) = m_bitmap.pix32(y + yoff, 1 + xoff) = PALETTE[m_bitmapmulti[code >> 6]]; m_bitmap.pix32(y + yoff, 2 + xoff) = @@ -589,7 +589,7 @@ void mos7360_device::draw_cursor(int ybegin, int yend, int yoff, int xoff, int c { for (int x = 0; x < 8; x++) { - m_bitmap.pix32(y + yoff, x + xoff) = PALETTE[color]; + m_bitmap.pix32(y + yoff, x + xoff) = PALETTE[color]; } } } @@ -617,7 +617,7 @@ void mos7360_device::drawlines(int first, int last) { for (int x = 0; x < m_bitmap.width(); x++) { - m_bitmap.pix32(line, x) = PALETTE[0]; + m_bitmap.pix32(line, x) = PALETTE[0]; } } return; @@ -637,7 +637,7 @@ void mos7360_device::drawlines(int first, int last) { for (int x = 0; x < m_bitmap.width(); x++) { - m_bitmap.pix32(line, x) = PALETTE[FRAMECOLOR]; + m_bitmap.pix32(line, x) = PALETTE[FRAMECOLOR]; } } } @@ -733,7 +733,7 @@ void mos7360_device::drawlines(int first, int last) { for (int x = 0; x < xbegin; x++) { - m_bitmap.pix32(yoff + i, x) = PALETTE[FRAMECOLOR]; + m_bitmap.pix32(yoff + i, x) = PALETTE[FRAMECOLOR]; } for (int x = xend; x < m_bitmap.width(); x++) @@ -752,7 +752,7 @@ void mos7360_device::drawlines(int first, int last) { for (int x = 0; x < m_bitmap.width(); x++) { - m_bitmap.pix32(line, x) = PALETTE[FRAMECOLOR]; + m_bitmap.pix32(line, x) = PALETTE[FRAMECOLOR]; } } } diff --git a/src/mess/audio/socrates.c b/src/mess/audio/socrates.c index 347c7ee3ea8..e7eac40f0a5 100644 --- a/src/mess/audio/socrates.c +++ b/src/mess/audio/socrates.c @@ -10,7 +10,7 @@ #include "emu.h" #include "socrates.h" -struct SocratesASIC +struct SocratesASIC { sound_stream *stream; UINT8 freq[2]; /* channel 1,2 frequencies */ diff --git a/src/mess/audio/spchroms.h b/src/mess/audio/spchroms.h index c10ce25ee04..453dc9825fd 100644 --- a/src/mess/audio/spchroms.h +++ b/src/mess/audio/spchroms.h @@ -1,7 +1,7 @@ #ifndef __SPCHROMS_H #define __SPCHROMS_H -struct spchroms_interface +struct spchroms_interface { const char *memory_region; /* memory region where the speech ROM is. NULL means no speech ROM */ }; diff --git a/src/mess/audio/svision.c b/src/mess/audio/svision.c index ad0be994e8b..8c9298e5166 100644 --- a/src/mess/audio/svision.c +++ b/src/mess/audio/svision.c @@ -7,13 +7,13 @@ #include "emu.h" #include "includes/svision.h" -enum SVISION_NOISE_Type +enum SVISION_NOISE_Type { SVISION_NOISE_Type7Bit, SVISION_NOISE_Type14Bit }; -struct SVISION_NOISE +struct SVISION_NOISE { UINT8 reg[3]; int on, right, left, play; @@ -25,7 +25,7 @@ struct SVISION_NOISE int value; // currently simple random function }; -struct SVISION_DMA +struct SVISION_DMA { UINT8 reg[5]; int on, right, left; @@ -35,7 +35,7 @@ struct SVISION_DMA int finished; }; -struct SVISION_CHANNEL +struct SVISION_CHANNEL { UINT8 reg[4]; int on; diff --git a/src/mess/devices/sonydriv.c b/src/mess/devices/sonydriv.c index 2fa59a61ae0..b34f51a1ddd 100644 --- a/src/mess/devices/sonydriv.c +++ b/src/mess/devices/sonydriv.c @@ -60,7 +60,7 @@ enum Structure that describes the state of a floppy drive, and the associated disk image */ -struct floppy_t +struct floppy_t { device_t *img; emu_file *fd; @@ -80,7 +80,7 @@ struct floppy_t int is_400k; /* drive is single-sided, which means 400K */ }; -struct sonydriv_t +struct sonydriv_t { int lines; /* four lines SONY_CA0 - SONY_LSTRB */ diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c index 17352fd7388..eb611cfda71 100644 --- a/src/mess/drivers/a2600.c +++ b/src/mess/drivers/a2600.c @@ -25,7 +25,7 @@ struct df_t { UINT8 osc_clk; /* Only used by data fetchers 5,6, and 7 */ }; -struct dpc_t +struct dpc_t { df_t df[8]; UINT8 movamt; diff --git a/src/mess/drivers/aim65.c b/src/mess/drivers/aim65.c index 2123098f29b..929475589f3 100644 --- a/src/mess/drivers/aim65.c +++ b/src/mess/drivers/aim65.c @@ -226,27 +226,27 @@ static const cassette_interface aim65_2_cassette_interface = NULL }; -const dl1416_interface aim65_ds1_intf = +const dl1416_interface aim65_ds1_intf = { aim65_update_ds1 }; -const dl1416_interface aim65_ds2_intf = +const dl1416_interface aim65_ds2_intf = { aim65_update_ds2 }; -const dl1416_interface aim65_ds3_intf = +const dl1416_interface aim65_ds3_intf = { aim65_update_ds3 }; -const dl1416_interface aim65_ds4_intf = +const dl1416_interface aim65_ds4_intf = { aim65_update_ds4 }; -const dl1416_interface aim65_ds5_intf = +const dl1416_interface aim65_ds5_intf = { aim65_update_ds5 }; diff --git a/src/mess/drivers/apollo.c b/src/mess/drivers/apollo.c index f4e36fc2679..c43d38e52ee 100644 --- a/src/mess/drivers/apollo.c +++ b/src/mess/drivers/apollo.c @@ -1020,12 +1020,12 @@ void apollo_state::machine_reset() memcmp (db+0x22, "APOLLO", 6) == 0 && omti8621_get_sector(machine().device(APOLLO_WDC_TAG), sector1, db, sizeof(db), 0) == sizeof(db)) { -// MLOG2(("machine_reset_dn3500: node ID is %06X (from ROM)", node_id)); +// MLOG2(("machine_reset_dn3500: node ID is %06X (from ROM)", node_id)); // set node_id from UID of logical volume 1 of logical unit 0 node_id = (((db[0x49] << 8) | db[0x4a]) << 8) | db[0x4b]; -// MLOG2(("machine_reset_dn3500: node ID is %06X (from disk)", node_id)); +// MLOG2(("machine_reset_dn3500: node ID is %06X (from disk)", node_id)); } } diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c index 91ff09783c0..711cde54797 100644 --- a/src/mess/drivers/apricot.c +++ b/src/mess/drivers/apricot.c @@ -319,10 +319,10 @@ void apricot_state::palette_init() /*************************************************************************** - SOUND INTERFACE + SOUND INTERFACE **************************************************************************/ - - + + //------------------------------------------------- // sn76496_config psg_intf //------------------------------------------------- diff --git a/src/mess/drivers/apricotp.c b/src/mess/drivers/apricotp.c index 5aed9a8cad7..388dae4a334 100644 --- a/src/mess/drivers/apricotp.c +++ b/src/mess/drivers/apricotp.c @@ -534,8 +534,8 @@ static const centronics_interface centronics_intf = * Sound interface * *************************************/ - - + + //------------------------------------------------- // sn76496_config psg_intf //------------------------------------------------- diff --git a/src/mess/drivers/bebox.c b/src/mess/drivers/bebox.c index b6f75dc9c07..bcef26276c5 100644 --- a/src/mess/drivers/bebox.c +++ b/src/mess/drivers/bebox.c @@ -149,10 +149,10 @@ static SLOT_INTERFACE_START( pci_devices ) SLOT_INTERFACE("cirrus", CIRRUS) SLOT_INTERFACE_END -static const ide_config ide_intf = +static const ide_config ide_intf = { - bebox_ide_interrupt, - NULL, + bebox_ide_interrupt, + NULL, 0 }; diff --git a/src/mess/drivers/c128.c b/src/mess/drivers/c128.c index f6b0fa3dd99..1f3ab967e3a 100644 --- a/src/mess/drivers/c128.c +++ b/src/mess/drivers/c128.c @@ -171,15 +171,15 @@ to use an EEPROM reader, in order to obtain a dump of the whole content. /* - TODO: + TODO: - - connect to PLA - - clean up ROMs - - wire up function ROM softlist - - remove banking code from machine/c128.h - - inherit from c64_state and use common members from there - - clean up inputs - - fix fast serial + - connect to PLA + - clean up ROMs + - wire up function ROM softlist + - remove banking code from machine/c128.h + - inherit from c64_state and use common members from there + - clean up inputs + - fix fast serial */ @@ -281,14 +281,14 @@ void c128_state::bankswitch_pla(offs_t offset, offs_t ta, offs_t vma, int ba, in UINT8 c128_state::read_memory(address_space &space, offs_t offset, offs_t vma, int ba, int aec, int z80io) { int rw = 1, ms0 = 1, ms1 = 1, ms2 = 1, ms3 = 1, cas0 = 1, cas1 = 1; - int sden = 1, dir = 1, gwe = 1, rom1 = 1, rom2 = 1, rom3 = 1, rom4 = 1, charom = 1, colorram = 1, vic = 1, + int sden = 1, dir = 1, gwe = 1, rom1 = 1, rom2 = 1, rom3 = 1, rom4 = 1, charom = 1, colorram = 1, vic = 1, from1 = 1, romh = 1, roml = 1, dwe = 1, ioacc = 1, clrbank = 1, iocs = 1, casenb = 1; int io1 = 1, io2 = 1; offs_t ta = m_mmu->ta_r(offset, aec, &ms0, &ms1, &ms2, &ms3, &cas0, &cas1); bankswitch_pla(offset, ta, vma, ba, rw, aec, z80io, ms3, ms2, ms1, ms0, - &sden, &dir, &gwe, &rom1, &rom2, &rom3, &rom4, &charom, &colorram, &vic, + &sden, &dir, &gwe, &rom1, &rom2, &rom3, &rom4, &charom, &colorram, &vic, &from1, &romh, &roml, &dwe, &ioacc, &clrbank, &iocs, &casenb); UINT8 data = 0xff; @@ -400,14 +400,14 @@ UINT8 c128_state::read_memory(address_space &space, offs_t offset, offs_t vma, i void c128_state::write_memory(address_space &space, offs_t offset, offs_t vma, UINT8 data, int ba, int aec, int z80io) { int rw = 0, ms0 = 1, ms1 = 1, ms2 = 1, ms3 = 1, cas0 = 1, cas1 = 1; - int sden = 1, dir = 1, gwe = 1, rom1 = 1, rom2 = 1, rom3 = 1, rom4 = 1, charom = 1, colorram = 1, vic = 1, + int sden = 1, dir = 1, gwe = 1, rom1 = 1, rom2 = 1, rom3 = 1, rom4 = 1, charom = 1, colorram = 1, vic = 1, from1 = 1, romh = 1, roml = 1, dwe = 1, ioacc = 1, clrbank = 1, iocs = 1, casenb = 1; int io1 = 1, io2 = 1; offs_t ta = m_mmu->ta_r(offset, aec, &ms0, &ms1, &ms2, &ms3, &cas0, &cas1); bankswitch_pla(offset, ta, vma, ba, rw, aec, z80io, ms3, ms2, ms1, ms0, - &sden, &dir, &gwe, &rom1, &rom2, &rom3, &rom4, &charom, &colorram, &vic, + &sden, &dir, &gwe, &rom1, &rom2, &rom3, &rom4, &charom, &colorram, &vic, &from1, &romh, &roml, &dwe, &ioacc, &clrbank, &iocs, &casenb); if (!casenb && !dwe) @@ -483,7 +483,7 @@ WRITE8_MEMBER( c128_state::z80_w ) { int ba = 1, aec = 1, z80io = 1; offs_t vma = 0; - + write_memory(space, offset, vma, data, ba, aec, z80io); } @@ -491,7 +491,7 @@ READ8_MEMBER( c128_state::z80_io_r ) { int ba = 1, aec = 1, z80io = 0; offs_t vma = 0; - + return read_memory(space, offset, vma, ba, aec, z80io); } @@ -499,7 +499,7 @@ WRITE8_MEMBER( c128_state::z80_io_w ) { int ba = 1, aec = 1, z80io = 0; offs_t vma = 0; - + write_memory(space, offset, vma, data, ba, aec, z80io); } @@ -507,7 +507,7 @@ READ8_MEMBER( c128_state::read ) { int ba = 1, aec = 1, z80io = 1; offs_t vma = 0; - + return read_memory(space, vma, offset, ba, aec, z80io); } @@ -515,7 +515,7 @@ WRITE8_MEMBER( c128_state::write ) { int ba = 1, aec = 1, z80io = 1; offs_t vma = 0; - + write_memory(space, offset, vma, data, ba, aec, z80io); } @@ -523,7 +523,7 @@ READ8_MEMBER( c128_state::vic_videoram_r ) { int ba = 0, aec = 0, z80io = 1; offs_t vma = 0; - + return read_memory(space, offset, vma, ba, aec, z80io); } @@ -969,7 +969,7 @@ static const mc6845_interface vdc_intf = READ8_MEMBER( c128_state::sid_potx_r ) { UINT8 cia1_pa = mos6526_pa_r(m_cia1, 0); - + int sela = BIT(cia1_pa, 6); int selb = BIT(cia1_pa, 7); @@ -984,7 +984,7 @@ READ8_MEMBER( c128_state::sid_potx_r ) READ8_MEMBER( c128_state::sid_poty_r ) { UINT8 cia1_pa = mos6526_pa_r(m_cia1, 0); - + int sela = BIT(cia1_pa, 6); int selb = BIT(cia1_pa, 7); diff --git a/src/mess/drivers/c64.c b/src/mess/drivers/c64.c index 64f84cb65e9..32f91a30017 100644 --- a/src/mess/drivers/c64.c +++ b/src/mess/drivers/c64.c @@ -2,8 +2,8 @@ TODO: - - floating bus writes to peripheral registers in m6502.c - - sort out kernals between PAL/NTSC + - floating bus writes to peripheral registers in m6502.c + - sort out kernals between PAL/NTSC - tsuit215 test failures - IRQ (WRONG $DC0D) - NMI (WRONG $DD0D) @@ -428,7 +428,7 @@ static MOS6567_INTERFACE( vic_intf ) READ8_MEMBER( c64_state::sid_potx_r ) { UINT8 cia1_pa = mos6526_pa_r(m_cia1, 0); - + int sela = BIT(cia1_pa, 6); int selb = BIT(cia1_pa, 7); @@ -443,7 +443,7 @@ READ8_MEMBER( c64_state::sid_potx_r ) READ8_MEMBER( c64_state::sid_poty_r ) { UINT8 cia1_pa = mos6526_pa_r(m_cia1, 0); - + int sela = BIT(cia1_pa, 6); int selb = BIT(cia1_pa, 7); @@ -646,9 +646,9 @@ READ8_MEMBER( c64_state::cpu_r ) P0 1 P1 1 P2 1 - P3 + P3 P4 CASS SENS - P5 0 + P5 0 */ @@ -710,9 +710,9 @@ READ8_MEMBER( sx64_state::cpu_r ) P0 1 P1 1 P2 1 - P3 - P4 - P5 + P3 + P4 + P5 */ @@ -764,9 +764,9 @@ READ8_MEMBER( c64gs_state::cpu_r ) P0 1 P1 1 P2 1 - P3 - P4 - P5 + P3 + P4 + P5 */ @@ -1489,20 +1489,20 @@ ROM_END //************************************************************************** // YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS -COMP( 1982, c64n, 0, 0, ntsc, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64 (NTSC)", GAME_SUPPORTS_SAVE ) -COMP( 1982, c64j, c64n, 0, ntsc, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64 (Japan)", GAME_SUPPORTS_SAVE ) -COMP( 1982, c64p, c64n, 0, pal, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64 (PAL)", GAME_SUPPORTS_SAVE ) -COMP( 1982, c64sw, c64n, 0, pal, c64sw, driver_device, 0, "Commodore Business Machines", "Commodore 64 / VIC-64S (Sweden/Finland)", GAME_SUPPORTS_SAVE ) -COMP( 1983, pet64, c64n, 0, pet64, c64, driver_device, 0, "Commodore Business Machines", "PET 64 / CBM 4064 (NTSC)", GAME_SUPPORTS_SAVE | GAME_WRONG_COLORS ) -COMP( 1983, edu64, c64n, 0, pet64, c64, driver_device, 0, "Commodore Business Machines", "Educator 64 (NTSC)", GAME_SUPPORTS_SAVE | GAME_WRONG_COLORS ) -COMP( 1984, sx64n, c64n, 0, ntsc_sx, c64, driver_device, 0, "Commodore Business Machines", "SX-64 / Executive 64 (NTSC)", GAME_SUPPORTS_SAVE ) -COMP( 1984, sx64p, c64n, 0, pal_sx, c64, driver_device, 0, "Commodore Business Machines", "SX-64 / Executive 64 (PAL)", GAME_SUPPORTS_SAVE ) -COMP( 1984, vip64, c64n, 0, pal_sx, c64sw, driver_device, 0, "Commodore Business Machines", "VIP-64 (Sweden/Finland)", GAME_SUPPORTS_SAVE ) -COMP( 1984, dx64, c64n, 0, ntsc_dx, c64, driver_device, 0, "Commodore Business Machines", "DX-64 (NTSC)", GAME_SUPPORTS_SAVE ) +COMP( 1982, c64n, 0, 0, ntsc, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64 (NTSC)", GAME_SUPPORTS_SAVE ) +COMP( 1982, c64j, c64n, 0, ntsc, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64 (Japan)", GAME_SUPPORTS_SAVE ) +COMP( 1982, c64p, c64n, 0, pal, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64 (PAL)", GAME_SUPPORTS_SAVE ) +COMP( 1982, c64sw, c64n, 0, pal, c64sw, driver_device, 0, "Commodore Business Machines", "Commodore 64 / VIC-64S (Sweden/Finland)", GAME_SUPPORTS_SAVE ) +COMP( 1983, pet64, c64n, 0, pet64, c64, driver_device, 0, "Commodore Business Machines", "PET 64 / CBM 4064 (NTSC)", GAME_SUPPORTS_SAVE | GAME_WRONG_COLORS ) +COMP( 1983, edu64, c64n, 0, pet64, c64, driver_device, 0, "Commodore Business Machines", "Educator 64 (NTSC)", GAME_SUPPORTS_SAVE | GAME_WRONG_COLORS ) +COMP( 1984, sx64n, c64n, 0, ntsc_sx, c64, driver_device, 0, "Commodore Business Machines", "SX-64 / Executive 64 (NTSC)", GAME_SUPPORTS_SAVE ) +COMP( 1984, sx64p, c64n, 0, pal_sx, c64, driver_device, 0, "Commodore Business Machines", "SX-64 / Executive 64 (PAL)", GAME_SUPPORTS_SAVE ) +COMP( 1984, vip64, c64n, 0, pal_sx, c64sw, driver_device, 0, "Commodore Business Machines", "VIP-64 (Sweden/Finland)", GAME_SUPPORTS_SAVE ) +COMP( 1984, dx64, c64n, 0, ntsc_dx, c64, driver_device, 0, "Commodore Business Machines", "DX-64 (NTSC)", GAME_SUPPORTS_SAVE ) //COMP(1983, clipper, c64, 0, c64pal, clipper, XXX_CLASS, c64pal, "PDC", "Clipper", GAME_NOT_WORKING) // C64 in a briefcase with 3" floppy, electroluminescent flat screen, thermal printer //COMP(1983, tesa6240, c64, 0, c64pal, c64, XXX_CLASS, c64pal, "Tesa", "6240", GAME_NOT_WORKING) // modified SX64 with label printer -COMP( 1986, c64cn, c64n, 0, ntsc_c, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64C (NTSC)", GAME_SUPPORTS_SAVE ) -COMP( 1986, c64cp, c64n, 0, pal_c, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64C (PAL)", GAME_SUPPORTS_SAVE ) -COMP( 1986, c64csw, c64n, 0, pal_c, c64sw, driver_device, 0, "Commodore Business Machines", "Commodore 64C (Sweden/Finland)", GAME_SUPPORTS_SAVE ) -COMP( 1986, c64g, c64n, 0, pal_c, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64G (PAL)", GAME_SUPPORTS_SAVE ) -CONS( 1990, c64gs, c64n, 0, pal_gs, c64gs, driver_device, 0, "Commodore Business Machines", "Commodore 64 Games System (PAL)", GAME_SUPPORTS_SAVE ) +COMP( 1986, c64cn, c64n, 0, ntsc_c, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64C (NTSC)", GAME_SUPPORTS_SAVE ) +COMP( 1986, c64cp, c64n, 0, pal_c, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64C (PAL)", GAME_SUPPORTS_SAVE ) +COMP( 1986, c64csw, c64n, 0, pal_c, c64sw, driver_device, 0, "Commodore Business Machines", "Commodore 64C (Sweden/Finland)", GAME_SUPPORTS_SAVE ) +COMP( 1986, c64g, c64n, 0, pal_c, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64G (PAL)", GAME_SUPPORTS_SAVE ) +CONS( 1990, c64gs, c64n, 0, pal_gs, c64gs, driver_device, 0, "Commodore Business Machines", "Commodore 64 Games System (PAL)", GAME_SUPPORTS_SAVE ) diff --git a/src/mess/drivers/cgenie.c b/src/mess/drivers/cgenie.c index fd1895a1146..540ebfa8628 100644 --- a/src/mess/drivers/cgenie.c +++ b/src/mess/drivers/cgenie.c @@ -626,7 +626,7 @@ ROM_END // GATL GAT Length // GATM GAT Mask // DDGA Disk Directory Granule Allocation -struct PDRIVE +struct PDRIVE { UINT8 DDSL; // Disk Directory Start Lump (lump number of GAT) UINT8 GATL; // # of bytes used in the Granule Allocation Table sector diff --git a/src/mess/drivers/cybiko.c b/src/mess/drivers/cybiko.c index 6debfea06ab..9ab29604d74 100644 --- a/src/mess/drivers/cybiko.c +++ b/src/mess/drivers/cybiko.c @@ -342,7 +342,7 @@ static MACHINE_CONFIG_START( cybikov1, cybiko_state ) MCFG_RAM_EXTRA_OPTIONS("1M") MACHINE_CONFIG_END -const sst39vfx_config cybyko_sst39vfx_intf = +const sst39vfx_config cybyko_sst39vfx_intf = { 16, ENDIANNESS_BIG }; diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c index ad32ae03e15..48420d4a171 100644 --- a/src/mess/drivers/gba.c +++ b/src/mess/drivers/gba.c @@ -2474,7 +2474,7 @@ static astring gba_chip_string( UINT32 chip) return str.trimspace(); } -struct gba_chip_fix_conflict_item +struct gba_chip_fix_conflict_item { char game_code[5]; UINT32 chip; @@ -2518,7 +2518,7 @@ static const gba_chip_fix_conflict_item gba_chip_fix_conflict_list[] = { "BYUJ", GBA_CHIP_EEPROM_64K }, // 2322 - Yggdra Union (JPN) }; -struct gba_chip_fix_eeprom_item +struct gba_chip_fix_eeprom_item { char game_code[5]; }; diff --git a/src/mess/drivers/geneve.c b/src/mess/drivers/geneve.c index b9dc2d9a315..804d2e7da38 100644 --- a/src/mess/drivers/geneve.c +++ b/src/mess/drivers/geneve.c @@ -258,9 +258,9 @@ public: WRITE_LINE_MEMBER( mapper_ready ); DECLARE_DRIVER_INIT(geneve); - virtual void machine_start(); + virtual void machine_start(); virtual void machine_reset(); - + void set_tms9901_INT2_from_v9938(v99x8_device &vdp, int state); line_state m_inta; diff --git a/src/mess/drivers/hp49gp.c b/src/mess/drivers/hp49gp.c index 536155da7e1..26099ed7ad6 100644 --- a/src/mess/drivers/hp49gp.c +++ b/src/mess/drivers/hp49gp.c @@ -24,7 +24,7 @@ INLINE void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_level, } } -struct lcd_spi_t +struct lcd_spi_t { int l1; int data; diff --git a/src/mess/drivers/ht68k.c b/src/mess/drivers/ht68k.c index ba6110b8209..608dd27ff6f 100644 --- a/src/mess/drivers/ht68k.c +++ b/src/mess/drivers/ht68k.c @@ -45,9 +45,9 @@ public: , m_p_ram(*this, "p_ram"){ } - + static const floppy_format_type floppy_formats[]; - + required_device<cpu_device> m_maincpu; required_device<generic_terminal_device> m_terminal; required_device<device_t> m_duart; @@ -117,10 +117,10 @@ static void duart_output(device_t *device, UINT8 data) if(con) floppy = con->get_device(); break; - } + } } if (floppy) floppy->ss_w(BIT(data,3) ? 0 : 1); - state->m_fdc->set_floppy(floppy); + state->m_fdc->set_floppy(floppy); } WRITE8_MEMBER( ht68k_state::kbd_put ) @@ -162,7 +162,7 @@ static MACHINE_CONFIG_START( ht68k, ht68k_state ) MCFG_FLOPPY_DRIVE_ADD("fd0", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd2", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("fd3", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats) + MCFG_FLOPPY_DRIVE_ADD("fd3", ht68k_floppies, "525dd", 0, ht68k_state::floppy_formats) MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mess/drivers/ip20.c b/src/mess/drivers/ip20.c index eca05f899ee..317a9327f1a 100644 --- a/src/mess/drivers/ip20.c +++ b/src/mess/drivers/ip20.c @@ -26,7 +26,7 @@ #include "machine/scsicd.h" #include "machine/wd33c93.h" -struct HPC_t +struct HPC_t { UINT8 nMiscStatus; UINT32 nParBufPtr; @@ -38,7 +38,7 @@ struct HPC_t UINT32 nSCSI0DMACtrl; }; -struct RTC_t +struct RTC_t { UINT8 nRAM[32]; UINT8 nTemp; diff --git a/src/mess/drivers/ip22.c b/src/mess/drivers/ip22.c index 232a7a4cb10..a4d6607be23 100644 --- a/src/mess/drivers/ip22.c +++ b/src/mess/drivers/ip22.c @@ -57,14 +57,14 @@ #include "machine/scsihd.h" #include "machine/wd33c93.h" -struct RTC_t +struct RTC_t { UINT8 nRegs[0x80]; UINT8 nUserRAM[0x200]; UINT8 nRAM[0x800]; }; -struct HPC3_t +struct HPC3_t { UINT32 nenetr_nbdp; UINT32 nenetr_cbp; @@ -75,13 +75,13 @@ struct HPC3_t UINT32 nSCSI0DMACtrl; }; -struct HAL2_t +struct HAL2_t { UINT32 nIAR; UINT32 nIDR[4]; }; -struct PBUS_DMA_t +struct PBUS_DMA_t { UINT8 nActive; UINT32 nCurPtr; diff --git a/src/mess/drivers/juicebox.c b/src/mess/drivers/juicebox.c index 40719159f82..1de8be61351 100644 --- a/src/mess/drivers/juicebox.c +++ b/src/mess/drivers/juicebox.c @@ -31,7 +31,7 @@ INLINE void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_level, } } -struct smc_t +struct smc_t { int add_latch; int cmd_latch; diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c index 3cb3cc213b4..a13e39ae837 100644 --- a/src/mess/drivers/mycom.c +++ b/src/mess/drivers/mycom.c @@ -551,8 +551,8 @@ static const wd17xx_interface wd1771_intf = * Sound interface * *************************************/ - - + + //------------------------------------------------- // sn76496_config psg_intf //------------------------------------------------- diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c index a0ce520c6e4..73ba9293621 100644 --- a/src/mess/drivers/mz2000.c +++ b/src/mess/drivers/mz2000.c @@ -10,8 +10,8 @@ TODO: - cassette interface, basically any program that's bigger than 8kb fails to load; - implement remaining video capabilities - - add 80b compatibility support; - - Vosque (color): keyboard doesn't work properly; + - add 80b compatibility support; + - Vosque (color): keyboard doesn't work properly; ****************************************************************************/ @@ -607,7 +607,7 @@ static READ8_DEVICE_HANDLER( mz2000_portc_r ) static WRITE8_DEVICE_HANDLER( mz2000_porta_w ) { /* - These are enabled thru a 0->1 transition + These are enabled thru a 0->1 transition x--- ---- tape "APSS" -x-- ---- tape "APLAY" --x- ---- tape "AREW" diff --git a/src/mess/drivers/mz700.c b/src/mess/drivers/mz700.c index 2b6ae33b3cc..1f8ca1cfa4e 100644 --- a/src/mess/drivers/mz700.c +++ b/src/mess/drivers/mz700.c @@ -321,8 +321,8 @@ GFXDECODE_END * Sound interface * *************************************/ - - + + //------------------------------------------------- // sn76496_config psg_intf //------------------------------------------------- diff --git a/src/mess/drivers/ng_aes.c b/src/mess/drivers/ng_aes.c index cb1c22eb33d..c0935068eca 100644 --- a/src/mess/drivers/ng_aes.c +++ b/src/mess/drivers/ng_aes.c @@ -44,7 +44,7 @@ static const char *audio_banks[4] = }; // CD-ROM / DMA control registers -struct neocd_ctrl_t +struct neocd_ctrl_t { UINT8 area_sel; UINT8 pcm_bank_sel; @@ -91,7 +91,7 @@ public: DECLARE_MACHINE_START(neocd); DECLARE_MACHINE_START(neogeo); DECLARE_MACHINE_RESET(neogeo); - + }; diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c index 13c4de8d8b5..8f6d77e9442 100644 --- a/src/mess/drivers/pc.c +++ b/src/mess/drivers/pc.c @@ -933,8 +933,8 @@ GFXDECODE_END * Sound interface * *************************************/ - - + + //------------------------------------------------- // sn76496_config psg_intf //------------------------------------------------- diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c index dbb18c49024..e29e295ff8c 100644 --- a/src/mess/drivers/pc8801.c +++ b/src/mess/drivers/pc8801.c @@ -271,14 +271,14 @@ #define UPD1990A_TAG "upd1990a" #define I8251_TAG "i8251" -struct crtc_t +struct crtc_t { UINT8 cmd,param_count,cursor_on,status,irq_mask; UINT8 param[8][5]; UINT8 inverse; }; -struct mouse_t +struct mouse_t { UINT8 phase; UINT8 x,y; @@ -450,7 +450,7 @@ protected: public: DECLARE_MACHINE_RESET(pc8801_clock_speed); DECLARE_MACHINE_RESET(pc8801_dic); - DECLARE_MACHINE_RESET(pc8801_cdrom); + DECLARE_MACHINE_RESET(pc8801_cdrom); }; diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c index 85d3a5bf768..621a9ed4746 100644 --- a/src/mess/drivers/pc88va.c +++ b/src/mess/drivers/pc88va.c @@ -29,7 +29,7 @@ #include "sound/2203intf.h" #include "formats/basicdsk.h" -struct tsp_t +struct tsp_t { UINT16 tvram_vreg_offset; UINT16 attr_offset; diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c index 1360ab58d2f..4d0c6a4ed59 100644 --- a/src/mess/drivers/pc9801.c +++ b/src/mess/drivers/pc9801.c @@ -8,7 +8,7 @@ - floppy interface doesn't seem to work at all with either floppy inserted or not, missing DMA irq? - proper 8251 uart hook-up on keyboard - boot is too slow right now, might be due of the floppy / HDD devices - - investigate on POR bit + - investigate on POR bit TODO (PC-9801RS): - floppy disk hook-up; @@ -17,7 +17,7 @@ TODO (PC-9821): - fix CPU for some clones; - - PARITY ERROR, presumably it needs a far better emulation of the i8251 ports + - PARITY ERROR, presumably it needs a far better emulation of the i8251 ports TODO: (PC-486MU) - Tries to read port C of i8255_sys (-> 0x35) at boot without setting up the control diff --git a/src/mess/drivers/pcfx.c b/src/mess/drivers/pcfx.c index 51a0fa4e35a..cb3a403d99c 100644 --- a/src/mess/drivers/pcfx.c +++ b/src/mess/drivers/pcfx.c @@ -79,7 +79,7 @@ WRITE8_MEMBER(pcfx_state::extio_w) static ADDRESS_MAP_START( pcfx_mem, AS_PROGRAM, 32, pcfx_state ) AM_RANGE( 0x00000000, 0x001FFFFF ) AM_RAM /* RAM */ -// AM_RANGE( 0x80000000, 0x807FFFFF ) AM_READWRITE8(extio_r,extio_w,0xffffffff) /* EXTIO */ +// AM_RANGE( 0x80000000, 0x807FFFFF ) AM_READWRITE8(extio_r,extio_w,0xffffffff) /* EXTIO */ AM_RANGE( 0xE0000000, 0xE7FFFFFF ) AM_NOP /* BackUp RAM */ AM_RANGE( 0xE8000000, 0xE9FFFFFF ) AM_NOP /* Extended BackUp RAM */ AM_RANGE( 0xF8000000, 0xF8000007 ) AM_NOP /* PIO */ @@ -95,9 +95,9 @@ READ16_MEMBER( pcfx_state::pad_r ) { // status /* - ---- x--- - ---- ---x incoming data state (0=available) - */ + ---- x--- + ---- ---x incoming data state (0=available) + */ res = m_pad.status[port_type]; //printf("STATUS %d\n",port_type); } @@ -126,7 +126,7 @@ static TIMER_CALLBACK(pad_func) state->m_pad.status[param] |= 8; state->m_pad.ctrl[param] &= ~1; // ack TX line // TODO: pad IRQ -// state->set_irq_line(11, 1); +// state->set_irq_line(11, 1); } WRITE16_MEMBER( pcfx_state::pad_w ) @@ -137,10 +137,10 @@ WRITE16_MEMBER( pcfx_state::pad_w ) { // control /* - ---- -x-- receiver enable - ---- --x- enable multi-tap - ---- ---x enable send (0->1 transition) - */ + ---- -x-- receiver enable + ---- --x- enable multi-tap + ---- ---x enable send (0->1 transition) + */ if(data & 1 && (!(m_pad.ctrl[port_type] & 1))) { machine().scheduler().timer_set(attotime::from_msec(1), FUNC(pad_func), port_type); // TODO: time @@ -168,7 +168,7 @@ static ADDRESS_MAP_START( pcfx_io, AS_IO, 32, pcfx_state ) AM_RANGE( 0x00000C80, 0x00000C83 ) AM_NOP AM_RANGE( 0x00000E00, 0x00000EFF ) AM_READWRITE16( irq_read, irq_write, 0xffff ) /* Interrupt controller */ AM_RANGE( 0x00000F00, 0x00000FFF ) AM_NOP -// AM_RANGE( 0x00600000, 0x006FFFFF ) AM_READ(scsi_ctrl_r) +// AM_RANGE( 0x00600000, 0x006FFFFF ) AM_READ(scsi_ctrl_r) AM_RANGE( 0x00780000, 0x007FFFFF ) AM_ROM AM_REGION("scsi_rom", 0 ) AM_RANGE( 0x80500000, 0x805000FF ) AM_NOP /* HuC6273 */ ADDRESS_MAP_END @@ -176,8 +176,8 @@ ADDRESS_MAP_END static INPUT_PORTS_START( pcfx ) /* - xxxx ---- ---- ---- ID (0xf = 6 button pad, 0xe = tap, 0xd = ?) - */ + xxxx ---- ---- ---- ID (0xf = 6 button pad, 0xe = tap, 0xd = ?) + */ PORT_START("P1") PORT_BIT( 0xf0000000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ID PORT_DIPNAME( 0x01000000, 0x01000000, "1" ) diff --git a/src/mess/drivers/pcw16.c b/src/mess/drivers/pcw16.c index ae545256695..2e386866607 100644 --- a/src/mess/drivers/pcw16.c +++ b/src/mess/drivers/pcw16.c @@ -347,7 +347,7 @@ static const struct { write8_space_func func; const char *name; } pcw16_flash1_b { FUNC(pcw16_flash1_bank_handler3_w) } }; -enum PCW16_RAM_TYPE +enum PCW16_RAM_TYPE { /* rom which is really first block of flash0 */ PCW16_MEM_ROM, diff --git a/src/mess/drivers/pockstat.c b/src/mess/drivers/pockstat.c index 3f7d6849ec4..4d000405022 100644 --- a/src/mess/drivers/pockstat.c +++ b/src/mess/drivers/pockstat.c @@ -36,7 +36,7 @@ #define MAX_PS_TIMERS 3 -struct ps_ftlb_regs_t +struct ps_ftlb_regs_t { UINT32 control; UINT32 stat; @@ -47,7 +47,7 @@ struct ps_ftlb_regs_t UINT32 serial; }; -struct ps_intc_regs_t +struct ps_intc_regs_t { UINT32 hold; UINT32 status; @@ -55,7 +55,7 @@ struct ps_intc_regs_t UINT32 mask; }; -struct ps_timer_t +struct ps_timer_t { UINT32 period; UINT32 count; @@ -63,12 +63,12 @@ struct ps_timer_t emu_timer *timer; }; -struct ps_timer_regs_t +struct ps_timer_regs_t { ps_timer_t timer[MAX_PS_TIMERS]; }; -struct ps_clock_regs_t +struct ps_clock_regs_t { UINT32 mode; UINT32 control; @@ -76,7 +76,7 @@ struct ps_clock_regs_t #define PS_CLOCK_STEADY 0x10 -struct ps_rtc_regs_t +struct ps_rtc_regs_t { UINT32 mode; UINT32 control; diff --git a/src/mess/drivers/psx.c b/src/mess/drivers/psx.c index a25e78d59b3..3c642b1dd44 100644 --- a/src/mess/drivers/psx.c +++ b/src/mess/drivers/psx.c @@ -19,7 +19,7 @@ #include "machine/psxcd.h" #include "machine/psxcard.h" -struct pad_t +struct pad_t { UINT8 n_shiftin; UINT8 n_shiftout; diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c index 5ae95a1a752..e89ca985fe4 100644 --- a/src/mess/drivers/pv1000.c +++ b/src/mess/drivers/pv1000.c @@ -15,7 +15,7 @@ class pv1000_sound_device : public device_t, public: pv1000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - // device-level overrides + // device-level overrides virtual void device_config_complete(); virtual void device_start(); diff --git a/src/mess/drivers/pv2000.c b/src/mess/drivers/pv2000.c index 66cc6b5f48f..904258d9f36 100644 --- a/src/mess/drivers/pv2000.c +++ b/src/mess/drivers/pv2000.c @@ -351,8 +351,8 @@ static TMS9928A_INTERFACE(pv2000_tms9928a_interface) * Sound interface * *************************************/ - - + + //------------------------------------------------- // sn76496_config psg_intf //------------------------------------------------- diff --git a/src/mess/drivers/rvoice.c b/src/mess/drivers/rvoice.c index 92e36b2955c..cf165b32f1c 100644 --- a/src/mess/drivers/rvoice.c +++ b/src/mess/drivers/rvoice.c @@ -18,7 +18,7 @@ /* Components */ -struct hd63701y0_t +struct hd63701y0_t { UINT8 data[8]; UINT8 P1DDR; @@ -57,7 +57,7 @@ struct hd63701y0_t UINT8 P6CSR; }; -struct rvoicepc_t +struct rvoicepc_t { UINT8 data[8]; UINT8 port1; diff --git a/src/mess/drivers/sgi_ip6.c b/src/mess/drivers/sgi_ip6.c index 253b0f82b04..af936d02fa8 100644 --- a/src/mess/drivers/sgi_ip6.c +++ b/src/mess/drivers/sgi_ip6.c @@ -17,7 +17,7 @@ #include "cpu/mips/r3000.h" -struct ip6_regs_t +struct ip6_regs_t { UINT16 unknown_half_0; UINT8 unknown_byte_0; diff --git a/src/mess/drivers/sitcom.c b/src/mess/drivers/sitcom.c index a19a64fb898..801e01c4ac2 100644 --- a/src/mess/drivers/sitcom.c +++ b/src/mess/drivers/sitcom.c @@ -91,12 +91,12 @@ void sitcom_update_ds1(device_t *device, int digit, int data) output_set_digit_value(4 + digit, data); } -const dl1416_interface sitcom_ds0_intf = +const dl1416_interface sitcom_ds0_intf = { sitcom_update_ds0 }; -const dl1416_interface sitcom_ds1_intf = +const dl1416_interface sitcom_ds1_intf = { sitcom_update_ds1 }; diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index 99d1034e905..23e45ee8740 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -35,7 +35,7 @@ public: : driver_device(mconfig, type, tag), m_sn(*this, "sn1") { } - + optional_device<sn76489a_new_device> m_sn; UINT16 m_cursor_addr; UINT16 m_cursor_raster; @@ -1060,8 +1060,8 @@ static INTERRUPT_GEN( smc777_vblank_irq ) * Sound interface * *************************************/ - - + + //------------------------------------------------- // sn76496_config psg_intf //------------------------------------------------- diff --git a/src/mess/drivers/ti99_4x.c b/src/mess/drivers/ti99_4x.c index a33cf1c2669..8b8b9143c24 100644 --- a/src/mess/drivers/ti99_4x.c +++ b/src/mess/drivers/ti99_4x.c @@ -967,15 +967,15 @@ MACHINE_START_MEMBER(ti99_4x,ti99_4a) m_cpu = static_cast<tms9900_device*>(machine().device("maincpu")); m_tms9901 = static_cast<tms9901_device*>(machine().device(TMS9901_TAG)); - + m_gromport = static_cast<gromport_device*>(machine().device(GROMPORT_TAG)); m_peribox = static_cast<peribox_device*>(machine().device(PERIBOX_TAG)); - + m_datamux = static_cast<ti99_datamux_device*>(machine().device(DATAMUX_TAG)); m_joyport = static_cast<joyport_device*>(machine().device(JOYPORT_TAG)); m_video = static_cast<ti_video_device*>(machine().device(VIDEO_SYSTEM_TAG)); m_firstjoy = 6; - + m_peribox->senila(CLEAR_LINE); m_peribox->senilb(CLEAR_LINE); m_ready_line = m_ready_line_dmux = ASSERT_LINE; diff --git a/src/mess/drivers/ti99_8.c b/src/mess/drivers/ti99_8.c index bd5d7b2dc4c..3d622a91f87 100644 --- a/src/mess/drivers/ti99_8.c +++ b/src/mess/drivers/ti99_8.c @@ -252,7 +252,7 @@ public: DECLARE_WRITE8_MEMBER(tms9901_interrupt); DECLARE_WRITE_LINE_MEMBER( clock_out ); - virtual void machine_start(); + virtual void machine_start(); virtual void machine_reset(); // Some values to keep diff --git a/src/mess/drivers/vboy.c b/src/mess/drivers/vboy.c index 573511b8594..260376a645e 100644 --- a/src/mess/drivers/vboy.c +++ b/src/mess/drivers/vboy.c @@ -8,10 +8,10 @@ and http://www.vr32.de/modules/dokuwiki/doku.php? TODO: - - 3dtetris: missing gfxs on gameplay (writes to framebuffer) + - 3dtetris: missing gfxs on gameplay (writes to framebuffer) - boundh: game is way too fast - galactic: ball goes out of bounds sometimes? - - golf: missing gfxs on gameplay (writes to framebuffer) + - golf: missing gfxs on gameplay (writes to framebuffer) - marioten: title screen logo is misplaced if Mario completes his animation - nesterfb: once that you hit the pins, animation phase takes a while to start - redalarm: gameplay doesn't work @@ -19,7 +19,7 @@ - spaceinv: missing shots - telerobo: crashes if you die - telerobo: hangs after winning first match; - - vlab: doesn't boot (irq issue?) + - vlab: doesn't boot (irq issue?) - wariolnd: brightness gets suddently darker during intro. \ ****************************************************************************/ @@ -699,7 +699,7 @@ void vboy_state::m_set_brightness(void) if(b > 0xff) { b = 0xff; } if(c > 0xff) { c = 0xff; } -// popmessage("%02x %02x %02x %02x",m_vip_regs.BRTA,m_vip_regs.BRTB,m_vip_regs.BRTC,m_vip_regs.REST); +// popmessage("%02x %02x %02x %02x",m_vip_regs.BRTA,m_vip_regs.BRTB,m_vip_regs.BRTC,m_vip_regs.REST); palette_set_color_rgb(machine(), 1, a,0,0); palette_set_color_rgb(machine(), 2, b,0,0); palette_set_color_rgb(machine(), 3, c,0,0); @@ -716,17 +716,17 @@ READ16_MEMBER( vboy_state::vip_r ) logerror("Error reading INTCLR\n"); break; /* - ---- -x-- ---- ---- LOCK (status column table address (CTA) lock) - ---- --x- ---- ---- SYNCE (status of sync signal enable) - ---- ---x ---- ---- RE (status of memory refresh cycle) - ---- ---- x--- ---- FCLK + ---- -x-- ---- ---- LOCK (status column table address (CTA) lock) + ---- --x- ---- ---- SYNCE (status of sync signal enable) + ---- ---x ---- ---- RE (status of memory refresh cycle) + ---- ---- x--- ---- FCLK ---- ---- -x-- ---- SCANRDY (active low) - ---- ---- --xx xx-- DPBSY (current framebuffer displayed) - ---- ---- --10 00-- RFB1 - ---- ---- --01 00-- LFB1 - ---- ---- --00 10-- RFB0 - ---- ---- --00 01-- LFB0 - ---- ---- ---- --x- DISP + ---- ---- --xx xx-- DPBSY (current framebuffer displayed) + ---- ---- --10 00-- RFB1 + ---- ---- --01 00-- LFB1 + ---- ---- --00 10-- RFB0 + ---- ---- --00 01-- LFB0 + ---- ---- ---- --x- DISP */ case 0x20: //DPSTTS { @@ -767,9 +767,9 @@ READ16_MEMBER( vboy_state::vip_r ) case 0x40: //XPSTTS, piXel Processor STaTuS { /* - x--- ---- ---- ---- SBOUT - ---x xxxx ---- ---- SBCOUNT - ---- ---- ---x ---- OVERTIME (process overflow) + x--- ---- ---- ---- SBOUT + ---x xxxx ---- ---- SBCOUNT + ---- ---- ---x ---- OVERTIME (process overflow) ---- ---- ---- x--- XPBSY1 (second framebuffer busy flag) ---- ---- ---- -x-- XPBSY0 (first framebfuffer busy flag) ---- ---- ---- --x- XPEN (starts drawing at beginning of game frame) @@ -862,11 +862,11 @@ WRITE16_MEMBER( vboy_state::vip_w ) logerror("Error writing DPSTTS\n"); break; /* - ---- -x-- ---- ---- LOCK (status column table address (CTA) lock) - ---- --x- ---- ---- SYNCE (status of sync signal enable) - ---- ---x ---- ---- RE (status of memory refresh cycle) - ---- ---- ---- --x- DISP - ---- ---- ---- ---x DPRST (Resets the VIP internal counter) + ---- -x-- ---- ---- LOCK (status column table address (CTA) lock) + ---- --x- ---- ---- SYNCE (status of sync signal enable) + ---- ---x ---- ---- RE (status of memory refresh cycle) + ---- ---- ---- --x- DISP + ---- ---- ---- ---x DPRST (Resets the VIP internal counter) */ case 0x22: //DPCTRL m_vip_regs.DPCTRL = data & 0x0702; @@ -1085,7 +1085,7 @@ static ADDRESS_MAP_START( vboy_mem, AS_PROGRAM, 32, vboy_state ) AM_RANGE( 0x02000000, 0x0200002b ) AM_MIRROR(0x0ffff00) AM_READWRITE(io_r, io_w) // Hardware control registers mask 0xff //AM_RANGE( 0x04000000, 0x04ffffff ) // Expansion area AM_RANGE( 0x05000000, 0x0500ffff ) AM_MIRROR(0x0ff0000) AM_RAM AM_SHARE("wram")// Main RAM - 64K mask 0xffff -// AM_RANGE( 0x06000000, 0x06003fff ) AM_RAM AM_SHARE("nvram") // Cart RAM - 8K NVRAM +// AM_RANGE( 0x06000000, 0x06003fff ) AM_RAM AM_SHARE("nvram") // Cart RAM - 8K NVRAM AM_RANGE( 0x07000000, 0x071fffff ) AM_MIRROR(0x0e00000) AM_ROM AM_REGION("cartridge", 0) /* ROM */ ADDRESS_MAP_END @@ -1157,7 +1157,7 @@ void vboy_state::machine_start() /* add a hook for battery save */ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(vboy_machine_stop),&machine())); -// m_vboy_sram = auto_alloc_array(machine(), UINT32, 0x10000/4); +// m_vboy_sram = auto_alloc_array(machine(), UINT32, 0x10000/4); } void vboy_state::machine_reset() diff --git a/src/mess/drivers/vic10.c b/src/mess/drivers/vic10.c index 40ae406ef7e..815829dfa38 100644 --- a/src/mess/drivers/vic10.c +++ b/src/mess/drivers/vic10.c @@ -480,11 +480,11 @@ READ8_MEMBER( vic10_state::cpu_r ) bit description P0 EXPANSION PORT - P1 - P2 + P1 + P2 P3 P4 CASS SENS - P5 0 + P5 0 */ diff --git a/src/mess/drivers/vic20.c b/src/mess/drivers/vic20.c index d898be32c5e..0eb7e8a3567 100644 --- a/src/mess/drivers/vic20.c +++ b/src/mess/drivers/vic20.c @@ -463,7 +463,7 @@ WRITE8_MEMBER( vic20_state::via0_pa_w ) PA2 PA3 PA4 - PA5 LITE PEN (FIRE) + PA5 LITE PEN (FIRE) PA6 PA7 SERIAL ATN OUT @@ -550,7 +550,7 @@ READ8_MEMBER( vic20_state::via1_pb_r ) // joystick UINT8 joy = m_joy1->joy_r(); - + data &= BIT(joy, 3) << 7; return data; @@ -881,7 +881,7 @@ ROM_END //************************************************************************** // YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS -COMP( 1980, vic1001, 0, 0, ntsc, vic1001, driver_device, 0, "Commodore Business Machines", "VIC-1001 (Japan)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) -COMP( 1981, vic20, vic1001, 0, ntsc, vic20, driver_device, 0, "Commodore Business Machines", "VIC-20 (NTSC)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) -COMP( 1981, vic20p, vic1001, 0, pal, vic20, driver_device, 0, "Commodore Business Machines", "VIC-20 / VC-20 (PAL)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) -COMP( 1981, vic20s, vic1001, 0, pal, vic20s, driver_device, 0, "Commodore Business Machines", "VIC-20 (Sweden/Finland)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +COMP( 1980, vic1001, 0, 0, ntsc, vic1001, driver_device, 0, "Commodore Business Machines", "VIC-1001 (Japan)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +COMP( 1981, vic20, vic1001, 0, ntsc, vic20, driver_device, 0, "Commodore Business Machines", "VIC-20 (NTSC)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +COMP( 1981, vic20p, vic1001, 0, pal, vic20, driver_device, 0, "Commodore Business Machines", "VIC-20 / VC-20 (PAL)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) +COMP( 1981, vic20s, vic1001, 0, pal, vic20s, driver_device, 0, "Commodore Business Machines", "VIC-20 (Sweden/Finland)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) diff --git a/src/mess/drivers/vk100.c b/src/mess/drivers/vk100.c index 80416b6ed46..46ebcc3f320 100644 --- a/src/mess/drivers/vk100.c +++ b/src/mess/drivers/vk100.c @@ -576,7 +576,7 @@ READ8_MEMBER(vk100_state::SYSTAT_A) * write command -> 0x05 (normal, normal, /RTS is 1, normal, normal, recieve ON, /DTR is 0, transmit off) * read SYSTAT B (and xor with 0xe), expect d7 to be SET or jump to error * after this it does something and waits for an rxrdy interrupt - + shows the results of: * ACTS (/CTS) ? ? ? ? ? ? ? * d7 d6 d5 d4 d3 d2 d1 d0 diff --git a/src/mess/formats/spec_snqk.h b/src/mess/formats/spec_snqk.h index 8894e58713e..529b45101a8 100644 --- a/src/mess/formats/spec_snqk.h +++ b/src/mess/formats/spec_snqk.h @@ -141,7 +141,7 @@ void spectrum_setup_raw(running_machine &machine, UINT8 *quickdata, UINT32 quick #define FRZ_HDR 42 #define FRZ_SIZE (FRZ_HDR + 8*SPECTRUM_BANK) -enum SPECTRUM_SNAPSHOT_TYPE +enum SPECTRUM_SNAPSHOT_TYPE { SPECTRUM_SNAPSHOT_NONE, SPECTRUM_SNAPSHOT_SNA, diff --git a/src/mess/formats/timex_dck.h b/src/mess/formats/timex_dck.h index d05c49cb650..a7cc6142a4d 100644 --- a/src/mess/formats/timex_dck.h +++ b/src/mess/formats/timex_dck.h @@ -18,7 +18,7 @@ enum TIMEX_CART_HOME }; -struct timex_cart_t +struct timex_cart_t { int type; UINT8 chunks; diff --git a/src/mess/includes/amstrad.h b/src/mess/includes/amstrad.h index ab3f7fa5406..b4ad39a488a 100644 --- a/src/mess/includes/amstrad.h +++ b/src/mess/includes/amstrad.h @@ -23,7 +23,7 @@ /**************************** * Gate Array data (CPC) - ****************************/ -struct gate_array_t +struct gate_array_t { bitmap_ind16 *bitmap; /* The bitmap we work on */ UINT8 pen_selected; /* Pen selection */ @@ -60,7 +60,7 @@ struct gate_array_t /**************************** * ASIC data (CPC plus) ****************************/ -struct asic_t +struct asic_t { UINT8 *ram; /* pointer to RAM used for the CPC+ ASIC memory-mapped registers */ UINT8 enabled; /* Are CPC plus features enabled/unlocked */ diff --git a/src/mess/includes/apple1.h b/src/mess/includes/apple1.h index 727adf972e2..61966536e40 100644 --- a/src/mess/includes/apple1.h +++ b/src/mess/includes/apple1.h @@ -12,7 +12,7 @@ typedef short termchar_t; -struct terminal_t +struct terminal_t { tilemap_t *tm; int gfx; diff --git a/src/mess/includes/apple2.h b/src/mess/includes/apple2.h index a75e950df5c..f2d46921146 100644 --- a/src/mess/includes/apple2.h +++ b/src/mess/includes/apple2.h @@ -72,7 +72,7 @@ #define APPLE2_MEM_FLOATING 0xFFFFFFFF #define APPLE2_MEM_MASK 0x00FFFFFF -enum machine_type_t +enum machine_type_t { APPLE_II, // Apple II/II+ APPLE_IIEPLUS, // Apple IIe/IIc/IIgs/IIc+ @@ -81,7 +81,7 @@ enum machine_type_t SPACE84 // "Space 84" with flipped text mode }; -enum bank_disposition_t +enum bank_disposition_t { A2MEM_IO = 0, /* this is always handlers; never banked memory */ A2MEM_MONO = 1, /* this is a bank where read and write are always in unison */ diff --git a/src/mess/includes/apple2gs.h b/src/mess/includes/apple2gs.h index cd97d72b184..ec5a3abe91f 100644 --- a/src/mess/includes/apple2gs.h +++ b/src/mess/includes/apple2gs.h @@ -24,7 +24,7 @@ #define BORDER_TOP (16) // (plus bottom) -enum apple2gs_clock_mode +enum apple2gs_clock_mode { CLOCKMODE_IDLE, CLOCKMODE_TIME, @@ -34,7 +34,7 @@ enum apple2gs_clock_mode }; -enum adbstate_t +enum adbstate_t { ADBSTATE_IDLE, ADBSTATE_INCOMMAND, diff --git a/src/mess/includes/bebox.h b/src/mess/includes/bebox.h index b26cdc07caa..a3b942c07e1 100644 --- a/src/mess/includes/bebox.h +++ b/src/mess/includes/bebox.h @@ -13,7 +13,7 @@ #include "machine/8237dma.h" #include "machine/53c810.h" -struct bebox_devices_t +struct bebox_devices_t { device_t *pic8259_master; device_t *pic8259_slave; diff --git a/src/mess/includes/c65.h b/src/mess/includes/c65.h index f29335bc808..e1547718fc2 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" -struct dma_t +struct dma_t { int version; UINT8 data[4]; }; -struct fdc_t +struct fdc_t { int state; @@ -32,7 +32,7 @@ struct fdc_t int head,track,sector; }; -struct expansion_ram_t +struct expansion_ram_t { UINT8 reg; }; diff --git a/src/mess/includes/cgenie.h b/src/mess/includes/cgenie.h index e5d88a615ca..294560a8a09 100644 --- a/src/mess/includes/cgenie.h +++ b/src/mess/includes/cgenie.h @@ -10,7 +10,7 @@ #include "machine/wd17xx.h" // CRTC 6845 -struct CRTC6845 +struct CRTC6845 { UINT8 cursor_address_lo; UINT8 cursor_address_hi; diff --git a/src/mess/includes/channelf.h b/src/mess/includes/channelf.h index 17d6996d1d9..d49cd3879fa 100644 --- a/src/mess/includes/channelf.h +++ b/src/mess/includes/channelf.h @@ -13,7 +13,7 @@ /* SKR - 2102 RAM chip on carts 10 and 18 I/O ports */ -struct r2102_t +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 */ diff --git a/src/mess/includes/compis.h b/src/mess/includes/compis.h index e49a5947bdb..7375fbd68ec 100644 --- a/src/mess/includes/compis.h +++ b/src/mess/includes/compis.h @@ -73,7 +73,7 @@ struct intr_state UINT16 ext[4]; }; -struct i186_state +struct i186_state { struct timer_state timer[3]; struct dma_state dma[2]; @@ -83,7 +83,7 @@ struct i186_state /* Keyboard */ -struct TYP_COMPIS_KEYBOARD +struct TYP_COMPIS_KEYBOARD { UINT8 nationality; /* Character set, keyboard layout (Swedish) */ UINT8 release_time; /* Autorepeat release time (0.8) */ @@ -102,14 +102,14 @@ struct TYP_COMPIS_KEYBOARD }; /* USART 8251 */ -struct TYP_COMPIS_USART +struct TYP_COMPIS_USART { UINT8 status; UINT8 bytes_sent; }; /* Printer */ -struct TYP_COMPIS_PRINTER +struct TYP_COMPIS_PRINTER { UINT8 data; UINT8 strobe; @@ -117,7 +117,7 @@ struct TYP_COMPIS_PRINTER /* Main emulation */ -struct TYP_COMPIS +struct TYP_COMPIS { TYP_COMPIS_PRINTER printer; /* Printer */ TYP_COMPIS_USART usart; /* USART 8251 */ diff --git a/src/mess/includes/concept.h b/src/mess/includes/concept.h index 42196b979ca..7cbd5a4d935 100644 --- a/src/mess/includes/concept.h +++ b/src/mess/includes/concept.h @@ -21,7 +21,7 @@ enum MaxKeyMessageLen = 1 }; -struct expansion_slot_t +struct expansion_slot_t { read8_space_func reg_read; write8_space_func reg_write; diff --git a/src/mess/includes/cxhumax.h b/src/mess/includes/cxhumax.h index d00fe40f37b..ca5da0d57b8 100644 --- a/src/mess/includes/cxhumax.h +++ b/src/mess/includes/cxhumax.h @@ -9,7 +9,7 @@ #define MAX_CX_TIMERS 16 -struct cx_timer_t +struct cx_timer_t { UINT32 value; UINT32 limit; @@ -18,7 +18,7 @@ struct cx_timer_t emu_timer *timer; }; -struct cx_timer_regs_t +struct cx_timer_regs_t { cx_timer_t timer[MAX_CX_TIMERS]; UINT32 timer_irq; diff --git a/src/mess/includes/cybiko.h b/src/mess/includes/cybiko.h index 769d1208a41..a200a60a644 100644 --- a/src/mess/includes/cybiko.h +++ b/src/mess/includes/cybiko.h @@ -28,14 +28,14 @@ #include "machine/sst39vfx.h" #include "machine/ram.h" -struct CYBIKO_RS232_PINS +struct CYBIKO_RS232_PINS { int sck; // serial clock int txd; // transmit data int rxd; // receive data }; -struct CYBIKO_RS232 +struct CYBIKO_RS232 { CYBIKO_RS232_PINS pin; UINT8 rx_bits, rx_byte, tx_byte, tx_bits; diff --git a/src/mess/includes/dgn_beta.h b/src/mess/includes/dgn_beta.h index f9077d09910..f3bbe4bc70d 100644 --- a/src/mess/includes/dgn_beta.h +++ b/src/mess/includes/dgn_beta.h @@ -63,7 +63,7 @@ /***** Video Modes *****/ -enum BETA_VID_MODES +enum BETA_VID_MODES { TEXT_40x25, /* Text mode 40x25 */ TEXT_80x25, /* Text mode 80x25 */ @@ -74,7 +74,7 @@ enum BETA_VID_MODES #define iosize (0xfEFF-0xfc00) -struct PageReg +struct PageReg { int value; /* Value of the page register */ UINT8 *memory; /* The memory it actually points to */ diff --git a/src/mess/includes/electron.h b/src/mess/includes/electron.h index e86692f8685..62a857d866e 100644 --- a/src/mess/includes/electron.h +++ b/src/mess/includes/electron.h @@ -23,7 +23,7 @@ /* ULA context */ -struct ULA +struct ULA { UINT8 interrupt_status; UINT8 interrupt_control; diff --git a/src/mess/includes/fm7.h b/src/mess/includes/fm7.h index c41d0302310..693f1693715 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) -struct fm7_encoder_t +struct fm7_encoder_t { UINT8 buffer[12]; UINT8 tx_count; @@ -42,7 +42,7 @@ struct fm7_encoder_t UINT8 position; }; -struct fm7_mmr_t +struct fm7_mmr_t { UINT8 bank_addr[8][16]; UINT8 segment; @@ -51,7 +51,7 @@ struct fm7_mmr_t UINT8 mode; }; -struct fm7_video_t +struct fm7_video_t { UINT8 sub_busy; UINT8 sub_halt; @@ -77,7 +77,7 @@ struct fm7_video_t UINT8 vsync_flag; }; -struct fm7_alu_t +struct fm7_alu_t { UINT8 command; UINT8 lcolour; diff --git a/src/mess/includes/gamecom.h b/src/mess/includes/gamecom.h index a10b95567de..64725c648e3 100644 --- a/src/mess/includes/gamecom.h +++ b/src/mess/includes/gamecom.h @@ -149,7 +149,7 @@ enum SM8521_SG1W15 = 0x7F }; -struct GAMECOM_DMA +struct GAMECOM_DMA { int enabled; int transfer_mode; @@ -182,7 +182,7 @@ struct GAMECOM_DMA unsigned int dest_mask; }; -struct GAMECOM_TIMER +struct GAMECOM_TIMER { int enabled; int state_count; @@ -190,7 +190,7 @@ struct GAMECOM_TIMER int check_value; }; -struct gamecom_sound_t +struct gamecom_sound_t { UINT8 sgc; UINT8 sg0l; diff --git a/src/mess/includes/gb.h b/src/mess/includes/gb.h index f7a348a6d83..54a3dda6534 100644 --- a/src/mess/includes/gb.h +++ b/src/mess/includes/gb.h @@ -241,7 +241,7 @@ public: DECLARE_MACHINE_RESET(gbpocket); DECLARE_PALETTE_INIT(gbp); DECLARE_MACHINE_START(gbc); - DECLARE_MACHINE_RESET(gbc); + DECLARE_MACHINE_RESET(gbc); DECLARE_PALETTE_INIT(gbc); DECLARE_MACHINE_START(gb_video); DECLARE_MACHINE_START(gbc_video); diff --git a/src/mess/includes/gmaster.h b/src/mess/includes/gmaster.h index f1d5a91d166..1f1b5960a08 100644 --- a/src/mess/includes/gmaster.h +++ b/src/mess/includes/gmaster.h @@ -1,7 +1,7 @@ #ifndef __GMASTER_H__ #define __GMASTER_H__ -struct GMASTER_VIDEO +struct GMASTER_VIDEO { UINT8 data[8]; int index; @@ -11,7 +11,7 @@ struct GMASTER_VIDEO UINT8 pixels[8][64/*>=62 sure*/]; }; -struct GMASTER_MACHINE +struct GMASTER_MACHINE { UINT8 ports[5]; }; diff --git a/src/mess/includes/gp32.h b/src/mess/includes/gp32.h index e6fbb8ff291..048bca837cd 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 -struct s3c240x_lcd_t +struct s3c240x_lcd_t { UINT32 vramaddr_cur; UINT32 vramaddr_max; @@ -47,7 +47,7 @@ struct s3c240x_lcd_t int vpos, hpos; }; -struct smc_t +struct smc_t { int add_latch; int chip; @@ -61,21 +61,21 @@ struct smc_t UINT8 datatx; }; -struct i2s_t +struct i2s_t { int l3d; int l3m; int l3c; }; -struct s3c240x_iic_t +struct s3c240x_iic_t { UINT8 data[4]; int data_index; UINT16 address; }; -struct s3c240x_iis_t +struct s3c240x_iis_t { UINT16 fifo[16/2]; int fifo_index; diff --git a/src/mess/includes/hp48.h b/src/mess/includes/hp48.h index fc4e13b7364..d70054ebba5 100644 --- a/src/mess/includes/hp48.h +++ b/src/mess/includes/hp48.h @@ -20,7 +20,7 @@ enum hp48_models { }; /* memory module configuration */ -struct hp48_module +struct hp48_module { /* static part */ UINT32 off_mask; /* offset bit-mask, indicates the real size */ diff --git a/src/mess/includes/intv.h b/src/mess/includes/intv.h index 1192688187c..33ff2ab93ae 100644 --- a/src/mess/includes/intv.h +++ b/src/mess/includes/intv.h @@ -7,7 +7,7 @@ #ifndef INTV_H_ #define INTV_H_ -struct intv_sprite_type +struct intv_sprite_type { int visible; int xpos; diff --git a/src/mess/includes/kyocera.h b/src/mess/includes/kyocera.h index 6a004b53061..b788cd618ea 100644 --- a/src/mess/includes/kyocera.h +++ b/src/mess/includes/kyocera.h @@ -113,7 +113,7 @@ public: /* sound state */ int m_buzzer; /* buzzer select */ int m_bell; /* bell output */ - + DECLARE_PALETTE_INIT(kc85); }; diff --git a/src/mess/includes/lisa.h b/src/mess/includes/lisa.h index 10cc368119b..3c56892ed96 100644 --- a/src/mess/includes/lisa.h +++ b/src/mess/includes/lisa.h @@ -16,7 +16,7 @@ #define KB_COP421_TAG "kbcop" /* lisa MMU segment regs */ -struct real_mmu_entry +struct real_mmu_entry { UINT16 sorg; UINT16 slim; @@ -25,7 +25,7 @@ struct real_mmu_entry /* MMU regs translated into a more efficient format */ enum mmu_entry_t { RAM_stack_r, RAM_r, RAM_stack_rw, RAM_rw, IO, invalid, special_IO }; -struct mmu_entry +struct mmu_entry { offs_t sorg; /* (real_sorg & 0x0fff) << 9 */ mmu_entry_t type; /* <-> (real_slim & 0x0f00) */ @@ -48,7 +48,7 @@ enum clock_mode_t }; /* clock mode */ /* clock registers */ -struct clock_regs_t +struct clock_regs_t { long alarm; /* alarm (20-bit binary) */ int years; /* years (4-bit binary ) */ @@ -68,7 +68,7 @@ struct clock_regs_t enum clock_mode_t clock_mode; }; -struct lisa_features_t +struct lisa_features_t { unsigned int has_fast_timers : 1; /* I/O board VIAs are clocked at 1.25 MHz (?) instead of .5 MHz (?) (Lisa 2/10, Mac XL) */ /* Note that the beep routine in boot ROMs implies that diff --git a/src/mess/includes/lynx.h b/src/mess/includes/lynx.h index bc803c04f61..0af7f9fbefa 100644 --- a/src/mess/includes/lynx.h +++ b/src/mess/includes/lynx.h @@ -15,7 +15,7 @@ class lynx_state; -struct BLITTER +struct BLITTER { UINT8 *mem; // global @@ -54,7 +54,7 @@ struct BLITTER int busy; }; -struct UART +struct UART { UINT8 serctl; UINT8 data_received, data_to_send, buffer; @@ -63,7 +63,7 @@ struct UART int buffer_loaded; }; -struct SUZY +struct SUZY { UINT8 data[0x100]; UINT8 high; @@ -73,14 +73,14 @@ struct SUZY int accumulate_overflow; }; -struct MIKEY +struct MIKEY { UINT8 data[0x100]; UINT16 disp_addr; UINT8 vb_rest; }; -struct LYNX_TIMER +struct LYNX_TIMER { UINT8 bakup; UINT8 cntrl1; diff --git a/src/mess/includes/mac.h b/src/mess/includes/mac.h index 1fae2a49aaf..803be472ea8 100644 --- a/src/mess/includes/mac.h +++ b/src/mess/includes/mac.h @@ -37,7 +37,7 @@ #define ADB_IS_PM_CLASS ((m_model >= MODEL_MAC_PORTABLE && m_model <= MODEL_MAC_PB100) || (m_model >= MODEL_MAC_PB140 && m_model <= MODEL_MAC_PBDUO_270c)) /* for Egret and CUDA streaming MCU commands, command types */ -enum mac_streaming_t +enum mac_streaming_t { MCU_STREAMING_NONE = 0, MCU_STREAMING_PRAMRD, @@ -55,7 +55,7 @@ enum }; /* tells which model is being emulated (set by macxxx_init) */ -enum model_t +enum model_t { MODEL_MAC_128K512K, // 68000 machines MODEL_MAC_512KE, diff --git a/src/mess/includes/macpci.h b/src/mess/includes/macpci.h index 17832aab5c3..03449d28fed 100644 --- a/src/mess/includes/macpci.h +++ b/src/mess/includes/macpci.h @@ -24,7 +24,7 @@ #define MAC_539X_2_TAG "539x_2" /* tells which model is being emulated (set by macxxx_init) */ -enum model_t +enum model_t { PCIMODEL_MAC_PM5200, PCIMODEL_MAC_PM6200, diff --git a/src/mess/includes/mbc55x.h b/src/mess/includes/mbc55x.h index 9b7dc32e41f..3f4a5b74c89 100644 --- a/src/mess/includes/mbc55x.h +++ b/src/mess/includes/mbc55x.h @@ -75,7 +75,7 @@ #define FDC_TAG "wd1793" -struct keyboard_t +struct keyboard_t { UINT8 keyrows[MBC55X_KEYROWS]; emu_timer *keyscan_timer; @@ -161,7 +161,7 @@ public: /* IO chips */ -struct msm_rx_t +struct msm_rx_t { }; diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h index 3f6abe0ed2b..33582481413 100644 --- a/src/mess/includes/nascom1.h +++ b/src/mess/includes/nascom1.h @@ -10,13 +10,13 @@ #include "imagedev/snapquik.h" #include "machine/wd17xx.h" -struct nascom1_portstat_t +struct nascom1_portstat_t { UINT8 stat_flags; UINT8 stat_count; }; -struct nascom2_fdc_t +struct nascom2_fdc_t { UINT8 select; UINT8 irq; diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h index 5e4c271ff7a..029eab0e6da 100644 --- a/src/mess/includes/nes.h +++ b/src/mess/includes/nes.h @@ -35,7 +35,7 @@ struct nes_input #define CHRROM 0 #define CHRRAM 1 -struct chr_bank +struct chr_bank { int source; //defines source of base pointer int origin; //defines offset of 0x400 byte segment at base pointer @@ -53,7 +53,7 @@ struct chr_bank #define NES_BATTERY 0 #define NES_WRAM 1 -struct name_table +struct name_table { int source; /* defines source of base pointer */ int origin; /* defines offset of 0x400 byte segment at base pointer */ diff --git a/src/mess/includes/odyssey2.h b/src/mess/includes/odyssey2.h index 93e00f109ed..b0077fa6251 100644 --- a/src/mess/includes/odyssey2.h +++ b/src/mess/includes/odyssey2.h @@ -54,7 +54,7 @@ union o2_vdc_t { } s; }; -struct ef9341_t +struct ef9341_t { UINT8 X; UINT8 Y; diff --git a/src/mess/includes/oric.h b/src/mess/includes/oric.h index 3646d382459..6d5d75a9531 100644 --- a/src/mess/includes/oric.h +++ b/src/mess/includes/oric.h @@ -30,7 +30,7 @@ enum TELESTRAT_MEM_BLOCK_ROM }; -struct telestrat_mem_block +struct telestrat_mem_block { int MemType; unsigned char *ptr; @@ -40,7 +40,7 @@ struct telestrat_mem_block /* current state of the display */ /* some attributes persist until they are turned off. This structure holds this persistant information */ -struct oric_vh_state +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 */ diff --git a/src/mess/includes/p2000t.h b/src/mess/includes/p2000t.h index 57ab913327e..b9c5a5dc995 100644 --- a/src/mess/includes/p2000t.h +++ b/src/mess/includes/p2000t.h @@ -40,7 +40,7 @@ public: UINT8 m_port_202f; UINT8 m_port_303f; UINT8 m_port_707f; - INT8 m_frame_count; + INT8 m_frame_count; DECLARE_VIDEO_START(p2000m); DECLARE_PALETTE_INIT(p2000m); }; diff --git a/src/mess/includes/pc8401a.h b/src/mess/includes/pc8401a.h index ef421c9ae18..902236b69a4 100644 --- a/src/mess/includes/pc8401a.h +++ b/src/mess/includes/pc8401a.h @@ -65,7 +65,7 @@ public: DECLARE_READ8_MEMBER( ppi_pc_r ); DECLARE_WRITE8_MEMBER( ppi_pc_w ); DECLARE_PALETTE_INIT(pc8401a); - + void scan_keyboard(); void bankswitch(UINT8 data); diff --git a/src/mess/includes/pce.h b/src/mess/includes/pce.h index 9df0e86b795..b2beec59a35 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 -struct pce_cd_t +struct pce_cd_t { UINT8 regs[16]; UINT8 *bram; diff --git a/src/mess/includes/pdp1.h b/src/mess/includes/pdp1.h index 3f66c5e18c3..216076b13ab 100644 --- a/src/mess/includes/pdp1.h +++ b/src/mess/includes/pdp1.h @@ -164,7 +164,7 @@ enum }; /* tape reader registers */ -struct tape_reader_t +struct tape_reader_t { device_image_interface *fd; /* file descriptor of tape image */ @@ -182,7 +182,7 @@ struct tape_reader_t /* tape puncher registers */ -struct tape_puncher_t +struct tape_puncher_t { device_image_interface *fd; /* file descriptor of tape image */ @@ -192,7 +192,7 @@ struct tape_puncher_t /* typewriter registers */ -struct typewriter_t +struct typewriter_t { device_image_interface *fd; /* file descriptor of output image */ @@ -202,7 +202,7 @@ struct typewriter_t }; /* MIT parallel drum (mostly similar to type 23) */ -struct parallel_drum_t +struct parallel_drum_t { device_image_interface *fd; /* file descriptor of drum image */ @@ -219,7 +219,7 @@ struct parallel_drum_t }; -struct lightpen_t +struct lightpen_t { char active; char down; diff --git a/src/mess/includes/pet.h b/src/mess/includes/pet.h index 0c1d3b2d2fa..ed3f92a4895 100644 --- a/src/mess/includes/pet.h +++ b/src/mess/includes/pet.h @@ -13,7 +13,7 @@ #include "machine/ieee488.h" #include "imagedev/cartslot.h" -struct spet_t +struct spet_t { int bank; /* rambank to be switched in 0x9000 */ int rom; /* rom socket 6502? at 0x9000 */ diff --git a/src/mess/includes/pokemini.h b/src/mess/includes/pokemini.h index 0e549d2a3c2..1e1b90ffc2a 100644 --- a/src/mess/includes/pokemini.h +++ b/src/mess/includes/pokemini.h @@ -14,7 +14,7 @@ #include "rendlay.h" -struct PRC +struct PRC { UINT8 colors_inverted; UINT8 background_enabled; @@ -31,7 +31,7 @@ struct PRC }; -struct TIMERS +struct TIMERS { emu_timer *seconds_timer; emu_timer *hz256_timer; diff --git a/src/mess/includes/rmnimbus.h b/src/mess/includes/rmnimbus.h index e59a469c762..e70dd9d6b83 100644 --- a/src/mess/includes/rmnimbus.h +++ b/src/mess/includes/rmnimbus.h @@ -26,7 +26,7 @@ /* Nimbus sub-bios structures for debugging */ -struct t_area_params +struct t_area_params { UINT16 ofs_brush; UINT16 seg_brush; @@ -35,7 +35,7 @@ struct t_area_params UINT16 count; }; -struct t_plot_string_params +struct t_plot_string_params { UINT16 ofs_font; UINT16 seg_font; @@ -46,7 +46,7 @@ struct t_plot_string_params UINT16 length; }; -struct t_nimbus_brush +struct t_nimbus_brush { UINT16 style; UINT16 style_index; @@ -110,7 +110,7 @@ struct intr_state UINT16 ext_vector[2]; // external vectors, when in cascade mode }; -struct i186_state +struct i186_state { struct timer_state timer[3]; struct dma_state dma[2]; @@ -118,7 +118,7 @@ struct i186_state struct mem_state mem; }; -struct keyboard_t +struct keyboard_t { UINT8 keyrows[NIMBUS_KEYROWS]; emu_timer *keyscan_timer; @@ -128,7 +128,7 @@ struct keyboard_t }; // Static data related to Floppy and SCSI hard disks -struct nimbus_drives_t +struct nimbus_drives_t { UINT8 reg400; UINT8 reg410_in; @@ -140,7 +140,7 @@ struct nimbus_drives_t }; /* 8031 Peripheral controler */ -struct ipc_interface_t +struct ipc_interface_t { UINT8 ipc_in; UINT8 ipc_out; @@ -152,7 +152,7 @@ struct ipc_interface_t }; /* Mouse/Joystick */ -struct mouse_joy_state +struct mouse_joy_state { UINT8 m_mouse_px; UINT8 m_mouse_py; diff --git a/src/mess/includes/spectrum.h b/src/mess/includes/spectrum.h index 5aa120b689b..c06f582ba88 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) -struct EVENT_LIST_ITEM +struct EVENT_LIST_ITEM { /* driver defined ID for this write */ int Event_ID; diff --git a/src/mess/includes/ssystem3.h b/src/mess/includes/ssystem3.h index 9cf33903358..41955981c84 100644 --- a/src/mess/includes/ssystem3.h +++ b/src/mess/includes/ssystem3.h @@ -8,7 +8,7 @@ #define SSYSTEM3_H_ -struct playfield_t +struct playfield_t { int signal; // int on; @@ -26,7 +26,7 @@ struct playfield_t } u; }; -struct lcd_t +struct lcd_t { UINT8 data[5]; int clock; diff --git a/src/mess/includes/svi318.h b/src/mess/includes/svi318.h index 9689851b8df..61baa943be8 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" -struct SVI_318 +struct SVI_318 { /* general */ UINT8 svi318; /* Are we dealing with an SVI-318 or a SVI-328 model. 0 = 328, 1 = 318 */ @@ -37,7 +37,7 @@ struct SVI_318 UINT8 *svi806_gfx; }; -struct SVI318_FDC_STRUCT +struct SVI318_FDC_STRUCT { UINT8 driveselect; int drq; diff --git a/src/mess/includes/svision.h b/src/mess/includes/svision.h index 68defb725d7..7c685dd8c94 100644 --- a/src/mess/includes/svision.h +++ b/src/mess/includes/svision.h @@ -7,13 +7,13 @@ #ifndef SVISION_H_ #define SVISION_H_ -struct svision_t +struct svision_t { emu_timer *timer1; int timer_shot; }; -struct svision_pet_t +struct svision_pet_t { int state; int on, clock, data; @@ -21,7 +21,7 @@ struct svision_pet_t emu_timer *timer; }; -struct tvlink_t +struct tvlink_t { UINT32 palette[4/*0x40?*/]; /* rgb8 */ int palette_on; diff --git a/src/mess/includes/tx0.h b/src/mess/includes/tx0.h index 67a7c38d88d..9b96d1872c0 100644 --- a/src/mess/includes/tx0.h +++ b/src/mess/includes/tx0.h @@ -55,7 +55,7 @@ enum irg_pos_t /* tape reader registers */ -struct tape_reader_t +struct tape_reader_t { device_image_interface *fd; /* file descriptor of tape image */ @@ -70,7 +70,7 @@ struct tape_reader_t /* tape puncher registers */ -struct tape_puncher_t +struct tape_puncher_t { device_image_interface *fd; /* file descriptor of tape image */ @@ -80,7 +80,7 @@ struct tape_puncher_t /* typewriter registers */ -struct typewriter_t +struct typewriter_t { device_image_interface *fd; /* file descriptor of output image */ @@ -89,7 +89,7 @@ struct typewriter_t /* magnetic tape unit registers */ -struct magtape_t +struct magtape_t { device_image_interface *img; /* image descriptor */ diff --git a/src/mess/includes/vc4000.h b/src/mess/includes/vc4000.h index 391124593eb..3610a15669b 100644 --- a/src/mess/includes/vc4000.h +++ b/src/mess/includes/vc4000.h @@ -19,12 +19,12 @@ #define ANALOG_HACK -struct SPRITE_HELPER +struct SPRITE_HELPER { UINT8 bitmap[10],x1,x2,y1,y2, res1, res2; }; -struct SPRITE +struct SPRITE { const SPRITE_HELPER *data; int mask; @@ -37,7 +37,7 @@ struct SPRITE int finished_now; }; -struct vc4000_video_t +struct vc4000_video_t { SPRITE sprites[4]; int line; diff --git a/src/mess/includes/vic20.h b/src/mess/includes/vic20.h index bc790709f62..c8d762fb058 100644 --- a/src/mess/includes/vic20.h +++ b/src/mess/includes/vic20.h @@ -69,7 +69,7 @@ public: DECLARE_READ8_MEMBER( vic_lightx_cb ); DECLARE_READ8_MEMBER( vic_lighty_cb ); DECLARE_READ8_MEMBER( vic_lightbut_cb ); - + DECLARE_READ8_MEMBER( via0_pa_r ); DECLARE_WRITE8_MEMBER( via0_pa_w ); diff --git a/src/mess/includes/wswan.h b/src/mess/includes/wswan.h index cea55dc27cb..f134e1a8018 100644 --- a/src/mess/includes/wswan.h +++ b/src/mess/includes/wswan.h @@ -40,7 +40,7 @@ #include "machine/nvram.h" -struct EEPROM +struct EEPROM { UINT8 mode; /* eeprom mode */ UINT16 address; /* Read/write address */ @@ -52,7 +52,7 @@ struct EEPROM UINT8 *page; /* pointer to current sram/eeprom page */ }; -struct RTC +struct RTC { UINT8 present; /* Is an RTC present */ UINT8 setting; /* Timer setting byte */ @@ -66,14 +66,14 @@ struct RTC UINT8 index; /* index for reading/writing of current of alarm time */ }; -struct SoundDMA +struct SoundDMA { UINT32 source; /* Source address */ UINT16 size; /* Size */ UINT8 enable; /* Enabled */ }; -struct VDP +struct VDP { UINT8 layer_bg_enable; /* Background layer on/off */ UINT8 layer_fg_enable; /* Foreground layer on/off */ diff --git a/src/mess/includes/x07.h b/src/mess/includes/x07.h index 99f63fbcbfd..8d4a0fbedbc 100644 --- a/src/mess/includes/x07.h +++ b/src/mess/includes/x07.h @@ -86,7 +86,7 @@ static const UINT8 t6834_cmd_len[0x47] = 0x01, 0x09, 0x01, 0x03, 0x03, 0x01, 0x01 }; -struct x07_kb +struct x07_kb { const char *tag; //input port tag UINT8 mask; //bit mask diff --git a/src/mess/includes/x1.h b/src/mess/includes/x1.h index cbf251285cf..a87a96ba33c 100644 --- a/src/mess/includes/x1.h +++ b/src/mess/includes/x1.h @@ -44,7 +44,7 @@ private: virtual void z80daisy_irq_reti(); }; -struct scrn_reg_t +struct scrn_reg_t { UINT8 gfx_bank; UINT8 disp_bank; @@ -56,7 +56,7 @@ struct scrn_reg_t UINT8 blackclip; // x1 turbo specific }; -struct turbo_reg_t +struct turbo_reg_t { UINT8 pal; UINT8 gfx_pal; @@ -64,7 +64,7 @@ struct turbo_reg_t UINT8 txt_disp; }; -struct x1_rtc_t +struct x1_rtc_t { UINT8 sec, min, hour, day, wday, month, year; }; diff --git a/src/mess/includes/z80ne.h b/src/mess/includes/z80ne.h index 26925192abc..59e31b98b4d 100644 --- a/src/mess/includes/z80ne.h +++ b/src/mess/includes/z80ne.h @@ -26,7 +26,7 @@ #define LX385_TAPE_SAMPLE_FREQ 38400 /* wave duration threshold */ -enum z80netape_speed +enum z80netape_speed { TAPE_300BPS = 300, /* 300 bps */ TAPE_600BPS = 600, /* 600 bps */ 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), diff --git a/src/mess/tools/imgtool/charconv.h b/src/mess/tools/imgtool/charconv.h index 6a2b3042ff3..1d811eef99a 100644 --- a/src/mess/tools/imgtool/charconv.h +++ b/src/mess/tools/imgtool/charconv.h @@ -12,7 +12,7 @@ /* Supported character sets */ -enum imgtool_charset +enum imgtool_charset { IMGTOOL_CHARSET_UTF8, IMGTOOL_CHARSET_ISO_8859_1, diff --git a/src/mess/tools/imgtool/imgterrs.h b/src/mess/tools/imgtool/imgterrs.h index fe75b46c273..6b17631c5fc 100644 --- a/src/mess/tools/imgtool/imgterrs.h +++ b/src/mess/tools/imgtool/imgterrs.h @@ -10,7 +10,7 @@ #define IMGTERRS_H /* Error codes */ -enum imgtoolerr_t +enum imgtoolerr_t { IMGTOOLERR_SUCCESS, IMGTOOLERR_OUTOFMEMORY, diff --git a/src/mess/tools/imgtool/library.h b/src/mess/tools/imgtool/library.h index 9717e52e088..f46344ce578 100644 --- a/src/mess/tools/imgtool/library.h +++ b/src/mess/tools/imgtool/library.h @@ -30,7 +30,7 @@ struct imgtool_partition; struct imgtool_directory; struct imgtool_library; -enum imgtool_suggestion_viability_t +enum imgtool_suggestion_viability_t { SUGGESTION_END, SUGGESTION_POSSIBLE, @@ -51,13 +51,13 @@ union filterinfo typedef void (*filter_getinfoproc)(UINT32 state, union filterinfo *info); -enum imgtool_libsort_t +enum imgtool_libsort_t { ITLS_NAME, ITLS_DESCRIPTION }; -struct imgtool_dirent +struct imgtool_dirent { char filename[1024]; char attr[64]; @@ -77,13 +77,13 @@ struct imgtool_dirent unsigned int hardlink : 1; }; -struct imgtool_chainent +struct imgtool_chainent { UINT8 level; UINT64 block; }; -enum imgtool_forktype_t +enum imgtool_forktype_t { FORK_END, FORK_DATA, @@ -91,14 +91,14 @@ enum imgtool_forktype_t FORK_ALTERNATE }; -struct imgtool_forkent +struct imgtool_forkent { imgtool_forktype_t type; UINT64 size; char forkname[64]; }; -struct imgtool_transfer_suggestion +struct imgtool_transfer_suggestion { imgtool_suggestion_viability_t viability; filter_getinfoproc filter; @@ -134,13 +134,13 @@ enum IMGTOOLATTR_TIME_LASTMODIFIED }; -union imgtool_attribute +union imgtool_attribute { INT64 i; time_t t; }; -struct imgtool_iconinfo +struct imgtool_iconinfo { unsigned icon16x16_specified : 1; unsigned icon32x32_specified : 1; diff --git a/src/mess/tools/imgtool/modules/amiga.c b/src/mess/tools/imgtool/modules/amiga.c index df6af54426f..40670767f46 100644 --- a/src/mess/tools/imgtool/modules/amiga.c +++ b/src/mess/tools/imgtool/modules/amiga.c @@ -33,7 +33,7 @@ #define MSIZE ((BSIZE/4) - 1) /* Size of bitmaps */ -enum disk_type +enum disk_type { DT_UNKNOWN = -1, DT_OFS = 0, @@ -55,7 +55,7 @@ enum }; -enum sec_type +enum sec_type { ST_INVALID = 0, ST_ROOT = 1, diff --git a/src/mess/tools/imgtool/modules/concept.c b/src/mess/tools/imgtool/modules/concept.c index 0aa608e983e..94dcd3b38cc 100644 --- a/src/mess/tools/imgtool/modules/concept.c +++ b/src/mess/tools/imgtool/modules/concept.c @@ -12,7 +12,7 @@ #include <limits.h> #include "imgtool.h" -struct UINT16xE +struct UINT16xE { UINT8 bytes[2]; }; @@ -69,7 +69,7 @@ INLINE void set_UINT16xE(int little_endian, UINT16xE *word, UINT16 data) device directory record (Disk sector 2-5) */ -struct concept_vol_hdr_entry +struct concept_vol_hdr_entry { UINT16xE first_block; UINT16xE next_block; @@ -85,7 +85,7 @@ struct concept_vol_hdr_entry UINT16xE unused; }; -struct concept_file_dir_entry +struct concept_file_dir_entry { UINT16xE first_block; UINT16xE next_block; @@ -96,7 +96,7 @@ struct concept_file_dir_entry UINT16xE last_access; }; -struct concept_dev_dir +struct concept_dev_dir { concept_vol_hdr_entry vol_hdr; concept_file_dir_entry file_dir[77]; @@ -106,7 +106,7 @@ struct concept_dev_dir /* concept disk image descriptor */ -struct concept_image +struct concept_image { imgtool_stream *file_handle; /* imgtool file handle */ concept_dev_dir dev_dir; /* cached copy of device directory */ @@ -115,7 +115,7 @@ struct concept_image /* concept catalog iterator, used when imgtool reads the catalog */ -struct concept_iterator +struct concept_iterator { concept_image *image; int index; /* current index */ diff --git a/src/mess/tools/imgtool/modules/fat.c b/src/mess/tools/imgtool/modules/fat.c index 5bd21f2ba02..e03a2d70601 100644 --- a/src/mess/tools/imgtool/modules/fat.c +++ b/src/mess/tools/imgtool/modules/fat.c @@ -201,7 +201,7 @@ struct fat_mediatype UINT8 sectors; }; -enum creation_policy_t +enum creation_policy_t { CREATE_NONE, CREATE_FILE, @@ -1395,7 +1395,7 @@ static imgtoolerr_t fat_read_dirent(imgtool_partition *partition, fat_file *file -enum sfn_disposition_t +enum sfn_disposition_t { SFN_SUFFICIENT, /* name fully representable in short file name */ SFN_DERIVATIVE, /* name not fully representable in short file name, but no need to tildize */ diff --git a/src/mess/tools/imgtool/modules/mac.c b/src/mess/tools/imgtool/modules/mac.c index 00039986c3f..24a9421cc74 100644 --- a/src/mess/tools/imgtool/modules/mac.c +++ b/src/mess/tools/imgtool/modules/mac.c @@ -114,17 +114,17 @@ #pragma mark MISCELLANEOUS UTILITIES #endif -struct UINT16BE +struct UINT16BE { UINT8 bytes[2]; }; -struct UINT24BE +struct UINT24BE { UINT8 bytes[3]; }; -struct UINT32BE +struct UINT32BE { UINT8 bytes[4]; }; @@ -181,7 +181,7 @@ typedef UINT32BE mac_type; /* point record, with the y and x coordinates */ -struct mac_point +struct mac_point { UINT16BE v; /* actually signed */ UINT16BE h; /* actually signed */ @@ -190,7 +190,7 @@ struct mac_point /* rect record, with the corner coordinates */ -struct mac_rect +struct mac_rect { UINT16BE top; /* actually signed */ UINT16BE left; /* actually signed */ @@ -226,7 +226,7 @@ struct mac_FInfo /* FXInfo (Finder extended file info) record -- not found in MFS */ -struct mac_FXInfo +struct mac_FXInfo { UINT16BE iconID; /* System 7: An ID number for the file???s icon; the numbers that identify icons are assigned by the @@ -264,7 +264,7 @@ struct mac_DInfo /* DXInfo (Finder extended folder info) record -- not found in MFS */ -struct mac_DXInfo +struct mac_DXInfo { mac_point scroll; /* Scroll position */ UINT32BE openChain; /* System 7: chain of directory IDs for open folders */ @@ -609,7 +609,7 @@ static void mac_strncpy(UINT8 *dest, int n, const UINT8 *src) /* disk image reference */ -struct mac_l1_imgref +struct mac_l1_imgref { imgtool_image *image; UINT32 heads; @@ -744,7 +744,7 @@ static imgtoolerr_t image_write_tag(mac_l1_imgref *image, UINT32 block, const vo #pragma mark MFS/HFS WRAPPERS #endif -enum mac_format +enum mac_format { L2I_MFS, L2I_HFS @@ -755,7 +755,7 @@ enum mac_forkID { data_fork = 0x00, rsrc_fork = 0xff }; /* MFS image ref */ -struct mfs_l2_imgref +struct mfs_l2_imgref { UINT16 dir_num_files; UINT16 dir_start; @@ -772,7 +772,7 @@ struct mfs_l2_imgref /* HFS extent descriptor */ -struct hfs_extent +struct hfs_extent { UINT16BE stABN; /* first allocation block */ UINT16BE numABlks; /* number of allocation blocks */ @@ -787,7 +787,7 @@ typedef hfs_extent hfs_extent_3[3]; /* MFS open file ref */ -struct mfs_fileref +struct mfs_fileref { UINT16 stBlk; /* first allocation block of file */ }; @@ -795,7 +795,7 @@ struct mfs_fileref /* HFS open file ref */ -struct hfs_fileref +struct hfs_fileref { hfs_extent_3 extents; /* first 3 file extents */ @@ -834,7 +834,7 @@ struct mac_fileref /* open BT ref */ -struct mac_BTref +struct mac_BTref { struct mac_fileref fileref; /* open B-tree file ref */ @@ -864,7 +864,7 @@ enum /* HFS image ref */ -struct hfs_l2_imgref +struct hfs_l2_imgref { UINT16 VBM_start; @@ -998,7 +998,7 @@ struct hfs_mdb }; /* to save a little stack space, we use the same buffer for MDB and next blocks */ -union img_open_buf +union img_open_buf { struct mfs_mdb mfs_mdb; struct hfs_mdb hfs_mdb; @@ -1008,7 +1008,7 @@ union img_open_buf /* Information extracted from catalog/directory */ -struct mac_dirent +struct mac_dirent { UINT16 dataRecType; /* type of data record */ @@ -1033,7 +1033,7 @@ struct mac_dirent And, no, I don't know the format of the 20-byte tag record of the HD20 */ -struct floppy_tag_record +struct floppy_tag_record { UINT32BE fileID; /* a.k.a. CNID */ /* a value of 1 seems to be the default for non-AB blocks, but this is not consistent */ @@ -1452,7 +1452,7 @@ static imgtoolerr_t mac_file_seteof(struct mac_fileref *fileref, UINT32 newEof) files appear does not match file names, and it does not always match file IDs. */ -struct mfs_dir_entry +struct mfs_dir_entry { UINT8 flags; /* bit 7=1 if entry used, bit 0=1 if file locked */ /* 0x00 means end of block: if we are not done @@ -1527,7 +1527,7 @@ struct mfs_FOBJ /* MFS open dir ref */ -struct mfs_dirref +struct mfs_dirref { struct mac_l2_imgref *l2_img; /* image pointer */ UINT16 index; /* current file index in the disk directory */ @@ -2770,7 +2770,7 @@ static int mfs_hashString(const mac_str255 string) /* HFS extents B-tree key */ -struct hfs_extentKey +struct hfs_extentKey { UINT8 keyLength; /* length of key, excluding this field */ UINT8 forkType; /* 0 = data fork, FF = resource fork */ @@ -2785,7 +2785,7 @@ enum /* HFS catalog B-tree key */ -struct hfs_catKey +struct hfs_catKey { UINT8 keyLen; /* key length */ UINT8 resrv1; /* reserved */ @@ -2798,7 +2798,7 @@ struct hfs_catKey /* HFS catalog data record for a folder - 70 bytes */ -struct hfs_catFolderData +struct hfs_catFolderData { UINT16BE recordType; /* record type */ UINT16BE flags; /* folder flags */ @@ -2815,7 +2815,7 @@ struct hfs_catFolderData /* HFS catalog data record for a file - 102 bytes */ -struct hfs_catFileData +struct hfs_catFileData { UINT16BE recordType; /* record type */ UINT8 flags; /* file flags */ @@ -2844,7 +2844,7 @@ struct hfs_catFileData The key for a thread record features the CNID of the item and an empty name, instead of the CNID of the parent and the item name. */ -struct hfs_catThreadData +struct hfs_catThreadData { UINT16BE recordType; /* record type */ UINT32BE reserved[2]; /* reserved - set to zero */ @@ -2855,7 +2855,7 @@ struct hfs_catThreadData /* union for all types at once */ -union hfs_catData +union hfs_catData { UINT16BE dataType; hfs_catFolderData folder; @@ -2890,7 +2890,7 @@ enum /* BT functions used by HFS functions */ -struct BT_leaf_rec_enumerator +struct BT_leaf_rec_enumerator { mac_BTref *BTref; UINT32 cur_node; @@ -2907,7 +2907,7 @@ static imgtoolerr_t BT_get_keyed_record_data(mac_BTref *BTref, void *rec_ptr, in static imgtoolerr_t BT_leaf_rec_enumerator_open(mac_BTref *BTref, BT_leaf_rec_enumerator *enumerator); static imgtoolerr_t BT_leaf_rec_enumerator_read(BT_leaf_rec_enumerator *enumerator, void **record_ptr, int *rec_len); -struct hfs_cat_enumerator +struct hfs_cat_enumerator { struct mac_l2_imgref *l2_img; BT_leaf_rec_enumerator BT_enumerator; @@ -3640,7 +3640,7 @@ static imgtoolerr_t hfs_file_get_nth_block_address(struct mac_fileref *fileref, Header of a node record */ -struct BTNodeHeader +struct BTNodeHeader { UINT32BE fLink; /* (index of) next node at this level */ UINT32BE bLink; /* (index of) previous node at this level */ @@ -3672,7 +3672,7 @@ enum BTHeaderRecord: first record of a B-tree header node (second record is unused, and third is node allocation bitmap). */ -struct BTHeaderRecord +struct BTHeaderRecord { UINT16BE treeDepth; /* maximum height (usually leaf nodes) */ UINT32BE rootNode; /* node number of root node */ @@ -3955,7 +3955,7 @@ static imgtoolerr_t BT_get_keyed_record_data(mac_BTref *BTref, void *rec_ptr, in Return imgtool error code */ -struct data_nodes_t +struct data_nodes_t { void *buf; UINT32 node_num; @@ -4842,7 +4842,7 @@ static imgtoolerr_t BT_leaf_rec_enumerator_read(BT_leaf_rec_enumerator *enumerat /* Resource header */ -struct rsrc_header +struct rsrc_header { UINT32BE data_offs; /* Offset from beginning of resource fork to resource data */ UINT32BE map_offs; /* Offset from beginning of resource fork to resource map */ @@ -4858,7 +4858,7 @@ struct rsrc_header /* Resource map: */ -struct rsrc_map_header +struct rsrc_map_header { rsrc_header reserved0; /* Reserved for copy of resource header */ UINT32BE reserved1; /* Reserved for handle to next resource map */ @@ -4874,7 +4874,7 @@ struct rsrc_map_header /* Resource type list entry */ -struct rsrc_type_entry +struct rsrc_type_entry { UINT32BE type; /* Resource type */ UINT16BE ref_count; /* Number of resources of this type in map minus 1 */ @@ -4884,7 +4884,7 @@ struct rsrc_type_entry /* Resource reference list entry */ -struct rsrc_ref_entry +struct rsrc_ref_entry { UINT16BE id; /* Resource ID */ UINT16BE name_offs; /* Offset from beginning of resource name list to resource name */ @@ -4898,7 +4898,7 @@ struct rsrc_ref_entry Resource name list entry: this is just a standard macintosh string */ -struct mac_resfileref +struct mac_resfileref { mac_fileref fileref; /* open resource fork ref (you may open resources files in data fork, too, if you ever need to, diff --git a/src/mess/tools/imgtool/modules/macutil.h b/src/mess/tools/imgtool/modules/macutil.h index 1156a08bc05..f40017b5c77 100644 --- a/src/mess/tools/imgtool/modules/macutil.h +++ b/src/mess/tools/imgtool/modules/macutil.h @@ -12,13 +12,13 @@ #include "imgtool.h" -enum mac_fork_t +enum mac_fork_t { MAC_FORK_DATA, MAC_FORK_RESOURCE }; -enum mac_filecategory_t +enum mac_filecategory_t { MAC_FILECATEGORY_DATA, MAC_FILECATEGORY_TEXT, diff --git a/src/mess/tools/imgtool/modules/os9.c b/src/mess/tools/imgtool/modules/os9.c index 0a099bff9db..1e4bc27e554 100644 --- a/src/mess/tools/imgtool/modules/os9.c +++ b/src/mess/tools/imgtool/modules/os9.c @@ -13,7 +13,7 @@ #include "formats/coco_dsk.h" #include "iflopimg.h" -enum creation_policy_t +enum creation_policy_t { CREATE_NONE, CREATE_FILE, diff --git a/src/mess/tools/imgtool/modules/prodos.c b/src/mess/tools/imgtool/modules/prodos.c index 788c028ff9a..d15d9f615a4 100644 --- a/src/mess/tools/imgtool/modules/prodos.c +++ b/src/mess/tools/imgtool/modules/prodos.c @@ -175,7 +175,7 @@ struct prodos_dirent UINT32 putaway_directory; }; -enum creation_policy_t +enum creation_policy_t { CREATE_NONE, CREATE_FILE, diff --git a/src/mess/tools/imgtool/modules/ti99.c b/src/mess/tools/imgtool/modules/ti99.c index 24227d2ccf6..514e5aa7344 100644 --- a/src/mess/tools/imgtool/modules/ti99.c +++ b/src/mess/tools/imgtool/modules/ti99.c @@ -266,12 +266,12 @@ will accept paths of such length). */ Miscellaneous utilities that are used to handle TI data types */ -struct UINT16BE +struct UINT16BE { UINT8 bytes[2]; }; -struct UINT16LE +struct UINT16LE { UINT8 bytes[2]; }; @@ -456,7 +456,7 @@ static int check_fpath(const char *fpath) /* Disk geometry */ -struct ti99_geometry +struct ti99_geometry { int secspertrack; int cylinders; @@ -466,7 +466,7 @@ struct ti99_geometry /* Physical sector address */ -struct ti99_sector_address +struct ti99_sector_address { int sector; int cylinder; @@ -476,7 +476,7 @@ struct ti99_sector_address /* Time stamp (used in fdr, and WIN VIB/DDR) */ -struct ti99_date_time +struct ti99_date_time { UINT8 time_MSB, time_LSB;/* 0-4: hour, 5-10: minutes, 11-15: seconds/2 */ UINT8 date_MSB, date_LSB;/* 0-6: year, 7-10: month, 11-15: day */ @@ -487,7 +487,7 @@ struct ti99_date_time The HFDC supports up to 3 subdirectories. */ -struct dsk_subdir +struct dsk_subdir { char name[10]; /* subdirectory name (10 characters, pad with spaces) */ UINT16BE fdir_aphysrec; /* aphysrec address of fdir record for this subdirectory */ @@ -499,7 +499,7 @@ struct dsk_subdir Most fields in this record are only revelant to level 2 routines, but level 1 routines need the disk geometry information extracted from the VIB. */ -struct dsk_vib +struct dsk_vib { char name[10]; /* disk volume name (10 characters, pad with spaces) */ UINT16BE totphysrecs; /* total number of physrecs on disk (usually 360, */ @@ -528,7 +528,7 @@ struct dsk_vib /* of byte 1, etc.) */ }; -enum ti99_img_format +enum ti99_img_format { if_mess, if_v9t9, @@ -540,7 +540,7 @@ enum ti99_img_format /* level-1 disk image descriptor */ -struct ti99_lvl1_imgref +struct ti99_lvl1_imgref { ti99_img_format img_format; /* tells the image format */ imgtool_stream *file_handle; /* imgtool file handle */ @@ -1442,7 +1442,7 @@ struct win_vib_ddr /* AU format */ -struct ti99_AUformat +struct ti99_AUformat { int totAUs; /* total number of AUs */ int physrecsperAU; /* number of 256-byte physical records per AU */ @@ -1457,21 +1457,21 @@ struct ti99_AUformat /* catalog entry (used for in-memory catalog) */ -struct dir_entry +struct dir_entry { UINT16 dir_ptr; /* DSK: unused */ /* WIN: AU address of the DDR for this directory */ char name[10]; /* name of this directory (copied from the VIB for DSK, DDR for WIN) */ }; -struct file_entry +struct file_entry { UINT16 fdr_ptr; /* DSK: aphysrec address of the FDR for this file */ /* WIN: AU address of the FDR for this file */ char name[10]; /* name of this file (copied from FDR) */ }; -struct ti99_catalog +struct ti99_catalog { int num_subdirs; /* number of subdirectories */ int num_files; /* number of files */ @@ -1482,7 +1482,7 @@ struct ti99_catalog /* level-2 disk image descriptor */ -struct ti99_lvl2_imgref_dsk +struct ti99_lvl2_imgref_dsk { UINT16 totphysrecs; /* total number of aphysrecs (extracted from vib record in aphysrec 0) */ ti99_catalog catalogs[4]; /* catalog of root directory and up to 3 subdirectories */ @@ -1495,7 +1495,7 @@ enum win_vib_t win_vib_v1, win_vib_v2 }; -struct ti99_lvl2_imgref_win +struct ti99_lvl2_imgref_win { win_vib_t vib_version; /* version of the vib record in aphysrec 0 (see win_vib_ddr) */ }; @@ -1555,7 +1555,7 @@ enum /* DSK FDR record */ -struct dsk_fdr +struct dsk_fdr { char name[10]; /* file name (10 characters, pad with spaces) */ UINT16BE xreclen; /* extended record len: if record len is >= 256, */ @@ -1601,7 +1601,7 @@ struct dsk_fdr /* WIN FDR record */ -struct win_fdr +struct win_fdr { char name[10]; /* file name (10 characters, pad with spaces) */ UINT16BE xreclen; /* extended record len: if record len is >= 256, */ @@ -1663,7 +1663,7 @@ struct win_fdr /* tifile header: stand-alone file */ -struct tifile_header +struct tifile_header { char tifiles[8]; /* always '\7TIFILES' */ UINT16BE fphysrecs; /* file length in physrecs */ @@ -1703,14 +1703,14 @@ struct tifile_header /* level-2 file descriptor */ -struct ti99_lvl2_fileref_dsk +struct ti99_lvl2_fileref_dsk { struct ti99_lvl2_imgref *l2_img; int fdr_aphysrec; dsk_fdr fdr; }; -struct ti99_lvl2_fileref_win +struct ti99_lvl2_fileref_win { struct ti99_lvl2_imgref *l2_img; unsigned fphysrecs; /* copy of field in the eldest FDR */ @@ -1719,7 +1719,7 @@ struct ti99_lvl2_fileref_win win_fdr curfdr; /* buffer with currently open sibling FDR */ }; -struct ti99_lvl2_fileref_tifiles +struct ti99_lvl2_fileref_tifiles { imgtool_stream *file_handle; tifile_header hdr; @@ -3696,7 +3696,7 @@ static void current_date_time(ti99_date_time *reply) * files with variable-size records (sequential-access) */ -struct ti99_lvl3_fileref +struct ti99_lvl3_fileref { ti99_lvl2_fileref l2_file; @@ -3827,7 +3827,7 @@ static int read_next_record(ti99_lvl3_fileref *l3_file, void *dest, int *out_rec /* ti99 catalog iterator, used when imgtool reads the catalog */ -struct dsk_iterator +struct dsk_iterator { struct ti99_lvl2_imgref *image; int level; @@ -3836,7 +3836,7 @@ struct dsk_iterator ti99_catalog *cur_catalog; /* current catalog */ }; -struct win_iterator +struct win_iterator { struct ti99_lvl2_imgref *image; int level; diff --git a/src/mess/tools/imgtool/modules/ti990hd.c b/src/mess/tools/imgtool/modules/ti990hd.c index 44fde6df08b..5be89a0f928 100644 --- a/src/mess/tools/imgtool/modules/ti990hd.c +++ b/src/mess/tools/imgtool/modules/ti990hd.c @@ -35,12 +35,12 @@ that is longer than 39 characters. */ #define MAX_DIR_LEVEL 25 /* We need to put a recursion limit to avoid endless recursion hazard */ -struct UINT16BE +struct UINT16BE { UINT8 bytes[2]; }; -struct UINT32BE +struct UINT32BE { UINT8 bytes[4]; }; @@ -72,7 +72,7 @@ INLINE void set_UINT32BE(UINT32BE *word, UINT32 data) /* 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) */ @@ -101,7 +101,7 @@ enum /* SC0 record (Disk sector 0) */ -struct ti990_sc0 +struct ti990_sc0 { char vnm[8]; /* volume name */ UINT16BE tna; /* total number of ADUs */ @@ -153,7 +153,7 @@ struct ti990_sc0 /* DOR (Directory Overhead Record) */ -struct ti990_dor +struct ti990_dor { UINT16BE nrc; /* # records in directory (minus DOR) nrc = nfl + nar (+ tfc???) */ UINT16BE nfl; /* # files currently in directory */ @@ -198,7 +198,7 @@ enum /* ACE subrecord found in FDR */ -struct ti990_ace +struct ti990_ace { char agn[8]; /* access group name */ UINT16BE flg; /* flags */ @@ -207,7 +207,7 @@ struct ti990_ace /* FDR record */ -struct ti990_fdr +struct ti990_fdr { UINT16BE hkc; /* hask key count: the number of file descriptor records that are present in the directory that hashed to this record number */ UINT16BE hkv; /* hask key value: the result of the hash algorithm for the file name actually covered in this record */ @@ -251,7 +251,7 @@ struct ti990_fdr The fields marked here with *** are in the ADR template to maintain compatability with the FDR template. */ -struct ti990_adr +struct ti990_adr { UINT16BE hkc; /* hask key count */ UINT16BE hkv; /* hask key value */ @@ -274,7 +274,7 @@ struct ti990_adr The CDR is the permanent record of a channel. It is carried as an alias of the program file in which the channel owner task resides. */ -struct ti990_cdr +struct ti990_cdr { UINT16BE hkc; /* hask key count */ UINT16BE hkv; /* hask key value */ @@ -305,7 +305,7 @@ struct ti990_cdr field starts at offset 4, and therefore if we try to interpret a KDR as an FDR (or ADR, CDR), we will find fnm[0] and assume the FDR is empty. */ -union directory_entry +union directory_entry { ti990_fdr fdr; ti990_adr adr; @@ -317,7 +317,7 @@ union directory_entry /* tifile header: stand-alone file */ -struct tifile_header +struct tifile_header { char tifiles[8]; /* always '\7TIFILES' */ UINT8 secsused_MSB; /* file length in sectors (big-endian) */ @@ -335,7 +335,7 @@ struct tifile_header /* catalog entry (used for in-memory catalog) */ -struct catalog_entry +struct catalog_entry { UINT16 fdr_secnum; char filename[10]; @@ -346,7 +346,7 @@ struct catalog_entry /* Disk geometry */ -struct ti990_geometry +struct ti990_geometry { unsigned int cylinders, heads, sectors_per_track, bytes_per_sector; }; @@ -354,7 +354,7 @@ struct ti990_geometry /* Physical sector address */ -struct ti990_phys_sec_address +struct ti990_phys_sec_address { int cylinder; int head; @@ -364,7 +364,7 @@ struct ti990_phys_sec_address /* ti99 disk image descriptor */ -struct ti990_image +struct ti990_image { imgtool_stream *file_handle; /* imgtool file handle */ ti990_geometry geometry; /* geometry */ @@ -374,7 +374,7 @@ struct ti990_image /* ti990 catalog iterator, used when imgtool reads the catalog */ -struct ti990_iterator +struct ti990_iterator { ti990_image *image; int level; /* current recursion level */ diff --git a/src/mess/tools/imgtool/modules/vzdos.c b/src/mess/tools/imgtool/modules/vzdos.c index 5c93a3b94d4..28e27873e66 100644 --- a/src/mess/tools/imgtool/modules/vzdos.c +++ b/src/mess/tools/imgtool/modules/vzdos.c @@ -40,7 +40,7 @@ as track map, with one bit for each sector used. #define MAX_DIRENTS (15*8) /* vzdos directry entry */ -struct vzdos_dirent +struct vzdos_dirent { char ftype; char delimitor; @@ -51,7 +51,7 @@ struct vzdos_dirent UINT16 end_address; }; -struct vz_iterator +struct vz_iterator { int index; int eof; diff --git a/src/mess/tools/imgtool/stream.c b/src/mess/tools/imgtool/stream.c index 5b7c22148aa..e7532650ab4 100644 --- a/src/mess/tools/imgtool/stream.c +++ b/src/mess/tools/imgtool/stream.c @@ -14,7 +14,7 @@ #include "osdcore.h" #include "imgtool.h" -enum imgtype_t +enum imgtype_t { IMG_FILE, IMG_MEM diff --git a/src/mess/video/733_asr.c b/src/mess/video/733_asr.c index 73272696c96..f3361311f99 100644 --- a/src/mess/video/733_asr.c +++ b/src/mess/video/733_asr.c @@ -34,7 +34,7 @@ enum asr_scroll_step = 8 }; -struct asr_t +struct asr_t { #if 0 UINT8 OutQueue[ASROutQueueSize]; diff --git a/src/mess/video/733_asr.h b/src/mess/video/733_asr.h index a48ed344891..e461b2033cb 100644 --- a/src/mess/video/733_asr.h +++ b/src/mess/video/733_asr.h @@ -9,7 +9,7 @@ enum asr733_chr_region_len = 128*asr733_single_char_len }; -struct asr733_init_params_t +struct asr733_init_params_t { void (*int_callback)(running_machine &machine, int state); }; diff --git a/src/mess/video/911_chr.h b/src/mess/video/911_chr.h index fe72017cee9..06b4e9bc89c 100644 --- a/src/mess/video/911_chr.h +++ b/src/mess/video/911_chr.h @@ -75,7 +75,7 @@ enum /* structure used to describe differences between national character sets and US character set */ /* much more compact than defining the complete 128-char vector */ -struct char_override_t +struct char_override_t { unsigned char char_index; /* char to replace */ unsigned short symbol_index; /* replacement symbol */ diff --git a/src/mess/video/911_vdt.c b/src/mess/video/911_vdt.c index c471b197656..0fd88bdc19f 100644 --- a/src/mess/video/911_vdt.c +++ b/src/mess/video/911_vdt.c @@ -79,7 +79,7 @@ static const unsigned short vdt911_palette[] = 2, 1 /* low intensity, reverse */ }; -struct vdt_t +struct vdt_t { vdt911_screen_size_t screen_size; /* char_960 for 960-char, 12-line model; char_1920 for 1920-char, 24-line model */ vdt911_model_t model; /* country code */ diff --git a/src/mess/video/911_vdt.h b/src/mess/video/911_vdt.h index c9204c77eb7..4b37c043366 100644 --- a/src/mess/video/911_vdt.h +++ b/src/mess/video/911_vdt.h @@ -20,7 +20,7 @@ enum GFXDECODE_EXTERN( vdt911 ); enum vdt911_screen_size_t { char_960, char_1920 }; -enum vdt911_model_t +enum vdt911_model_t { vdt911_model_US, vdt911_model_UK, @@ -33,7 +33,7 @@ enum vdt911_model_t vdt911_model_FrenchWP /* French word processing */ }; -struct vdt911_init_params_t +struct vdt911_init_params_t { vdt911_screen_size_t screen_size; vdt911_model_t model; diff --git a/src/mess/video/apollo.c b/src/mess/video/apollo.c index bf74247e929..3b4e0f10a63 100644 --- a/src/mess/video/apollo.c +++ b/src/mess/video/apollo.c @@ -843,7 +843,7 @@ const device_type APOLLO_MONO19I = &device_creator<apollo_mono19i_device>; apollo_mono19i_device::apollo_mono19i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : apollo_mono_device(mconfig, APOLLO_MONO19I, "Apollo 19\" Monochrome Screen", tag, owner, clock) -{ +{ } //------------------------------------------------- diff --git a/src/mess/video/apple1.c b/src/mess/video/apple1.c index f0d0243e594..f094ccecd4a 100644 --- a/src/mess/video/apple1.c +++ b/src/mess/video/apple1.c @@ -186,7 +186,7 @@ static terminal_t *terminal_create( terminal_t *term; int char_width, char_height; apple1_state *state = machine.driver_data<apple1_state>(); - + char_width = machine.gfx[gfx]->width(); char_height = machine.gfx[gfx]->height(); diff --git a/src/mess/video/crt.c b/src/mess/video/crt.c index ca3f34b8cf4..48b4798dd29 100644 --- a/src/mess/video/crt.c +++ b/src/mess/video/crt.c @@ -32,7 +32,7 @@ Theory of operation: #include "video/crt.h" -struct point +struct point { int intensity; /* current intensity of the pixel */ /* a node is not in the list when (intensity == -1) */ @@ -44,7 +44,7 @@ enum intensity_pixel_not_in_list = -1 /* special value that tells that the node is not in list */ }; -struct crt_t +struct crt_t { point *list; /* array of (crt_window_width*crt_window_height) point */ int *list_head; /* head of the list of lit pixels (index in the array) */ diff --git a/src/mess/video/dl1416.c b/src/mess/video/dl1416.c index 8a25fc74d9e..f9e0a1dccd1 100644 --- a/src/mess/video/dl1416.c +++ b/src/mess/video/dl1416.c @@ -266,7 +266,7 @@ WRITE8_DEVICE_HANDLER( dl1416_data_w ) if (intf->update) intf->update(device, i, pattern); } - } + } } } else /* cursor enable is not set, so standard write */ diff --git a/src/mess/video/epnick.c b/src/mess/video/epnick.c index d020401c922..5bd81760def 100644 --- a/src/mess/video/epnick.c +++ b/src/mess/video/epnick.c @@ -43,7 +43,7 @@ /* Nick executes a Display list, in the form of a list of Line Parameter Tables, this is the form of the data */ -struct LPT_ENTRY +struct LPT_ENTRY { unsigned char SC; /* scanlines in this modeline (two's complement) */ unsigned char MB; /* the MODEBYTE (defines video display mode) */ @@ -56,7 +56,7 @@ struct LPT_ENTRY unsigned char COL[8]; /* COL0..COL7 */ }; -struct NICK_STATE +struct NICK_STATE { /* horizontal position */ unsigned char HorizontalClockCount; diff --git a/src/mess/video/isa_vga_ati.c b/src/mess/video/isa_vga_ati.c index 180a3088f60..5d02810c16b 100644 --- a/src/mess/video/isa_vga_ati.c +++ b/src/mess/video/isa_vga_ati.c @@ -1,8 +1,8 @@ /* * isa_vga_ati.c * - * Implementation of the ATi Graphics Ultra ISA Video card - * - Uses ATi 28800-6 (VGA Wonder) and ATi 38800-1 (Mach8, 8514/A clone) + * Implementation of the ATi Graphics Ultra ISA Video card + * - Uses ATi 28800-6 (VGA Wonder) and ATi 38800-1 (Mach8, 8514/A clone) * * Created on: 9/09/2012 */ diff --git a/src/mess/video/isa_vga_ati.h b/src/mess/video/isa_vga_ati.h index b4972cb826e..53f13da7c07 100644 --- a/src/mess/video/isa_vga_ati.h +++ b/src/mess/video/isa_vga_ati.h @@ -1,7 +1,7 @@ /* * isa_vga_ati.h * - * Header for ATi Graphics Ultra ISA video card + * Header for ATi Graphics Ultra ISA video card * * Created on: 9/09/2012 */ diff --git a/src/mess/video/mos6566.c b/src/mess/video/mos6566.c index 2eeadd3bcf1..ed03f97b216 100644 --- a/src/mess/video/mos6566.c +++ b/src/mess/video/mos6566.c @@ -281,7 +281,7 @@ inline void mos6566_device::vic2_clear_interrupt( int mask ) inline UINT8 mos6566_device::read_videoram(offs_t offset) { m_last_data = space(AS_0)->read_byte(offset & 0x3fff); - + return m_last_data; } @@ -799,7 +799,7 @@ void mos6566_device::device_reset() m_spr_ptr[i] = 0; m_mc_base[i] = 0; m_mc[i] = 0; - + for (int j = 0; j < 4; j++) { m_spr_draw_data[i][j] = 0; diff --git a/src/mess/video/newport.c b/src/mess/video/newport.c index 8813d000da5..42fc6d2eb77 100644 --- a/src/mess/video/newport.c +++ b/src/mess/video/newport.c @@ -52,7 +52,7 @@ static WRITE32_HANDLER( newport_xmap1_w ); static READ32_HANDLER( newport_vc2_r ); static WRITE32_HANDLER( newport_vc2_w ); -struct VC2_t +struct VC2_t { UINT16 nRegister[0x21]; UINT16 nRAM[0x8000]; @@ -79,7 +79,7 @@ struct VC2_t #define VC2_DISPLAYCTRL pNVID->VC2.nRegister[0x10] #define VC2_CONFIG pNVID->VC2.nRegister[0x1f] -struct XMAP_t +struct XMAP_t { UINT32 nRegister[0x08]; UINT32 nModeTable[0x20]; @@ -100,7 +100,7 @@ struct XMAP_t #define XMAP1_MODETBLIDX pNVID->XMAP1.nRegister[0x07] -struct REX3_t +struct REX3_t { UINT32 nDrawMode1; UINT32 nDrawMode0; @@ -180,7 +180,7 @@ struct REX3_t }; -struct CMAP_t +struct CMAP_t { UINT16 nPaletteIndex; UINT32 nPalette[0x10000]; diff --git a/src/mess/video/vic4567.h b/src/mess/video/vic4567.h index 9116e3c3432..c510bf8844e 100644 --- a/src/mess/video/vic4567.h +++ b/src/mess/video/vic4567.h @@ -26,7 +26,7 @@ typedef void (*vic3_port_changed_callback) (running_machine &, int); typedef UINT8 (*vic3_c64mem_callback)(running_machine &machine, int offset); -enum vic3_type +enum vic3_type { VIC4567_NTSC, VIC4567_PAL diff --git a/src/mess/video/vic6567.h b/src/mess/video/vic6567.h index ebdb5183c8d..4314827d5e2 100644 --- a/src/mess/video/vic6567.h +++ b/src/mess/video/vic6567.h @@ -14,7 +14,7 @@ TYPE DEFINITIONS ***************************************************************************/ -enum vic2_type +enum vic2_type { VIC6567, // VIC II NTSC VIC6569, // VIC II PAL |
