summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus')
-rw-r--r--src/devices/bus/a2bus/a2themill.c2
-rw-r--r--src/devices/bus/cpc/ddi1.h2
-rw-r--r--src/devices/bus/cpc/doubler.c11
-rw-r--r--src/devices/bus/cpc/doubler.h10
-rw-r--r--src/devices/bus/isa/omti8621.c2
-rw-r--r--src/devices/bus/rs232/pty.c152
-rw-r--r--src/devices/bus/rs232/pty.h58
-rw-r--r--src/devices/bus/rs232/rs232.c2
-rw-r--r--src/devices/bus/tiki100/8088.c2
-rw-r--r--src/devices/bus/tiki100/8088.h2
-rw-r--r--src/devices/bus/tiki100/exp.h4
-rw-r--r--src/devices/bus/tiki100/hdc.c2
-rw-r--r--src/devices/bus/tiki100/hdc.h2
13 files changed, 125 insertions, 126 deletions
diff --git a/src/devices/bus/a2bus/a2themill.c b/src/devices/bus/a2bus/a2themill.c
index 8f6fc5d1cc0..34b2cac13c1 100644
--- a/src/devices/bus/a2bus/a2themill.c
+++ b/src/devices/bus/a2bus/a2themill.c
@@ -255,7 +255,7 @@ READ8_MEMBER( a2bus_themill_device::dma_r )
{
return slot_dma_read(space, (offset&0xfff) + 0xc000);
}
- else if (offset <= 0xcfff) // 6809 Cxxx -> 6502 ZP
+ else if (offset <= 0xcfff) // 6809 Cxxx -> 6502 ZP
{
return slot_dma_read(space, (offset&0xfff));
}
diff --git a/src/devices/bus/cpc/ddi1.h b/src/devices/bus/cpc/ddi1.h
index 404bc76120c..9d36783d9b4 100644
--- a/src/devices/bus/cpc/ddi1.h
+++ b/src/devices/bus/cpc/ddi1.h
@@ -42,7 +42,7 @@ private:
required_device<upd765_family_device> m_fdc;
required_device<floppy_connector> m_connector;
-
+
bool m_rom_active;
bool m_romen;
};
diff --git a/src/devices/bus/cpc/doubler.c b/src/devices/bus/cpc/doubler.c
index 50bdf437a5d..2c753d3565e 100644
--- a/src/devices/bus/cpc/doubler.c
+++ b/src/devices/bus/cpc/doubler.c
@@ -1,15 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald
/*
- * doubler.c -- Draysoft Doubler - external cassette interface for the 464 (works on 664/6128 with external cassette?),
+ * doubler.c -- Draysoft Doubler - external cassette interface for the 464 (works on 664/6128 with external cassette?),
* intended for use in duplicating cassette software
*
*/
-
- #include "doubler.h"
- #include "includes/amstrad.h"
- //**************************************************************************
+ #include "doubler.h"
+ #include "includes/amstrad.h"
+
+ //**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
@@ -72,4 +72,3 @@ READ8_MEMBER(cpc_doubler_device::ext_tape_r)
data |= 0x20;
return data;
}
-
diff --git a/src/devices/bus/cpc/doubler.h b/src/devices/bus/cpc/doubler.h
index 22cac02c3e2..6b650179b0f 100644
--- a/src/devices/bus/cpc/doubler.h
+++ b/src/devices/bus/cpc/doubler.h
@@ -1,13 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald
/*
- * doubler.c -- Draysoft Doubler - external cassette interface for the 464 (works on 664/6128 with external cassette?),
+ * doubler.c -- Draysoft Doubler - external cassette interface for the 464 (works on 664/6128 with external cassette?),
* intended for use in duplicating cassette software
*
* Uses only port F0E0 (may conflict with other peripherals, PPI port A is not usable while Doubler software is running)
*
*/
-
+
#ifndef DOUBLER_H_
#define DOUBLER_H_
@@ -27,7 +27,7 @@ public:
virtual machine_config_constructor device_mconfig_additions() const;
DECLARE_READ8_MEMBER(ext_tape_r);
-
+
protected:
// device-level overrides
virtual void device_start();
@@ -35,11 +35,11 @@ protected:
private:
cpc_expansion_slot_device *m_slot;
-
+
required_device<cassette_image_device> m_tape;
};
// device type definition
extern const device_type CPC_DOUBLER;
-
+
#endif /* DOUBLER_H_ */
diff --git a/src/devices/bus/isa/omti8621.c b/src/devices/bus/isa/omti8621.c
index fdb11304f5c..9f86243a90a 100644
--- a/src/devices/bus/isa/omti8621.c
+++ b/src/devices/bus/isa/omti8621.c
@@ -216,7 +216,7 @@ MACHINE_CONFIG_FRAGMENT( omti_disk )
MCFG_PC_FDC_DRQ_CALLBACK(WRITELINE(omti8621_device, fdc_drq_w))
MCFG_FLOPPY_DRIVE_ADD(OMTI_FDC_TAG":0", pc_hd_floppies, "525hd", omti8621_device::floppy_formats)
// Apollo workstations never have more then 1 floppy drive
-// MCFG_FLOPPY_DRIVE_ADD(OMTI_FDC_TAG":1", pc_hd_floppies, "525hd", omti8621_device::floppy_formats)
+// MCFG_FLOPPY_DRIVE_ADD(OMTI_FDC_TAG":1", pc_hd_floppies, "525hd", omti8621_device::floppy_formats)
MACHINE_CONFIG_END
FLOPPY_FORMATS_MEMBER( omti8621_device::floppy_formats )
diff --git a/src/devices/bus/rs232/pty.c b/src/devices/bus/rs232/pty.c
index bc673318e2a..0039925ac85 100644
--- a/src/devices/bus/rs232/pty.c
+++ b/src/devices/bus/rs232/pty.c
@@ -7,132 +7,132 @@
static const int TIMER_POLL = 1;
pseudo_terminal_device::pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, PSEUDO_TERMINAL, "Pseudo terminal", tag, owner, clock, "pseudo_terminal", __FILE__),
- device_serial_interface(mconfig, *this),
- device_rs232_port_interface(mconfig, *this),
- device_pty_interface(mconfig, *this),
- m_rs232_txbaud(*this, "RS232_TXBAUD"),
- m_rs232_rxbaud(*this, "RS232_RXBAUD"),
- m_rs232_startbits(*this, "RS232_STARTBITS"),
- m_rs232_databits(*this, "RS232_DATABITS"),
- m_rs232_parity(*this, "RS232_PARITY"),
- m_rs232_stopbits(*this, "RS232_STOPBITS"),
- m_input_count(0),
- m_input_index(0)
+ device_t(mconfig, PSEUDO_TERMINAL, "Pseudo terminal", tag, owner, clock, "pseudo_terminal", __FILE__),
+ device_serial_interface(mconfig, *this),
+ device_rs232_port_interface(mconfig, *this),
+ device_pty_interface(mconfig, *this),
+ m_rs232_txbaud(*this, "RS232_TXBAUD"),
+ m_rs232_rxbaud(*this, "RS232_RXBAUD"),
+ m_rs232_startbits(*this, "RS232_STARTBITS"),
+ m_rs232_databits(*this, "RS232_DATABITS"),
+ m_rs232_parity(*this, "RS232_PARITY"),
+ m_rs232_stopbits(*this, "RS232_STOPBITS"),
+ m_input_count(0),
+ m_input_index(0)
{
}
WRITE_LINE_MEMBER(pseudo_terminal_device::update_serial)
{
- int startbits = convert_startbits(m_rs232_startbits->read());
- int databits = convert_databits(m_rs232_databits->read());
- parity_t parity = convert_parity(m_rs232_parity->read());
- stop_bits_t stopbits = convert_stopbits(m_rs232_stopbits->read());
+ int startbits = convert_startbits(m_rs232_startbits->read());
+ int databits = convert_databits(m_rs232_databits->read());
+ parity_t parity = convert_parity(m_rs232_parity->read());
+ stop_bits_t stopbits = convert_stopbits(m_rs232_stopbits->read());
- set_data_frame(startbits, databits, parity, stopbits);
+ set_data_frame(startbits, databits, parity, stopbits);
- int txbaud = convert_baud(m_rs232_txbaud->read());
- set_tra_rate(txbaud);
+ int txbaud = convert_baud(m_rs232_txbaud->read());
+ set_tra_rate(txbaud);
- int rxbaud = convert_baud(m_rs232_rxbaud->read());
- set_rcv_rate(rxbaud);
+ int rxbaud = convert_baud(m_rs232_rxbaud->read());
+ set_rcv_rate(rxbaud);
- output_rxd(1);
+ output_rxd(1);
- // TODO: make this configurable
- output_dcd(0);
- output_dsr(0);
- output_cts(0);
+ // TODO: make this configurable
+ output_dcd(0);
+ output_dsr(0);
+ output_cts(0);
}
static INPUT_PORTS_START(pseudo_terminal)
- MCFG_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", pseudo_terminal_device, update_serial)
- MCFG_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", pseudo_terminal_device, update_serial)
- MCFG_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", pseudo_terminal_device, update_serial)
- MCFG_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", pseudo_terminal_device, update_serial)
- MCFG_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", pseudo_terminal_device, update_serial)
- MCFG_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", pseudo_terminal_device, update_serial)
+ MCFG_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", pseudo_terminal_device, update_serial)
+ MCFG_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", pseudo_terminal_device, update_serial)
+ MCFG_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", pseudo_terminal_device, update_serial)
+ MCFG_RS232_DATABITS("RS232_DATABITS", RS232_DATABITS_8, "Data Bits", pseudo_terminal_device, update_serial)
+ MCFG_RS232_PARITY("RS232_PARITY", RS232_PARITY_NONE, "Parity", pseudo_terminal_device, update_serial)
+ MCFG_RS232_STOPBITS("RS232_STOPBITS", RS232_STOPBITS_1, "Stop Bits", pseudo_terminal_device, update_serial)
INPUT_PORTS_END
ioport_constructor pseudo_terminal_device::device_input_ports() const
{
- return INPUT_PORTS_NAME(pseudo_terminal);
+ return INPUT_PORTS_NAME(pseudo_terminal);
}
void pseudo_terminal_device::device_start()
{
- m_timer_poll = timer_alloc(TIMER_POLL);
+ m_timer_poll = timer_alloc(TIMER_POLL);
- open();
+ open();
}
void pseudo_terminal_device::device_stop()
{
- close();
+ close();
}
void pseudo_terminal_device::device_reset()
{
- update_serial(0);
- queue();
+ update_serial(0);
+ queue();
}
void pseudo_terminal_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
- switch (id)
- {
- case TIMER_POLL:
- queue();
- break;
-
- default:
- device_serial_interface::device_timer(timer, id, param, ptr);
- }
+ switch (id)
+ {
+ case TIMER_POLL:
+ queue();
+ break;
+
+ default:
+ device_serial_interface::device_timer(timer, id, param, ptr);
+ }
}
void pseudo_terminal_device::tra_callback()
{
- output_rxd(transmit_register_get_data_bit());
+ output_rxd(transmit_register_get_data_bit());
}
void pseudo_terminal_device::tra_complete()
{
- queue();
+ queue();
}
void pseudo_terminal_device::rcv_complete()
{
- receive_register_extract();
- write(get_received_char());
+ receive_register_extract();
+ write(get_received_char());
}
void pseudo_terminal_device::queue(void)
{
- if (is_transmit_register_empty())
- {
- if (m_input_index == m_input_count)
- {
- m_input_index = 0;
- int tmp = read(m_input_buffer , sizeof(m_input_buffer));
- if (tmp > 0) {
- m_input_count = tmp;
- } else {
- m_input_count = 0;
- }
- }
-
- if (m_input_count != 0)
- {
- transmit_register_setup(m_input_buffer[ m_input_index++ ]);
-
- m_timer_poll->adjust(attotime::never);
- }
- else
- {
- int txbaud = convert_baud(m_rs232_txbaud->read());
- m_timer_poll->adjust(attotime::from_hz(txbaud));
- }
- }
+ if (is_transmit_register_empty())
+ {
+ if (m_input_index == m_input_count)
+ {
+ m_input_index = 0;
+ int tmp = read(m_input_buffer , sizeof(m_input_buffer));
+ if (tmp > 0) {
+ m_input_count = tmp;
+ } else {
+ m_input_count = 0;
+ }
+ }
+
+ if (m_input_count != 0)
+ {
+ transmit_register_setup(m_input_buffer[ m_input_index++ ]);
+
+ m_timer_poll->adjust(attotime::never);
+ }
+ else
+ {
+ int txbaud = convert_baud(m_rs232_txbaud->read());
+ m_timer_poll->adjust(attotime::from_hz(txbaud));
+ }
+ }
}
const device_type PSEUDO_TERMINAL = &device_creator<pseudo_terminal_device>;
diff --git a/src/devices/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h
index 1f4ddbce754..222ee446b53 100644
--- a/src/devices/bus/rs232/pty.h
+++ b/src/devices/bus/rs232/pty.h
@@ -7,44 +7,44 @@
#include "rs232.h"
class pseudo_terminal_device : public device_t,
- public device_serial_interface,
- public device_rs232_port_interface,
- public device_pty_interface
+ public device_serial_interface,
+ public device_rs232_port_interface,
+ public device_pty_interface
{
public:
- pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+ pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
- virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) {
- device_serial_interface::rx_w(state);
- }
+ virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) {
+ device_serial_interface::rx_w(state);
+ }
- DECLARE_WRITE_LINE_MEMBER(update_serial);
+ DECLARE_WRITE_LINE_MEMBER(update_serial);
protected:
- virtual ioport_constructor device_input_ports() const;
- virtual void device_start();
- virtual void device_stop();
- virtual void device_reset();
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
+ virtual ioport_constructor device_input_ports() const;
+ virtual void device_start();
+ virtual void device_stop();
+ virtual void device_reset();
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
- virtual void tra_callback();
- virtual void tra_complete();
- virtual void rcv_complete();
+ virtual void tra_callback();
+ virtual void tra_complete();
+ virtual void rcv_complete();
private:
- required_ioport m_rs232_txbaud;
- required_ioport m_rs232_rxbaud;
- required_ioport m_rs232_startbits;
- required_ioport m_rs232_databits;
- required_ioport m_rs232_parity;
- required_ioport m_rs232_stopbits;
-
- UINT8 m_input_buffer[ 1024 ];
- UINT32 m_input_count;
- UINT32 m_input_index;
- emu_timer *m_timer_poll;
-
- void queue(void);
+ required_ioport m_rs232_txbaud;
+ required_ioport m_rs232_rxbaud;
+ required_ioport m_rs232_startbits;
+ required_ioport m_rs232_databits;
+ required_ioport m_rs232_parity;
+ required_ioport m_rs232_stopbits;
+
+ UINT8 m_input_buffer[ 1024 ];
+ UINT32 m_input_count;
+ UINT32 m_input_index;
+ emu_timer *m_timer_poll;
+
+ void queue(void);
};
extern const device_type PSEUDO_TERMINAL;
diff --git a/src/devices/bus/rs232/rs232.c b/src/devices/bus/rs232/rs232.c
index cb2d1771a6e..411a31a8f01 100644
--- a/src/devices/bus/rs232/rs232.c
+++ b/src/devices/bus/rs232/rs232.c
@@ -111,5 +111,5 @@ SLOT_INTERFACE_START( default_rs232_devices )
SLOT_INTERFACE("null_modem", NULL_MODEM)
SLOT_INTERFACE("printer", SERIAL_PRINTER)
SLOT_INTERFACE("terminal", SERIAL_TERMINAL)
- SLOT_INTERFACE("pty", PSEUDO_TERMINAL)
+ SLOT_INTERFACE("pty", PSEUDO_TERMINAL)
SLOT_INTERFACE_END
diff --git a/src/devices/bus/tiki100/8088.c b/src/devices/bus/tiki100/8088.c
index 1065c856340..d8c9fe201b5 100644
--- a/src/devices/bus/tiki100/8088.c
+++ b/src/devices/bus/tiki100/8088.c
@@ -14,7 +14,7 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define I8088_TAG "u3"
+#define I8088_TAG "u3"
diff --git a/src/devices/bus/tiki100/8088.h b/src/devices/bus/tiki100/8088.h
index 2700866a169..6bfa5e723bc 100644
--- a/src/devices/bus/tiki100/8088.h
+++ b/src/devices/bus/tiki100/8088.h
@@ -24,7 +24,7 @@
// ======================> tiki100_8088_t
class tiki100_8088_t : public device_t,
- public device_tiki100bus_card_interface
+ public device_tiki100bus_card_interface
{
public:
// construction/destruction
diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h
index fc25c522c79..e41b18e7831 100644
--- a/src/devices/bus/tiki100/exp.h
+++ b/src/devices/bus/tiki100/exp.h
@@ -105,8 +105,8 @@ public:
// ======================> tiki100_bus_slot_t
class tiki100_bus_slot_t : public device_t,
- public device_slot_interface,
- public device_z80daisy_interface
+ public device_slot_interface,
+ public device_z80daisy_interface
{
public:
// construction/destruction
diff --git a/src/devices/bus/tiki100/hdc.c b/src/devices/bus/tiki100/hdc.c
index 2b978635ead..504222f0f48 100644
--- a/src/devices/bus/tiki100/hdc.c
+++ b/src/devices/bus/tiki100/hdc.c
@@ -14,7 +14,7 @@
// MACROS/CONSTANTS
//**************************************************************************
-#define WD1010_TAG "hdc"
+#define WD1010_TAG "hdc"
diff --git a/src/devices/bus/tiki100/hdc.h b/src/devices/bus/tiki100/hdc.h
index d06342fc66c..fefde73c2e7 100644
--- a/src/devices/bus/tiki100/hdc.h
+++ b/src/devices/bus/tiki100/hdc.h
@@ -25,7 +25,7 @@
// ======================> tiki100_hdc_t
class tiki100_hdc_t : public device_t,
- public device_tiki100bus_card_interface
+ public device_tiki100bus_card_interface
{
public:
// construction/destruction