diff options
Diffstat (limited to 'src/emu/bus')
27 files changed, 188 insertions, 201 deletions
diff --git a/src/emu/bus/a2bus/a2bus.h b/src/emu/bus/a2bus/a2bus.h index 7444df4151c..a440ef0c83c 100644 --- a/src/emu/bus/a2bus/a2bus.h +++ b/src/emu/bus/a2bus/a2bus.h @@ -16,13 +16,13 @@ #include "emu.h" // /INH special addresses -#define INH_START_INVALID 0xffff; -#define INH_END_INVALID 0x0000; +#define INH_START_INVALID 0xffff; +#define INH_END_INVALID 0x0000; -// /INH types -#define INH_NONE 0x00 -#define INH_READ 0x01 -#define INH_WRITE 0x02 +// /INH types +#define INH_NONE 0x00 +#define INH_READ 0x01 +#define INH_WRITE 0x02 //************************************************************************** // INTERFACE CONFIGURATION MACROS @@ -120,7 +120,7 @@ protected: devcb_write_line m_out_irq_cb; devcb_write_line m_out_nmi_cb; - devcb_write8 m_out_inh_cb; + devcb_write8 m_out_inh_cb; device_a2bus_card_interface *m_device_list[8]; const char *m_cputag; diff --git a/src/emu/bus/a2bus/a2eext80col.c b/src/emu/bus/a2bus/a2eext80col.c index b6bd2443489..f4ffbb0505e 100644 --- a/src/emu/bus/a2bus/a2eext80col.c +++ b/src/emu/bus/a2bus/a2eext80col.c @@ -71,4 +71,3 @@ UINT8 *a2eaux_ext80col_device::get_auxbank_ptr() { return &m_ram[0]; } - diff --git a/src/emu/bus/a2bus/a2estd80col.c b/src/emu/bus/a2bus/a2estd80col.c index 5bffdc11af6..2bfcef11a8c 100644 --- a/src/emu/bus/a2bus/a2estd80col.c +++ b/src/emu/bus/a2bus/a2estd80col.c @@ -78,4 +78,3 @@ UINT8 *a2eaux_std80col_device::get_auxbank_ptr() { return &m_ram[0]; } - diff --git a/src/emu/bus/a2bus/a2swyft.c b/src/emu/bus/a2bus/a2swyft.c index 1547814ec68..a7e011bd1c3 100644 --- a/src/emu/bus/a2bus/a2swyft.c +++ b/src/emu/bus/a2bus/a2swyft.c @@ -74,7 +74,7 @@ void a2bus_swyft_device::device_reset() { m_rombank = 0; - m_inh_state = INH_READ; // read-enable the ROM + m_inh_state = INH_READ; // read-enable the ROM recalc_slot_inh(); } @@ -146,4 +146,3 @@ int a2bus_swyft_device::inh_type() { return m_inh_state; } - diff --git a/src/emu/bus/a2bus/ramcard128k.c b/src/emu/bus/a2bus/ramcard128k.c index e78dde368e9..3b05128e186 100644 --- a/src/emu/bus/a2bus/ramcard128k.c +++ b/src/emu/bus/a2bus/ramcard128k.c @@ -126,11 +126,11 @@ void a2bus_ssramcard_device::do_io(int offset) } #if 0 - printf("LC: (ofs %x) new state %c%c dxxx=%04x main=%05x\n", - offset, - (m_inh_state & INH_READ) ? 'R' : 'x', - (m_inh_state & INH_WRITE) ? 'W' : 'x', - m_dxxx_bank, m_main_bank); + printf("LC: (ofs %x) new state %c%c dxxx=%04x main=%05x\n", + offset, + (m_inh_state & INH_READ) ? 'R' : 'x', + (m_inh_state & INH_WRITE) ? 'W' : 'x', + m_dxxx_bank, m_main_bank); #endif } @@ -157,7 +157,7 @@ void a2bus_ssramcard_device::write_c0nx(address_space &space, UINT8 offset, UINT UINT8 a2bus_ssramcard_device::read_inh_rom(address_space &space, UINT16 offset) { - assert(m_inh_state & INH_READ); // this should never happen + assert(m_inh_state & INH_READ); // this should never happen if (offset < 0xe000) { @@ -188,4 +188,3 @@ int a2bus_ssramcard_device::inh_type() { return m_inh_state; } - diff --git a/src/emu/bus/a2bus/ramcard16k.c b/src/emu/bus/a2bus/ramcard16k.c index dc731cfb06e..a25ba79423f 100644 --- a/src/emu/bus/a2bus/ramcard16k.c +++ b/src/emu/bus/a2bus/ramcard16k.c @@ -107,10 +107,10 @@ void a2bus_ramcard_device::do_io(int offset) } #if 0 - printf("LC: new state %c%c dxxx=%04x\n", - (m_inh_state & INH_READ) ? 'R' : 'x', - (m_inh_state & INH_WRITE) ? 'W' : 'x', - m_dxxx_bank); + printf("LC: new state %c%c dxxx=%04x\n", + (m_inh_state & INH_READ) ? 'R' : 'x', + (m_inh_state & INH_WRITE) ? 'W' : 'x', + m_dxxx_bank); #endif } @@ -137,7 +137,7 @@ void a2bus_ramcard_device::write_c0nx(address_space &space, UINT8 offset, UINT8 UINT8 a2bus_ramcard_device::read_inh_rom(address_space &space, UINT16 offset) { - assert(m_inh_state & INH_READ); // this should never happen + assert(m_inh_state & INH_READ); // this should never happen if (offset < 0xe000) { @@ -168,4 +168,3 @@ int a2bus_ramcard_device::inh_type() { return m_inh_state; } - diff --git a/src/emu/bus/astrocde/exp.h b/src/emu/bus/astrocde/exp.h index bbd8c0b6465..3acbe2590d0 100644 --- a/src/emu/bus/astrocde/exp.h +++ b/src/emu/bus/astrocde/exp.h @@ -34,7 +34,7 @@ public: virtual void device_start(); bool get_card_mounted() { return m_card_mounted; } - + // reading and writing virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); diff --git a/src/emu/bus/astrocde/ram.c b/src/emu/bus/astrocde/ram.c index 41f79e176e9..4aae888cba6 100644 --- a/src/emu/bus/astrocde/ram.c +++ b/src/emu/bus/astrocde/ram.c @@ -19,7 +19,7 @@ mapped to the cartridge memory starting at $2000. So it would be possible to load a cartridge program from tape into the expansion memory, then flip the range switch and run it as a cartridge. This is useful for cartridge development. - + Blue RAM -- available in 4K, 16K, and 32K. These also use an INS8154 chip, (not yet implemented) which has an additional $80 bytes of RAM mapped immediately after the end of the expansion address space. This memory @@ -29,17 +29,17 @@ past this range) 16K: $6000 to $9FFF 32K: $6000 to $DFFF - + VIPER System 1 -- This is available in 16K only. It also includes a keyboard (not implemented). 16K: $6000 to $9FFF - + Lil' WHITE RAM -- This is available in 32K only. Attempts to read and write to memory outside of its address range ($D000 to $FFFF) are mapped to the expansion memory $5000 to $7FFF. The current implementation won't allow the shadow RAM area to be accessed when RAM protect is on, but there is no known software that will access the upper range of the expansion RAM when RAM protect is enabled. 32K: $5000 to $CFFF - + R&L 64K RAM Board -- This is a highly configurable kit. RAM can be installed in 2K increments. So, the entire 44K expansion memory can be filled. It is also possible to override the rest of the memory map with RAM (not implemented). @@ -48,7 +48,7 @@ installing switches. The ranges are $0000 to $0FFF (first 4K), $0000 to $3FFF (first 16K), and $0000 to $FFFF (all 64K). The current implementation is for 44K expansion memory mapped from $5000 to $FFFF, with only a single write protect covering this entire range. - + ***********************************************************************************************************/ @@ -209,5 +209,3 @@ WRITE8_MEMBER(astrocade_rl64ram_device::write) if (!m_write_prot->read()) m_ram[offset] = data; } - - diff --git a/src/emu/bus/astrocde/ram.h b/src/emu/bus/astrocde/ram.h index 8434249cdee..c99fec58aa2 100644 --- a/src/emu/bus/astrocde/ram.h +++ b/src/emu/bus/astrocde/ram.h @@ -37,7 +37,7 @@ class astrocade_blueram_16k_device : public astrocade_blueram_4k_device public: // construction/destruction astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual void device_start() { m_ram.resize(0x4000); save_item(NAME(m_ram)); } }; @@ -48,7 +48,7 @@ class astrocade_blueram_32k_device : public astrocade_blueram_4k_device public: // construction/destruction astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual void device_start() { m_ram.resize(0x8000); save_item(NAME(m_ram)); } }; @@ -60,7 +60,7 @@ class astrocade_viper_sys1_device : public device_t, public: // construction/destruction astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + // device-level overrides virtual void device_start() { m_ram.resize(0x4000); save_item(NAME(m_ram)); } virtual void device_reset() {} @@ -69,7 +69,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); - + private: dynamic_buffer m_ram; required_ioport m_write_prot; @@ -83,16 +83,16 @@ class astrocade_whiteram_device : public device_t, public: // construction/destruction astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + // device-level overrides virtual void device_start() { m_ram.resize(0x8000); save_item(NAME(m_ram)); } virtual void device_reset() {} virtual ioport_constructor device_input_ports() const; - + // reading and writing virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); - + private: dynamic_buffer m_ram; required_ioport m_write_prot; @@ -106,16 +106,16 @@ class astrocade_rl64ram_device : public device_t, public: // construction/destruction astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + // device-level overrides virtual void device_start() { m_ram.resize(0xb000); save_item(NAME(m_ram)); } virtual void device_reset() {} virtual ioport_constructor device_input_ports() const; - + // reading and writing virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); - + private: dynamic_buffer m_ram; required_ioport m_write_prot; diff --git a/src/emu/bus/astrocde/rom.c b/src/emu/bus/astrocde/rom.c index 3f76b024df0..25ef8123666 100644 --- a/src/emu/bus/astrocde/rom.c +++ b/src/emu/bus/astrocde/rom.c @@ -80,21 +80,20 @@ READ8_MEMBER(astrocade_rom_device::read_rom) READ8_MEMBER(astrocade_rom_256k_device::read_rom) { - if (offset < 0x1000) // 0x2000-0x2fff + if (offset < 0x1000) // 0x2000-0x2fff return m_rom[offset + 0x1000 * 0x3f]; - else if (offset < 0x1fc0) // 0x3000-0x3fbf + else if (offset < 0x1fc0) // 0x3000-0x3fbf return m_rom[(offset & 0xfff) + (0x1000 * m_base_bank)]; - else // 0x3fc0-0x3fff + else // 0x3fc0-0x3fff return m_base_bank = offset & 0x3f; } READ8_MEMBER(astrocade_rom_512k_device::read_rom) { - if (offset < 0x1000) // 0x2000-0x2fff + if (offset < 0x1000) // 0x2000-0x2fff return m_rom[offset + 0x1000 * 0x7f]; - else if (offset < 0x1f80) // 0x3000-0x3fbf + else if (offset < 0x1f80) // 0x3000-0x3fbf return m_rom[(offset & 0xfff) + (0x1000 * m_base_bank)]; - else // 0x3fc0-0x3fff + else // 0x3fc0-0x3fff return m_base_bank = offset & 0x7f; } - diff --git a/src/emu/bus/astrocde/rom.h b/src/emu/bus/astrocde/rom.h index 4c30038dfce..64fd9f3d7ac 100644 --- a/src/emu/bus/astrocde/rom.h +++ b/src/emu/bus/astrocde/rom.h @@ -31,13 +31,13 @@ class astrocade_rom_256k_device : public astrocade_rom_device public: // construction/destruction astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual void device_start(); virtual void device_reset(); // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); - + private: UINT8 m_base_bank; }; @@ -49,13 +49,13 @@ class astrocade_rom_512k_device : public astrocade_rom_device public: // construction/destruction astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual void device_start(); virtual void device_reset(); - + // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); - + private: UINT8 m_base_bank; }; diff --git a/src/emu/bus/astrocde/slot.c b/src/emu/bus/astrocde/slot.c index 08895cbd569..5b70beff977 100644 --- a/src/emu/bus/astrocde/slot.c +++ b/src/emu/bus/astrocde/slot.c @@ -207,7 +207,7 @@ void astrocade_cart_slot_device::get_default_card_software(astring &result) const char *slot_string = "rom"; UINT32 size = core_fsize(m_file); int type = ASTROCADE_STD; - + if (size == 0x40000) type = ASTROCADE_256K; if (size == 0x80000) @@ -236,4 +236,3 @@ READ8_MEMBER(astrocade_cart_slot_device::read_rom) else return 0xff; } - diff --git a/src/emu/bus/centronics/epson_lx810l.h b/src/emu/bus/centronics/epson_lx810l.h index 29f80e803e4..6c40abf50fb 100644 --- a/src/emu/bus/centronics/epson_lx810l.h +++ b/src/emu/bus/centronics/epson_lx810l.h @@ -28,15 +28,15 @@ // ======================> epson_lx810l_t class epson_lx810l_t : public device_t, - public device_centronics_peripheral_interface + public device_centronics_peripheral_interface { public: // construction/destruction epson_lx810l_t(const machine_config &mconfig, const char *tag, - device_t *owner, UINT32 clock); + device_t *owner, UINT32 clock); epson_lx810l_t(const machine_config &mconfig, device_type type, - const char *name, const char *tag, device_t *owner, - UINT32 clock, const char *shortname, const char *source); + const char *name, const char *tag, device_t *owner, + UINT32 clock, const char *shortname, const char *source); // optional information overrides virtual const rom_entry *device_rom_region() const; @@ -103,7 +103,7 @@ class epson_ap2000_t : public epson_lx810l_t public: // construction/destruction epson_ap2000_t(const machine_config &mconfig, const char *tag, - device_t *owner, UINT32 clock); + device_t *owner, UINT32 clock); // optional information overrides virtual const rom_entry *device_rom_region() const; diff --git a/src/emu/bus/coco/coco_dwsock.c b/src/emu/bus/coco/coco_dwsock.c index aff17ae2929..c0228bef3cc 100644 --- a/src/emu/bus/coco/coco_dwsock.c +++ b/src/emu/bus/coco/coco_dwsock.c @@ -24,8 +24,8 @@ const device_type COCO_DWSOCK = &device_creator<beckerport_device>; INPUT_PORTS_START( coco_drivewire ) PORT_START(DRIVEWIRE_PORT_TAG) - PORT_CONFNAME( 0xffff, 65504, "Drivewire Server TCP Port") - PORT_CHANGED_MEMBER(DEVICE_SELF, beckerport_device, drivewire_port_changed, NULL ) + PORT_CONFNAME( 0xffff, 65504, "Drivewire Server TCP Port") + PORT_CHANGED_MEMBER(DEVICE_SELF, beckerport_device, drivewire_port_changed, NULL ) PORT_CONFSETTING( 65500, "65500" ) PORT_CONFSETTING( 65501, "65501" ) PORT_CONFSETTING( 65502, "65502" ) @@ -52,7 +52,7 @@ ioport_constructor beckerport_device::device_input_ports() const //------------------------------------------------- INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed) { - this->update_port(); + this->update_port(); } //************************************************************************** @@ -64,18 +64,18 @@ INPUT_CHANGED_MEMBER(beckerport_device::drivewire_port_changed) //------------------------------------------------- beckerport_device::beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__), - m_dwconfigport(*this, DRIVEWIRE_PORT_TAG) + : device_t(mconfig, COCO_DWSOCK, "Virtual Becker Port", tag, owner, clock, "coco_dwsock", __FILE__), + m_dwconfigport(*this, DRIVEWIRE_PORT_TAG) { - m_pSocket = NULL; - m_head = 0; - m_rx_pending = 0; + m_pSocket = NULL; + m_head = 0; + m_rx_pending = 0; } beckerport_device::~beckerport_device() { - if (m_pSocket != NULL) - device_stop(); + if (m_pSocket != NULL) + device_stop(); } /*------------------------------------------------- @@ -84,22 +84,22 @@ beckerport_device::~beckerport_device() void beckerport_device::device_start(void) { - char chAddress[64]; + char chAddress[64]; - /* format address string for opening the port */ - snprintf(chAddress, sizeof(chAddress), "socket.%s:%d", m_hostname, m_dwtcpport); + /* format address string for opening the port */ + snprintf(chAddress, sizeof(chAddress), "socket.%s:%d", m_hostname, m_dwtcpport); - fprintf(stderr, "Connecting to Drivewire server on %s:%d... ", m_hostname, m_dwtcpport); + fprintf(stderr, "Connecting to Drivewire server on %s:%d... ", m_hostname, m_dwtcpport); - UINT64 filesize; // unused - file_error filerr = osd_open(chAddress, 0, &m_pSocket, &filesize); - if (filerr != FILERR_NONE) - { - fprintf(stderr, "Error: osd_open returned error %i!\n", (int) filerr); - return; - } + UINT64 filesize; // unused + file_error filerr = osd_open(chAddress, 0, &m_pSocket, &filesize); + if (filerr != FILERR_NONE) + { + fprintf(stderr, "Error: osd_open returned error %i!\n", (int) filerr); + return; + } - fprintf(stderr, "Connected!\n"); + fprintf(stderr, "Connected!\n"); } /*------------------------------------------------- @@ -108,12 +108,12 @@ void beckerport_device::device_start(void) void beckerport_device::device_stop(void) { - if (m_pSocket != NULL) - { - printf("Closing connection to Drivewire server\n"); - osd_close(m_pSocket); - m_pSocket = NULL; - } + if (m_pSocket != NULL) + { + printf("Closing connection to Drivewire server\n"); + osd_close(m_pSocket); + m_pSocket = NULL; + } } /*------------------------------------------------- @@ -132,40 +132,40 @@ void beckerport_device::device_config_complete(void) READ8_MEMBER(beckerport_device::read) { - unsigned char data = 0x5a; - - if (m_pSocket == NULL) - return data; - - switch (offset) - { - case DWS_STATUS: - if (!m_rx_pending) - { - /* Try to read from dws */ - file_error filerr = osd_read(m_pSocket, m_buf, 0, sizeof(m_buf), &m_rx_pending); - if (filerr != FILERR_NONE && filerr != FILERR_FAILURE) // FILERR_FAILURE means no data available, so don't throw error message - fprintf(stderr, "coco_dwsock.c: beckerport_device::read() socket read operation failed with file_error %i\n", filerr); - else - m_head = 0; - } - //printf("beckerport_device: status read. %i bytes remaining.\n", m_rx_pending); - data = (m_rx_pending > 0) ? 2 : 0; - break; - case DWS_DATA: - if (!m_rx_pending) { - fprintf(stderr, "coco_dwsock.c: beckerport_device::read() buffer underrun\n"); - break; - } - data = m_buf[m_head++]; - m_rx_pending--; - //printf("beckerport_device: data read 1 byte (0x%02x). %i bytes remaining.\n", data&0xff, m_rx_pending); - break; - default: - fprintf(stderr, "%s: read from bad offset %d\n", __FILE__, offset); - } - - return (int)data; + unsigned char data = 0x5a; + + if (m_pSocket == NULL) + return data; + + switch (offset) + { + case DWS_STATUS: + if (!m_rx_pending) + { + /* Try to read from dws */ + file_error filerr = osd_read(m_pSocket, m_buf, 0, sizeof(m_buf), &m_rx_pending); + if (filerr != FILERR_NONE && filerr != FILERR_FAILURE) // FILERR_FAILURE means no data available, so don't throw error message + fprintf(stderr, "coco_dwsock.c: beckerport_device::read() socket read operation failed with file_error %i\n", filerr); + else + m_head = 0; + } + //printf("beckerport_device: status read. %i bytes remaining.\n", m_rx_pending); + data = (m_rx_pending > 0) ? 2 : 0; + break; + case DWS_DATA: + if (!m_rx_pending) { + fprintf(stderr, "coco_dwsock.c: beckerport_device::read() buffer underrun\n"); + break; + } + data = m_buf[m_head++]; + m_rx_pending--; + //printf("beckerport_device: data read 1 byte (0x%02x). %i bytes remaining.\n", data&0xff, m_rx_pending); + break; + default: + fprintf(stderr, "%s: read from bad offset %d\n", __FILE__, offset); + } + + return (int)data; } /*------------------------------------------------- @@ -174,26 +174,26 @@ READ8_MEMBER(beckerport_device::read) WRITE8_MEMBER(beckerport_device::write) { - char d = (char)data; - file_error filerr; - - if (m_pSocket == NULL) - return; - - switch (offset) - { - case DWS_STATUS: - //printf("beckerport_write: error: write (0x%02x) to status register\n", d); - break; - case DWS_DATA: - filerr = osd_write(m_pSocket, &d, 0, 1, NULL); - if (filerr != FILERR_NONE) - fprintf(stderr, "coco_dwsock.c: beckerport_device::write() socket write operation failed with file_error %i\n", filerr); - //printf("beckerport_write: data write one byte (0x%02x)\n", d & 0xff); - break; - default: - fprintf(stderr, "%s: write to bad offset %d\n", __FILE__, offset); - } + char d = (char)data; + file_error filerr; + + if (m_pSocket == NULL) + return; + + switch (offset) + { + case DWS_STATUS: + //printf("beckerport_write: error: write (0x%02x) to status register\n", d); + break; + case DWS_DATA: + filerr = osd_write(m_pSocket, &d, 0, 1, NULL); + if (filerr != FILERR_NONE) + fprintf(stderr, "coco_dwsock.c: beckerport_device::write() socket write operation failed with file_error %i\n", filerr); + //printf("beckerport_write: data write one byte (0x%02x)\n", d & 0xff); + break; + default: + fprintf(stderr, "%s: write to bad offset %d\n", __FILE__, offset); + } } /*------------------------------------------------- @@ -202,8 +202,7 @@ WRITE8_MEMBER(beckerport_device::write) void beckerport_device::update_port(void) { - device_stop(); - m_dwtcpport = m_dwconfigport->read_safe(65504); - device_start(); + device_stop(); + m_dwtcpport = m_dwconfigport->read_safe(65504); + device_start(); } - diff --git a/src/emu/bus/coco/coco_dwsock.h b/src/emu/bus/coco/coco_dwsock.h index 9abbc240244..0006a091cdc 100644 --- a/src/emu/bus/coco/coco_dwsock.h +++ b/src/emu/bus/coco/coco_dwsock.h @@ -23,33 +23,33 @@ class beckerport_device : public device_t { public: - beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ~beckerport_device(); + beckerport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + virtual ~beckerport_device(); - // optional information overrides - virtual ioport_constructor device_input_ports() const; + // optional information overrides + virtual ioport_constructor device_input_ports() const; - virtual void device_start(void); - virtual void device_stop(void); - virtual void device_config_complete(void); + virtual void device_start(void); + virtual void device_stop(void); + virtual void device_config_complete(void); - void update_port(void); + void update_port(void); - // driver update handlers - DECLARE_INPUT_CHANGED_MEMBER(drivewire_port_changed); + // driver update handlers + DECLARE_INPUT_CHANGED_MEMBER(drivewire_port_changed); - virtual DECLARE_READ8_MEMBER(read); - virtual DECLARE_WRITE8_MEMBER(write); + virtual DECLARE_READ8_MEMBER(read); + virtual DECLARE_WRITE8_MEMBER(write); - // types - enum dwsock_ports { - DWS_STATUS, - DWS_DATA - }; + // types + enum dwsock_ports { + DWS_STATUS, + DWS_DATA + }; private: - /* IP hostname */ - const char * m_hostname; + /* IP hostname */ + const char * m_hostname; /* IP port */ required_ioport m_dwconfigport; @@ -69,4 +69,3 @@ extern const device_type COCO_DWSOCK; typedef device_type_iterator<&device_creator<beckerport_device>, beckerport_device> beckerport_device_iterator; #endif /* _DWSOCK_H_ */ - diff --git a/src/emu/bus/cpc/playcity.c b/src/emu/bus/cpc/playcity.c index e6803ffb049..161213b1582 100644 --- a/src/emu/bus/cpc/playcity.c +++ b/src/emu/bus/cpc/playcity.c @@ -1,4 +1,4 @@ -/* +/* PlayCity expansion device Z80 CTC @@ -158,4 +158,3 @@ void cpc_playcity_device::update_ymz_clock() m_ymz2->ay_set_clock(clk); popmessage("YMZ clocks set to %d Hz",clk); } - diff --git a/src/emu/bus/cpc/playcity.h b/src/emu/bus/cpc/playcity.h index 0f904da3bc3..0c35887e345 100644 --- a/src/emu/bus/cpc/playcity.h +++ b/src/emu/bus/cpc/playcity.h @@ -1,15 +1,15 @@ -/* +/* PlayCity expansion device - I/O ports: - * F880 - Z80CTC channel 0 (input is system clock (4MHz), output to YMZ294 clock) - * F881 - Z80CTC channel 1 (input from CRTC CURSOR, output to /NMI) - * F882 - Z80CTC channel 2 (input is system clock (4MHz), output to channel 3 input) - * F883 - Z80CTC channel 3 (input is channel 2 output) - * F884 - YMZ294 #1 (right) data - * F888 - YMZ294 #2 (left) data - * F984 - YMZ294 #1 (right) register select - * F988 - YMZ294 #2 (left) register select + I/O ports: + * F880 - Z80CTC channel 0 (input is system clock (4MHz), output to YMZ294 clock) + * F881 - Z80CTC channel 1 (input from CRTC CURSOR, output to /NMI) + * F882 - Z80CTC channel 2 (input is system clock (4MHz), output to channel 3 input) + * F883 - Z80CTC channel 3 (input is channel 2 output) + * F884 - YMZ294 #1 (right) data + * F888 - YMZ294 #2 (left) data + * F984 - YMZ294 #1 (right) register select + * F988 - YMZ294 #2 (left) register select */ #ifndef CPC_PLAYCITY_H_ @@ -64,4 +64,3 @@ extern const device_type CPC_PLAYCITY; #endif /* CPC_PLAYCITY_H_ */ - diff --git a/src/emu/bus/gameboy/gb_slot.c b/src/emu/bus/gameboy/gb_slot.c index 728905746ed..5caab4688c8 100644 --- a/src/emu/bus/gameboy/gb_slot.c +++ b/src/emu/bus/gameboy/gb_slot.c @@ -557,11 +557,11 @@ int base_gb_cart_slot_device::get_cart_type(UINT8 *ROM, UINT32 len) /* Check if we're dealing with the multigame variant of the MBC1 mapper */ if (type == GB_MBC_MBC1) - { // bomberman collection korea + { // bomberman collection korea if (ROM[0x134] == 0x42 && ROM[0x135] == 0x4f && ROM[0x136] == 0x4d && ROM[0x137] == 0x53) type = GB_MBC_MBC1_COL; -// if (ROM[0x13f] == 0x42 && ROM[0x140] == 0x32 && ROM[0x141] == 0x43 && ROM[0x142] == 0x4B) -// type = GB_MBC_MBC1_COL; +// if (ROM[0x13f] == 0x42 && ROM[0x140] == 0x32 && ROM[0x141] == 0x43 && ROM[0x142] == 0x4B) +// type = GB_MBC_MBC1_COL; // genjin collection if (ROM[0x134] == 0x47 && ROM[0x135] == 0x45 && ROM[0x136] == 0x4e && ROM[0x137] == 0x43) type = GB_MBC_MBC1_COL; diff --git a/src/emu/bus/isa/mda.c b/src/emu/bus/isa/mda.c index eb93ab93a75..fc2953061fc 100644 --- a/src/emu/bus/isa/mda.c +++ b/src/emu/bus/isa/mda.c @@ -968,7 +968,7 @@ MC6845_UPDATE_ROW( isa8_ec1840_0002_device::crtc_update_row ) { if (m_update_row_type == -1) return; - + switch (m_update_row_type) { case MDA_LOWRES_TEXT_INTEN: diff --git a/src/emu/bus/isa/xsu_cards.c b/src/emu/bus/isa/xsu_cards.c index 992eaf222d6..d6b9a607d1d 100644 --- a/src/emu/bus/isa/xsu_cards.c +++ b/src/emu/bus/isa/xsu_cards.c @@ -39,13 +39,13 @@ SLOT_INTERFACE_START( mc1502_isa8_cards ) SLOT_INTERFACE_END SLOT_INTERFACE_START( ec184x_isa8_cards ) - SLOT_INTERFACE("ec1840.0002", ISA8_EC1840_0002) // MDA with downloadable font - SLOT_INTERFACE("ec1841.0002", ISA8_EC1841_0002) // CGA with downloadable font + SLOT_INTERFACE("ec1840.0002", ISA8_EC1840_0002) // MDA with downloadable font + SLOT_INTERFACE("ec1841.0002", ISA8_EC1841_0002) // CGA with downloadable font SLOT_INTERFACE("ec1841.0003", ISA8_FDC_XT) /* - SLOT_INTERFACE("ec1841.0010", ISA8_EC1841_0010) // 8089-based HDC - SLOT_INTERFACE("ec1841.0003", ISA8_EC1841_0003) // FDC + mouse port - SLOT_INTERFACE("ec1841.0004", ISA8_EC1841_0004) // BSC-like serial ports + parallel port + SLOT_INTERFACE("ec1841.0010", ISA8_EC1841_0010) // 8089-based HDC + SLOT_INTERFACE("ec1841.0003", ISA8_EC1841_0003) // FDC + mouse port + SLOT_INTERFACE("ec1841.0004", ISA8_EC1841_0004) // BSC-like serial ports + parallel port */ SLOT_INTERFACE("mda", ISA8_MDA) SLOT_INTERFACE("hdc", ISA8_HDC_EC1841) diff --git a/src/emu/bus/pce/pce_slot.c b/src/emu/bus/pce/pce_slot.c index 45eded53d3e..7ed13a71e6c 100644 --- a/src/emu/bus/pce/pce_slot.c +++ b/src/emu/bus/pce/pce_slot.c @@ -6,7 +6,7 @@ TODO: - reimplement cart mirroring in a better way - + ***********************************************************************************************************/ diff --git a/src/emu/bus/pet/hsg.c b/src/emu/bus/pet/hsg.c index 649fba69803..a5499eb2960 100644 --- a/src/emu/bus/pet/hsg.c +++ b/src/emu/bus/pet/hsg.c @@ -13,7 +13,7 @@ TODO: - http://www.6502.org/users/sjgray/computer/hsg/index.html + http://www.6502.org/users/sjgray/computer/hsg/index.html - version A (EF9365, 512x512 interlaced, 1 page) - version B (EF9366, 512x256 non-interlaced, 2 pages) diff --git a/src/emu/bus/pet/hsg.h b/src/emu/bus/pet/hsg.h index b82d6a94dce..c99e360e739 100644 --- a/src/emu/bus/pet/hsg.h +++ b/src/emu/bus/pet/hsg.h @@ -26,7 +26,7 @@ // ======================> cbm8000_hsg_t class cbm8000_hsg_t : public device_t, - public device_pet_expansion_card_interface + public device_pet_expansion_card_interface { public: // construction/destruction diff --git a/src/emu/bus/spc1000/fdd.c b/src/emu/bus/spc1000/fdd.c index 1a9cbb33f81..ebe1c6e90d3 100644 --- a/src/emu/bus/spc1000/fdd.c +++ b/src/emu/bus/spc1000/fdd.c @@ -34,18 +34,18 @@ WRITE8_MEMBER(spc1000_fdd_exp_device::i8255_c_w) READ8_MEMBER( spc1000_fdd_exp_device::tc_r ) { logerror("%s: tc_r\n", space.machine().describe_context()); - + // toggle tc on read m_fdc->tc_w(true); m_timer_tc->adjust(attotime::zero); - + return 0xff; } WRITE8_MEMBER( spc1000_fdd_exp_device::control_w ) { logerror("%s: control_w(%02x)\n", space.machine().describe_context(), data); - + // bit 0, motor on signal if (m_fd0) m_fd0->mon_w(!BIT(data, 0)); @@ -150,7 +150,7 @@ void spc1000_fdd_exp_device::device_start() { m_timer_tc = timer_alloc(TIMER_TC); m_timer_tc->adjust(attotime::never); - + m_fd0 = subdevice<floppy_connector>("upd765:0")->get_device(); m_fd1 = subdevice<floppy_connector>("upd765:1")->get_device(); } diff --git a/src/emu/bus/spc1000/fdd.h b/src/emu/bus/spc1000/fdd.h index b06dc8fa971..7ee6f56a50c 100644 --- a/src/emu/bus/spc1000/fdd.h +++ b/src/emu/bus/spc1000/fdd.h @@ -36,7 +36,7 @@ public: DECLARE_WRITE8_MEMBER(i8255_b_w); DECLARE_READ8_MEMBER(i8255_c_r); DECLARE_WRITE8_MEMBER(i8255_c_w); - + private: // internal state required_device<z80_device> m_cpu; @@ -47,11 +47,11 @@ private: floppy_image_device *m_fd1; emu_timer *m_timer_tc; - + UINT8 m_i8255_0_pc; UINT8 m_i8255_1_pc; UINT8 m_i8255_portb; - + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); static const device_timer_id TIMER_TC = 0; }; diff --git a/src/emu/bus/spc1000/vdp.c b/src/emu/bus/spc1000/vdp.c index 511a7937bb0..539bfe5a8bb 100644 --- a/src/emu/bus/spc1000/vdp.c +++ b/src/emu/bus/spc1000/vdp.c @@ -19,7 +19,7 @@ WRITE_LINE_MEMBER(spc1000_vdp_exp_device::vdp_interrupt) static MACHINE_CONFIG_FRAGMENT(scp1000_vdp) - MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock? + MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock? MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_OUT_INT_LINE_CB(WRITELINE(spc1000_vdp_exp_device, vdp_interrupt)) MCFG_TMS9928A_SCREEN_ADD_NTSC("tms_screen") diff --git a/src/emu/bus/spc1000/vdp.h b/src/emu/bus/spc1000/vdp.h index 8fbc10ad4e1..f4cd47e9b81 100644 --- a/src/emu/bus/spc1000/vdp.h +++ b/src/emu/bus/spc1000/vdp.h @@ -30,7 +30,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write); DECLARE_WRITE_LINE_MEMBER(vdp_interrupt); - + private: // internal state required_device<tms9928a_device> m_vdp; |
