diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2013-02-11 07:44:56 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2013-02-11 07:44:56 +0000 |
commit | a440a8e0200a36491ae540f6f00beae59c148549 (patch) | |
tree | b4c31ebadaa2857396c37178674086420bf1658f /src/mess/drivers | |
parent | 4b0b4e6b2fa7eb5105859f561354662d479f53be (diff) |
Cleanups and version bumpmame0148u1
Diffstat (limited to 'src/mess/drivers')
53 files changed, 428 insertions, 434 deletions
diff --git a/src/mess/drivers/apc.c b/src/mess/drivers/apc.c index 8d6a86353c8..5d8308a2a17 100644 --- a/src/mess/drivers/apc.c +++ b/src/mess/drivers/apc.c @@ -403,10 +403,10 @@ WRITE8_MEMBER(apc_state::apc_dma_w) WRITE8_MEMBER(apc_state::apc_irq_ack_w) { /* - x--- GDC - -x-- TM - --x- APU - ---x CRT + x--- GDC + -x-- TM + --x- APU + ---x CRT */ if(data & 4) pic8259_ir3_w(machine().device("pic8259_master"), 0); @@ -464,7 +464,7 @@ RTC write bits: 76543210 static ADDRESS_MAP_START( apc_map, AS_PROGRAM, 16, apc_state ) AM_RANGE(0x00000, 0x9ffff) AM_RAM AM_RANGE(0xa0000, 0xa0fff) AM_RAM AM_SHARE("cmos") -// AM_RANGE(0xa1000, 0xbffff) mirror CMOS +// AM_RANGE(0xa1000, 0xbffff) mirror CMOS // AM_RANGE(0xc0000, 0xcffff) standard character ROM AM_RANGE(0xd8000, 0xd9fff) AM_RAM AM_REGION("aux_pcg", 0) // AUX character RAM // AM_RANGE(0xe0000, 0xeffff) Special Character RAM @@ -483,7 +483,7 @@ static ADDRESS_MAP_START( apc_io, AS_IO, 16, apc_state ) AM_RANGE(0x48, 0x4f) AM_READWRITE8(apc_kbd_r, apc_kbd_w, 0x00ff) AM_RANGE(0x50, 0x53) AM_DEVICE8("upd765", upd765a_device, map, 0x00ff ) // upd765 AM_RANGE(0x58, 0x59) AM_READWRITE8(apc_rtc_r, apc_rtc_w, 0x00ff) -// 0x59 CMOS enable +// 0x59 CMOS enable // 0x5a APU data (Arithmetic Processing Unit!) // 0x5b, Power Off // 0x5e APU status/command @@ -492,7 +492,7 @@ static ADDRESS_MAP_START( apc_io, AS_IO, 16, apc_state ) // 0x70, 0x76 AM_DEVREADWRITE8("upd7220_btm", upd7220_device, read, write, 0x00ff) // 0x71, 0x77 IDA Controller // 0x80, 0x90 Communication Adapter -// 0xf0, 0xf6 ASOP Controller +// 0xf0, 0xf6 ASOP Controller ADDRESS_MAP_END /* TODO: key repeat, remove port impulse! */ diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c index 7c6c40fbce7..2c04a0dc02f 100644 --- a/src/mess/drivers/apple2.c +++ b/src/mess/drivers/apple2.c @@ -633,7 +633,7 @@ static SLOT_INTERFACE_START(apple2_cards) SLOT_INTERFACE("vtc1", A2BUS_VTC1) /* Unknown VideoTerm clone #1 */ SLOT_INTERFACE("vtc2", A2BUS_VTC2) /* Unknown VideoTerm clone #2 */ SLOT_INTERFACE("arcbd", A2BUS_ARCADEBOARD) /* Third Millenium Engineering Arcade Board */ - SLOT_INTERFACE("midi", A2BUS_MIDI) /* Generic 6840+6850 MIDI board */ + SLOT_INTERFACE("midi", A2BUS_MIDI) /* Generic 6840+6850 MIDI board */ // SLOT_INTERFACE("scsi", A2BUS_SCSI) /* Apple II SCSI Card */ SLOT_INTERFACE_END @@ -727,7 +727,7 @@ static MACHINE_CONFIG_DERIVED( apple2e, apple2_common ) MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl0", A2BUS_LANG, NULL) MCFG_A2EAUXSLOT_BUS_ADD(AUXSLOT_TAG, "maincpu", a2eauxbus_intf) - MCFG_A2EAUXSLOT_SLOT_ADD(AUXSLOT_TAG, "aux", apple2eaux_cards, "ext80", NULL) // default to an extended 80-column card + MCFG_A2EAUXSLOT_SLOT_ADD(AUXSLOT_TAG, "aux", apple2eaux_cards, "ext80", NULL) // default to an extended 80-column card MACHINE_CONFIG_END diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c index 2a87471f1c4..88265b5b723 100644 --- a/src/mess/drivers/apple2gs.c +++ b/src/mess/drivers/apple2gs.c @@ -72,24 +72,24 @@ static const gfx_layout apple2gs_text_layout = { - 14,8, /* 14*8 characters */ - 512, /* 256 characters */ - 1, /* 1 bits per pixel */ - { 0 }, /* no bitplanes; 1 bit per pixel */ + 14,8, /* 14*8 characters */ + 512, /* 256 characters */ + 1, /* 1 bits per pixel */ + { 0 }, /* no bitplanes; 1 bit per pixel */ { 7, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 1, 1 }, /* x offsets */ { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, - 8*8 /* every char takes 8 bytes */ + 8*8 /* every char takes 8 bytes */ }; static const gfx_layout apple2gs_dbltext_layout = { - 7,8, /* 7*8 characters */ - 512, /* 256 characters */ - 1, /* 1 bits per pixel */ - { 0 }, /* no bitplanes; 1 bit per pixel */ + 7,8, /* 7*8 characters */ + 512, /* 256 characters */ + 1, /* 1 bits per pixel */ + { 0 }, /* no bitplanes; 1 bit per pixel */ { 7, 6, 5, 4, 3, 2, 1 }, /* x offsets */ { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, - 8*8 /* every char takes 8 bytes */ + 8*8 /* every char takes 8 bytes */ }; static GFXDECODE_START( apple2gs ) @@ -99,22 +99,22 @@ GFXDECODE_END static const unsigned char apple2gs_palette[] = { - 0x0, 0x0, 0x0, /* Black $0 $0000 */ - 0xD, 0x0, 0x3, /* Deep Red $1 $0D03 */ - 0x0, 0x0, 0x9, /* Dark Blue $2 $0009 */ - 0xD, 0x2, 0xD, /* Purple $3 $0D2D */ - 0x0, 0x7, 0x2, /* Dark Green $4 $0072 */ - 0x5, 0x5, 0x5, /* Dark Gray $5 $0555 */ - 0x2, 0x2, 0xF, /* Medium Blue $6 $022F */ - 0x6, 0xA, 0xF, /* Light Blue $7 $06AF */ - 0x8, 0x5, 0x0, /* Brown $8 $0850 */ - 0xF, 0x6, 0x0, /* Orange $9 $0F60 */ - 0xA, 0xA, 0xA, /* Light Gray $A $0AAA */ - 0xF, 0x9, 0x8, /* Pink $B $0F98 */ - 0x1, 0xD, 0x0, /* Light Green $C $01D0 */ - 0xF, 0xF, 0x0, /* Yellow $D $0FF0 */ - 0x4, 0xF, 0x9, /* Aquamarine $E $04F9 */ - 0xF, 0xF, 0xF /* White $F $0FFF */ + 0x0, 0x0, 0x0, /* Black $0 $0000 */ + 0xD, 0x0, 0x3, /* Deep Red $1 $0D03 */ + 0x0, 0x0, 0x9, /* Dark Blue $2 $0009 */ + 0xD, 0x2, 0xD, /* Purple $3 $0D2D */ + 0x0, 0x7, 0x2, /* Dark Green $4 $0072 */ + 0x5, 0x5, 0x5, /* Dark Gray $5 $0555 */ + 0x2, 0x2, 0xF, /* Medium Blue $6 $022F */ + 0x6, 0xA, 0xF, /* Light Blue $7 $06AF */ + 0x8, 0x5, 0x0, /* Brown $8 $0850 */ + 0xF, 0x6, 0x0, /* Orange $9 $0F60 */ + 0xA, 0xA, 0xA, /* Light Gray $A $0AAA */ + 0xF, 0x9, 0x8, /* Pink $B $0F98 */ + 0x1, 0xD, 0x0, /* Light Green $C $01D0 */ + 0xF, 0xF, 0x0, /* Yellow $D $0FF0 */ + 0x4, 0xF, 0x9, /* Aquamarine $E $04F9 */ + 0xF, 0xF, 0xF /* White $F $0FFF */ }; static INPUT_PORTS_START( apple2gs ) @@ -195,7 +195,7 @@ READ8_MEMBER(apple2gs_state::adbmicro_p1_in) { if (m_is_rom3) { - return 0x06; // indicate ROM 3 + return 0x06; // indicate ROM 3 } return 0; @@ -203,12 +203,12 @@ READ8_MEMBER(apple2gs_state::adbmicro_p1_in) READ8_MEMBER(apple2gs_state::adbmicro_p2_in) { - return (m_adb_line) ? 0x80 : 0x00; + return (m_adb_line) ? 0x80 : 0x00; } READ8_MEMBER(apple2gs_state::adbmicro_p3_in) { - return (m_adb_line) ? 0x08 : 0x00; + return (m_adb_line) ? 0x08 : 0x00; } WRITE8_MEMBER(apple2gs_state::adbmicro_p0_out) @@ -223,12 +223,12 @@ WRITE8_MEMBER(apple2gs_state::adbmicro_p1_out) WRITE8_MEMBER(apple2gs_state::adbmicro_p2_out) { if (!(data & 0x10)) - { + { if (m_adbmicro->are_port_bits_output(0, 0xff)) { keyglu_mcu_write(data & 7, m_glu_bus); } - else // read GLU + else // read GLU { m_glu_bus = keyglu_mcu_read(data & 7); } @@ -255,47 +255,47 @@ static const struct m5074x_interface adbmicro_intf = WRITE8_MEMBER(apple2gs_state::a2bus_irq_w) { - if (data) - { - apple2gs_add_irq(machine(), IRQ_SLOT); - } - else - { - apple2gs_remove_irq(machine(), IRQ_SLOT); - } + if (data) + { + apple2gs_add_irq(machine(), IRQ_SLOT); + } + else + { + apple2gs_remove_irq(machine(), IRQ_SLOT); + } } WRITE8_MEMBER(apple2gs_state::a2bus_nmi_w) { - m_maincpu->set_input_line(INPUT_LINE_NMI, data); + m_maincpu->set_input_line(INPUT_LINE_NMI, data); } WRITE8_MEMBER(apple2gs_state::a2bus_inh_w) { - m_inh_slot = data; - apple2_update_memory(); + m_inh_slot = data; + apple2_update_memory(); } static const struct a2bus_interface a2bus_intf = { - // interrupt lines - DEVCB_DRIVER_MEMBER(apple2gs_state,a2bus_irq_w), - DEVCB_DRIVER_MEMBER(apple2gs_state,a2bus_nmi_w), - DEVCB_DRIVER_MEMBER(apple2gs_state,a2bus_inh_w) + // interrupt lines + DEVCB_DRIVER_MEMBER(apple2gs_state,a2bus_irq_w), + DEVCB_DRIVER_MEMBER(apple2gs_state,a2bus_nmi_w), + DEVCB_DRIVER_MEMBER(apple2gs_state,a2bus_inh_w) }; static SLOT_INTERFACE_START(apple2_cards) - SLOT_INTERFACE("diskii", A2BUS_DISKII) /* Disk II Controller Card */ - SLOT_INTERFACE("mockingboard", A2BUS_MOCKINGBOARD) /* Sweet Micro Systems Mockingboard */ - SLOT_INTERFACE("phasor", A2BUS_PHASOR) /* Applied Engineering Phasor */ - SLOT_INTERFACE("cffa2", A2BUS_CFFA2) /* CFFA2000 Compact Flash for Apple II (www.dreher.net), 65C02/65816 firmware */ - SLOT_INTERFACE("cffa202", A2BUS_CFFA2_6502) /* CFFA2000 Compact Flash for Apple II (www.dreher.net), 6502 firmware */ - SLOT_INTERFACE("memexp", A2BUS_MEMEXP) /* Apple II Memory Expansion Card */ - SLOT_INTERFACE("ramfactor", A2BUS_RAMFACTOR) /* Applied Engineering RamFactor */ - SLOT_INTERFACE("sam", A2BUS_SAM) /* SAM Software Automated Mouth (8-bit DAC + speaker) */ - SLOT_INTERFACE("alfam2", A2BUS_ALFAM2) /* ALF Apple Music II */ - SLOT_INTERFACE("midi", A2BUS_MIDI) /* Generic 6840+6850 MIDI board */ - SLOT_INTERFACE("vulcan", A2BUS_VULCAN) /* AE Vulcan IDE card */ + SLOT_INTERFACE("diskii", A2BUS_DISKII) /* Disk II Controller Card */ + SLOT_INTERFACE("mockingboard", A2BUS_MOCKINGBOARD) /* Sweet Micro Systems Mockingboard */ + SLOT_INTERFACE("phasor", A2BUS_PHASOR) /* Applied Engineering Phasor */ + SLOT_INTERFACE("cffa2", A2BUS_CFFA2) /* CFFA2000 Compact Flash for Apple II (www.dreher.net), 65C02/65816 firmware */ + SLOT_INTERFACE("cffa202", A2BUS_CFFA2_6502) /* CFFA2000 Compact Flash for Apple II (www.dreher.net), 6502 firmware */ + SLOT_INTERFACE("memexp", A2BUS_MEMEXP) /* Apple II Memory Expansion Card */ + SLOT_INTERFACE("ramfactor", A2BUS_RAMFACTOR) /* Applied Engineering RamFactor */ + SLOT_INTERFACE("sam", A2BUS_SAM) /* SAM Software Automated Mouth (8-bit DAC + speaker) */ + SLOT_INTERFACE("alfam2", A2BUS_ALFAM2) /* ALF Apple Music II */ + SLOT_INTERFACE("midi", A2BUS_MIDI) /* Generic 6840+6850 MIDI board */ + SLOT_INTERFACE("vulcan", A2BUS_VULCAN) /* AE Vulcan IDE card */ // SLOT_INTERFACE("softcard", A2BUS_SOFTCARD) /* Microsoft SoftCard */ // appears not to be IIgs compatible? // SLOT_INTERFACE("scsi", A2BUS_SCSI) /* Apple II SCSI Card */ SLOT_INTERFACE_END @@ -310,7 +310,7 @@ static MACHINE_CONFIG_START( apple2gs, apple2gs_state ) MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ - MCFG_SCREEN_SIZE(704, 262) // 640+32+32 for the borders + MCFG_SCREEN_SIZE(704, 262) // 640+32+32 for the borders MCFG_SCREEN_VISIBLE_AREA(0,703,0,230) MCFG_SCREEN_UPDATE_DRIVER(apple2gs_state, screen_update_apple2gs) @@ -338,17 +338,17 @@ static MACHINE_CONFIG_START( apple2gs, apple2gs_state ) #endif /* slot devices */ - MCFG_A2BUS_BUS_ADD("a2bus", "maincpu", a2bus_intf) - MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl0", A2BUS_LANG, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl4", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl5", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl6", apple2_cards, NULL, NULL) - MCFG_A2BUS_SLOT_ADD("a2bus", "sl7", apple2_cards, NULL, NULL) - - MCFG_IWM_ADD("fdc", apple2_fdc_interface) + MCFG_A2BUS_BUS_ADD("a2bus", "maincpu", a2bus_intf) + MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl0", A2BUS_LANG, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl1", apple2_cards, NULL, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl2", apple2_cards, NULL, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl3", apple2_cards, NULL, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl4", apple2_cards, NULL, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl5", apple2_cards, NULL, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl6", apple2_cards, NULL, NULL) + MCFG_A2BUS_SLOT_ADD("a2bus", "sl7", apple2_cards, NULL, NULL) + + MCFG_IWM_ADD("fdc", apple2_fdc_interface) /* SCC */ MCFG_SCC8530_ADD("scc", APPLE2GS_14M/2, line_cb_t()) @@ -365,7 +365,7 @@ static MACHINE_CONFIG_START( apple2gs, apple2gs_state ) MCFG_RAM_DEFAULT_VALUE(0x00) MCFG_SOFTWARE_LIST_ADD("flop35_list","apple2gs") - MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop525_list", "apple2") + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop525_list", "apple2") MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( apple2gsr1, apple2gs ) @@ -376,7 +376,7 @@ static MACHINE_CONFIG_DERIVED( apple2gsr1, apple2gs ) MCFG_M50740_ADD(ADBMICRO_TAG, XTAL_3_579545MHz, adbmicro_intf) #endif - MCFG_RAM_MODIFY(RAM_TAG) + MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1280K") // 256K on board + 1M in the expansion slot was common for ROM 01 MCFG_RAM_EXTRA_OPTIONS("256K,512K,768K,1M,2M,3M,4M,5M,6M,7M,8M") MCFG_RAM_DEFAULT_VALUE(0x00) @@ -389,18 +389,18 @@ MACHINE_CONFIG_END ***************************************************************************/ ROM_START(apple2gs) - // M50740/50741 ADB MCU inside the IIgs system unit + // M50740/50741 ADB MCU inside the IIgs system unit ROM_REGION(0x1000,"m50741",0) ROM_LOAD( "341s0632-2.bin", 0x000000, 0x001000, CRC(e1c11fb0) SHA1(141d18c36a617ab9dce668445440d34354be0672) ) - // i8048 microcontroller inside the IIgs ADB Standard Keyboard - ROM_REGION(0x400, "kmcu", 0) - // from early-production ROM 00 Woz Limited Edition IIgs. keyboard "Part Number 658-4081 825-1301-A" - // ROM is marked "NEC Japan 8626XD 341-0232A 543" so 26th week of 1986 - ROM_LOAD( "341-0232a.bin", 0x000000, 0x000400, CRC(6a158b9f) SHA1(e8744180075182849d431fd8023a52a062a6da76) ) - // from later non-Woz ROM 01. keyboard "Model A9M0330" - // ROM is marked "NEC Japan 8806HD 8048HC610 341-0124-A (c) APPLE 87" so 6th week of 1988 - ROM_LOAD( "341-0124a.bin", 0x000000, 0x000400, CRC(2a3576bf) SHA1(58fbf770d3801a02d0944039829f9241b5279013) ) + // i8048 microcontroller inside the IIgs ADB Standard Keyboard + ROM_REGION(0x400, "kmcu", 0) + // from early-production ROM 00 Woz Limited Edition IIgs. keyboard "Part Number 658-4081 825-1301-A" + // ROM is marked "NEC Japan 8626XD 341-0232A 543" so 26th week of 1986 + ROM_LOAD( "341-0232a.bin", 0x000000, 0x000400, CRC(6a158b9f) SHA1(e8744180075182849d431fd8023a52a062a6da76) ) + // from later non-Woz ROM 01. keyboard "Model A9M0330" + // ROM is marked "NEC Japan 8806HD 8048HC610 341-0124-A (c) APPLE 87" so 6th week of 1988 + ROM_LOAD( "341-0124a.bin", 0x000000, 0x000400, CRC(2a3576bf) SHA1(58fbf770d3801a02d0944039829f9241b5279013) ) ROM_REGION(0x1000,"gfx1",0) ROM_LOAD ( "apple2gs.chr", 0x0000, 0x1000, CRC(91e53cd8) SHA1(34e2443e2ef960a36c047a09ed5a93f471797f89)) /* need label/part number */ @@ -409,16 +409,16 @@ ROM_START(apple2gs) ROM_LOAD("341-0737", 0x0000, 0x20000, CRC(8d410067) SHA1(c0f4704233ead14cb8e1e8a68fbd7063c56afd27)) /* Needs verification; 341-0737: IIgs ROM03 FC-FD */ ROM_LOAD("341-0748", 0x20000, 0x20000, CRC(d4c50550) SHA1(2784cdd7ac7094b3e494409db3e72b4e6d2d9e81)) /* Needs verification; 341-0748: IIgs ROM03 FE-FF */ - ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00) + ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00) ROM_END ROM_START(apple2gsr3p) ROM_REGION(0x1000,"m50741",0) ROM_LOAD( "341s0632-2.bin", 0x000000, 0x001000, CRC(e1c11fb0) SHA1(141d18c36a617ab9dce668445440d34354be0672) ) - ROM_REGION(0x400, "kmcu", 0) - ROM_LOAD( "341-0232a.bin", 0x000000, 0x000400, CRC(6a158b9f) SHA1(e8744180075182849d431fd8023a52a062a6da76) ) - ROM_LOAD( "341-0124a.bin", 0x000000, 0x000400, CRC(2a3576bf) SHA1(58fbf770d3801a02d0944039829f9241b5279013) ) + ROM_REGION(0x400, "kmcu", 0) + ROM_LOAD( "341-0232a.bin", 0x000000, 0x000400, CRC(6a158b9f) SHA1(e8744180075182849d431fd8023a52a062a6da76) ) + ROM_LOAD( "341-0124a.bin", 0x000000, 0x000400, CRC(2a3576bf) SHA1(58fbf770d3801a02d0944039829f9241b5279013) ) ROM_REGION(0x1000,"gfx1",0) ROM_LOAD ( "apple2gs.chr", 0x0000, 0x1000, CRC(91e53cd8) SHA1(34e2443e2ef960a36c047a09ed5a93f471797f89)) /* need label/part number */ @@ -427,16 +427,16 @@ ROM_START(apple2gsr3p) ROM_LOAD("341-0728", 0x0000, 0x20000, NO_DUMP) /* 341-0728: IIgs ROM03 prototype FC-FD */ ROM_LOAD("341-0729", 0x20000, 0x20000, NO_DUMP) /* 341-0729: IIgs ROM03 prototype FE-FF */ - ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00) + ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00) ROM_END ROM_START(apple2gsr3lp) ROM_REGION(0x1000,"m50741",0) ROM_LOAD( "341s0632-2.bin", 0x000000, 0x001000, CRC(e1c11fb0) SHA1(141d18c36a617ab9dce668445440d34354be0672) ) - ROM_REGION(0x400, "kmcu", 0) - ROM_LOAD( "341-0232a.bin", 0x000000, 0x000400, CRC(6a158b9f) SHA1(e8744180075182849d431fd8023a52a062a6da76) ) - ROM_LOAD( "341-0124a.bin", 0x000000, 0x000400, CRC(2a3576bf) SHA1(58fbf770d3801a02d0944039829f9241b5279013) ) + ROM_REGION(0x400, "kmcu", 0) + ROM_LOAD( "341-0232a.bin", 0x000000, 0x000400, CRC(6a158b9f) SHA1(e8744180075182849d431fd8023a52a062a6da76) ) + ROM_LOAD( "341-0124a.bin", 0x000000, 0x000400, CRC(2a3576bf) SHA1(58fbf770d3801a02d0944039829f9241b5279013) ) ROM_REGION(0x1000,"gfx1",0) ROM_LOAD ( "apple2gs.chr", 0x0000, 0x1000, CRC(91e53cd8) SHA1(34e2443e2ef960a36c047a09ed5a93f471797f89)) /* need label/part number */ @@ -445,16 +445,16 @@ ROM_START(apple2gsr3lp) ROM_LOAD("341-0737", 0x0000, 0x20000, CRC(8d410067) SHA1(c0f4704233ead14cb8e1e8a68fbd7063c56afd27)) /* 341-0737: IIgs ROM03 FC-FD */ ROM_LOAD("341-0749", 0x20000, 0x20000, NO_DUMP) /* 341-0749: unknown ?post? ROM03 IIgs prototype? FE-FF */ - ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00) + ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00) ROM_END ROM_START(apple2gsr1) ROM_REGION(0xc00,"m50740",0) ROM_LOAD( "341s0345.bin", 0x000000, 0x000c00, CRC(48cd5779) SHA1(97e421f5247c00a0ca34cd08b6209df573101480) ) - ROM_REGION(0x400, "kmcu", 0) - ROM_LOAD( "341-0232a.bin", 0x000000, 0x000400, CRC(6a158b9f) SHA1(e8744180075182849d431fd8023a52a062a6da76) ) - ROM_LOAD( "341-0124a.bin", 0x000000, 0x000400, CRC(2a3576bf) SHA1(58fbf770d3801a02d0944039829f9241b5279013) ) + ROM_REGION(0x400, "kmcu", 0) + ROM_LOAD( "341-0232a.bin", 0x000000, 0x000400, CRC(6a158b9f) SHA1(e8744180075182849d431fd8023a52a062a6da76) ) + ROM_LOAD( "341-0124a.bin", 0x000000, 0x000400, CRC(2a3576bf) SHA1(58fbf770d3801a02d0944039829f9241b5279013) ) ROM_REGION(0x1000,"gfx1",0) ROM_LOAD ( "apple2gs.chr", 0x0000, 0x1000, CRC(91e53cd8) SHA1(34e2443e2ef960a36c047a09ed5a93f471797f89)) /* need label/part number */ @@ -462,16 +462,16 @@ ROM_START(apple2gsr1) ROM_REGION(0x20000,"maincpu",0) ROM_LOAD("342-0077-b", 0x0000, 0x20000, CRC(42f124b0) SHA1(e4fc7560b69d062cb2da5b1ffbe11cd1ca03cc37)) /* 342-0077-B: IIgs ROM01 */ - ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00) + ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00) ROM_END ROM_START(apple2gsr0) ROM_REGION(0xc00,"m50740",0) ROM_LOAD( "341s0345.bin", 0x000000, 0x000c00, CRC(48cd5779) SHA1(97e421f5247c00a0ca34cd08b6209df573101480) ) - ROM_REGION(0x400, "kmcu", 0) - ROM_LOAD( "341-0232a.bin", 0x000000, 0x000400, CRC(6a158b9f) SHA1(e8744180075182849d431fd8023a52a062a6da76) ) - ROM_LOAD( "341-0124a.bin", 0x000000, 0x000400, CRC(2a3576bf) SHA1(58fbf770d3801a02d0944039829f9241b5279013) ) + ROM_REGION(0x400, "kmcu", 0) + ROM_LOAD( "341-0232a.bin", 0x000000, 0x000400, CRC(6a158b9f) SHA1(e8744180075182849d431fd8023a52a062a6da76) ) + ROM_LOAD( "341-0124a.bin", 0x000000, 0x000400, CRC(2a3576bf) SHA1(58fbf770d3801a02d0944039829f9241b5279013) ) ROM_REGION(0x1000,"gfx1",0) ROM_LOAD ( "apple2gs.chr", 0x0000, 0x1000, CRC(91e53cd8) SHA1(34e2443e2ef960a36c047a09ed5a93f471797f89)) @@ -483,7 +483,7 @@ ROM_START(apple2gsr0) ROM_LOAD("rom0c.bin", 0x10000, 0x8000, CRC(94c32caa) SHA1(4806d50d676b06f5213b181693fc1585956b98bb)) ROM_LOAD("rom0d.bin", 0x18000, 0x8000, CRC(200a15b8) SHA1(0c2890bb169ead63369738bbd5f33b869f24c42a)) - ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00) + ROM_REGION(0x20000, "es5503", ROMREGION_ERASE00) ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */ @@ -492,4 +492,3 @@ COMP( 198?, apple2gsr3p, apple2gs, 0, apple2gs, apple2gs, driver_device, 0, COMP( 1989, apple2gsr3lp, apple2gs, 0, apple2gs, apple2gs, driver_device, 0, "Apple Computer", "Apple IIgs (ROM03 late prototype?)", GAME_NOT_WORKING ) COMP( 1987, apple2gsr1, apple2gs, 0, apple2gsr1, apple2gs, driver_device, 0, "Apple Computer", "Apple IIgs (ROM01)", GAME_SUPPORTS_SAVE ) COMP( 1986, apple2gsr0, apple2gs, 0, apple2gsr1, apple2gs, driver_device, 0, "Apple Computer", "Apple IIgs (ROM00)", GAME_SUPPORTS_SAVE ) - diff --git a/src/mess/drivers/apricotp.c b/src/mess/drivers/apricotp.c index 0839ad2fb88..daa33003395 100644 --- a/src/mess/drivers/apricotp.c +++ b/src/mess/drivers/apricotp.c @@ -416,7 +416,7 @@ static APRICOT_KEYBOARD_INTERFACE( kb_intf ) // pic8259_interface pic_intf //------------------------------------------------- - IRQ_CALLBACK_MEMBER(fp_state::fp_irq_callback) + IRQ_CALLBACK_MEMBER(fp_state::fp_irq_callback) { return m_pic->inta_r(); } diff --git a/src/mess/drivers/aquarius.c b/src/mess/drivers/aquarius.c index 793f83cf71e..d60ab73de2b 100644 --- a/src/mess/drivers/aquarius.c +++ b/src/mess/drivers/aquarius.c @@ -5,7 +5,7 @@ TODO: - - slot interface for cartridges + - slot interface for cartridges - hand controllers - scramble RAM also - CAQ tape support diff --git a/src/mess/drivers/b16.c b/src/mess/drivers/b16.c index 66994ac89bb..c6e5f64e87e 100644 --- a/src/mess/drivers/b16.c +++ b/src/mess/drivers/b16.c @@ -250,7 +250,7 @@ void b16_state::machine_reset() static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ diff --git a/src/mess/drivers/binbug.c b/src/mess/drivers/binbug.c index 8cfc8147a82..e6f6b051b2d 100644 --- a/src/mess/drivers/binbug.c +++ b/src/mess/drivers/binbug.c @@ -355,7 +355,7 @@ Port 8 controls some kind of memory protection scheme. The code indicates that B is the page to protect, and A is the code (0x08 = inhibit; 0x0B = unprotect; 0x0C = enable; 0x0E = protect). There are 256 pages so -each page is 256 bytes. +each page is 256 bytes. To turn the clock on (if it was working), put a non-zero into D80D. diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c index e821b71f434..995247e0e85 100644 --- a/src/mess/drivers/bml3.c +++ b/src/mess/drivers/bml3.c @@ -568,7 +568,7 @@ INPUT_PORTS_END static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ diff --git a/src/mess/drivers/c128.c b/src/mess/drivers/c128.c index ffc7d954564..4a63515e07e 100644 --- a/src/mess/drivers/c128.c +++ b/src/mess/drivers/c128.c @@ -1014,7 +1014,7 @@ READ8_MEMBER( c128_state::cia1_pa_r ) // keyboard UINT8 cia1_pb = m_cia1->pb_r(); UINT8 row[8] = { m_row0->read(), m_row1->read() & m_lock->read(), m_row2->read(), m_row3->read(), - m_row4->read(), m_row5->read(), m_row6->read(), m_row7->read() }; + m_row4->read(), m_row5->read(), m_row6->read(), m_row7->read() }; for (int i = 0; i < 8; i++) { @@ -1055,7 +1055,7 @@ READ8_MEMBER( c128_state::cia1_pb_r ) // joystick UINT8 joy_a = m_joy1->joy_r(); - + data &= (0xf0 | (joy_a & 0x0f)); data &= ~(!BIT(joy_a, 5) << 4); diff --git a/src/mess/drivers/c64.c b/src/mess/drivers/c64.c index 14345119482..225624f60c4 100644 --- a/src/mess/drivers/c64.c +++ b/src/mess/drivers/c64.c @@ -608,7 +608,7 @@ READ8_MEMBER( c64_state::cia1_pa_r ) // keyboard UINT8 cia1_pb = m_cia1->pb_r(); UINT8 row[8] = { m_row0->read(), m_row1->read() & m_lock->read(), m_row2->read(), m_row3->read(), - m_row4->read(), m_row5->read(), m_row6->read(), m_row7->read() }; + m_row4->read(), m_row5->read(), m_row6->read(), m_row7->read() }; for (int i = 0; i < 8; i++) { @@ -649,7 +649,7 @@ READ8_MEMBER( c64_state::cia1_pb_r ) // joystick UINT8 joy_a = m_joy1->joy_r(); - + data &= (0xf0 | (joy_a & 0x0f)); data &= ~(!BIT(joy_a, 5) << 4); @@ -711,9 +711,9 @@ READ8_MEMBER( c64gs_state::cia1_pa_r ) PA2 JOY B2 PA3 JOY B3 PA4 BTNB - PA5 - PA6 - PA7 + PA5 + PA6 + PA7 */ @@ -749,7 +749,7 @@ READ8_MEMBER( c64gs_state::cia1_pb_r ) // joystick UINT8 joy_a = m_joy1->joy_r(); - + data &= (0xf0 | (joy_a & 0x0f)); data &= ~(!BIT(joy_a, 5) << 4); diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c index 2a864522af0..536148d46c7 100644 --- a/src/mess/drivers/cat.c +++ b/src/mess/drivers/cat.c @@ -66,9 +66,9 @@ In MESS, to activate it as above: * simultaneously press both alt keys for a moment and release both (the whole "Enable Forth Language" line will be selected) * press control(use front) and press backspace(ERASE) (If beeping actually worked the cat would beep here) * press control(use front), shift, and space (the cursor should stop blinking) -* press enter and the forth "ok" prompt should appear. you can type 'page' and enter to clear the screen +* press enter and the forth "ok" prompt should appear. you can type 'page' and enter to clear the screen Optional further steps: -* type without quotes "-1 wheel! savesetup re" at the forth prompt to permanently +* type without quotes "-1 wheel! savesetup re" at the forth prompt to permanently enable shift + use front + space to dump to forth mode easily * change the keyboard setting in the setup menu (use front + [ ) to ASCII so you can type < and > * after doing the -1 wheel! thing, you can compile a selected forth program in the editor @@ -177,13 +177,13 @@ ToDo: - (would-be-really-nice-but-totally-unnecessary feature): due to open bus, the svrom1 and svrom2 checksums in diagnostics read as 01A80000 and 01020000 respectively on a real machine (and hence appear inverted/'fail'-state). - This requires sub-cycle accurate 68k open bus emulation to pull off, as well + This requires sub-cycle accurate 68k open bus emulation to pull off, as well as emulating the fact that UDS/LDS are ?not connected? (unclear because this happens inside an asic) for the SVROMS (or the svram or the code roms, for that matter!) - Hook Battery Low input to a dipswitch. - Document what every IPx and OPx bit on the DUART connects to. - + * Swyft - Figure out the keyboard (interrupts are involved? or maybe an NMI on a @@ -307,7 +307,7 @@ public: this causes the DUART to fire an interrupt, which makes the 68000 read the keyboard. */ - UINT16 m_6ms_counter; + UINT16 m_6ms_counter; UINT8 m_video_enable; UINT8 m_video_invert; UINT16 m_pr_cont; @@ -323,18 +323,18 @@ public: /* DRIVER_INIT_MEMBER( cat_state,cat ) { - UINT8 *svrom = machine().root_device().memregion("svrom")->base(); - int i; - // fill svrom with the correct 2e80 pattern except where svrom1 sits - // first half - for (i = 0; i < 0x20000; i+=2) - svrom[i] = 0x2E; - // second half - for (i = 0x20000; i < 0x40000; i+=2) - { - svrom[i] = 0x2E; - svrom[i+1] = 0x80; - } + UINT8 *svrom = machine().root_device().memregion("svrom")->base(); + int i; + // fill svrom with the correct 2e80 pattern except where svrom1 sits + // first half + for (i = 0; i < 0x20000; i+=2) + svrom[i] = 0x2E; + // second half + for (i = 0x20000; i < 0x40000; i+=2) + { + svrom[i] = 0x2E; + svrom[i+1] = 0x80; + } }*/ /* 0x600000-0x65ffff Write: Video Generator (AKA NH4-5001 AKA Gate Array #1 @ IC30) @@ -607,7 +607,7 @@ a23 a22 a21 a20 a19 a18 a17 a16 a15 a14 a13 a12 a11 a10 a9 a8 a7 a6 a5 a4 0 0 1 x x 1 * * * * * * * * * * * * * * * * * 1 R SVROM 1 ic8 (not present on cat as sold, open bus reads as 0x80) [controlled via GA2 /SVCS1] *SEE BELOW* *NOTE: on Dwight E's user-made developer unit, two 128K SRAMS are mapped in place of the two entries immediately above!* (this involves some creative wiring+sockets); the official IAI 'shadow ram board' maps the ram to the A00000-A3FFFF area instead) 0 1 * * * * * * * * * * * * * * * * * * * * * * *BOTH GATE ARRAYS 1 and 2 DECODE THIS AREA; 2 DEALS WITH ADDR AND 1 WITH DATA/CAS/RAS* -0 1 0 x x a b * * * * * * * * * * * * * * * * * RW VIDEO/SYSTEM DRAM (ab: 00=row 0, ic26-29; 01=row 1, ic22-25; 10=row 2; ic18-21; 11=row 3; ic14-17) +0 1 0 x x a b * * * * * * * * * * * * * * * * * RW VIDEO/SYSTEM DRAM (ab: 00=row 0, ic26-29; 01=row 1, ic22-25; 10=row 2; ic18-21; 11=row 3; ic14-17) *NOTE: DRAM rows 2 and 3 above are only usually populated in cat developer units!* 0 1 1 ? ? * * * ? ? ? ? ? ? ? * * * * * * * * x W VIDEO CONTRL REGISTERS (reads as 0x2e80) 1 x x x x x x x x x x x x x x x x x x * * * * * *GATE ARRAY 3 DECODES THIS AREA, GA3 IS ENABLED BY /IOCS1 FROM GA2* @@ -626,7 +626,7 @@ a23 a22 a21 a20 a19 a18 a17 a16 a15 a14 a13 a12 a11 a10 a9 a8 a7 a6 a5 a4 1 0 0 x x 0 1 0 x x x x x x x x x x * * * * * 0 RW {'modem'} Modem Chip AMI S35213 @ IC37 DATA BIT 7 ONLY [controlled via GA2 /SMCS] 1 0 0 x x 0 1 1 x x x x x x x x x x x x x x x * R {'timer'} Read: Fixed 16-bit counter from ga2. increments every 6.5535ms when another 16-bit counter clocked at 10mhz overflows 1 0 0 x x 1 0 0 x x x x x x x x x x x x x x x * W {'opr'} Output Port (Video/Sync enable and watchdog reset?) register (screen enable on bit 3?) (reads as 0x2e80) -1 0 0 x x 1 0 1 x x x x x x x x x x x x x x x * R {'wdt'} Watchdog timer reads as 0x0100 0x0101 or 0x0102, some sort of test register or video status register? +1 0 0 x x 1 0 1 x x x x x x x x x x x x x x x * R {'wdt'} Watchdog timer reads as 0x0100 0x0101 or 0x0102, some sort of test register or video status register? 1 0 0 x x 1 1 0 x x x x x x x x x x x x x x x * R?W {'tcb'} test control bits: powerfail status in bit <?> (reads as 0x0000) 1 0 0 x x 1 1 1 x x x x x x x x x x x x x x x * ? Unknown (reads as 0x2e80) @@ -1010,12 +1010,12 @@ ROM_START( cat ) * populated, as opposed to 256k-standard (2 rows) and 512k-max with all * 4 rows populated on a "released" cat. */ - ROM_SYSTEM_BIOS( 0, "r240", "Canon Cat V2.40 US Firmware") + ROM_SYSTEM_BIOS( 0, "r240", "Canon Cat V2.40 US Firmware") ROMX_LOAD( "boultl0.ic2", 0x00001, 0x10000, CRC(77b66208) SHA1(9D718C0A521FEFE4F86EF328805B7921BADE9D89), ROM_SKIP(1) | ROM_BIOS(1)) ROMX_LOAD( "boulth0.ic4", 0x00000, 0x10000, CRC(f1e1361a) SHA1(0A85385527E2CC55790DE9F9919EB44AC32D7F62), ROM_SKIP(1) | ROM_BIOS(1)) ROMX_LOAD( "boultl1.ic3", 0x20001, 0x10000, CRC(c61dafb0) SHA1(93216c26c2d5fc71412acc548c96046a996ea668), ROM_SKIP(1) | ROM_BIOS(1)) ROMX_LOAD( "boulth1.ic5", 0x20000, 0x10000, CRC(bed1f761) SHA1(D177E1D3A39B005DD94A6BDA186221D597129AF4), ROM_SKIP(1) | ROM_BIOS(1)) - /* This 2.40 code was compiled by Dwight Elvey based on the v2.40 source + /* This 2.40 code was compiled by Dwight Elvey based on the v2.40 source * code disks recovered around 2004. It does NOT exactly match the above * set exactly but has a few small differences. * It is as of yet unknown whether it is earlier or later code than the diff --git a/src/mess/drivers/cbm2.c b/src/mess/drivers/cbm2.c index 227f839cc7e..676d17b85b3 100644 --- a/src/mess/drivers/cbm2.c +++ b/src/mess/drivers/cbm2.c @@ -2732,20 +2732,20 @@ ROM_END // SYSTEM DRIVERS //************************************************************************** -// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS -COMP( 1983, p500, 0, 0, p500_ntsc, cbm2, driver_device, 0, "Commodore Business Machines", "P500 (NTSC)", GAME_SUPPORTS_SAVE ) -COMP( 1983, p500p, p500, 0, p500_pal, cbm2, driver_device, 0, "Commodore Business Machines", "P500 (PAL)", GAME_SUPPORTS_SAVE ) -COMP( 1983, b500, 0, 0, b128, cbm2, driver_device, 0, "Commodore Business Machines", "B500", GAME_SUPPORTS_SAVE ) -COMP( 1983, b128, b500, 0, b128, cbm2, driver_device, 0, "Commodore Business Machines", "B128", GAME_SUPPORTS_SAVE ) -COMP( 1983, b256, b500, 0, b256, cbm2, driver_device, 0, "Commodore Business Machines", "B256", GAME_SUPPORTS_SAVE ) -COMP( 1983, cbm610, b500, 0, cbm610, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 610", GAME_SUPPORTS_SAVE ) -COMP( 1983, cbm620, b500, 0, cbm620, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 620", GAME_SUPPORTS_SAVE ) -COMP( 1983, cbm620_hu, b500, 0, cbm620, cbm2_hu, driver_device, 0, "Commodore Business Machines", "CBM 620 (Hungary)", GAME_SUPPORTS_SAVE ) -COMP( 1983, b128hp, 0, 0, b128hp, cbm2, driver_device, 0, "Commodore Business Machines", "B128-80HP", GAME_SUPPORTS_SAVE ) -COMP( 1983, b256hp, b128hp, 0, b256hp, cbm2, driver_device, 0, "Commodore Business Machines", "B256-80HP", GAME_SUPPORTS_SAVE ) -COMP( 1983, bx256hp, b128hp, 0, bx256hp, cbm2, driver_device, 0, "Commodore Business Machines", "BX256-80HP", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) // 8088 co-processor is missing -COMP( 1983, cbm710, b128hp, 0, cbm710, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 710", GAME_SUPPORTS_SAVE ) -COMP( 1983, cbm720, b128hp, 0, cbm720, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 720", GAME_SUPPORTS_SAVE ) -COMP( 1983, cbm720_de, b128hp, 0, cbm720, cbm2_de, driver_device, 0, "Commodore Business Machines", "CBM 720 (Germany)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) -COMP( 1983, cbm720_se, b128hp, 0, cbm720, cbm2_se, driver_device, 0, "Commodore Business Machines", "CBM 720 (Sweden/Finland)", GAME_SUPPORTS_SAVE ) -COMP( 1983, cbm730, b128hp, 0, cbm730, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 730", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) // 8088 co-processor is missing +// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS +COMP( 1983, p500, 0, 0, p500_ntsc, cbm2, driver_device, 0, "Commodore Business Machines", "P500 (NTSC)", GAME_SUPPORTS_SAVE ) +COMP( 1983, p500p, p500, 0, p500_pal, cbm2, driver_device, 0, "Commodore Business Machines", "P500 (PAL)", GAME_SUPPORTS_SAVE ) +COMP( 1983, b500, 0, 0, b128, cbm2, driver_device, 0, "Commodore Business Machines", "B500", GAME_SUPPORTS_SAVE ) +COMP( 1983, b128, b500, 0, b128, cbm2, driver_device, 0, "Commodore Business Machines", "B128", GAME_SUPPORTS_SAVE ) +COMP( 1983, b256, b500, 0, b256, cbm2, driver_device, 0, "Commodore Business Machines", "B256", GAME_SUPPORTS_SAVE ) +COMP( 1983, cbm610, b500, 0, cbm610, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 610", GAME_SUPPORTS_SAVE ) +COMP( 1983, cbm620, b500, 0, cbm620, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 620", GAME_SUPPORTS_SAVE ) +COMP( 1983, cbm620_hu, b500, 0, cbm620, cbm2_hu, driver_device, 0, "Commodore Business Machines", "CBM 620 (Hungary)", GAME_SUPPORTS_SAVE ) +COMP( 1983, b128hp, 0, 0, b128hp, cbm2, driver_device, 0, "Commodore Business Machines", "B128-80HP", GAME_SUPPORTS_SAVE ) +COMP( 1983, b256hp, b128hp, 0, b256hp, cbm2, driver_device, 0, "Commodore Business Machines", "B256-80HP", GAME_SUPPORTS_SAVE ) +COMP( 1983, bx256hp, b128hp, 0, bx256hp, cbm2, driver_device, 0, "Commodore Business Machines", "BX256-80HP", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) // 8088 co-processor is missing +COMP( 1983, cbm710, b128hp, 0, cbm710, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 710", GAME_SUPPORTS_SAVE ) +COMP( 1983, cbm720, b128hp, 0, cbm720, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 720", GAME_SUPPORTS_SAVE ) +COMP( 1983, cbm720_de, b128hp, 0, cbm720, cbm2_de, driver_device, 0, "Commodore Business Machines", "CBM 720 (Germany)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) +COMP( 1983, cbm720_se, b128hp, 0, cbm720, cbm2_se, driver_device, 0, "Commodore Business Machines", "CBM 720 (Sweden/Finland)", GAME_SUPPORTS_SAVE ) +COMP( 1983, cbm730, b128hp, 0, cbm730, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 730", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) // 8088 co-processor is missing diff --git a/src/mess/drivers/clcd.c b/src/mess/drivers/clcd.c index 1bbf5101d44..0e7af199fc1 100644 --- a/src/mess/drivers/clcd.c +++ b/src/mess/drivers/clcd.c @@ -81,7 +81,7 @@ public: { case 0: return m_col0->read(); - + case 1: return m_col1->read(); diff --git a/src/mess/drivers/esq1.c b/src/mess/drivers/esq1.c index 463fdb543a7..30910cb3b55 100644 --- a/src/mess/drivers/esq1.c +++ b/src/mess/drivers/esq1.c @@ -231,7 +231,7 @@ static ADDRESS_MAP_START( esq1_map, AS_PROGRAM, 8, esq1_state ) AM_RANGE(0x0000, 0x1fff) AM_RAM // OSRAM AM_RANGE(0x4000, 0x5fff) AM_RAM // SEQRAM AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE("es5503", es5503_device, read, write) - AM_RANGE(0x6400, 0x640f) AM_DEVREADWRITE("duart", duartn68681_device, read, write) + AM_RANGE(0x6400, 0x640f) AM_DEVREADWRITE("duart", duartn68681_device, read, write) AM_RANGE(0x6800, 0x68ff) AM_NOP AM_RANGE(0x7000, 0x7fff) AM_ROMBANK("osbank") @@ -323,7 +323,7 @@ SLOT_INTERFACE_END static const serial_port_interface midiin_intf = { - DEVCB_DEVICE_LINE_MEMBER("duart", duartn68681_device, rx_a_w) // route MIDI Tx send directly to 68681 channel A Rx + DEVCB_DEVICE_LINE_MEMBER("duart", duartn68681_device, rx_a_w) // route MIDI Tx send directly to 68681 channel A Rx }; static SLOT_INTERFACE_START(midiout_slot) @@ -332,7 +332,7 @@ SLOT_INTERFACE_END static const serial_port_interface midiout_intf = { - DEVCB_NULL // midi out ports don't transmit inward + DEVCB_NULL // midi out ports don't transmit inward }; static const duartn68681_config duart_config = diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c index e108be87323..4fae3c4a6de 100644 --- a/src/mess/drivers/esq5505.c +++ b/src/mess/drivers/esq5505.c @@ -192,29 +192,29 @@ static SLOT_INTERFACE_START( ensoniq_floppies ) SLOT_INTERFACE_END static int maincpu_irq_acknowledge_callback(device_t *device, int irqnum) { - // We immediately update the interrupt presented to the CPU, so that it doesn't - // end up retrying the same interrupt over and over. We then return the appropriate vector. - esq5505_state *esq5505 = device->machine().driver_data<esq5505_state>(); - int vector = 0; - switch(irqnum) { - case 1: - esq5505->otis_irq_state = 0; - vector = M68K_INT_ACK_AUTOVECTOR; - break; - case 2: - esq5505->dmac_irq_state = 0; - vector = esq5505->dmac_irq_vector; - break; - case 3: - esq5505->duart_irq_state = 0; - vector = esq5505->duart_irq_vector; - break; - default: - printf("\nUnexpected IRQ ACK Callback: IRQ %d\n", irqnum); - return 0; - } - esq5505->update_irq_to_maincpu(); - return vector; + // We immediately update the interrupt presented to the CPU, so that it doesn't + // end up retrying the same interrupt over and over. We then return the appropriate vector. + esq5505_state *esq5505 = device->machine().driver_data<esq5505_state>(); + int vector = 0; + switch(irqnum) { + case 1: + esq5505->otis_irq_state = 0; + vector = M68K_INT_ACK_AUTOVECTOR; + break; + case 2: + esq5505->dmac_irq_state = 0; + vector = esq5505->dmac_irq_vector; + break; + case 3: + esq5505->duart_irq_state = 0; + vector = esq5505->duart_irq_vector; + break; + default: + printf("\nUnexpected IRQ ACK Callback: IRQ %d\n", irqnum); + return 0; + } + esq5505->update_irq_to_maincpu(); + return vector; } void esq5505_state::machine_reset() @@ -225,24 +225,24 @@ void esq5505_state::machine_reset() } void esq5505_state::update_irq_to_maincpu() { - //printf("\nupdating IRQ state: have OTIS=%d, DMAC=%d, DUART=%d\n", otis_irq_state, dmac_irq_state, duart_irq_state); - if (duart_irq_state) { - m_maincpu->set_input_line(M68K_IRQ_2, CLEAR_LINE); - m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE); - m_maincpu->set_input_line_and_vector(M68K_IRQ_3, ASSERT_LINE, duart_irq_vector); - } else if (dmac_irq_state) { - m_maincpu->set_input_line(M68K_IRQ_3, CLEAR_LINE); - m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE); - m_maincpu->set_input_line_and_vector(M68K_IRQ_2, ASSERT_LINE, dmac_irq_vector); - } else if (otis_irq_state) { - m_maincpu->set_input_line(M68K_IRQ_3, CLEAR_LINE); - m_maincpu->set_input_line(M68K_IRQ_2, CLEAR_LINE); - m_maincpu->set_input_line(M68K_IRQ_1, ASSERT_LINE); - } else { - m_maincpu->set_input_line(M68K_IRQ_3, CLEAR_LINE); - m_maincpu->set_input_line(M68K_IRQ_2, CLEAR_LINE); - m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE); - } + //printf("\nupdating IRQ state: have OTIS=%d, DMAC=%d, DUART=%d\n", otis_irq_state, dmac_irq_state, duart_irq_state); + if (duart_irq_state) { + m_maincpu->set_input_line(M68K_IRQ_2, CLEAR_LINE); + m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE); + m_maincpu->set_input_line_and_vector(M68K_IRQ_3, ASSERT_LINE, duart_irq_vector); + } else if (dmac_irq_state) { + m_maincpu->set_input_line(M68K_IRQ_3, CLEAR_LINE); + m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE); + m_maincpu->set_input_line_and_vector(M68K_IRQ_2, ASSERT_LINE, dmac_irq_vector); + } else if (otis_irq_state) { + m_maincpu->set_input_line(M68K_IRQ_3, CLEAR_LINE); + m_maincpu->set_input_line(M68K_IRQ_2, CLEAR_LINE); + m_maincpu->set_input_line(M68K_IRQ_1, ASSERT_LINE); + } else { + m_maincpu->set_input_line(M68K_IRQ_3, CLEAR_LINE); + m_maincpu->set_input_line(M68K_IRQ_2, CLEAR_LINE); + m_maincpu->set_input_line(M68K_IRQ_1, CLEAR_LINE); + } } READ16_MEMBER(esq5505_state::lower_r) @@ -252,17 +252,17 @@ READ16_MEMBER(esq5505_state::lower_r) // get pointers when 68k resets if (!m_rom) { - m_rom = (UINT16 *)(void *)machine().root_device().memregion("osrom")->base(); - m_ram = (UINT16 *)(void *)machine().root_device().memshare("osram")->ptr(); + m_rom = (UINT16 *)(void *)machine().root_device().memregion("osrom")->base(); + m_ram = (UINT16 *)(void *)machine().root_device().memshare("osram")->ptr(); } - if (m68k_get_fc(m_maincpu) == 0x6) // supervisor mode = ROM + if (m68k_get_fc(m_maincpu) == 0x6) // supervisor mode = ROM { - return m_rom[offset]; + return m_rom[offset]; } else { - return m_ram[offset]; + return m_ram[offset]; } } @@ -360,10 +360,10 @@ static UINT16 esq5505_read_adc(device_t *device) return 0x7fff; case 2: // volume control - return 0xffff; + return 0xffff; case 3: // pedal - return 0xffff; + return 0xffff; case 5: // mod wheel return 0xffff; @@ -390,7 +390,7 @@ WRITE_LINE_MEMBER(esq5505_state::duart_irq_handler) } else { - duart_irq_state = 0; + duart_irq_state = 0; } update_irq_to_maincpu(); }; @@ -446,20 +446,20 @@ WRITE8_MEMBER(esq5505_state::duart_output) bit 7 = SACK (?) */ - if (data & 0x40) { - if (!m_esp->input_state(es5510_device::ES5510_HALT)) { + if (data & 0x40) { + if (!m_esp->input_state(es5510_device::ES5510_HALT)) { logerror("ESQ5505: Asserting ESPHALT\n"); m_esp->set_input_line(es5510_device::ES5510_HALT, ASSERT_LINE); - } - } else { - if (m_esp->input_state(es5510_device::ES5510_HALT)) { + } + } else { + if (m_esp->input_state(es5510_device::ES5510_HALT)) { logerror("ESQ5505: Clearing ESPHALT\n"); m_esp->set_input_line(es5510_device::ES5510_HALT, CLEAR_LINE); - } - } + } + } - if (floppy) - { + if (floppy) + { if (m_system_type == EPS) { floppy->ss_w((data & 2)>>1); @@ -566,13 +566,13 @@ INPUT_CHANGED_MEMBER(esq5505_state::key_stroke) shift += 32; printf("New shift %d\n", shift); } - else if (val == 0x02) + else if (val == 0x02) { - printf("Analog tests!\n"); - m_panel->xmit_char(54 | 0x80); m_panel->xmit_char(0); // Preset down - m_panel->xmit_char(8 | 0x80); m_panel->xmit_char(0); // Compare down - m_panel->xmit_char(8); m_panel->xmit_char(0); // Compare up - m_panel->xmit_char(54); m_panel->xmit_char(0); // Preset up + printf("Analog tests!\n"); + m_panel->xmit_char(54 | 0x80); m_panel->xmit_char(0); // Preset down + m_panel->xmit_char(8 | 0x80); m_panel->xmit_char(0); // Compare down + m_panel->xmit_char(8); m_panel->xmit_char(0); // Compare up + m_panel->xmit_char(54); m_panel->xmit_char(0); // Preset up } } } @@ -611,7 +611,7 @@ static const es5505_interface es5505_config = "waverom", /* Bank 0 */ "waverom2", /* Bank 1 */ esq5505_otis_irq, /* irq */ - esq5505_read_adc + esq5505_read_adc }; static const esqpanel_interface esqpanel_config = @@ -625,7 +625,7 @@ SLOT_INTERFACE_END static const serial_port_interface midiin_intf = { - DEVCB_DEVICE_LINE_MEMBER("duart", duartn68681_device, rx_a_w) // route MIDI Tx send directly to 68681 channel A Rx + DEVCB_DEVICE_LINE_MEMBER("duart", duartn68681_device, rx_a_w) // route MIDI Tx send directly to 68681 channel A Rx }; static SLOT_INTERFACE_START(midiout_slot) @@ -634,7 +634,7 @@ SLOT_INTERFACE_END static const serial_port_interface midiout_intf = { - DEVCB_NULL // midi out ports don't transmit inward + DEVCB_NULL // midi out ports don't transmit inward }; static MACHINE_CONFIG_START( vfx, esq5505_state ) diff --git a/src/mess/drivers/esqkt.c b/src/mess/drivers/esqkt.c index 9d0d8859672..52a4a73b58b 100644 --- a/src/mess/drivers/esqkt.c +++ b/src/mess/drivers/esqkt.c @@ -435,7 +435,7 @@ SLOT_INTERFACE_END static const serial_port_interface midiin_intf = { - DEVCB_DEVICE_LINE_MEMBER("duart", duartn68681_device, rx_a_w) // route MIDI Tx send directly to 68681 channel A Rx + DEVCB_DEVICE_LINE_MEMBER("duart", duartn68681_device, rx_a_w) // route MIDI Tx send directly to 68681 channel A Rx }; static SLOT_INTERFACE_START(midiout_slot) @@ -444,7 +444,7 @@ SLOT_INTERFACE_END static const serial_port_interface midiout_intf = { - DEVCB_NULL // midi out ports don't transmit inward + DEVCB_NULL // midi out ports don't transmit inward }; static MACHINE_CONFIG_START( kt, esqkt_state ) diff --git a/src/mess/drivers/fp1100.c b/src/mess/drivers/fp1100.c index f0e36eadf08..c2fd8ab888b 100644 --- a/src/mess/drivers/fp1100.c +++ b/src/mess/drivers/fp1100.c @@ -385,7 +385,7 @@ static const UPD7810_CONFIG fp1100_slave_cpu_config = { TYPE_7801, NULL }; static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ fp1100_update_row, /* row update callback */ diff --git a/src/mess/drivers/fp6000.c b/src/mess/drivers/fp6000.c index 2276d356177..ee8d4f30774 100644 --- a/src/mess/drivers/fp6000.c +++ b/src/mess/drivers/fp6000.c @@ -283,7 +283,7 @@ void fp6000_state::machine_reset() static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ diff --git a/src/mess/drivers/gb.c b/src/mess/drivers/gb.c index d894ad8cd6c..5c34ebbf8e9 100644 --- a/src/mess/drivers/gb.c +++ b/src/mess/drivers/gb.c @@ -618,7 +618,7 @@ static ADDRESS_MAP_START(megaduck_map, AS_PROGRAM, 8, megaduck_state ) AM_RANGE(0x0000, 0x7fff) AM_READWRITE(cart_r, bank1_w) AM_RANGE(0x8000, 0x9fff) AM_READWRITE(gb_vram_r, gb_vram_w ) /* 8k VRAM */ AM_RANGE(0xa000, 0xafff) AM_NOP /* unused? */ - AM_RANGE(0xb000, 0xb000) AM_WRITE(bank2_w) + AM_RANGE(0xb000, 0xb000) AM_WRITE(bank2_w) AM_RANGE(0xb001, 0xbfff) AM_NOP /* unused? */ AM_RANGE(0xc000, 0xfe9f) AM_RAM /* 8k low RAM, echo RAM */ AM_RANGE(0xfe00, 0xfeff) AM_READWRITE(gb_oam_r, gb_oam_w ) /* OAM RAM */ diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c index 36581fc0297..d1ed29eef90 100644 --- a/src/mess/drivers/gba.c +++ b/src/mess/drivers/gba.c @@ -1325,7 +1325,7 @@ WRITE32_MEMBER(gba_state::gba_io_w) } if( (mem_mask) & 0x00ff0000 ) { - gb_sound_w(m_gbsound, space, 1, data>>16); // SOUND1CNT_H + gb_sound_w(m_gbsound, space, 1, data>>16); // SOUND1CNT_H } if( (mem_mask) & 0xff000000 ) { @@ -1339,7 +1339,7 @@ WRITE32_MEMBER(gba_state::gba_io_w) } if( (mem_mask) & 0x0000ff00 ) { - gb_sound_w(m_gbsound, space, 4, data>>8); // SOUND1CNT_H + gb_sound_w(m_gbsound, space, 4, data>>8); // SOUND1CNT_H } break; case 0x0068/4: @@ -1369,7 +1369,7 @@ WRITE32_MEMBER(gba_state::gba_io_w) } if( (mem_mask) & 0x00ff0000 ) { - gb_sound_w(m_gbsound, space, 0xb, data>>16); // SOUND1CNT_H + gb_sound_w(m_gbsound, space, 0xb, data>>16); // SOUND1CNT_H } if( (mem_mask) & 0xff000000 ) { diff --git a/src/mess/drivers/m20.c b/src/mess/drivers/m20.c index 78b4ac2a31b..7d6b81f7045 100644 --- a/src/mess/drivers/m20.c +++ b/src/mess/drivers/m20.c @@ -836,7 +836,7 @@ void m20_state::machine_reset() static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 16, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c index 3f1d986a491..7c6d0fa1663 100644 --- a/src/mess/drivers/mac.c +++ b/src/mess/drivers/mac.c @@ -39,7 +39,7 @@ 'g 6802c73c' to get to the interesting part (wait past the boot chime). PPC register r24 is the 68000 PC. when the PC hits GetCPUID, the move.l (a2), d0 at PC = 0x10000 will cause an MMU fault (jump to 0xFFF00300). why? a2 = 0x5ffffffc (the CPU ID register). MMU is unable to resolve this; defect in the MMU emulation probable. - + ****************************************************************************/ diff --git a/src/mess/drivers/megadriv.c b/src/mess/drivers/megadriv.c index f6c58d87705..ca9a6a5a609 100644 --- a/src/mess/drivers/megadriv.c +++ b/src/mess/drivers/megadriv.c @@ -297,7 +297,7 @@ static MACHINE_RESET( ms_megadriv ) static SLOT_INTERFACE_START(md_cart) SLOT_INTERFACE_INTERNAL("rom", MD_STD_ROM) SLOT_INTERFACE_INTERNAL("rom_svp", MD_STD_ROM) -// SLOT_INTERFACE_INTERNAL("rom_svp", MD_ROM_SVP) // not ready yet... +// SLOT_INTERFACE_INTERNAL("rom_svp", MD_ROM_SVP) // not ready yet... SLOT_INTERFACE_INTERNAL("rom_sk", MD_ROM_SK) // NVRAM handling SLOT_INTERFACE_INTERNAL("rom_sram", MD_ROM_SRAM) @@ -468,7 +468,7 @@ DEVICE_IMAGE_LOAD_MEMBER( md_base_state, _32x_cart ) UINT16 *ROM16; UINT32 *ROM32; int i; - + if (image.software_entry() == NULL) { length = image.length(); @@ -481,23 +481,23 @@ DEVICE_IMAGE_LOAD_MEMBER( md_base_state, _32x_cart ) temp_copy = auto_alloc_array(image.device().machine(), UINT8, length); memcpy(temp_copy, image.get_software_region("rom"), length); } - + /* Copy the cart image in the locations the driver expects */ // Notice that, by using pick_integer, we are sure the code works on both LE and BE machines ROM16 = (UINT16 *) image.device().machine().root_device().memregion("gamecart")->base(); for (i = 0; i < length; i += 2) ROM16[i / 2] = pick_integer_be(temp_copy, i, 2); - + ROM32 = (UINT32 *) image.device().machine().root_device().memregion("gamecart_sh2")->base(); for (i = 0; i < length; i += 4) ROM32[i / 4] = pick_integer_be(temp_copy, i, 4); - + ROM16 = (UINT16 *) image.device().machine().root_device().memregion("maincpu")->base(); for (i = 0x00; i < length; i += 2) ROM16[i / 2] = pick_integer_be(temp_copy, i, 2); - + auto_free(image.device().machine(), temp_copy); - + return IMAGE_INIT_PASS; } diff --git a/src/mess/drivers/microvsn.c b/src/mess/drivers/microvsn.c index 0d6153471a9..97d1fd7f4e8 100644 --- a/src/mess/drivers/microvsn.c +++ b/src/mess/drivers/microvsn.c @@ -80,8 +80,8 @@ public: }; cpu_type m_cpu_type; - pcb_type m_pcb_type; - rc_type m_rc_type; + pcb_type m_pcb_type; + rc_type m_rc_type; protected: required_device<dac_device> m_dac; @@ -191,7 +191,7 @@ MACHINE_RESET_MEMBER(microvision_state, microvision) break; case RC_TYPE_100PF_23_2K: - case RC_TYPE_UNKNOWN: // Default to most occuring setting + case RC_TYPE_UNKNOWN: // Default to most occuring setting static_set_clock( m_tms1100, 500000 ); break; diff --git a/src/mess/drivers/multi16.c b/src/mess/drivers/multi16.c index b885ea526c5..30871f718e7 100644 --- a/src/mess/drivers/multi16.c +++ b/src/mess/drivers/multi16.c @@ -149,7 +149,7 @@ void multi16_state::machine_reset() static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ diff --git a/src/mess/drivers/multi8.c b/src/mess/drivers/multi8.c index d8cfdc26d85..4413bb516c4 100644 --- a/src/mess/drivers/multi8.c +++ b/src/mess/drivers/multi8.c @@ -560,7 +560,7 @@ GFXDECODE_END static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ diff --git a/src/mess/drivers/myb3k.c b/src/mess/drivers/myb3k.c index d205b6c5c56..97d9ca79f57 100644 --- a/src/mess/drivers/myb3k.c +++ b/src/mess/drivers/myb3k.c @@ -233,7 +233,7 @@ GFXDECODE_END static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c index 35deaaa1751..e369801f282 100644 --- a/src/mess/drivers/mycom.c +++ b/src/mess/drivers/mycom.c @@ -333,17 +333,17 @@ GFXDECODE_END static MC6845_INTERFACE( mc6845_intf ) { - "screen", /* screen we are acting on */ - false, /* show border area */ - 8, /* number of pixels per video memory address */ - NULL, /* before pixel update callback */ - mycom_update_row, /* row update callback */ - NULL, /* after pixel update callback */ - DEVCB_NULL, /* callback for display state changes */ - DEVCB_NULL, /* callback for cursor state changes */ - DEVCB_NULL, /* HSYNC callback */ - DEVCB_NULL, /* VSYNC callback */ - NULL /* update address callback */ + "screen", /* screen we are acting on */ + false, /* show border area */ + 8, /* number of pixels per video memory address */ + NULL, /* before pixel update callback */ + mycom_update_row, /* row update callback */ + NULL, /* after pixel update callback */ + DEVCB_NULL, /* callback for display state changes */ + DEVCB_NULL, /* callback for cursor state changes */ + DEVCB_NULL, /* HSYNC callback */ + DEVCB_NULL, /* VSYNC callback */ + NULL /* update address callback */ }; WRITE8_MEMBER( mycom_state::mycom_04_w ) diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c index f244ae2c80d..ecd44b20af2 100644 --- a/src/mess/drivers/mz2500.c +++ b/src/mess/drivers/mz2500.c @@ -1849,8 +1849,8 @@ static GFXDECODE_START( mz2500 ) GFXDECODE_ENTRY("kanji", 0, mz2500_cg_layout, 0, 256) GFXDECODE_ENTRY("kanji", 0x4400, mz2500_8_layout, 0, 256) GFXDECODE_ENTRY("kanji", 0, mz2500_16_layout, 0, 256) -// GFXDECODE_ENTRY("pcg", 0, mz2500_pcg_layout_1bpp, 0, 0x10) -// GFXDECODE_ENTRY("pcg", 0, mz2500_pcg_layout_3bpp, 0, 4) +// GFXDECODE_ENTRY("pcg", 0, mz2500_pcg_layout_1bpp, 0, 0x10) +// GFXDECODE_ENTRY("pcg", 0, mz2500_pcg_layout_3bpp, 0, 4) GFXDECODE_END INTERRUPT_GEN_MEMBER(mz2500_state::mz2500_vbl) diff --git a/src/mess/drivers/odyssey2.c b/src/mess/drivers/odyssey2.c index ed0a0f82d9b..08e4578a032 100644 --- a/src/mess/drivers/odyssey2.c +++ b/src/mess/drivers/odyssey2.c @@ -96,7 +96,7 @@ protected: required_ioport m_key5; required_ioport m_joy0; required_ioport m_joy1; - + void switch_banks(); }; @@ -104,7 +104,7 @@ class g7400_state : public odyssey2_state { public: g7400_state(const machine_config &mconfig, device_type type, const char *tag) - : odyssey2_state(mconfig, type, tag) + : odyssey2_state(mconfig, type, tag) , m_i8243(*this, "i8243") , m_ef9340_1(*this, "ef9340_1") { } @@ -246,7 +246,7 @@ const UINT8 odyssey2_colors[] = /* Background,Grid Dim */ 0x00,0x00,0x00, /* Black */ // i r g b 0x13,0x35,0xA5, /* Blue - Calibrated To Real VideoPac */ // i r g B - 0x02,0x70,0x02, /* Green - Calibrated To Real VideoPac */ // i r G b + 0x02,0x70,0x02, /* Green - Calibrated To Real VideoPac */ // i r G b 0x38,0x85,0x8C, /* Blue-Green - Calibrated To Real VideoPac */ // i r G B 0x91,0x00,0x00, /* Dk Red - Calibrated To Real VideoPac */ // i R g b 0x86,0x49,0xA3, /* Violet - Calibrated To Real VideoPac */ // i R g B @@ -258,7 +258,7 @@ const UINT8 odyssey2_colors[] = 0x60,0x89,0xDB, /* Ltr Blue - Calibrated To Real VideoPac */ // I R g B 0x54,0xBF,0x54, /* Lt Green - Calibrated To Real VideoPac */ // I R g B 0x6B,0xDD,0xF4, /* Lt Blue - Calibrated To Real VideoPac */ // I R g b - 0xE5,0x5E,0x5E, /* Red - Calibrated To Real VideoPac */ // I R g b + 0xE5,0x5E,0x5E, /* Red - Calibrated To Real VideoPac */ // I R g b 0xD9,0x83,0xDB, /* Lt Violet - Calibrated To Real VideoPac */ // I R g B 0xC4,0xBD,0x5C, /* Lt Yellow - Calibrated To Real VideoPac */ // I R G b 0xFF,0xFF,0xFF, /* White */ // I R G B @@ -283,7 +283,7 @@ void g7400_state::palette_init() 0x49,0x49,0x49, 0x49,0x49,0xff, 0x49,0xff,0x49, 0x49,0xff,0xff, 0xff,0x49,0x49, 0xff,0x49,0xff, 0xff,0xff,0x49, 0xff,0xff,0xff - + }; for ( int i = 0; i < 16; i++ ) diff --git a/src/mess/drivers/paso1600.c b/src/mess/drivers/paso1600.c index 3d152ab4926..9d2c10b6a87 100644 --- a/src/mess/drivers/paso1600.c +++ b/src/mess/drivers/paso1600.c @@ -263,7 +263,7 @@ GFXDECODE_END static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ diff --git a/src/mess/drivers/pasopia.c b/src/mess/drivers/pasopia.c index 4e88bc37314..0159cf33b81 100644 --- a/src/mess/drivers/pasopia.c +++ b/src/mess/drivers/pasopia.c @@ -303,17 +303,17 @@ static Z80PIO_INTERFACE( z80pio_intf ) static MC6845_INTERFACE( mc6845_intf ) { - "screen", /* screen we are acting on */ - false, /* show border area */ - 8, /* number of pixels per video memory address */ - NULL, /* before pixel update callback */ + "screen", /* screen we are acting on */ + false, /* show border area */ + 8, /* number of pixels per video memory address */ + NULL, /* before pixel update callback */ pasopia_update_row, /* row update callback */ - NULL, /* after pixel update callback */ - DEVCB_NULL, /* callback for display state changes */ - DEVCB_NULL, /* callback for cursor state changes */ - DEVCB_NULL, /* HSYNC callback */ - DEVCB_NULL, /* VSYNC callback */ - NULL /* update address callback */ + NULL, /* after pixel update callback */ + DEVCB_NULL, /* callback for display state changes */ + DEVCB_NULL, /* callback for cursor state changes */ + DEVCB_NULL, /* HSYNC callback */ + DEVCB_NULL, /* VSYNC callback */ + NULL /* update address callback */ }; static const gfx_layout p7_chars_8x8 = diff --git a/src/mess/drivers/pasopia7.c b/src/mess/drivers/pasopia7.c index efb5c2a30e4..44eb2ed0138 100644 --- a/src/mess/drivers/pasopia7.c +++ b/src/mess/drivers/pasopia7.c @@ -726,7 +726,7 @@ GFXDECODE_END static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ diff --git a/src/mess/drivers/pet.c b/src/mess/drivers/pet.c index 9637c610524..2c3c4febe54 100644 --- a/src/mess/drivers/pet.c +++ b/src/mess/drivers/pet.c @@ -707,9 +707,9 @@ static MACHINE_CONFIG_START( pet_general, pet_state ) MCFG_PIA6821_ADD( "pia_0", pet_pia0) MCFG_PIA6821_ADD( "pia_1", pet_pia1) - /* software lists */ - MCFG_SOFTWARE_LIST_ADD("rom_list", "pet_rom") - MCFG_SOFTWARE_LIST_ADD("flop_list", "pet_flop") + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("rom_list", "pet_rom") + MCFG_SOFTWARE_LIST_ADD("flop_list", "pet_flop") MACHINE_CONFIG_END @@ -818,12 +818,12 @@ static MACHINE_CONFIG_DERIVED( superpet, pet80 ) MCFG_PIA6821_MODIFY( "pia_0", petb_pia0 ) - MCFG_SOFTWARE_LIST_ADD("flop_list2", "superpet_flop") + MCFG_SOFTWARE_LIST_ADD("flop_list2", "superpet_flop") MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( cbm8296, pet80pal ) - MCFG_SOFTWARE_LIST_ADD("flop_list2", "cbm8296_flop") + MCFG_SOFTWARE_LIST_ADD("flop_list2", "cbm8296_flop") MACHINE_CONFIG_END diff --git a/src/mess/drivers/pet2001.c b/src/mess/drivers/pet2001.c index 6a1eca61ff7..373141ea7e3 100644 --- a/src/mess/drivers/pet2001.c +++ b/src/mess/drivers/pet2001.c @@ -130,23 +130,23 @@ ROM sockets: UA3 2K or 4K character /* - TODO: - - - accurate video timing for non-CRTC models - - PET 4000-12 (40 column CRTC models) - - High Speed Graphics board - - keyboard layouts - - Swedish - - German - - SuperPET - - 6809 - - OS/9 MMU - - 8096 - - 64k expansion - - 8296 - - PLA dumps - - high resolution graphics - - rom software list + TODO: + + - accurate video timing for non-CRTC models + - PET 4000-12 (40 column CRTC models) + - High Speed Graphics board + - keyboard layouts + - Swedish + - German + - SuperPET + - 6809 + - OS/9 MMU + - 8096 + - 64k expansion + - 8296 + - PLA dumps + - high resolution graphics + - rom software list */ @@ -196,7 +196,7 @@ READ8_MEMBER( pet_state::read ) switch (sel) { - case SEL0: case SEL1: case SEL2: case SEL3: case SEL4: case SEL5: case SEL6: case SEL7: + case SEL0: case SEL1: case SEL2: case SEL3: case SEL4: case SEL5: case SEL6: case SEL7: if (offset < m_ram->size()) { data = m_ram->pointer()[offset]; @@ -255,7 +255,7 @@ WRITE8_MEMBER( pet_state::write ) switch (sel) { - case SEL0: case SEL1: case SEL2: case SEL3: case SEL4: case SEL5: case SEL6: case SEL7: + case SEL0: case SEL1: case SEL2: case SEL3: case SEL4: case SEL5: case SEL6: case SEL7: if (offset < m_ram->size()) { m_ram->pointer()[offset] = data; @@ -582,10 +582,10 @@ READ8_MEMBER( pet_state::via_pb_r ) bit description PB0 _NDAC IN - PB1 - PB2 - PB3 - PB4 + PB1 + PB2 + PB3 + PB4 PB5 SYNC IN PB6 _NRFD IN PB7 _DAV IN @@ -611,14 +611,14 @@ WRITE8_MEMBER( pet_state::via_pb_w ) bit description - PB0 + PB0 PB1 _NRFD OUT PB2 _ATN OUT PB3 CASS WRITE PB4 #2 CASS MOTOR - PB5 - PB6 - PB7 + PB5 + PB6 + PB7 */ @@ -726,9 +726,9 @@ WRITE8_MEMBER( pet_state::pia1_pa_w ) PA1 KEY B PA2 KEY C PA3 KEY D - PA4 - PA5 - PA6 + PA4 + PA5 + PA6 PA7 SPEAKER */ @@ -1871,33 +1871,33 @@ ROM_END // SYSTEM DRIVERS //************************************************************************** -// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS -COMP( 1977, pet2001, 0, 0, pet2001, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-4", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1977, pet20018, pet2001, 0, pet20018, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-8", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1979, pet2001n, 0, 0, pet2001n8, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-N8", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1979, pet2001n16, pet2001n, 0, pet2001n16, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-N16", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1979, pet2001n32, pet2001n, 0, pet2001n32, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-N32", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1979, cbm3008, pet2001n, 0, cbm3008, pet, driver_device, 0, "Commodore Business Machines", "CBM 3008", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1979, cbm3016, pet2001n, 0, cbm3016, pet, driver_device, 0, "Commodore Business Machines", "CBM 3016", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1979, cbm3032, pet2001n, 0, cbm3032, pet, driver_device, 0, "Commodore Business Machines", "CBM 3032", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1979, pet2001b, 0, 0, pet2001b8, petb, driver_device, 0, "Commodore Business Machines", "PET 2001-B8", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1979, pet2001b16, pet2001b, 0, pet2001b16, petb, driver_device, 0, "Commodore Business Machines", "PET 2001-B16", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1979, pet2001b32, pet2001b, 0, pet2001b32, petb, driver_device, 0, "Commodore Business Machines", "PET 2001-B32", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1979, cbm3032b, pet2001b, 0, cbm3032b, petb, driver_device, 0, "Commodore Business Machines", "CBM 3032B", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1980, pet4016, 0, 0, pet4016, pet, driver_device, 0, "Commodore Business Machines", "PET 4016", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1980, pet4032, pet4016, 0, pet4032, pet, driver_device, 0, "Commodore Business Machines", "PET 4032", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1980, cbm4016, pet4016, 0, cbm4016, pet, driver_device, 0, "Commodore Business Machines", "CBM 4016", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1980, cbm4032, pet4016, 0, cbm4032, pet, driver_device, 0, "Commodore Business Machines", "CBM 4032", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1980, pet4032b, 0, 0, pet4032b, petb, driver_device, 0, "Commodore Business Machines", "PET 4032B", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1980, cbm4032b, pet4032b, 0, cbm4032b, petb, driver_device, 0, "Commodore Business Machines", "CBM 4032B", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) -COMP( 1980, pet8032, 0, 0, pet8032, petb, driver_device, 0, "Commodore Business Machines", "PET 8032", GAME_SUPPORTS_SAVE ) -COMP( 1981, cbm8032, pet8032, 0, pet8032, petb, driver_device, 0, "Commodore Business Machines", "CBM 8032", GAME_SUPPORTS_SAVE ) -COMP( 1981, cbm8032_de, pet8032, 0, pet8032, petb_de, driver_device, 0, "Commodore Business Machines", "CBM 8032 (Germany)", GAME_SUPPORTS_SAVE ) -COMP( 1981, cbm8032_se, pet8032, 0, pet8032, petb_se, driver_device, 0, "Commodore Business Machines", "CBM 8032 (Sweden/Finland)", GAME_SUPPORTS_SAVE ) -COMP( 1981, superpet, pet8032, 0, superpet, petb, driver_device, 0, "Commodore Business Machines", "SuperPET SP-9000", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) -COMP( 1981, mmf9000, pet8032, 0, superpet, petb, driver_device, 0, "Commodore Business Machines", "MicroMainFrame 9000", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) -COMP( 1981, mmf9000_se, pet8032, 0, superpet, petb_se, driver_device, 0, "Commodore Business Machines", "MicroMainFrame 9000 (Sweden/Finland)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) -COMP( 1981, cbm8096, pet8032, 0, cbm8096, petb, driver_device, 0, "Commodore Business Machines", "CBM 8096", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) -COMP( 1984, cbm8296, 0, 0, cbm8296, petb, driver_device, 0, "Commodore Business Machines", "CBM 8296", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) -COMP( 1984, cbm8296d, cbm8296, 0, cbm8296d, petb, driver_device, 0, "Commodore Business Machines", "CBM 8296D", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) -COMP( 1984, cbm8296d_de,cbm8296, 0, cbm8296d, petb_de, driver_device, 0, "Commodore Business Machines", "CBM 8296D (Germany)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) +// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS +COMP( 1977, pet2001, 0, 0, pet2001, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-4", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1977, pet20018, pet2001, 0, pet20018, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-8", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1979, pet2001n, 0, 0, pet2001n8, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-N8", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1979, pet2001n16, pet2001n, 0, pet2001n16, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-N16", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1979, pet2001n32, pet2001n, 0, pet2001n32, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-N32", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1979, cbm3008, pet2001n, 0, cbm3008, pet, driver_device, 0, "Commodore Business Machines", "CBM 3008", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1979, cbm3016, pet2001n, 0, cbm3016, pet, driver_device, 0, "Commodore Business Machines", "CBM 3016", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1979, cbm3032, pet2001n, 0, cbm3032, pet, driver_device, 0, "Commodore Business Machines", "CBM 3032", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1979, pet2001b, 0, 0, pet2001b8, petb, driver_device, 0, "Commodore Business Machines", "PET 2001-B8", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1979, pet2001b16, pet2001b, 0, pet2001b16, petb, driver_device, 0, "Commodore Business Machines", "PET 2001-B16", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1979, pet2001b32, pet2001b, 0, pet2001b32, petb, driver_device, 0, "Commodore Business Machines", "PET 2001-B32", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1979, cbm3032b, pet2001b, 0, cbm3032b, petb, driver_device, 0, "Commodore Business Machines", "CBM 3032B", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1980, pet4016, 0, 0, pet4016, pet, driver_device, 0, "Commodore Business Machines", "PET 4016", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1980, pet4032, pet4016, 0, pet4032, pet, driver_device, 0, "Commodore Business Machines", "PET 4032", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1980, cbm4016, pet4016, 0, cbm4016, pet, driver_device, 0, "Commodore Business Machines", "CBM 4016", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1980, cbm4032, pet4016, 0, cbm4032, pet, driver_device, 0, "Commodore Business Machines", "CBM 4032", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1980, pet4032b, 0, 0, pet4032b, petb, driver_device, 0, "Commodore Business Machines", "PET 4032B", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1980, cbm4032b, pet4032b, 0, cbm4032b, petb, driver_device, 0, "Commodore Business Machines", "CBM 4032B", GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW ) +COMP( 1980, pet8032, 0, 0, pet8032, petb, driver_device, 0, "Commodore Business Machines", "PET 8032", GAME_SUPPORTS_SAVE ) +COMP( 1981, cbm8032, pet8032, 0, pet8032, petb, driver_device, 0, "Commodore Business Machines", "CBM 8032", GAME_SUPPORTS_SAVE ) +COMP( 1981, cbm8032_de, pet8032, 0, pet8032, petb_de, driver_device, 0, "Commodore Business Machines", "CBM 8032 (Germany)", GAME_SUPPORTS_SAVE ) +COMP( 1981, cbm8032_se, pet8032, 0, pet8032, petb_se, driver_device, 0, "Commodore Business Machines", "CBM 8032 (Sweden/Finland)", GAME_SUPPORTS_SAVE ) +COMP( 1981, superpet, pet8032, 0, superpet, petb, driver_device, 0, "Commodore Business Machines", "SuperPET SP-9000", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) +COMP( 1981, mmf9000, pet8032, 0, superpet, petb, driver_device, 0, "Commodore Business Machines", "MicroMainFrame 9000", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) +COMP( 1981, mmf9000_se, pet8032, 0, superpet, petb_se, driver_device, 0, "Commodore Business Machines", "MicroMainFrame 9000 (Sweden/Finland)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) +COMP( 1981, cbm8096, pet8032, 0, cbm8096, petb, driver_device, 0, "Commodore Business Machines", "CBM 8096", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) +COMP( 1984, cbm8296, 0, 0, cbm8296, petb, driver_device, 0, "Commodore Business Machines", "CBM 8296", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) +COMP( 1984, cbm8296d, cbm8296, 0, cbm8296d, petb, driver_device, 0, "Commodore Business Machines", "CBM 8296D", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) +COMP( 1984, cbm8296d_de,cbm8296, 0, cbm8296d, petb_de, driver_device, 0, "Commodore Business Machines", "CBM 8296D (Germany)", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE ) diff --git a/src/mess/drivers/plus4.c b/src/mess/drivers/plus4.c index 6f219081597..e3d07d8c1b8 100644 --- a/src/mess/drivers/plus4.c +++ b/src/mess/drivers/plus4.c @@ -594,18 +594,18 @@ WRITE_LINE_MEMBER( plus4_state::ted_irq_w ) READ8_MEMBER( plus4_state::ted_k_r ) { /* - + bit description - + 0 JOY A0, JOY B0 1 JOY A1, JOY B1 2 JOY A2, JOY B2 3 JOY A3, JOY B3 - 4 - 5 + 4 + 5 6 BTN A 7 BTN B - + */ UINT8 data = 0xff; @@ -614,7 +614,7 @@ READ8_MEMBER( plus4_state::ted_k_r ) if (!BIT(offset, 2)) { UINT8 joy_a = m_joy1->joy_r(); - + data &= (0xf0 | (joy_a & 0x0f)); data &= ~(!BIT(joy_a, 5) << 6); } @@ -622,7 +622,7 @@ READ8_MEMBER( plus4_state::ted_k_r ) if (!BIT(offset, 1)) { UINT8 joy_b = m_joy2->joy_r(); - + data &= (0xf0 | (joy_b & 0x0f)); data &= ~(!BIT(joy_b, 5) << 7); } diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c index 6d59e6ae520..53b1daa72b3 100644 --- a/src/mess/drivers/portfoli.c +++ b/src/mess/drivers/portfoli.c @@ -62,7 +62,7 @@ TODO: - - expansion port slot interface + - expansion port slot interface - clock is running too fast - create chargen ROM from tech manual - memory error interrupt vector @@ -202,12 +202,12 @@ void portfolio_state::scan_keyboard() UINT8 keycode = 0xff; UINT8 keydata[8] = { m_y0->read(), m_y1->read(), m_y2->read(), m_y3->read(), - m_y4->read(), m_y5->read(), m_y6->read(), m_y7->read() }; + m_y4->read(), m_y5->read(), m_y6->read(), m_y7->read() }; for (int row = 0; row < 8; row++) { UINT8 data = keydata[row]; - + if (data != 0xff) { for (int col = 0; col < 8; col++) diff --git a/src/mess/drivers/prof180x.c b/src/mess/drivers/prof180x.c index 5443a0ab0f6..bbbc60abe6d 100644 --- a/src/mess/drivers/prof180x.c +++ b/src/mess/drivers/prof180x.c @@ -40,31 +40,29 @@ READ8_MEMBER( prof180x_state::read ) if (offset < 0x40000) { - } else { - } /* - switch ((m_mm1 << 1) | m_mm0) - { - case 0: - // bank0_r = EPROM, bank0_w = RAM, bank1 = RAM - break; - - case 1: - // bank0_r = RAM, bank0_w = RAM, bank1 = RAM - break; - - case 2: - // bank0_r = UNMAP, bank0_w = UNMAP, bank1 = RAM - break; - - case 3: - // bank0_r = RAM, bank0_w = RAM, bank1 = UNMAP - break; - } + switch ((m_mm1 << 1) | m_mm0) + { + case 0: + // bank0_r = EPROM, bank0_w = RAM, bank1 = RAM + break; + + case 1: + // bank0_r = RAM, bank0_w = RAM, bank1 = RAM + break; + + case 2: + // bank0_r = UNMAP, bank0_w = UNMAP, bank1 = RAM + break; + + case 3: + // bank0_r = RAM, bank0_w = RAM, bank1 = UNMAP + break; + } */ return data; } @@ -73,12 +71,10 @@ WRITE8_MEMBER( prof180x_state::write ) { if (offset < 0x40000) { - } else { - - } + } } void prof180x_state::ls259_w(int flag, int value) diff --git a/src/mess/drivers/prof80.c b/src/mess/drivers/prof80.c index be3d2683dec..042965f1889 100644 --- a/src/mess/drivers/prof80.c +++ b/src/mess/drivers/prof80.c @@ -156,7 +156,7 @@ void prof80_state::ls259_w(int fa, int sa, int fb, int sb) // turn on floppy motor if (m_floppy0->get_device()) m_floppy0->get_device()->mon_w(0); if (m_floppy1->get_device()) m_floppy1->get_device()->mon_w(0); - + m_motor = 1; // reset floppy motor off NE555 timer diff --git a/src/mess/drivers/sage2.c b/src/mess/drivers/sage2.c index ca6d9c1a24d..a5ac172cbb5 100644 --- a/src/mess/drivers/sage2.c +++ b/src/mess/drivers/sage2.c @@ -255,7 +255,7 @@ WRITE8_MEMBER( sage2_state::ppi0_pc_w ) // floppy motor if (m_floppy) m_floppy->mon_w(BIT(data, 5)); - + // FDC reset if(BIT(data, 7)) m_fdc->reset(); } diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index 685ba4185b6..f4825345cd6 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -137,7 +137,7 @@ UINT32 smc777_state::screen_update_smc777(screen_device &screen, bitmap_ind16 &b UINT16 count; int x_width; -// popmessage("%d %d %d %d",mc6845_v_char_total,mc6845_v_total_adj,mc6845_v_display,mc6845_v_sync_pos); +// popmessage("%d %d %d %d",mc6845_v_char_total,mc6845_v_total_adj,mc6845_v_display,mc6845_v_sync_pos); bitmap.fill(machine().pens[m_backdrop_pen], cliprect); @@ -162,7 +162,7 @@ UINT32 smc777_state::screen_update_smc777(screen_device &screen, bitmap_ind16 &b } //else //{ - // bitmap.pix16(y+yi+CRTC_MIN_Y, x*2+0+CRTC_MIN_X) = machine().pens[color]; + // bitmap.pix16(y+yi+CRTC_MIN_Y, x*2+0+CRTC_MIN_X) = machine().pens[color]; //} color = (m_gvram[count] & 0x0f) >> 0; @@ -173,7 +173,7 @@ UINT32 smc777_state::screen_update_smc777(screen_device &screen, bitmap_ind16 &b } //else //{ - // bitmap.pix16(y+yi+CRTC_MIN_Y, x*2+1+CRTC_MIN_X) = machine().pens[color]; + // bitmap.pix16(y+yi+CRTC_MIN_Y, x*2+1+CRTC_MIN_X) = machine().pens[color]; //} count++; @@ -997,7 +997,7 @@ void smc777_state::machine_reset() static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - true, /* show border area */ + true, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ diff --git a/src/mess/drivers/super80.c b/src/mess/drivers/super80.c index 0ec66c414d3..edac90a20d6 100644 --- a/src/mess/drivers/super80.c +++ b/src/mess/drivers/super80.c @@ -185,14 +185,14 @@ hardware. #include "includes/super80.h" #include "formats/z80bin.h" -#define MASTER_CLOCK (XTAL_12MHz) -#define PIXEL_CLOCK (MASTER_CLOCK/2) -#define HTOTAL (384) -#define HBEND (0) -#define HBSTART (256) -#define VTOTAL (240) -#define VBEND (0) -#define VBSTART (160) +#define MASTER_CLOCK (XTAL_12MHz) +#define PIXEL_CLOCK (MASTER_CLOCK/2) +#define HTOTAL (384) +#define HBEND (0) +#define HBSTART (256) +#define VTOTAL (240) +#define VBEND (0) +#define VBSTART (160) #define SUPER80V_SCREEN_WIDTH (560) #define SUPER80V_SCREEN_HEIGHT (300) diff --git a/src/mess/drivers/tek405x.c b/src/mess/drivers/tek405x.c index 47d94ee6915..be29fa48699 100644 --- a/src/mess/drivers/tek405x.c +++ b/src/mess/drivers/tek405x.c @@ -1342,15 +1342,15 @@ ROM_START( tek4051 ) ROM_LOAD( "156-0714-01.u121", 0x1000, 0x0800, NO_DUMP ) ROM_LOAD( "156-0715-01.u131", 0x1800, 0x0800, NO_DUMP ) /* - ROM_REGION( 0x2000, "4051r01", 0 ) // 4051R01 Matrix Functions - ROM_LOAD( "4051r01", 0x0000, 0x1000, NO_DUMP ) + ROM_REGION( 0x2000, "4051r01", 0 ) // 4051R01 Matrix Functions + ROM_LOAD( "4051r01", 0x0000, 0x1000, NO_DUMP ) - ROM_REGION( 0x2000, "4051r05", 0 ) // 4051R05 Binary Program Loader - ROM_LOAD( "156-0856-00.u1", 0x0000, 0x0800, NO_DUMP ) - ROM_LOAD( "156-0857-00.u11", 0x0800, 0x0800, NO_DUMP ) + ROM_REGION( 0x2000, "4051r05", 0 ) // 4051R05 Binary Program Loader + ROM_LOAD( "156-0856-00.u1", 0x0000, 0x0800, NO_DUMP ) + ROM_LOAD( "156-0857-00.u11", 0x0800, 0x0800, NO_DUMP ) - ROM_REGION( 0x2000, "4051r06", 0 ) // 4051R06 Editor - ROM_LOAD( "4051r06", 0x0000, 0x1000, NO_DUMP ) + ROM_REGION( 0x2000, "4051r06", 0 ) // 4051R06 Editor + ROM_LOAD( "4051r06", 0x0000, 0x1000, NO_DUMP ) */ ROM_END diff --git a/src/mess/drivers/ti89.c b/src/mess/drivers/ti89.c index 4d8abcd84e4..5772c1d69bf 100644 --- a/src/mess/drivers/ti89.c +++ b/src/mess/drivers/ti89.c @@ -39,7 +39,7 @@ UINT8 ti68k_state::keypad_r (running_machine &machine) data ^= m_io_bit5->read() & (0x01 << bit) ? 0x20 : 0x00; data ^= m_io_bit6->read() & (0x01 << bit) ? 0x40 : 0x00; data ^= m_io_bit7->read() & (0x01 << bit) ? 0x80 : 0x00; - } + } } return data; diff --git a/src/mess/drivers/tk80bs.c b/src/mess/drivers/tk80bs.c index 110a8ec0ffb..25b1e396b29 100644 --- a/src/mess/drivers/tk80bs.c +++ b/src/mess/drivers/tk80bs.c @@ -197,7 +197,7 @@ READ8_MEMBER( tk80bs_state::key_matrix_r ) // PA0-7 keyscan in UINT8 data = 0xff; - + if (BIT(m_ppi_portc, 4)) data &= ioport("X0")->read(); if (BIT(m_ppi_portc, 5)) diff --git a/src/mess/drivers/tmc1800.c b/src/mess/drivers/tmc1800.c index c8dc469d177..6e0099b72a9 100644 --- a/src/mess/drivers/tmc1800.c +++ b/src/mess/drivers/tmc1800.c @@ -156,9 +156,9 @@ WRITE8_MEMBER( nano_state::keylatch_w ) 2 C 3 NY0 4 NY1 - 5 - 6 - 7 + 5 + 6 + 7 */ @@ -694,7 +694,7 @@ void tmc2000_state::machine_start() { m_colorram[addr] = machine().rand() & 0xff; } - + // find keyboard rows m_key_row[0] = m_y0; m_key_row[1] = m_y1; diff --git a/src/mess/drivers/tmc600.c b/src/mess/drivers/tmc600.c index d9ca0cd1917..6733e1ac9bc 100644 --- a/src/mess/drivers/tmc600.c +++ b/src/mess/drivers/tmc600.c @@ -249,7 +249,7 @@ void tmc600_state::machine_start() program.unmap_readwrite(0xa000, 0xbfff); break; } - + // find keyboard rows m_key_row[0] = m_y0; m_key_row[1] = m_y1; diff --git a/src/mess/drivers/vboy.c b/src/mess/drivers/vboy.c index 47ef5f2c7ee..b82608c9fae 100644 --- a/src/mess/drivers/vboy.c +++ b/src/mess/drivers/vboy.c @@ -43,7 +43,7 @@ // bit of magic here, we also write pre-flipped copies of the data to extra ram we've allocated // to simplify the draw loop (we can just pass the flip / unused bits as the upper character bits) -// (all TILE words are in the format of ccxy -ttt tttt tttt +// (all TILE words are in the format of ccxy -ttt tttt tttt // where 'c' = palette, 'x/y' are flips, '-' is unused(?) and 't' is your basic tile number #define WRITE_FONT(woffs) \ @@ -56,8 +56,7 @@ m_font[((woffs) + 0x10000)] = dat; /* flip x */ \ m_font[((woffs) + 0x14000)] = dat; /* flip x */ \ m_font[((woffs) + 0x18000) ^ 7] = dat; /* flip x+y */ \ - m_font[((woffs) + 0x1c000) ^ 7] = dat; /* flip x+y */ \ - + m_font[((woffs) + 0x1c000) ^ 7] = dat; /* flip x+y */ /* FIXME: most if not all of these must be UINT8 */ @@ -295,7 +294,7 @@ void vboy_state::fill_ovr_char(UINT16 code, UINT8 pal) inline INT8 vboy_state::get_bg_map_pixel(int num, int xpos, int ypos) { -// g_profiler.start(PROFILER_USER1); +// g_profiler.start(PROFILER_USER1); int x, y; UINT8 stepx, stepy; @@ -321,14 +320,14 @@ inline INT8 vboy_state::get_bg_map_pixel(int num, int xpos, int ypos) //g_profiler.stop(); return -1; } - // g_profiler.stop(); + // g_profiler.stop(); return (pal >> (dat*2)) & 3; } void vboy_state::draw_bg_map(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16 param_base, int mode, int gx, int gp, int gy, int mx, int mp, int my, int h, int w, UINT16 x_mask, UINT16 y_mask, UINT8 ovr, bool right, int bg_map_num) { -// g_profiler.start(PROFILER_USER2); +// g_profiler.start(PROFILER_USER2); int x,y; for(y=0;y<=h;y++) @@ -380,13 +379,13 @@ void vboy_state::draw_bg_map(bitmap_ind16 &bitmap, const rectangle &cliprect, UI bitmap.pix16(y1, x1) = machine().pens[pix & 3]; } } -// g_profiler.stop(); +// g_profiler.stop(); } void vboy_state::draw_affine_map(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16 param_base, int gx, int gp, int gy, int h, int w, UINT16 x_mask, UINT16 y_mask, UINT8 ovr, bool right, int bg_map_num) { -// g_profiler.start(PROFILER_USER3); +// g_profiler.start(PROFILER_USER3); int x,y; for(y=0;y<=h;y++) @@ -425,7 +424,7 @@ void vboy_state::draw_affine_map(bitmap_ind16 &bitmap, const rectangle &cliprect bitmap.pix16(y1, x1) = machine().pens[pix & 3]; } } -// g_profiler.stop(); +// g_profiler.stop(); } /* diff --git a/src/mess/drivers/vic10.c b/src/mess/drivers/vic10.c index e94d7c31518..7101c887dcb 100644 --- a/src/mess/drivers/vic10.c +++ b/src/mess/drivers/vic10.c @@ -405,7 +405,7 @@ READ8_MEMBER( vic10_state::cia_pa_r ) // keyboard UINT8 cia_pb = m_cia->pb_r(); UINT8 row[8] = { m_row0->read(), m_row1->read() & m_lock->read(), m_row2->read(), m_row3->read(), - m_row4->read(), m_row5->read(), m_row6->read(), m_row7->read() }; + m_row4->read(), m_row5->read(), m_row6->read(), m_row7->read() }; for (int i = 0; i < 8; i++) { @@ -446,7 +446,7 @@ READ8_MEMBER( vic10_state::cia_pb_r ) // joystick UINT8 joy_a = m_joy1->joy_r(); - + data &= (0xf0 | (joy_a & 0x0f)); data &= ~(!BIT(joy_a, 5) << 4); diff --git a/src/mess/drivers/vidbrain.c b/src/mess/drivers/vidbrain.c index e5ca3a171d1..dc1a0edd1a6 100644 --- a/src/mess/drivers/vidbrain.c +++ b/src/mess/drivers/vidbrain.c @@ -482,7 +482,7 @@ static VIDEOBRAIN_EXPANSION_INTERFACE( expansion_intf ) //************************************************************************** //------------------------------------------------- -// IRQ_CALLBACK_MEMBER(vidbrain_int_ack) +// IRQ_CALLBACK_MEMBER(vidbrain_int_ack) //------------------------------------------------- IRQ_CALLBACK_MEMBER(vidbrain_state::vidbrain_int_ack) diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c index 71769713a1a..be2d440115e 100644 --- a/src/mess/drivers/x1.c +++ b/src/mess/drivers/x1.c @@ -545,7 +545,7 @@ UINT32 x1_state::screen_update_x1(screen_device &screen, bitmap_rgb32 &bitmap, c m_xstart = ((mc6845_h_char_total - mc6845_h_sync_pos) * 8) / 2; m_ystart = ((mc6845_v_char_total - mc6845_v_sync_pos) * 8) / 2; -// popmessage("%d %d %d %d",mc6845_h_sync_pos,mc6845_v_sync_pos,mc6845_h_char_total,mc6845_v_char_total); +// popmessage("%d %d %d %d",mc6845_h_sync_pos,mc6845_v_sync_pos,mc6845_h_char_total,mc6845_v_char_total); draw_gfxbitmap(machine(),bitmap,cliprect,m_scrn_reg.disp_bank,m_scrn_reg.pri); draw_fgtilemap(machine(),bitmap,cliprect); @@ -1884,7 +1884,7 @@ static I8255A_INTERFACE( ppi8255_intf ) static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - true, /* show border area */ + true, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ @@ -2239,7 +2239,7 @@ static GFXDECODE_START( x1 ) GFXDECODE_ENTRY( "cgrom", 0x00000, x1_chars_8x8, 0, 1 ) GFXDECODE_ENTRY( "font", 0x00000, x1_chars_8x16, 0, 1 ) GFXDECODE_ENTRY( "kanji", 0x00000, x1_chars_16x16, 0, 1 ) -// GFXDECODE_ENTRY( "pcg", 0x00000, x1_pcg_8x8, 0, 1 ) +// GFXDECODE_ENTRY( "pcg", 0x00000, x1_pcg_8x8, 0, 1 ) GFXDECODE_END /************************************* diff --git a/src/mess/drivers/x1twin.c b/src/mess/drivers/x1twin.c index 99169f0b15b..59c44bd2861 100644 --- a/src/mess/drivers/x1twin.c +++ b/src/mess/drivers/x1twin.c @@ -91,16 +91,16 @@ static I8255A_INTERFACE( ppi8255_intf ) static MC6845_INTERFACE( mc6845_intf ) { "x1_screen", /* screen we are acting on */ - false, /* show border area*/ - 8, /* number of pixels per video memory address */ - NULL, /* before pixel update callback */ - NULL, /* row update callback */ - NULL, /* after pixel update callback */ - DEVCB_NULL, /* callback for display state changes */ - DEVCB_NULL, /* callback for cursor state changes */ - DEVCB_NULL, /* HSYNC callback */ - DEVCB_NULL, /* VSYNC callback */ - NULL /* update address callback */ + false, /* show border area*/ + 8, /* number of pixels per video memory address */ + NULL, /* before pixel update callback */ + NULL, /* row update callback */ + NULL, /* after pixel update callback */ + DEVCB_NULL, /* callback for display state changes */ + DEVCB_NULL, /* callback for cursor state changes */ + DEVCB_NULL, /* HSYNC callback */ + DEVCB_NULL, /* VSYNC callback */ + NULL /* update address callback */ }; /************************************* diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c index 1e4fb5ed021..d84e7609995 100644 --- a/src/mess/drivers/z100.c +++ b/src/mess/drivers/z100.c @@ -632,7 +632,7 @@ static const struct pic8259_interface z100_pic8259_slave_config = static MC6845_INTERFACE( mc6845_intf ) { "screen", /* screen we are acting on */ - false, /* show border area */ + false, /* show border area */ 8, /* number of pixels per video memory address */ NULL, /* before pixel update callback */ NULL, /* row update callback */ |