diff options
Diffstat (limited to 'src/emu/bus')
| -rw-r--r-- | src/emu/bus/a2bus/a2cffa.c | 2 | ||||
| -rw-r--r-- | src/emu/bus/a2bus/a2hsscsi.c | 14 | ||||
| -rw-r--r-- | src/emu/bus/a2bus/a2scsi.c | 10 | ||||
| -rw-r--r-- | src/emu/bus/abcbus/abcbus.h | 2 | ||||
| -rw-r--r-- | src/emu/bus/abcbus/lux10828.h | 2 | ||||
| -rw-r--r-- | src/emu/bus/abcbus/lux21046.c | 10 | ||||
| -rw-r--r-- | src/emu/bus/abcbus/lux21046.h | 2 | ||||
| -rw-r--r-- | src/emu/bus/abcbus/lux21056.c | 70 | ||||
| -rw-r--r-- | src/emu/bus/abcbus/lux21056.h | 4 | ||||
| -rw-r--r-- | src/emu/bus/adamnet/fdc.h | 2 | ||||
| -rw-r--r-- | src/emu/bus/c64/partner.c | 2 | ||||
| -rw-r--r-- | src/emu/bus/c64/partner.h | 2 | ||||
| -rw-r--r-- | src/emu/bus/c64/tdos.c | 62 | ||||
| -rw-r--r-- | src/emu/bus/centronics/ctronics.c | 4 | ||||
| -rw-r--r-- | src/emu/bus/centronics/ctronics.h | 4 | ||||
| -rw-r--r-- | src/emu/bus/ieee488/c2031.h | 2 | ||||
| -rw-r--r-- | src/emu/bus/isbx/compis_fdc.c | 2 | ||||
| -rw-r--r-- | src/emu/bus/isbx/compis_fdc.h | 2 | ||||
| -rw-r--r-- | src/emu/bus/isbx/isbx.h | 4 | ||||
| -rw-r--r-- | src/emu/bus/plus4/c1551.h | 2 |
20 files changed, 102 insertions, 102 deletions
diff --git a/src/emu/bus/a2bus/a2cffa.c b/src/emu/bus/a2bus/a2cffa.c index f0ccdbcd832..df1ffbddeac 100644 --- a/src/emu/bus/a2bus/a2cffa.c +++ b/src/emu/bus/a2bus/a2cffa.c @@ -35,7 +35,7 @@ MACHINE_CONFIG_FRAGMENT( cffa2 ) MCFG_ATA_INTERFACE_ADD(CFFA2_ATA_TAG, ata_devices, "hdd", NULL, false) // not yet, the core explodes -// MCFG_SOFTWARE_LIST_ADD("hdd_list", "apple2gs_hdd") +// MCFG_SOFTWARE_LIST_ADD("hdd_list", "apple2gs_hdd") MACHINE_CONFIG_END ROM_START( cffa2 ) diff --git a/src/emu/bus/a2bus/a2hsscsi.c b/src/emu/bus/a2bus/a2hsscsi.c index 3c74d555371..e42fef2da05 100644 --- a/src/emu/bus/a2bus/a2hsscsi.c +++ b/src/emu/bus/a2bus/a2hsscsi.c @@ -3,10 +3,10 @@ a2hsscsi.c Implementation of the Apple II High Speed SCSI Card - + This uses an ASIC called "Sandwich II"; the card itself is sometimes known as "Cocoon". - + Notes: C0n0-C0n7 = NCR5380 registers in normal order C0n8 = DMA address low @@ -17,7 +17,7 @@ C0nD = Enable DMA / reset 5380 C0nE = Priority (read bits 5-7) / Fire watchdog (write bit 7) / RAM bank (write bits 0-3) C0nF = DMA speed (bit 7 = 0 for fast, 1 for slow) / ROM bank (write bits 0-4) - + DMA control register (C0nC): 0x01 = pseudo-DMA enable 0x02 = DMA enable @@ -27,13 +27,13 @@ 0x20 = 5380 IRQ enable 0x40 = system DMA status (read only) 0x80 = DMA stopped due to IRQ - + Enable DMA / reset 5380 register (C0nD): 0x01 = Resume DMA after rollover or IRQ 0x02 = Reset the 5380 0x40 = Clear test mode 0x80 = Set test mode - + *********************************************************************/ #include "a2hsscsi.h" @@ -182,9 +182,9 @@ UINT8 a2bus_hsscsi_device::read_c0nx(address_space &space, UINT8 offset) break; case 0xc: - return 0x00; // indicate watchdog? + return 0x00; // indicate watchdog? - case 0xe: // code at cf32 wants to RMW this without killing the ROM bank + case 0xe: // code at cf32 wants to RMW this without killing the ROM bank return m_c0ne; case 0xf: diff --git a/src/emu/bus/a2bus/a2scsi.c b/src/emu/bus/a2bus/a2scsi.c index d27903464b4..81a88bf1fd4 100644 --- a/src/emu/bus/a2bus/a2scsi.c +++ b/src/emu/bus/a2bus/a2scsi.c @@ -15,18 +15,18 @@ C0na = RAM and ROM bank switching C0nb = reset 5380 C0nc = set IIgs block mode - C0nd = set pseudo-DMA + C0nd = set pseudo-DMA C0ne = read DRQ status in bit 7 - + In IIgs block mode, any read from C800-CBFF window fetches the next byte from the 5380's DMA port. This lets you use the 65816 MVN/MVP operations to burst-transfer up to 1K at a time. (Requires a cycle-by-cycle haltable 65816 core; don't install the - GS/OS driver right now to avoid this) - + GS/OS driver right now to avoid this) + Pseudo-DMA works similarly to the Mac implementation; use C0n8 to read/write "DMA" bytes in that mode. - + *********************************************************************/ #include "a2scsi.h" diff --git a/src/emu/bus/abcbus/abcbus.h b/src/emu/bus/abcbus/abcbus.h index 7374cd70209..6148e9dd36c 100644 --- a/src/emu/bus/abcbus/abcbus.h +++ b/src/emu/bus/abcbus/abcbus.h @@ -204,7 +204,7 @@ public: // ======================> abcbus_slot_device class abcbus_slot_device : public device_t, - public device_slot_interface + public device_slot_interface { public: // construction/destruction diff --git a/src/emu/bus/abcbus/lux10828.h b/src/emu/bus/abcbus/lux10828.h index 757342e54b5..4067611460b 100644 --- a/src/emu/bus/abcbus/lux10828.h +++ b/src/emu/bus/abcbus/lux10828.h @@ -52,7 +52,7 @@ // ======================> luxor_55_10828_device class luxor_55_10828_device : public device_t, - public device_abcbus_card_interface + public device_abcbus_card_interface { public: // construction/destruction diff --git a/src/emu/bus/abcbus/lux21046.c b/src/emu/bus/abcbus/lux21046.c index 42dea3dc827..3eba6c4f1a0 100644 --- a/src/emu/bus/abcbus/lux21046.c +++ b/src/emu/bus/abcbus/lux21046.c @@ -497,9 +497,9 @@ int luxor_55_21046_device::abcbus_csb() UINT8 luxor_55_21046_device::abcbus_stat() { /* - + bit description - + 0 3A pin 8 1 4B Q1 2 4B Q2 @@ -508,7 +508,7 @@ UINT8 luxor_55_21046_device::abcbus_stat() 5 PAL16R4 pin 17 6 S1/A: PREN*, S1/B: 4B Q6 7 S5/A: PAL16R4 pin 16 inverted, S5/B: 4B Q7 - + */ UINT8 data = 0; @@ -730,11 +730,11 @@ WRITE8_MEMBER( luxor_55_21046_device::_8a_w ) /* if (BIT(data, 2)) { - m_fdc->set_unscaled_clock(XTAL_16MHz/16); + m_fdc->set_unscaled_clock(XTAL_16MHz/16); } else { - m_fdc->set_unscaled_clock(XTAL_16MHz/8); + m_fdc->set_unscaled_clock(XTAL_16MHz/8); } */ } diff --git a/src/emu/bus/abcbus/lux21046.h b/src/emu/bus/abcbus/lux21046.h index 2817e155ddd..ee090926270 100644 --- a/src/emu/bus/abcbus/lux21046.h +++ b/src/emu/bus/abcbus/lux21046.h @@ -51,7 +51,7 @@ // ======================> luxor_55_21046_device class luxor_55_21046_device : public device_t, - public device_abcbus_card_interface + public device_abcbus_card_interface { public: // construction/destruction diff --git a/src/emu/bus/abcbus/lux21056.c b/src/emu/bus/abcbus/lux21056.c index 5b7796ad7d8..c2717e96e25 100644 --- a/src/emu/bus/abcbus/lux21056.c +++ b/src/emu/bus/abcbus/lux21056.c @@ -11,47 +11,47 @@ /* - Use the CHDMAN utility to create a 5MB image for ABC 850: + Use the CHDMAN utility to create a 5MB image for ABC 850: - $ chdman createhd -o /path/to/ro202.chd -chs 321,4,17 -ss 512 - $ chdman createhd -o /path/to/basf6185.chd -chs 440,6,32 -ss 256 + $ chdman createhd -o /path/to/ro202.chd -chs 321,4,17 -ss 512 + $ chdman createhd -o /path/to/basf6185.chd -chs 440,6,32 -ss 256 - or a 10MB image for ABC 852: + or a 10MB image for ABC 852: - $ chdman createhd -o /path/to/nec5126.chd -chs 615,4,17 -ss 512 + $ chdman createhd -o /path/to/nec5126.chd -chs 615,4,17 -ss 512 - or a 20MB image for ABC 856: + or a 20MB image for ABC 856: - $ chdman createhd -o /path/to/micr1325.chd -chs 1024,8,33 -ss 256 + $ chdman createhd -o /path/to/micr1325.chd -chs 1024,8,33 -ss 256 - Start the abc800 emulator with the ABC 850 attached on the ABC bus, - with the new CHD and a UFD-DOS floppy mounted: - - $ mess abc800m -bus hdd -bus:hdd:io2 xebec,bios=ro202 -flop1 ufd631 -hard ro202.chd - $ mess abc800m -bus hdd -bus:hdd:io2 xebec,bios=basf6185 -flop1 ufd631 -hard basf6185.chd - $ mess abc800m -bus hdd -bus:hdd:io2 xebec,bios=nec5126 -flop1 ufd631 -hard nec5126.chd - $ mess abc800m -bus hdd -bus:hdd:io2 xebec,bios=micr1325 -flop1 ufd631 -hard micr1325.chd + Start the abc800 emulator with the ABC 850 attached on the ABC bus, + with the new CHD and a UFD-DOS floppy mounted: - Configure the floppy controller for use with an ABC 850: + $ mess abc800m -bus hdd -bus:hdd:io2 xebec,bios=ro202 -flop1 ufd631 -hard ro202.chd + $ mess abc800m -bus hdd -bus:hdd:io2 xebec,bios=basf6185 -flop1 ufd631 -hard basf6185.chd + $ mess abc800m -bus hdd -bus:hdd:io2 xebec,bios=nec5126 -flop1 ufd631 -hard nec5126.chd + $ mess abc800m -bus hdd -bus:hdd:io2 xebec,bios=micr1325 -flop1 ufd631 -hard micr1325.chd - - Drive 0 Sides: Double - - Drive 1 Sides: Double - - Drive 0 Tracks: 40 or 80 depending on the UFD DOS image used - - Drive 1 Tracks: 40 or 80 depending on the UFD DOS image used - - Card Address: 44 (ABC 832/834/850) + Configure the floppy controller for use with an ABC 850: - Reset the emulated machine by pressing F3. + - Drive 0 Sides: Double + - Drive 1 Sides: Double + - Drive 0 Tracks: 40 or 80 depending on the UFD DOS image used + - Drive 1 Tracks: 40 or 80 depending on the UFD DOS image used + - Card Address: 44 (ABC 832/834/850) - You should now see the following text at the top of the screen: + Reset the emulated machine by pressing F3. - DOS är UFD-DOS ver. 19 - DR_: motsvarar MF_: + You should now see the following text at the top of the screen: - Enter "BYE" to get into the UFD-DOS command prompt. - Enter "DOSGEN,F HD0:" to start the formatting utility. - Enter "J", and enter "J" to confirm the formatting. + DOS ??r UFD-DOS ver. 19 + DR_: motsvarar MF_: - To Be Continued... + Enter "BYE" to get into the UFD-DOS command prompt. + Enter "DOSGEN,F HD0:" to start the formatting utility. + Enter "J", and enter "J" to confirm the formatting. + + To Be Continued... */ @@ -68,7 +68,7 @@ #define SASIBUS_TAG "sasi" #define STAT_DIR \ - BIT(m_stat, 6) + BIT(m_stat, 6) @@ -445,19 +445,19 @@ void luxor_55_21056_device::abcbus_c3(UINT8 data) READ8_MEMBER( luxor_55_21056_device::sasi_status_r ) { /* - + bit description - + 0 RDY 1 REQ 2 I/O 3 C/D 4 MSG 5 BSY - 6 - 7 - - */ + 6 + 7 + + */ UINT8 data = 0; diff --git a/src/emu/bus/abcbus/lux21056.h b/src/emu/bus/abcbus/lux21056.h index c5dc78b74d8..d9b1375fa71 100644 --- a/src/emu/bus/abcbus/lux21056.h +++ b/src/emu/bus/abcbus/lux21056.h @@ -32,7 +32,7 @@ // ======================> luxor_55_21056_device class luxor_55_21056_device : public device_t, - public device_abcbus_card_interface + public device_abcbus_card_interface { public: // construction/destruction @@ -64,7 +64,7 @@ public: DECLARE_WRITE_LINE_MEMBER( sasi_bsy_w ); DECLARE_WRITE_LINE_MEMBER( sasi_io_w ); DECLARE_WRITE_LINE_MEMBER( sasi_req_w ); - + protected: // device-level overrides virtual void device_start(); diff --git a/src/emu/bus/adamnet/fdc.h b/src/emu/bus/adamnet/fdc.h index e48a93c36ba..fee37379622 100644 --- a/src/emu/bus/adamnet/fdc.h +++ b/src/emu/bus/adamnet/fdc.h @@ -29,7 +29,7 @@ // ======================> adam_fdc_device class adam_fdc_device : public device_t, - public device_adamnet_card_interface + public device_adamnet_card_interface { public: // construction/destruction diff --git a/src/emu/bus/c64/partner.c b/src/emu/bus/c64/partner.c index 52f005a329f..1d1227e6256 100644 --- a/src/emu/bus/c64/partner.c +++ b/src/emu/bus/c64/partner.c @@ -198,7 +198,7 @@ int c64_partner_cartridge_device::c64_game_r(offs_t offset, int sphi2, int ba, i { switch ((offset >> 13) & 0x03) { - case 0: case 1: case 3: + case 0: case 1: case 3: game = 0; break; } diff --git a/src/emu/bus/c64/partner.h b/src/emu/bus/c64/partner.h index fcd3f177468..64cee99de14 100644 --- a/src/emu/bus/c64/partner.h +++ b/src/emu/bus/c64/partner.h @@ -26,7 +26,7 @@ // ======================> c64_partner_cartridge_device class c64_partner_cartridge_device : public device_t, - public device_c64_expansion_card_interface + public device_c64_expansion_card_interface { public: // construction/destruction diff --git a/src/emu/bus/c64/tdos.c b/src/emu/bus/c64/tdos.c index 8916416afd7..1fae5e230a9 100644 --- a/src/emu/bus/c64/tdos.c +++ b/src/emu/bus/c64/tdos.c @@ -92,26 +92,26 @@ Drive cable pinout ULA pinout ---------- _____ _____ - 1 |* \_/ | 40 - 2 | | 39 - 3 | | 38 - 4 | | 37 + 1 |* \_/ | 40 + 2 | | 39 + 3 | | 38 + 4 | | 37 5 | | 36 GND - 6 | | 35 - RD 7 | | 34 - _D5 8 | | 33 - RxC 9 | | 32 - RxD 10 | XZ-2085-1 | 31 - 11 | | 30 - WD 12 | | 29 - TxC 13 | | 28 - TxD 14 | | 27 - D7 15 | | 26 + 6 | | 35 + RD 7 | | 34 + _D5 8 | | 33 + RxC 9 | | 32 + RxD 10 | XZ-2085-1 | 31 + 11 | | 30 + WD 12 | | 29 + TxC 13 | | 28 + TxD 14 | | 27 + D7 15 | | 26 WG 16 | | 25 +5V 17 | | 24 XTAL2 18 | | 23 XTAL1 RS 19 | | 22 GND - 20 |_____________| 21 + 20 |_____________| 21 BASIC commands (SYS 32768 to activate) @@ -281,18 +281,18 @@ UINT8 c64_tdos_cartridge_device::c64_cd_r(address_space &space, offs_t offset, U case 2: /* - + bit description - - 0 - 1 - 2 - 3 - 4 + + 0 + 1 + 2 + 3 + 4 5 drive MS 6 drive WP 7 drive RY - + */ break; } @@ -320,18 +320,18 @@ void c64_tdos_cartridge_device::c64_cd_w(address_space &space, offs_t offset, UI case 1: /* - + bit description - - 0 - 1 - 2 - 3 - 4 + + 0 + 1 + 2 + 3 + 4 5 ULA pin 8, inverted 6 drive MO 7 ULA pin 15 - + */ break; diff --git a/src/emu/bus/centronics/ctronics.c b/src/emu/bus/centronics/ctronics.c index 68e612c1ea5..40918777b2b 100644 --- a/src/emu/bus/centronics/ctronics.c +++ b/src/emu/bus/centronics/ctronics.c @@ -2,8 +2,8 @@ Centronics printer interface - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best ***************************************************************************/ diff --git a/src/emu/bus/centronics/ctronics.h b/src/emu/bus/centronics/ctronics.h index acc2c68578f..52fdf1219a2 100644 --- a/src/emu/bus/centronics/ctronics.h +++ b/src/emu/bus/centronics/ctronics.h @@ -2,8 +2,8 @@ Centronics printer interface - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best ***************************************************************************/ diff --git a/src/emu/bus/ieee488/c2031.h b/src/emu/bus/ieee488/c2031.h index c62335f003c..14a8e4acc21 100644 --- a/src/emu/bus/ieee488/c2031.h +++ b/src/emu/bus/ieee488/c2031.h @@ -30,7 +30,7 @@ // ======================> c2031_device class c2031_device : public device_t, - public device_ieee488_interface + public device_ieee488_interface { public: // construction/destruction diff --git a/src/emu/bus/isbx/compis_fdc.c b/src/emu/bus/isbx/compis_fdc.c index dac875187d8..3eacf84331a 100644 --- a/src/emu/bus/isbx/compis_fdc.c +++ b/src/emu/bus/isbx/compis_fdc.c @@ -16,7 +16,7 @@ // MACROS / CONSTANTS //************************************************************************** -#define I8272_TAG "ic13" +#define I8272_TAG "ic13" diff --git a/src/emu/bus/isbx/compis_fdc.h b/src/emu/bus/isbx/compis_fdc.h index 9624e88d9fe..5e789503fd4 100644 --- a/src/emu/bus/isbx/compis_fdc.h +++ b/src/emu/bus/isbx/compis_fdc.h @@ -28,7 +28,7 @@ // ======================> compis_fdc_device class compis_fdc_device : public device_t, - public device_isbx_card_interface + public device_isbx_card_interface { public: // construction/destruction diff --git a/src/emu/bus/isbx/isbx.h b/src/emu/bus/isbx/isbx.h index bb81ffb1981..738e8c509fa 100644 --- a/src/emu/bus/isbx/isbx.h +++ b/src/emu/bus/isbx/isbx.h @@ -99,7 +99,7 @@ protected: // ======================> isbx_slot_device class isbx_slot_device : public device_t, - public device_slot_interface + public device_slot_interface { public: // construction/destruction @@ -109,7 +109,7 @@ public: template<class _mintr1> void set_mintr1_callback(_mintr1 mintr1) { m_write_mintr1.set_callback(mintr1); } template<class _mdrqt> void set_mdrqt_callback(_mdrqt mdrqt) { m_write_mdrqt.set_callback(mdrqt); } template<class _mwait> void set_mwait_callback(_mwait mwait) { m_write_mwait.set_callback(mwait); } - + // computer interface DECLARE_READ8_MEMBER( mcs0_r ) { return m_card ? m_card->mcs0_r(space, offset) : 0xff; } DECLARE_WRITE8_MEMBER( mcs0_w ) { if (m_card) m_card->mcs0_w(space, offset, data); } diff --git a/src/emu/bus/plus4/c1551.h b/src/emu/bus/plus4/c1551.h index 7090b962a68..93fda5a613b 100644 --- a/src/emu/bus/plus4/c1551.h +++ b/src/emu/bus/plus4/c1551.h @@ -34,7 +34,7 @@ // ======================> c1551_device class c1551_device : public device_t, - public device_plus4_expansion_card_interface + public device_plus4_expansion_card_interface { public: // construction/destruction |
