summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/bus/isa
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/bus/isa')
-rw-r--r--src/emu/bus/isa/3c505.c7
-rw-r--r--src/emu/bus/isa/adlib.h2
-rw-r--r--src/emu/bus/isa/aga.c15
-rw-r--r--src/emu/bus/isa/aga.h20
-rw-r--r--src/emu/bus/isa/cga.c4
-rw-r--r--src/emu/bus/isa/cga.h2
-rw-r--r--src/emu/bus/isa/dectalk.c2
-rw-r--r--src/emu/bus/isa/ega.h2
-rw-r--r--src/emu/bus/isa/gblaster.h2
-rw-r--r--src/emu/bus/isa/isa.c10
-rw-r--r--src/emu/bus/isa/isa.h28
-rw-r--r--src/emu/bus/isa/mda.c2
-rw-r--r--src/emu/bus/isa/mda.h2
-rw-r--r--src/emu/bus/isa/mufdc.c2
-rw-r--r--src/emu/bus/isa/mufdc.h4
-rw-r--r--src/emu/bus/isa/omti8621.c59
-rw-r--r--src/emu/bus/isa/omti8621.h6
-rw-r--r--src/emu/bus/isa/pds.c3
-rw-r--r--src/emu/bus/isa/sblaster.c2
-rw-r--r--src/emu/bus/isa/sblaster.h10
-rw-r--r--src/emu/bus/isa/sc499.c13
-rw-r--r--src/emu/bus/isa/side116.h2
22 files changed, 95 insertions, 104 deletions
diff --git a/src/emu/bus/isa/3c505.c b/src/emu/bus/isa/3c505.c
index fbe229f9e80..acc71e80ac0 100644
--- a/src/emu/bus/isa/3c505.c
+++ b/src/emu/bus/isa/3c505.c
@@ -3,8 +3,8 @@
*
* Created on: August 27, 2010
* Author: Hans Ostermeyer
- * ISA conversion by R. Belmont
- *
+ * ISA conversion by R. Belmont
+ *
* Released for general non-commercial use under the MAME license
* Visit http://mamedev.org for licensing and usage restrictions.
*
@@ -566,7 +566,7 @@ void threecom3c505_device::set_interrupt(enum line_state state)
case 5: m_isa->irq5_w(state); break;
case 6: m_isa->irq6_w(state); break;
case 7: m_isa->irq7_w(state); break;
- case 9: m_isa->irq2_w(state); break; // IRQ 9 on ISA16 goes to IRQ 2
+ case 9: m_isa->irq2_w(state); break; // IRQ 9 on ISA16 goes to IRQ 2
case 10: m_isa->irq10_w(state); break;
case 11: m_isa->irq11_w(state); break;
case 12: m_isa->irq12_w(state); break;
@@ -1579,4 +1579,3 @@ READ8_MEMBER(threecom3c505_device::read)
LOG2(("reading 3C505 Register at offset %02x = %02x", offset, data));
return data;
}
-
diff --git a/src/emu/bus/isa/adlib.h b/src/emu/bus/isa/adlib.h
index cdfe854f01b..78ad2afdfaa 100644
--- a/src/emu/bus/isa/adlib.h
+++ b/src/emu/bus/isa/adlib.h
@@ -23,7 +23,7 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
-
+
DECLARE_READ8_MEMBER(ym3812_16_r);
DECLARE_WRITE8_MEMBER(ym3812_16_w);
protected:
diff --git a/src/emu/bus/isa/aga.c b/src/emu/bus/isa/aga.c
index 8f950d382d4..ec1ac365018 100644
--- a/src/emu/bus/isa/aga.c
+++ b/src/emu/bus/isa/aga.c
@@ -92,7 +92,7 @@ void isa8_aga_device::device_start()
m_isa->install_memory(0xb0000, 0xbffff, 0, 0, read8_delegate(FUNC(isa8_aga_device::pc_aga_videoram_r),this), write8_delegate(FUNC(isa8_aga_device::pc_aga_videoram_w),this));
m_isa->install_device(0x3b0, 0x3bf, 0, 0, read8_delegate( FUNC(isa8_aga_device::pc_aga_mda_r), this ), write8_delegate( FUNC(isa8_aga_device::pc_aga_mda_w), this ) );
m_isa->install_device(0x3d0, 0x3df, 0, 0, read8_delegate( FUNC(isa8_aga_device::pc_aga_cga_r), this ), write8_delegate( FUNC(isa8_aga_device::pc_aga_cga_w), this ) );
-
+
/* Initialise the cga palette */
int i;
@@ -113,8 +113,8 @@ void isa8_aga_device::device_start()
}
}
}
-
- UINT8 *gfx = &memregion("gfx1")->base()[0x8000];
+
+ UINT8 *gfx = &memregion("gfx1")->base()[0x8000];
/* just a plain bit pattern for graphics data generation */
for (i = 0; i < 256; i++)
gfx[i] = i;
@@ -179,7 +179,7 @@ void isa8_aga_pc200_device::device_start()
m_isa->install_memory(0xb0000, 0xbffff, 0, 0, read8_delegate(FUNC(isa8_aga_pc200_device::pc200_videoram_r),this), write8_delegate(FUNC(isa8_aga_pc200_device::pc200_videoram_w),this));
m_isa->install_device(0x3b0, 0x3bf, 0, 0, read8_delegate( FUNC(isa8_aga_device::pc_aga_mda_r), this ), write8_delegate( FUNC(isa8_aga_device::pc_aga_mda_w), this ) );
m_isa->install_device(0x3d0, 0x3df, 0, 0, read8_delegate( FUNC(isa8_aga_pc200_device::pc200_cga_r), this ), write8_delegate( FUNC(isa8_aga_pc200_device::pc200_cga_w), this ) );
-
+
/* Initialise the cga palette */
int i;
@@ -200,8 +200,8 @@ void isa8_aga_pc200_device::device_start()
}
}
}
-
- UINT8 *gfx = &memregion("gfx1")->base()[0x8000];
+
+ UINT8 *gfx = &memregion("gfx1")->base()[0x8000];
/* just a plain bit pattern for graphics data generation */
for (i = 0; i < 256; i++)
gfx[i] = i;
@@ -765,7 +765,6 @@ void isa8_aga_device::set_palette_luts(void)
WRITE8_MEMBER (isa8_aga_device:: pc_aga_cga_w )
{
if ( m_mode == AGA_COLOR ) {
-
switch(offset) {
case 0: case 2: case 4: case 6:
m_mc6845->address_w( space, offset, data );
@@ -867,7 +866,7 @@ WRITE8_MEMBER ( isa8_aga_device::pc_aga_videoram_w )
}
READ8_MEMBER( isa8_aga_device::pc_aga_videoram_r )
-{
+{
switch (m_mode) {
case AGA_COLOR:
if (offset>=0x8000) return m_videoram[offset-0x8000];
diff --git a/src/emu/bus/isa/aga.h b/src/emu/bus/isa/aga.h
index baeecb13f55..12568353e3a 100644
--- a/src/emu/bus/isa/aga.h
+++ b/src/emu/bus/isa/aga.h
@@ -38,7 +38,7 @@ public:
isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
// device-level overrides
- virtual void device_start();
+ virtual void device_start();
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
virtual const rom_entry *device_rom_region() const;
@@ -46,7 +46,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( hsync_changed );
DECLARE_WRITE_LINE_MEMBER( vsync_changed );
-
+
DECLARE_READ8_MEMBER( pc_aga_mda_r );
DECLARE_WRITE8_MEMBER( pc_aga_mda_w );
DECLARE_READ8_MEMBER( pc_aga_cga_r );
@@ -56,9 +56,9 @@ public:
DECLARE_WRITE8_MEMBER( pc_aga_videoram_w );
DECLARE_READ8_MEMBER( pc_aga_videoram_r );
- required_device<palette_device> m_palette;
- required_device<mc6845_device> m_mc6845;
-
+ required_device<palette_device> m_palette;
+ required_device<mc6845_device> m_mc6845;
+
required_ioport m_cga_config;
mc6845_update_row_func m_update_row;
@@ -75,11 +75,11 @@ public:
int m_framecnt;
UINT8 m_vsync;
UINT8 m_hsync;
-
+
UINT8 m_cga_palette_lut_2bpp[4];
- UINT8 *m_videoram;
+ UINT8 *m_videoram;
};
// device type definition
@@ -94,14 +94,14 @@ public:
// construction/destruction
isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_start();
+ virtual void device_start();
// optional information overrides
virtual const rom_entry *device_rom_region() const;
-
+
UINT8 m_port8;
UINT8 m_portd;
UINT8 m_porte;
-
+
DECLARE_READ8_MEMBER( pc200_videoram_r );
DECLARE_WRITE8_MEMBER( pc200_videoram_w );
DECLARE_WRITE8_MEMBER( pc200_cga_w );
diff --git a/src/emu/bus/isa/cga.c b/src/emu/bus/isa/cga.c
index 753e2950142..cd5557ee6b2 100644
--- a/src/emu/bus/isa/cga.c
+++ b/src/emu/bus/isa/cga.c
@@ -285,7 +285,7 @@ void isa8_cga_device::device_start()
m_vram.resize(m_vram_size);
m_update_row = NULL;
m_isa->install_device(0x3d0, 0x3df, 0, 0, read8_delegate( FUNC(isa8_cga_device::io_read), this ), write8_delegate( FUNC(isa8_cga_device::io_write), this ) );
- m_isa->install_bank(0xb8000, 0xb8000 + MIN(0x8000,m_vram_size) - 1, 0, m_vram_size & 0x4000, "bank_cga", m_vram);
+ m_isa->install_bank(0xb8000, 0xb8000 + MIN(0x8000,m_vram_size) - 1, 0, m_vram_size & 0x4000, "bank_cga", m_vram);
/* Initialise the cga palette */
int i;
@@ -1799,7 +1799,7 @@ isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, co
ROM_START( mc1502 )
ROM_REGION(0x2000,"gfx1", 0)
// taken from mc1502
- ROM_LOAD( "symgen.rom", 0x0000, 0x2000, CRC(b2747a52) SHA1(6766d275467672436e91ac2997ac6b77700eba1e))
+ ROM_LOAD( "symgen.rom", 0x0000, 0x2000, CRC(b2747a52) SHA1(6766d275467672436e91ac2997ac6b77700eba1e))
ROM_END
const rom_entry *isa8_cga_mc1502_device::device_rom_region() const
diff --git a/src/emu/bus/isa/cga.h b/src/emu/bus/isa/cga.h
index 976fedb80e1..52f54796fdd 100644
--- a/src/emu/bus/isa/cga.h
+++ b/src/emu/bus/isa/cga.h
@@ -68,7 +68,7 @@ public:
bool m_superimpose;
UINT8 m_plantronics; /* This should be moved into the appropriate subclass */
offs_t m_start_offset;
- required_device<palette_device> m_palette;
+ required_device<palette_device> m_palette;
};
// device type definition
diff --git a/src/emu/bus/isa/dectalk.c b/src/emu/bus/isa/dectalk.c
index 1533ec7c775..34e02695bb7 100644
--- a/src/emu/bus/isa/dectalk.c
+++ b/src/emu/bus/isa/dectalk.c
@@ -143,7 +143,7 @@ ROM_START( dectalk_isa )
ROM_LOAD16_BYTE("pc_boot_hxl.am27c64.d6.e26", 0x0000, 0x2000, CRC(7492f1e3) SHA1(fe6946a227f01c94f2b99220320a616445c96ee0)) // Some cards have a different label on the chip which lists the sum16: 31AC (matches contents)
ROM_LOAD16_BYTE("pc_boot_hxh.am27c64.d8.e27", 0x0001, 0x2000, CRC(1fe7fe40) SHA1(6e89c237f01aa22e0d21ff4d6fdf8137c6ace374)) // Some cards have a different label on the chip which lists the sum16: 1A25 (matches contents)
ROM_REGION( 0x2000, "dectalk_dsp", 0 )
- ROM_LOAD("spc_034c__2-1-92.tms320p15nl.d3.bin", 0x0000, 0x2000, CRC(d8b1201e) SHA1(4b873a5e882205fcac79a27562054b5c4d1a117c))
+ ROM_LOAD("spc_034c__2-1-92.tms320p15nl.d3.bin", 0x0000, 0x2000, CRC(d8b1201e) SHA1(4b873a5e882205fcac79a27562054b5c4d1a117c))
ROM_END
const rom_entry* dectalk_isa_device::device_rom_region() const
diff --git a/src/emu/bus/isa/ega.h b/src/emu/bus/isa/ega.h
index 2914e13abbd..13ded1e31b0 100644
--- a/src/emu/bus/isa/ega.h
+++ b/src/emu/bus/isa/ega.h
@@ -96,7 +96,7 @@ public:
UINT8 m_vsync;
UINT8 m_vblank;
UINT8 m_display_enable;
- required_device<palette_device> m_palette;
+ required_device<palette_device> m_palette;
};
diff --git a/src/emu/bus/isa/gblaster.h b/src/emu/bus/isa/gblaster.h
index ba11f51f680..8bcde87342e 100644
--- a/src/emu/bus/isa/gblaster.h
+++ b/src/emu/bus/isa/gblaster.h
@@ -23,7 +23,7 @@ public:
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const;
-
+
DECLARE_READ8_MEMBER(saa1099_16_r);
DECLARE_WRITE8_MEMBER(saa1099_1_16_w);
DECLARE_WRITE8_MEMBER(saa1099_2_16_w);
diff --git a/src/emu/bus/isa/isa.c b/src/emu/bus/isa/isa.c
index 3d4a2bc898f..af6834fcbdb 100644
--- a/src/emu/bus/isa/isa.c
+++ b/src/emu/bus/isa/isa.c
@@ -243,12 +243,12 @@ void isa8_device::device_start()
m_iowidth = m_iospace->data_width();
m_prgwidth = m_prgspace->data_width();
}
- else // use host CPU's program and I/O spaces directly
+ else // use host CPU's program and I/O spaces directly
{
- m_iospace = &m_maincpu->space(AS_IO);
- m_iowidth = m_maincpu->space_config(AS_IO)->m_databus_width;
+ m_iospace = &m_maincpu->space(AS_IO);
+ m_iowidth = m_maincpu->space_config(AS_IO)->m_databus_width;
m_prgspace = &m_maincpu->space(AS_PROGRAM);
- m_prgwidth = m_maincpu->space_config(AS_PROGRAM)->m_databus_width;
+ m_prgwidth = m_maincpu->space_config(AS_PROGRAM)->m_databus_width;
}
}
@@ -679,5 +679,3 @@ UINT16 device_isa16_card_interface::dack16_r(int line)
void device_isa16_card_interface::dack16_w(int line,UINT16 data)
{
}
-
-
diff --git a/src/emu/bus/isa/isa.h b/src/emu/bus/isa/isa.h
index 775e8c259a3..a66cce07604 100644
--- a/src/emu/bus/isa/isa.h
+++ b/src/emu/bus/isa/isa.h
@@ -156,22 +156,22 @@ public:
template<class _iochck> void set_iochck_callback(_iochck iochck) { m_write_iochck.set_callback(iochck); }
// for ISA8, put the 8-bit configs in the primary slots and the 16-bit configs in the secondary
- virtual const address_space_config *memory_space_config(address_spacenum spacenum) const
- {
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum) const
+ {
switch (spacenum)
{
case AS_PROGRAM: return &m_program_config;
- case AS_IO: return &m_io_config;
- case AS_DATA: return &m_program16_config;
- case AS_3: return &m_io16_config;
- default: fatalerror("isa: invalid memory space!\n");
+ case AS_IO: return &m_io_config;
+ case AS_DATA: return &m_program16_config;
+ case AS_3: return &m_io16_config;
+ default: fatalerror("isa: invalid memory space!\n");
}
}
void install_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_delegate rhandler, write8_delegate whandler);
- template<typename T> void install_device(offs_t addrstart, offs_t addrend, T &device, void (T::*map)(class address_map &map, device_t &device), int bits = 8, UINT64 unitmask = U64(0xffffffffffffffff))
+ template<typename T> void install_device(offs_t addrstart, offs_t addrend, T &device, void (T::*map)(class address_map &map, device_t &device), int bits = 8, UINT64 unitmask = U64(0xffffffffffffffff))
{
- m_iospace->install_device(addrstart, addrend, device, map, bits, unitmask);
+ m_iospace->install_device(addrstart, addrend, device, map, bits, unitmask);
}
void install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data);
void install_rom(device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, const char *region);
@@ -331,15 +331,15 @@ public:
void install16_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_delegate rhandler, write16_delegate whandler);
// for ISA16, put the 16-bit configs in the primary slots and the 8-bit configs in the secondary
- virtual const address_space_config *memory_space_config(address_spacenum spacenum) const
- {
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum) const
+ {
switch (spacenum)
{
case AS_PROGRAM: return &m_program16_config;
- case AS_IO: return &m_io16_config;
- case AS_DATA: return &m_program_config;
- case AS_3: return &m_io_config;
- default: fatalerror("isa: invalid memory space!\n");
+ case AS_IO: return &m_io16_config;
+ case AS_DATA: return &m_program_config;
+ case AS_3: return &m_io_config;
+ default: fatalerror("isa: invalid memory space!\n");
}
}
diff --git a/src/emu/bus/isa/mda.c b/src/emu/bus/isa/mda.c
index 9fac599f912..ce08169992c 100644
--- a/src/emu/bus/isa/mda.c
+++ b/src/emu/bus/isa/mda.c
@@ -99,7 +99,7 @@ WRITE_LINE_MEMBER(isa8_mda_device::pc_cpu_line)
MACHINE_CONFIG_FRAGMENT( pcvideo_mda )
MCFG_SCREEN_ADD( MDA_SCREEN_NAME, RASTER)
MCFG_SCREEN_RAW_PARAMS(MDA_CLOCK, 882, 0, 720, 370, 0, 350 )
- MCFG_SCREEN_UPDATE_DEVICE( MDA_MC6845_NAME, mc6845_device, screen_update )
+ MCFG_SCREEN_UPDATE_DEVICE( MDA_MC6845_NAME, mc6845_device, screen_update )
MCFG_PALETTE_ADD( "palette", 4 )
diff --git a/src/emu/bus/isa/mda.h b/src/emu/bus/isa/mda.h
index 74a4a78cbb0..2fc74d49265 100644
--- a/src/emu/bus/isa/mda.h
+++ b/src/emu/bus/isa/mda.h
@@ -39,7 +39,7 @@ public:
protected:
// device-level overrides
virtual void device_start();
- virtual void device_reset();
+ virtual void device_reset();
public:
int m_framecnt;
diff --git a/src/emu/bus/isa/mufdc.c b/src/emu/bus/isa/mufdc.c
index 7976a47f869..5ef6abc219b 100644
--- a/src/emu/bus/isa/mufdc.c
+++ b/src/emu/bus/isa/mufdc.c
@@ -1,6 +1,6 @@
/***************************************************************************
- Multi Unique FDC
+ Multi Unique FDC
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
diff --git a/src/emu/bus/isa/mufdc.h b/src/emu/bus/isa/mufdc.h
index 2f1253ea529..da6ff090217 100644
--- a/src/emu/bus/isa/mufdc.h
+++ b/src/emu/bus/isa/mufdc.h
@@ -1,6 +1,6 @@
/***************************************************************************
- Multi Unique FDC
+ Multi Unique FDC
license: MAME, GPL-2.0+
copyright-holders: Dirk Best
@@ -33,7 +33,7 @@
// ======================> mufdc_device
class mufdc_device : public device_t,
- public device_isa8_card_interface
+ public device_isa8_card_interface
{
public:
// construction/destruction
diff --git a/src/emu/bus/isa/omti8621.c b/src/emu/bus/isa/omti8621.c
index 9cb218bc251..17b7381c492 100644
--- a/src/emu/bus/isa/omti8621.c
+++ b/src/emu/bus/isa/omti8621.c
@@ -3,9 +3,9 @@
*
* Created on: August 30, 2010
* Author: Hans Ostermeyer
- *
+ *
* Converted to ISA device by R. Belmont
- *
+ *
* Released for general non-commercial use under the MAME license
* Visit http://mamedev.org for licensing and usage restrictions.
*
@@ -72,7 +72,7 @@ protected:
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
-
+
void omti_disk_config(UINT16 disk_type);
public:
UINT16 m_type;
@@ -288,7 +288,7 @@ void omti8621_device::device_start()
sector_buffer.resize(OMTI_DISK_SECTOR_SIZE*OMTI_MAX_BLOCK_COUNT);
m_timer = timer_alloc(0, NULL);
-
+
our_disks[0] = subdevice<omti_disk_image_device>(OMTI_DISK0_TAG);
our_disks[1] = subdevice<omti_disk_image_device>(OMTI_DISK1_TAG);
}
@@ -388,7 +388,7 @@ void omti8621_device::device_config_complete()
set_interrupt - update the IRQ state
-------------------------------------------------*/
-void omti8621_device::set_interrupt(enum line_state line_state)
+void omti8621_device::set_interrupt(enum line_state line_state)
{
LOG2(("set_interrupt: status_port=%x, line_state %d", status_port, line_state));
m_isa->irq14_w(line_state);
@@ -396,7 +396,7 @@ void omti8621_device::set_interrupt(enum line_state line_state)
void omti8621_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
- set_interrupt(ASSERT_LINE);
+ set_interrupt(ASSERT_LINE);
}
/***************************************************************************
@@ -525,7 +525,7 @@ UINT32 omti8621_device::get_disk_address(const UINT8 * cdb) {
set_data_transfer - setup for data transfer from/to data
***************************************************************************/
-void omti8621_device::set_data_transfer(UINT8 *data, UINT16 length)
+void omti8621_device::set_data_transfer(UINT8 *data, UINT16 length)
{
// set controller for read data transfer
omti_state = OMTI_STATE_DATA;
@@ -541,7 +541,7 @@ void omti8621_device::set_data_transfer(UINT8 *data, UINT16 length)
read_sectors_from_disk - read sectors starting at diskaddr into sector_buffer
***************************************************************************/
-void omti8621_device::read_sectors_from_disk(INT32 diskaddr, UINT8 count, UINT8 lun)
+void omti8621_device::read_sectors_from_disk(INT32 diskaddr, UINT8 count, UINT8 lun)
{
UINT8 *data_buffer = sector_buffer;
device_image_interface *image = our_disks[lun]->m_image;
@@ -561,7 +561,7 @@ void omti8621_device::read_sectors_from_disk(INT32 diskaddr, UINT8 count, UINT8
write_sectors_to_disk - write sectors starting at diskaddr from sector_buffer
***************************************************************************/
-void omti8621_device::write_sectors_to_disk(INT32 diskaddr, UINT8 count, UINT8 lun)
+void omti8621_device::write_sectors_to_disk(INT32 diskaddr, UINT8 count, UINT8 lun)
{
UINT8 *data_buffer = sector_buffer;
device_image_interface *image = our_disks[lun]->m_image;
@@ -586,7 +586,7 @@ void omti8621_device::write_sectors_to_disk(INT32 diskaddr, UINT8 count, UINT8 l
copy_sectors - copy sectors
***************************************************************************/
-void omti8621_device::copy_sectors(INT32 dst_addr, INT32 src_addr, UINT8 count, UINT8 lun)
+void omti8621_device::copy_sectors(INT32 dst_addr, INT32 src_addr, UINT8 count, UINT8 lun)
{
device_image_interface *image = our_disks[lun]->m_image;
@@ -613,7 +613,7 @@ void omti8621_device::copy_sectors(INT32 dst_addr, INT32 src_addr, UINT8 count,
format track - format a track
***************************************************************************/
-void omti8621_device::format_track(const UINT8 * cdb)
+void omti8621_device::format_track(const UINT8 * cdb)
{
UINT8 lun = get_lun(cdb);
UINT32 disk_addr = get_disk_address(cdb);
@@ -668,7 +668,7 @@ void omti8621_device::set_esdi_defect_list(UINT8 lun, UINT8 head)
log_command - log command from a command descriptor block
***************************************************************************/
-void omti8621_device::log_command(const UINT8 cdb[], const UINT16 cdb_length)
+void omti8621_device::log_command(const UINT8 cdb[], const UINT16 cdb_length)
{
if (verbose > 0) {
int i;
@@ -767,7 +767,7 @@ void omti8621_device::log_command(const UINT8 cdb[], const UINT16 cdb_length)
log_data - log data in the common data buffer
***************************************************************************/
-void omti8621_device::log_data()
+void omti8621_device::log_data()
{
if (verbose > 0) {
int i;
@@ -788,7 +788,7 @@ void omti8621_device::log_data()
do_command
***************************************************************************/
-void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
+void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
{
UINT8 lun = get_lun(cdb);
omti_disk_image_device *disk = our_disks[lun];
@@ -943,11 +943,11 @@ void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
// LOG(("do_command: UNEXPECTED omti_state %02x",omti_state));
// }
status_port |= OMTI_STATUS_IREQ;
- if (command_duration == 0)
+ if (command_duration == 0)
{
set_interrupt(ASSERT_LINE);
- }
- else
+ }
+ else
{
// FIXME: should delay omti_state and status_port as well
m_timer->adjust(attotime::from_msec(command_duration), 0);
@@ -959,7 +959,7 @@ void omti8621_device::do_command(const UINT8 cdb[], const UINT16 cdb_length)
get_command_length
***************************************************************************/
-UINT8 omti8621_device::get_command_length(UINT8 command_byte)
+UINT8 omti8621_device::get_command_length(UINT8 command_byte)
{
return command_byte == OMTI_CMD_COPY ? 10 : 6;
}
@@ -968,7 +968,7 @@ UINT8 omti8621_device::get_command_length(UINT8 command_byte)
get_data
***************************************************************************/
-UINT16 omti8621_device::get_data()
+UINT16 omti8621_device::get_data()
{
UINT16 data = 0xff;
if (data_index < data_length) {
@@ -989,7 +989,7 @@ UINT16 omti8621_device::get_data()
set_data
***************************************************************************/
-void omti8621_device::set_data(UINT16 data)
+void omti8621_device::set_data(UINT16 data)
{
if (data_index < data_length) {
data_buffer[data_index++] = data >> 8;
@@ -1008,7 +1008,7 @@ void omti8621_device::set_data(UINT16 data)
WRITE16_MEMBER(omti8621_device::write)
{
- switch (mem_mask)
+ switch (mem_mask)
{
case 0x00ff:
write8(space, offset*2+1, data, mem_mask);
@@ -1026,7 +1026,7 @@ WRITE16_MEMBER(omti8621_device::write)
WRITE8_MEMBER(omti8621_device::write8)
{
- switch (offset)
+ switch (offset)
{
case OMTI_PORT_DATA_OUT: // 0x00
switch (omti_state) {
@@ -1120,7 +1120,7 @@ WRITE8_MEMBER(omti8621_device::write8)
READ16_MEMBER(omti8621_device::read)
{
- switch (mem_mask)
+ switch (mem_mask)
{
case 0x00ff:
return read8(space, offset*2+1, mem_mask);
@@ -1138,10 +1138,10 @@ READ8_MEMBER(omti8621_device::read8)
switch (offset) {
case OMTI_PORT_DATA_IN: // 0x00
- if (status_port & OMTI_STATUS_CD)
+ if (status_port & OMTI_STATUS_CD)
{
data = command_status;
- switch (omti_state)
+ switch (omti_state)
{
case OMTI_STATE_COMMAND:
LOG2(("reading OMTI 8621 Data Status Register 1 at offset %02x = %02x (omti state = %02x)", offset, data, omti_state));
@@ -1155,8 +1155,8 @@ READ8_MEMBER(omti8621_device::read8)
LOG(("UNEXPECTED reading OMTI 8621 Data Status Register 3 at offset %02x = %02x (omti state = %02x)", offset, data, omti_state));
break;
}
- }
- else
+ }
+ else
{
LOG(("UNEXPECTED reading OMTI 8621 Data Register 4 at offset %02x = %02x (status bit C/D = 0)", offset, data));
}
@@ -1165,7 +1165,7 @@ READ8_MEMBER(omti8621_device::read8)
case OMTI_PORT_STATUS: // 0x01
data = status_port;
// omit excessive logging
- if (data != last_data)
+ if (data != last_data)
{
LOG2(("reading OMTI 8621 Status Register 5 at offset %02x = %02x", offset, data));
// last_data = data;
@@ -1342,7 +1342,7 @@ void omti_disk_image_device::device_start()
-------------------------------------------------*/
void omti_disk_image_device::device_reset()
-{
+{
LOG1(("device_reset_omti_disk"));
if (exists() && fseek(0, SEEK_END) == 0)
@@ -1379,4 +1379,3 @@ bool omti_disk_image_device::call_create(int format_type, option_resolution *for
}
return IMAGE_INIT_PASS;
}
-
diff --git a/src/emu/bus/isa/omti8621.h b/src/emu/bus/isa/omti8621.h
index 3f637232d29..d6b09ea5d3a 100644
--- a/src/emu/bus/isa/omti8621.h
+++ b/src/emu/bus/isa/omti8621.h
@@ -2,8 +2,8 @@
* omti8621.h - SMS OMTI 8621 disk controller
*
* Created on: August 30, 2010
- * Author: Hans Ostermeyer
- *
+ * Author: Hans Ostermeyer
+ *
* Converted to ISA device March 3, 2014 by R. Belmont
*
* Released for general non-commercial use under the MAME license
@@ -28,7 +28,7 @@
***************************************************************************/
class omti_disk_image_device;
-
+
/* ----- device interface ----- */
class omti8621_device : public device_t, public device_isa16_card_interface
diff --git a/src/emu/bus/isa/pds.c b/src/emu/bus/isa/pds.c
index 054e4fad750..dc932cc9e46 100644
--- a/src/emu/bus/isa/pds.c
+++ b/src/emu/bus/isa/pds.c
@@ -47,12 +47,10 @@ void isa8_pds_device::device_start()
void isa8_pds_device::device_reset()
{
-
}
void isa8_pds_device::device_stop()
{
-
}
I8255_INTERFACE(pds_ppi_intf)
@@ -73,4 +71,3 @@ machine_config_constructor isa8_pds_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( pds_config );
}
-
diff --git a/src/emu/bus/isa/sblaster.c b/src/emu/bus/isa/sblaster.c
index 1d69bf31bee..e6056a27e0a 100644
--- a/src/emu/bus/isa/sblaster.c
+++ b/src/emu/bus/isa/sblaster.c
@@ -1190,7 +1190,7 @@ void isa8_sblaster1_0_device::device_start()
set_isa_device();
// 1.0 always has the SAA1099s for CMS back-compatibility
m_isa->install_device(0x0220, 0x0221, 0, 0, read8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_16_r), this ), write8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_1_16_w), this ) );
- m_isa->install_device(0x0222, 0x0223, 0, 0, read8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_16_r), this ), write8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_2_16_w), this ) );
+ m_isa->install_device(0x0222, 0x0223, 0, 0, read8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_16_r), this ), write8_delegate( FUNC(isa8_sblaster1_0_device::saa1099_2_16_w), this ) );
m_isa->set_dma_channel(1, this, FALSE);
m_dsp.version = 0x0105;
sb8_device::device_start();
diff --git a/src/emu/bus/isa/sblaster.h b/src/emu/bus/isa/sblaster.h
index 1666f9e667f..05f940eee2c 100644
--- a/src/emu/bus/isa/sblaster.h
+++ b/src/emu/bus/isa/sblaster.h
@@ -157,17 +157,17 @@ class sb8_device : public sb_device,
public:
// construction/destruction
sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname, const char *source);
-
+
DECLARE_READ8_MEMBER(ym3812_16_r);
- DECLARE_WRITE8_MEMBER(ym3812_16_w);
+ DECLARE_WRITE8_MEMBER(ym3812_16_w);
protected:
virtual void device_start();
virtual void drq_w(int state) { m_isa->drq1_w(state); }
virtual void irq_w(int state, int source) { m_isa->irq5_w(state); }
virtual UINT8 dack_r(int line) { return sb_device::dack_r(line); }
virtual void dack_w(int line, UINT8 data) { sb_device::dack_w(line, data); }
-private:
- required_device<ym3812_device> m_ym3812;
+private:
+ required_device<ym3812_device> m_ym3812;
};
class isa8_sblaster1_0_device : public sb8_device
@@ -189,7 +189,7 @@ private:
// internal state
required_device<saa1099_device> m_saa1099_1;
required_device<saa1099_device> m_saa1099_2;
-
+
};
class isa8_sblaster1_5_device : public sb8_device
diff --git a/src/emu/bus/isa/sc499.c b/src/emu/bus/isa/sc499.c
index aa73cf1346b..c7cd5737b3b 100644
--- a/src/emu/bus/isa/sc499.c
+++ b/src/emu/bus/isa/sc499.c
@@ -1,8 +1,8 @@
/*
* sc499.c - ARCHIVE SC-499 cartridge tape controller (for Apollo DN3x00)
* Created on: April 17, 2011
- * Author: Hans Ostermeyer
- * ISA conversion by R. Belmont
+ * Author: Hans Ostermeyer
+ * ISA conversion by R. Belmont
*
* Released for general non-commercial use under the MAME license
* Visit http://mamedev.org for licensing and usage restrictions.
@@ -636,7 +636,7 @@ void sc499_device::set_interrupt(enum line_state state)
{
if (state != irq_state)
{
- LOG2(("set_interrupt(%d)",state));
+ LOG2(("set_interrupt(%d)",state));
switch (m_irq)
{
case 2: m_isa->irq2_w(state); break;
@@ -659,7 +659,7 @@ void sc499_device::set_dma_drq(enum line_state state)
{
if (state != dma_drq_state)
{
- LOG2(("set_dma_drq(%d)",state));
+ LOG2(("set_dma_drq(%d)",state));
switch (m_drq)
{
@@ -668,7 +668,7 @@ void sc499_device::set_dma_drq(enum line_state state)
case 3: m_isa->drq3_w(state); break;
default: logerror("sc499: invalid DRQ %d\n", m_drq); break;
}
-
+
dma_drq_state = state;
}
}
@@ -1115,7 +1115,7 @@ UINT8 sc499_device::dack_r(int line)
return data;
}
-void sc499_device::dack_w(int line, UINT8 data)
+void sc499_device::dack_w(int line, UINT8 data)
{
LOG3(("dack_write: data=%x", data));
@@ -1311,4 +1311,3 @@ void sc499_ctape_image_device::device_config_complete()
{
update_names(SC499_CTAPE, "ctape", "ct");
};
-
diff --git a/src/emu/bus/isa/side116.h b/src/emu/bus/isa/side116.h
index 588d0b2aedb..8e452a5b99e 100644
--- a/src/emu/bus/isa/side116.h
+++ b/src/emu/bus/isa/side116.h
@@ -26,7 +26,7 @@
// ======================> side116_device
class side116_device : public device_t,
- public device_isa8_card_interface
+ public device_isa8_card_interface
{
public:
// construction/destruction