diff options
Diffstat (limited to 'src/emu/machine')
| -rw-r--r-- | src/emu/machine/6522via.c | 14 | ||||
| -rw-r--r-- | src/emu/machine/generic.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/im6402.c | 34 | ||||
| -rw-r--r-- | src/emu/machine/im6402.h | 30 | ||||
| -rw-r--r-- | src/emu/machine/scsihd.c | 10 |
5 files changed, 45 insertions, 45 deletions
diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c index 4bb2eae5bad..970e61cba89 100644 --- a/src/emu/machine/6522via.c +++ b/src/emu/machine/6522via.c @@ -27,14 +27,14 @@ #include "devhelpr.h" /*************************************************************************** - PARAMETERS + PARAMETERS ***************************************************************************/ #define TRACE_VIA 0 /*************************************************************************** - MACROS + MACROS ***************************************************************************/ /* Macros for PCR */ @@ -106,7 +106,7 @@ /*************************************************************************** - INLINE FUNCTIONS + INLINE FUNCTIONS ***************************************************************************/ inline void via6522_device::set_irq_line(int state) @@ -578,7 +578,7 @@ READ8_MEMBER( via6522_device::read ) CLR_PA_INT(); /* If CA2 is configured as output and in pulse or handshake mode, - CA2 is set now */ + CA2 is set now */ if (CA2_PULSE_OUTPUT(m_pcr)) { /* call the CA2 output function */ @@ -742,7 +742,7 @@ WRITE8_MEMBER( via6522_device::write ) CLR_PB_INT(); /* If CB2 is configured as output and in pulse or handshake mode, - CB2 is set now */ + CB2 is set now */ if (CB2_AUTO_HS(m_pcr)) { if (m_out_cb2) @@ -1015,7 +1015,7 @@ WRITE_LINE_MEMBER( via6522_device::write_ca1 ) set_int(INT_CA1); /* CA2 is configured as output and in pulse or handshake mode, - CA2 is cleared now */ + CA2 is cleared now */ if (CA2_AUTO_HS(m_pcr)) { if (!m_out_ca2) @@ -1089,7 +1089,7 @@ WRITE_LINE_MEMBER( via6522_device::write_cb1 ) set_int(INT_CB1); /* CB2 is configured as output and in pulse or handshake mode, - CB2 is cleared now */ + CB2 is cleared now */ if (CB2_AUTO_HS(m_pcr)) { if (!m_out_cb2) diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c index a62e175b808..3d90dcad6fd 100644 --- a/src/emu/machine/generic.c +++ b/src/emu/machine/generic.c @@ -320,7 +320,7 @@ static astring &nvram_filename(astring &result, device_t &device) { running_machine &machine = device.machine(); - // start with either basename or basename_biosnum + // start with either basename or basename_biosnum result.cpy(machine.basename()); if (rom_system_bios(machine) != 0 && rom_default_bios(machine) != rom_system_bios(machine)) result.catprintf("_%d", rom_system_bios(machine) - 1); diff --git a/src/emu/machine/im6402.c b/src/emu/machine/im6402.c index 6ceb337803a..9e03a188fd8 100644 --- a/src/emu/machine/im6402.c +++ b/src/emu/machine/im6402.c @@ -38,7 +38,7 @@ const device_type IM6402 = &device_creator<im6402_device>; inline void im6402_device::set_dr(int state) { m_dr = state; - + m_out_dr_func(state); } @@ -50,7 +50,7 @@ inline void im6402_device::set_dr(int state) inline void im6402_device::set_tbre(int state) { m_tbre = state; - + m_out_tbre_func(state); } @@ -62,7 +62,7 @@ inline void im6402_device::set_tbre(int state) inline void im6402_device::set_tre(int state) { m_tre = state; - + m_out_tre_func(state); } @@ -86,12 +86,12 @@ inline void im6402_device::receive() { receive_register_extract(); m_rbr = get_received_char(); - + if (m_dr) { m_oe = 1; } - + set_dr(ASSERT_LINE); } } @@ -106,18 +106,18 @@ inline void im6402_device::transmit() if (is_transmit_register_empty() && !m_tbre) { transmit_register_setup(m_tbr); - + set_tbre(ASSERT_LINE); set_tre(CLEAR_LINE); } - + if (!is_transmit_register_empty()) { int bit = transmit_register_get_data_bit(); - + m_out_tro_func(bit); serial_connection_out(); - + if (is_transmit_register_empty()) { set_tre(ASSERT_LINE); @@ -226,7 +226,7 @@ void im6402_device::device_reset() m_pe = 0; m_fe = 0; m_oe = 0; - + set_dr(CLEAR_LINE); set_tbre(ASSERT_LINE); set_tre(ASSERT_LINE); @@ -292,7 +292,7 @@ WRITE_LINE_MEMBER( im6402_device::rrc_w ) if (state) { m_rrc_count++; - + if (m_rrc_count == 16) { receive(); @@ -311,13 +311,13 @@ WRITE_LINE_MEMBER( im6402_device::trc_w ) if (state) { m_trc_count++; - + if (m_trc_count == 16) { transmit(); m_trc_count = 0; } - } + } } @@ -436,11 +436,11 @@ WRITE_LINE_MEMBER( im6402_device::crl_w ) int word_length = 5 + ((m_cls2 << 1) | m_cls1); int stop_bits = 1 + m_sbs ? ((word_length == 5) ? 0.5 : 1) : 0; int parity_code; - - if (m_pi) parity_code = SERIAL_PARITY_NONE; - else if (m_epe) parity_code = SERIAL_PARITY_EVEN; + + if (m_pi) parity_code = SERIAL_PARITY_NONE; + else if (m_epe) parity_code = SERIAL_PARITY_EVEN; else parity_code = SERIAL_PARITY_ODD; - + set_data_frame(word_length, stop_bits, parity_code); } } diff --git a/src/emu/machine/im6402.h b/src/emu/machine/im6402.h index a9575b225d1..254fa8027ce 100644 --- a/src/emu/machine/im6402.h +++ b/src/emu/machine/im6402.h @@ -29,12 +29,12 @@ RRI 20 |_____________| 21 MR - NOTE: PIN IM6402 IM6403 - --------------------------- - 2 N/C CONTROL - 17 RRC OSC IN - 40 TRC OSC OUT - + NOTE: PIN IM6402 IM6403 + --------------------------- + 2 N/C CONTROL + 17 RRC OSC IN + 40 TRC OSC OUT + ***************************************************************************/ #pragma once @@ -70,7 +70,7 @@ struct im6402_interface { int m_rrc; int m_trc; - + devcb_read_line m_in_rri_cb; devcb_write_line m_out_tro_cb; devcb_write_line m_out_dr_cb; @@ -81,7 +81,7 @@ struct im6402_interface // ======================> im6402_device -class im6402_device : public device_t, +class im6402_device : public device_t, public device_serial_interface, public im6402_interface { @@ -91,7 +91,7 @@ public: DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); - + DECLARE_READ_LINE_MEMBER( dr_r ); DECLARE_READ_LINE_MEMBER( tbre_r ); DECLARE_READ_LINE_MEMBER( tre_r ); @@ -118,7 +118,7 @@ protected: virtual void device_start(); virtual void device_reset(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - + // device_serial_interface overrides virtual void input_callback(UINT8 state); @@ -128,7 +128,7 @@ private: inline void set_tre(int state); inline void receive(); inline void transmit(); - + static const device_timer_id TIMER_RX = 0; static const device_timer_id TIMER_TX = 1; @@ -145,7 +145,7 @@ private: int m_pe; int m_fe; int m_oe; - + // control int m_cls1; int m_cls2; @@ -153,15 +153,15 @@ private: int m_sfd; int m_epe; int m_pi; - + // receiver UINT8 m_rbr; int m_rrc_count; - + // transmitter UINT8 m_tbr; int m_trc_count; - + // timers emu_timer *m_rx_timer; emu_timer *m_tx_timer; diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c index 05f372aa6e9..b7b51667007 100644 --- a/src/emu/machine/scsihd.c +++ b/src/emu/machine/scsihd.c @@ -257,17 +257,17 @@ static void scsihd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr // Attempt to register save state entry after state registration is closed! state_save_register_item( machine, "scsihd", diskregion, 0, our_this->lba ); state_save_register_item( machine, "scsihd", diskregion, 0, our_this->blocks ); - + // try to locate the CHD from a DISK_REGION our_this->handle = get_disk_handle(machine, diskregion); our_this->disk = hard_disk_open(our_this->handle); our_this->is_image_device = false; - + if (our_this->disk == NULL) { // try to locate the CHD from an image device harddisk_image_device *image_device = machine.device<harddisk_image_device>(diskregion); - + if (image_device != NULL) { our_this->handle = image_device->get_chd_file(); @@ -275,7 +275,7 @@ static void scsihd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr our_this->is_image_device = true; } } - + if (our_this->disk == NULL) { // try to locate the CHD from an image subdevice @@ -290,7 +290,7 @@ static void scsihd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr } } } - + if (our_this->disk != NULL) { // get hard disk sector size from CHD metadata |
