diff options
Diffstat (limited to 'src/mess/machine')
| -rw-r--r-- | src/mess/machine/64h156.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/b2m.c | 4 | ||||
| -rw-r--r-- | src/mess/machine/c128_comal80.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/c8280.c | 56 | ||||
| -rw-r--r-- | src/mess/machine/cbm2_graphic.c | 34 | ||||
| -rw-r--r-- | src/mess/machine/isa_ide.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/macadb.c | 18 | ||||
| -rw-r--r-- | src/mess/machine/macrtc.c | 4 | ||||
| -rw-r--r-- | src/mess/machine/macrtc.h | 2 | ||||
| -rw-r--r-- | src/mess/machine/mos8722.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/rmnimbus.c | 24 | ||||
| -rw-r--r-- | src/mess/machine/upd765.c | 14 | ||||
| -rw-r--r-- | src/mess/machine/upd765.h | 8 | ||||
| -rw-r--r-- | src/mess/machine/vcsctrl.h | 6 |
14 files changed, 89 insertions, 89 deletions
diff --git a/src/mess/machine/64h156.c b/src/mess/machine/64h156.c index a14caf4bc30..289358a4a0f 100644 --- a/src/mess/machine/64h156.c +++ b/src/mess/machine/64h156.c @@ -658,7 +658,7 @@ void c64h156_device::stp_w(int data) { int track = floppy_drive_get_current_track(m_image); int tracks = (data - track) & 0x03; - + if (tracks == 3) { tracks = -1; diff --git a/src/mess/machine/b2m.c b/src/mess/machine/b2m.c index 3ce0f9ee7c8..fe8fcc05869 100644 --- a/src/mess/machine/b2m.c +++ b/src/mess/machine/b2m.c @@ -206,7 +206,7 @@ WRITE8_MEMBER(b2m_state::b2m_ext_8255_portc_w) { UINT8 drive = ((data >> 1) & 1) ^ 1; UINT8 side = (data & 1) ^ 1; - + static const char *names[] = { "fd0", "fd1"}; floppy_image_device *floppy = NULL; floppy_connector *con = machine().device<floppy_connector>(names[drive]); @@ -219,7 +219,7 @@ WRITE8_MEMBER(b2m_state::b2m_ext_8255_portc_w) m_b2m_drive = drive; } floppy->ss_w(side); - if (m_b2m_side!=side) { + if (m_b2m_side!=side) { m_b2m_side = side; } } diff --git a/src/mess/machine/c128_comal80.c b/src/mess/machine/c128_comal80.c index ff1ee6c793d..171882e13c7 100644 --- a/src/mess/machine/c128_comal80.c +++ b/src/mess/machine/c128_comal80.c @@ -94,7 +94,7 @@ void c128_comal80_cartridge_device::c64_cd_w(address_space &space, offs_t offset 4 A14 5 A15 6 A16 - 7 A17 + 7 A17 */ diff --git a/src/mess/machine/c8280.c b/src/mess/machine/c8280.c index b37b6c602dc..25cd345de3a 100644 --- a/src/mess/machine/c8280.c +++ b/src/mess/machine/c8280.c @@ -313,7 +313,7 @@ static const floppy_interface c8280_floppy_interface = NULL }; -static struct wd17xx_interface fdc_intf = +static struct wd17xx_interface fdc_intf = { DEVCB_NULL, DEVCB_CPU_INPUT_LINE(M6502_FDC_TAG, M6502_IRQ_LINE), @@ -407,7 +407,7 @@ void c8280_device::device_start() // state saving save_item(NAME(m_rfdo)); save_item(NAME(m_daco)); - save_item(NAME(m_atna)); + save_item(NAME(m_atna)); save_item(NAME(m_fk5)); } @@ -467,19 +467,19 @@ void c8280_device::ieee488_ifc(int state) READ8_MEMBER( c8280_device::fk5_r ) { /* - - bit description - - 0 DS1 - 1 DS2 - 2 _DDEN - 3 DCHG - 4 TSID - 5 MOTOR ENABLE - 6 0 - 7 0 - - */ + + bit description + + 0 DS1 + 1 DS2 + 2 _DDEN + 3 DCHG + 4 TSID + 5 MOTOR ENABLE + 6 0 + 7 0 + + */ UINT8 data = m_fk5; @@ -500,19 +500,19 @@ READ8_MEMBER( c8280_device::fk5_r ) WRITE8_MEMBER( c8280_device::fk5_w ) { /* - - bit description - - 0 DS1 - 1 DS2 - 2 _DDEN - 3 - 4 - 5 MOTOR ENABLE - 6 - 7 - - */ + + bit description + + 0 DS1 + 1 DS2 + 2 _DDEN + 3 + 4 + 5 MOTOR ENABLE + 6 + 7 + + */ m_fk5 = data & 0x3f; diff --git a/src/mess/machine/cbm2_graphic.c b/src/mess/machine/cbm2_graphic.c index cd627be3f4e..be129174c1c 100644 --- a/src/mess/machine/cbm2_graphic.c +++ b/src/mess/machine/cbm2_graphic.c @@ -43,7 +43,7 @@ const device_type CBM2_GRAPHIC = &device_creator<cbm2_graphic_cartridge_device>; /* static const ef9365_interface gdp_intf = { - SCREEN_TAG + SCREEN_TAG }; */ @@ -52,14 +52,14 @@ static const ef9365_interface gdp_intf = //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm2_graphic_a ) -/* MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) - MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) - MCFG_SCREEN_SIZE(512, 512) - MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) - MCFG_SCREEN_REFRESH_RATE(50) - - MCFG_EF9365_ADD(EF9365_TAG, gdp_intf)*/ +/* MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_UPDATE_DEVICE(EF9365_TAG, ef9365_device, screen_update) + MCFG_SCREEN_SIZE(512, 512) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 512-1) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) + MCFG_SCREEN_REFRESH_RATE(50) + + MCFG_EF9365_ADD(EF9365_TAG, gdp_intf)*/ MACHINE_CONFIG_END @@ -68,14 +68,14 @@ MACHINE_CONFIG_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( cbm2_graphic_b ) -/* MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) - MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9366_device, screen_update) - MCFG_SCREEN_SIZE(512, 256) - MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) - MCFG_SCREEN_REFRESH_RATE(50) - - MCFG_EF9366_ADD(EF9366_TAG, gdp_intf)*/ +/* MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) + MCFG_SCREEN_UPDATE_DEVICE(EF9366_TAG, ef9366_device, screen_update) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-1) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) + MCFG_SCREEN_REFRESH_RATE(50) + + MCFG_EF9366_ADD(EF9366_TAG, gdp_intf)*/ MACHINE_CONFIG_END diff --git a/src/mess/machine/isa_ide.c b/src/mess/machine/isa_ide.c index b3459bc35ed..1f24045fa67 100644 --- a/src/mess/machine/isa_ide.c +++ b/src/mess/machine/isa_ide.c @@ -36,7 +36,7 @@ WRITE_LINE_MEMBER(isa16_ide_device::ide_interrupt) { m_isa->irq14_w(state); } - else + else { m_isa->irq15_w(state); } diff --git a/src/mess/machine/macadb.c b/src/mess/machine/macadb.c index 98c4791f222..3c9ec20b8f4 100644 --- a/src/mess/machine/macadb.c +++ b/src/mess/machine/macadb.c @@ -1,7 +1,7 @@ /*************************************************************************** macadb.c - handles various aspects of ADB on the Mac. - + ***************************************************************************/ #include "emu.h" @@ -1254,14 +1254,14 @@ void mac_state::adb_linechange(int state, int dtime) } break; - case LST_BIT0: - case LST_BIT1: - case LST_BIT2: - case LST_BIT3: - case LST_BIT4: - case LST_BIT5: - case LST_BIT6: - case LST_BIT7: + case LST_BIT0: + case LST_BIT1: + case LST_BIT2: + case LST_BIT3: + case LST_BIT4: + case LST_BIT5: + case LST_BIT6: + case LST_BIT7: if (!state) { if (dtime >= 90) // "1" bit diff --git a/src/mess/machine/macrtc.c b/src/mess/machine/macrtc.c index bedb38ae137..691110a9264 100644 --- a/src/mess/machine/macrtc.c +++ b/src/mess/machine/macrtc.c @@ -2,11 +2,11 @@ macrtc.c - the real-time clock & NVRAM chip used in early 680x0 Macs, Apple part numbers 343-0040 (original) and 343-0042 (with extended PRAM) - + The IIgs has this chip also, but the VGC contains a relatively sophisticated logic block that offloads the low-level serial comms from the CPU, which makes it look quite different to software. - + ***************************************************************************/ #include "emu.h" diff --git a/src/mess/machine/macrtc.h b/src/mess/machine/macrtc.h index 6ae533916fa..6d53723c093 100644 --- a/src/mess/machine/macrtc.h +++ b/src/mess/machine/macrtc.h @@ -29,7 +29,7 @@ // ======================> rtc3430042_device class rtc3430042_device : public device_t, - public device_rtc_interface, + public device_rtc_interface, public device_nvram_interface { public: diff --git a/src/mess/machine/mos8722.c b/src/mess/machine/mos8722.c index ca3d17735fa..9b301f000b6 100644 --- a/src/mess/machine/mos8722.c +++ b/src/mess/machine/mos8722.c @@ -258,7 +258,7 @@ WRITE8_MEMBER( mos8722_device::write ) int fsdir = MCR_FSDIR; m_reg[MCR] = data; - + if (_8500 != MCR_8500) m_out_z80en_func(MCR_8500); if (fsdir != MCR_FSDIR) m_out_fsdir_func(MCR_FSDIR); break; diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c index f7fa24c04b2..a38924e88cb 100644 --- a/src/mess/machine/rmnimbus.c +++ b/src/mess/machine/rmnimbus.c @@ -2987,18 +2987,18 @@ READ8_MEMBER(rmnimbus_state::nimbus_mouse_js_r) { /* - bit description - - 0 JOY 0-Up or mouse XB - 1 JOY 0-Down or mouse XA - 2 JOY 0-Left or mouse YA - 3 JOY 0-Right or mouse YB - 4 JOY 0-b0 or mouse rbutton - 5 JOY 0-b1 or mouse lbutton - 6 ?? always reads 1 - 7 ?? always reads 1 - - */ + bit description + + 0 JOY 0-Up or mouse XB + 1 JOY 0-Down or mouse XA + 2 JOY 0-Left or mouse YA + 3 JOY 0-Right or mouse YB + 4 JOY 0-b0 or mouse rbutton + 5 JOY 0-b1 or mouse lbutton + 6 ?? always reads 1 + 7 ?? always reads 1 + + */ UINT8 result; //int pc=machine().device(MAINCPU_TAG)->safe_pc(); mouse_joy_state *state = &m_nimbus_mouse; diff --git a/src/mess/machine/upd765.c b/src/mess/machine/upd765.c index ffdc0cb36fd..2b2733c72a4 100644 --- a/src/mess/machine/upd765.c +++ b/src/mess/machine/upd765.c @@ -444,7 +444,7 @@ void upd765_family_device::fifo_push(UINT8 data, bool internal) } fifo[fifo_pos++] = data; fifo_expected--; - + int thr = (fifocfg & FIF_THR)+1; if(!fifo_write && (!fifo_expected || fifo_pos >= thr || (fifocfg & FIF_DIS))) enable_transfer(); @@ -674,7 +674,7 @@ void upd765_family_device::live_run(attotime limit) if(cur_live.bit_counter & 15) break; int slot = (cur_live.bit_counter >> 4)-1; - + if(0) fprintf(stderr, "%s: slot=%d data=%02x crc=%04x\n", tts(cur_live.tm).cstr(), slot, cur_live.data_reg, cur_live.crc); cur_live.idbuf[slot] = cur_live.data_reg; @@ -910,7 +910,7 @@ void upd765_family_device::live_run(attotime limit) return; } break; - + default: logerror("%s: Unknown live state %d\n", tts(cur_live.tm).cstr(), cur_live.state); return; @@ -1623,7 +1623,7 @@ void upd765_family_device::read_track_continue(floppy_info &fi) case SCAN_ID_FAILED: fprintf(stderr, "RNF\n"); - // command_end(fi, true, 1); + // command_end(fi, true, 1); return; case SECTOR_READ: @@ -1645,7 +1645,7 @@ void upd765_family_device::read_track_continue(floppy_info &fi) result[5] = command[4]; result[6] = command[5]; result_pos = 7; - // command_end(fi, true, 0); + // command_end(fi, true, 0); return; default: @@ -1992,7 +1992,7 @@ bool upd765_family_device::write_one_bit(attotime limit) void upd765_family_device::live_write_raw(UINT16 raw) { - // logerror("write %04x %04x\n", raw, cur_live.crc); + // logerror("write %04x %04x\n", raw, cur_live.crc); cur_live.shift_reg = raw; cur_live.data_bit_context = raw & 1; } @@ -2012,7 +2012,7 @@ void upd765_family_device::live_write_mfm(UINT8 mfm) cur_live.data_reg = mfm; cur_live.shift_reg = raw; cur_live.data_bit_context = context; - // logerror("write %02x %04x %04x\n", mfm, cur_live.crc, raw); + // logerror("write %02x %04x %04x\n", mfm, cur_live.crc, raw); } bool upd765_family_device::sector_matches() const diff --git a/src/mess/machine/upd765.h b/src/mess/machine/upd765.h index e8dca14500d..2ccf44477b1 100644 --- a/src/mess/machine/upd765.h +++ b/src/mess/machine/upd765.h @@ -52,9 +52,9 @@ public: virtual void setup_drq_cb(line_cb cb) = 0; /* Note that the address map must cover and handle the whole 0-7 - * range. The upd765, while conforming to the rest of the - * interface, is not eligible as a result. - */ + * range. The upd765, while conforming to the rest of the + * interface, is not eligible as a result. + */ virtual DECLARE_ADDRESS_MAP(map, 8) = 0; @@ -168,7 +168,7 @@ protected: SPEC_ND = 0x0001, }; - + enum { // General "doing nothing" state IDLE, diff --git a/src/mess/machine/vcsctrl.h b/src/mess/machine/vcsctrl.h index ff9837d45aa..03351963d04 100644 --- a/src/mess/machine/vcsctrl.h +++ b/src/mess/machine/vcsctrl.h @@ -47,16 +47,16 @@ public: // computer interface - // Data returned by the joy_r methods: + // Data returned by the joy_r methods: // bit 0 - pin 1 - Up // bit 1 - pin 2 - Down // bit 2 - pin 3 - Left // bit 3 - pin 4 - Right - // bit 4 - pin 5 - + // bit 4 - pin 5 - // bit 5 - pin 6 - Button // pin 7 - +5V // pin 8 - GND - // bit 6 - pin 9 - + // bit 6 - pin 9 - // UINT8 joy_r(); DECLARE_READ8_MEMBER( joy_r ); |
