summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2024-02-25 01:56:09 +1100
committer Vas Crabb <vas@vastheman.com>2024-02-25 01:56:09 +1100
commit9827b7f54787ec833690b3e95c19191bbda36637 (patch)
tree3988048d0ebc6a7613f9b60c0c277f85abe15555 /src/devices
parentcc621cca1dd15a30a42f1e149a7bd550e0073965 (diff)
srcclean and manual cleanup in preparation for 0.263 release.
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/idpartner/bus.cpp30
-rw-r--r--src/devices/bus/idpartner/bus.h88
-rw-r--r--src/devices/bus/idpartner/gdp.cpp190
-rw-r--r--src/devices/bus/idpartner/sasi.cpp184
-rw-r--r--src/devices/bus/pci/ess_maestro.cpp10
-rw-r--r--src/devices/bus/pci/ess_maestro.h6
-rw-r--r--src/devices/bus/pci/vt6306.cpp8
-rw-r--r--src/devices/bus/pci/vt6306.h4
-rw-r--r--src/devices/bus/qbus/dvk_mx.cpp18
-rw-r--r--src/devices/bus/qbus/dvk_mx.h2
-rw-r--r--src/devices/bus/tim011/aycard.cpp4
-rw-r--r--src/devices/cpu/sh/sh7042.cpp2
-rw-r--r--src/devices/cpu/sh/sh7042.h2
-rw-r--r--src/devices/cpu/t11/t11.h20
-rw-r--r--src/devices/machine/z80dma.cpp2
-rw-r--r--src/devices/sound/swp30.cpp2
-rw-r--r--src/devices/video/atirage.cpp2
17 files changed, 288 insertions, 286 deletions
diff --git a/src/devices/bus/idpartner/bus.cpp b/src/devices/bus/idpartner/bus.cpp
index 6b82488062a..2c426f39991 100644
--- a/src/devices/bus/idpartner/bus.cpp
+++ b/src/devices/bus/idpartner/bus.cpp
@@ -19,8 +19,8 @@ namespace bus::idpartner {
***********************************************************************/
device_exp_card_interface::device_exp_card_interface(const machine_config &mconfig, device_t &device)
- : device_interface(device, "idpartner_card")
- , m_bus(nullptr)
+ : device_interface(device, "idpartner_card")
+ , m_bus(nullptr)
{
}
@@ -29,9 +29,9 @@ device_exp_card_interface::device_exp_card_interface(const machine_config &mconf
***********************************************************************/
bus_connector_device::bus_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, IDPARTNER_BUS_CONNECTOR, tag, owner, clock)
- , device_single_card_slot_interface<device_exp_card_interface>(mconfig, *this)
- , m_bus(*this, finder_base::DUMMY_TAG)
+ : device_t(mconfig, IDPARTNER_BUS_CONNECTOR, tag, owner, clock)
+ , device_single_card_slot_interface<device_exp_card_interface>(mconfig, *this)
+ , m_bus(*this, finder_base::DUMMY_TAG)
{
}
@@ -41,9 +41,9 @@ bus_connector_device::bus_connector_device(const machine_config &mconfig, const
void bus_connector_device::device_resolve_objects()
{
- device_exp_card_interface *const exp_card = get_card_device();
- if (exp_card)
- exp_card->set_bus(m_bus);
+ device_exp_card_interface *const exp_card = get_card_device();
+ if (exp_card)
+ exp_card->set_bus(m_bus);
}
void bus_connector_device::device_start()
@@ -55,11 +55,11 @@ void bus_connector_device::device_start()
***********************************************************************/
bus_device::bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, IDPARTNER_BUS, tag, owner, clock)
- , m_io(*this, finder_base::DUMMY_TAG, -1)
- , m_int_handler(*this)
- , m_nmi_handler(*this)
- , m_drq_handler(*this)
+ : device_t(mconfig, IDPARTNER_BUS, tag, owner, clock)
+ , m_io(*this, finder_base::DUMMY_TAG, -1)
+ , m_int_handler(*this)
+ , m_nmi_handler(*this)
+ , m_drq_handler(*this)
{
}
@@ -82,6 +82,6 @@ void bus_device::device_reset()
void idpartner_exp_devices(device_slot_interface &device)
{
- device.option_add("gdp", IDPARTNER_GDP);
- device.option_add("sasi", IDPARTNER_SASI);
+ device.option_add("gdp", IDPARTNER_GDP);
+ device.option_add("sasi", IDPARTNER_SASI);
}
diff --git a/src/devices/bus/idpartner/bus.h b/src/devices/bus/idpartner/bus.h
index 0ac5cc6cb47..51521e946db 100644
--- a/src/devices/bus/idpartner/bus.h
+++ b/src/devices/bus/idpartner/bus.h
@@ -58,61 +58,61 @@ class device_exp_card_interface;
class bus_connector_device : public device_t, public device_single_card_slot_interface<device_exp_card_interface>
{
public:
- // construction/destruction
- template <typename T, typename U>
- bus_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&bus_tag, U &&opts, const char *dflt)
- : bus_connector_device(mconfig, tag, owner)
- {
- option_reset();
- opts(*this);
- set_default_option(dflt);
- set_fixed(false);
- m_bus.set_tag(std::forward<T>(bus_tag));
- }
-
- bus_connector_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
+ // construction/destruction
+ template <typename T, typename U>
+ bus_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&bus_tag, U &&opts, const char *dflt)
+ : bus_connector_device(mconfig, tag, owner)
+ {
+ option_reset();
+ opts(*this);
+ set_default_option(dflt);
+ set_fixed(false);
+ m_bus.set_tag(std::forward<T>(bus_tag));
+ }
+
+ bus_connector_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
protected:
- // device_t implementation
- virtual void device_resolve_objects() override;
- virtual void device_start() override;
+ // device_t implementation
+ virtual void device_resolve_objects() override;
+ virtual void device_start() override;
- // configuration
- required_device<bus_device> m_bus;
+ // configuration
+ required_device<bus_device> m_bus;
};
class bus_device : public device_t
{
public:
- // construction/destruction
- bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ // construction/destruction
+ bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // inline configuration
- template <typename T> void set_io_space(T &&tag, int spacenum) { m_io.set_tag(std::forward<T>(tag), spacenum); }
+ // inline configuration
+ template <typename T> void set_io_space(T &&tag, int spacenum) { m_io.set_tag(std::forward<T>(tag), spacenum); }
- // callbacks
- auto int_handler() { return m_int_handler.bind(); }
- auto nmi_handler() { return m_nmi_handler.bind(); }
- auto drq_handler() { return m_drq_handler.bind(); }
+ // callbacks
+ auto int_handler() { return m_int_handler.bind(); }
+ auto nmi_handler() { return m_nmi_handler.bind(); }
+ auto drq_handler() { return m_drq_handler.bind(); }
- // called from expansion device
- void int_w(int state) { m_int_handler(state); }
- void nmi_w(int state) { m_nmi_handler(state); }
- void drq_w(int state) { m_drq_handler(state); }
+ // called from expansion device
+ void int_w(int state) { m_int_handler(state); }
+ void nmi_w(int state) { m_nmi_handler(state); }
+ void drq_w(int state) { m_drq_handler(state); }
- address_space &io() { return *m_io; }
+ address_space &io() { return *m_io; }
private:
- // device_t implementation
- virtual void device_start() override;
- virtual void device_reset() override;
+ // device_t implementation
+ virtual void device_start() override;
+ virtual void device_reset() override;
- // internal state
- required_address_space m_io;
+ // internal state
+ required_address_space m_io;
- devcb_write_line m_int_handler;
- devcb_write_line m_nmi_handler;
- devcb_write_line m_drq_handler;
+ devcb_write_line m_int_handler;
+ devcb_write_line m_nmi_handler;
+ devcb_write_line m_drq_handler;
};
// ======================> device_exp_card_interface
@@ -120,15 +120,15 @@ private:
class device_exp_card_interface : public device_interface
{
protected:
- // construction/destruction
- device_exp_card_interface(const machine_config &mconfig, device_t &device);
+ // construction/destruction
+ device_exp_card_interface(const machine_config &mconfig, device_t &device);
public:
- // inline configuration
- void set_bus(bus_device *bus) { m_bus = bus; }
+ // inline configuration
+ void set_bus(bus_device *bus) { m_bus = bus; }
protected:
- bus_device *m_bus;
+ bus_device *m_bus;
};
} // namespace bus::idpartner
diff --git a/src/devices/bus/idpartner/gdp.cpp b/src/devices/bus/idpartner/gdp.cpp
index 0b7f34dbf90..72e3fc7d931 100644
--- a/src/devices/bus/idpartner/gdp.cpp
+++ b/src/devices/bus/idpartner/gdp.cpp
@@ -19,63 +19,63 @@
namespace {
class idpartner_gdp_device :
- public device_t,
- public bus::idpartner::device_exp_card_interface
+ public device_t,
+ public bus::idpartner::device_exp_card_interface
{
public:
- // construction/destruction
- idpartner_gdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ // construction/destruction
+ idpartner_gdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
- // device_t implementation
- virtual void device_start() override;
- virtual void device_reset() override;
- virtual void device_add_mconfig(machine_config &config) override;
- virtual const tiny_rom_entry *device_rom_region() const override;
+ // device_t implementation
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ virtual void device_add_mconfig(machine_config &config) override;
+ virtual const tiny_rom_entry *device_rom_region() const override;
private:
- void char_w(u8 data) { m_avdc->buffer_w(data); }
- void attr_w(u8 data) { m_avdc->attr_buffer_w(data); }
- void scroll_w(u8 data) { m_scroll = data; }
- u8 common_r() { m_common ^= 0x10; return m_common; }
- void porta_w(u8 data);
- void portb_w(u8 data);
+ void char_w(u8 data) { m_avdc->buffer_w(data); }
+ void attr_w(u8 data) { m_avdc->attr_buffer_w(data); }
+ void scroll_w(u8 data) { m_scroll = data; }
+ u8 common_r() { m_common ^= 0x10; return m_common; }
+ void porta_w(u8 data);
+ void portb_w(u8 data);
void vram_w(offs_t offset, u8 data);
u8 vram_r(offs_t offset);
- void msl_w(u8 data);
- void gdc_map(address_map &map);
- void int_w(int state) { m_bus->int_w(state); }
- void nmi_w(int state) { m_bus->nmi_w(state); }
-
- SCN2674_DRAW_CHARACTER_MEMBER(draw_character);
- TIMER_DEVICE_CALLBACK_MEMBER(scanline) { m_gdc->update_scanline(param); }
-
- void char_map(address_map &map);
- void attr_map(address_map &map);
-
- required_device<ef9365_device> m_gdc;
- memory_share_creator<u8> m_vram;
- required_device<scn2674_device> m_avdc;
- required_device<z80pio_device> m_pio;
- required_device<palette_device> m_palette;
- required_region_ptr<u8> m_p_chargen;
-
- u8 m_scroll;
- u8 m_common;
+ void msl_w(u8 data);
+ void gdc_map(address_map &map);
+ void int_w(int state) { m_bus->int_w(state); }
+ void nmi_w(int state) { m_bus->nmi_w(state); }
+
+ SCN2674_DRAW_CHARACTER_MEMBER(draw_character);
+ TIMER_DEVICE_CALLBACK_MEMBER(scanline) { m_gdc->update_scanline(param); }
+
+ void char_map(address_map &map);
+ void attr_map(address_map &map);
+
+ required_device<ef9365_device> m_gdc;
+ memory_share_creator<u8> m_vram;
+ required_device<scn2674_device> m_avdc;
+ required_device<z80pio_device> m_pio;
+ required_device<palette_device> m_palette;
+ required_region_ptr<u8> m_p_chargen;
+
+ u8 m_scroll;
+ u8 m_common;
};
idpartner_gdp_device::idpartner_gdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, IDPARTNER_GDP, tag, owner, clock)
- , bus::idpartner::device_exp_card_interface(mconfig, *this)
- , m_gdc(*this, "gdc")
- , m_vram(*this, "vram", 0x20000, ENDIANNESS_LITTLE)
- , m_avdc(*this, "avdc")
- , m_pio(*this, "pio")
- , m_palette(*this, "palette")
- , m_p_chargen(*this, "chargen")
- , m_scroll(0)
- , m_common(0)
+ : device_t(mconfig, IDPARTNER_GDP, tag, owner, clock)
+ , bus::idpartner::device_exp_card_interface(mconfig, *this)
+ , m_gdc(*this, "gdc")
+ , m_vram(*this, "vram", 0x20000, ENDIANNESS_LITTLE)
+ , m_avdc(*this, "avdc")
+ , m_pio(*this, "pio")
+ , m_palette(*this, "palette")
+ , m_p_chargen(*this, "chargen")
+ , m_scroll(0)
+ , m_common(0)
{
}
@@ -85,54 +85,54 @@ idpartner_gdp_device::idpartner_gdp_device(const machine_config &mconfig, const
void idpartner_gdp_device::device_start()
{
- save_item(NAME(m_scroll));
+ save_item(NAME(m_scroll));
}
void idpartner_gdp_device::device_reset()
{
- m_bus->io().install_read_handler (0x20, 0x2f, emu::rw_delegate(m_gdc, FUNC(ef9365_device::data_r))); // Thomson GDP EF9367
- m_bus->io().install_write_handler(0x20, 0x2f, emu::rw_delegate(m_gdc, FUNC(ef9365_device::data_w))); // Thomson GDP EF9367
- m_bus->io().install_read_handler (0x30, 0x33, emu::rw_delegate(m_pio, FUNC(z80pio_device::read_alt))); // PIO - Graphics
- m_bus->io().install_write_handler(0x30, 0x33, emu::rw_delegate(m_pio, FUNC(z80pio_device::write_alt))); // PIO - Graphics
- m_bus->io().install_write_handler(0x34, 0x34, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::char_w))); // char reg
- m_bus->io().install_write_handler(0x35, 0x35, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::attr_w))); // attr reg
- m_bus->io().install_write_handler(0x36, 0x36, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::scroll_w))); // scroll reg/common input
- m_bus->io().install_read_handler (0x36, 0x36, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::common_r))); // common input
- m_bus->io().install_read_handler (0x38, 0x3f, emu::rw_delegate(m_avdc, FUNC(scn2674_device::read))); // AVDC SCN2674
- m_bus->io().install_write_handler(0x38, 0x3f, emu::rw_delegate(m_avdc, FUNC(scn2674_device::write))); // AVDC SCN2674
+ m_bus->io().install_read_handler (0x20, 0x2f, emu::rw_delegate(m_gdc, FUNC(ef9365_device::data_r))); // Thomson GDP EF9367
+ m_bus->io().install_write_handler(0x20, 0x2f, emu::rw_delegate(m_gdc, FUNC(ef9365_device::data_w))); // Thomson GDP EF9367
+ m_bus->io().install_read_handler (0x30, 0x33, emu::rw_delegate(m_pio, FUNC(z80pio_device::read_alt))); // PIO - Graphics
+ m_bus->io().install_write_handler(0x30, 0x33, emu::rw_delegate(m_pio, FUNC(z80pio_device::write_alt))); // PIO - Graphics
+ m_bus->io().install_write_handler(0x34, 0x34, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::char_w))); // char reg
+ m_bus->io().install_write_handler(0x35, 0x35, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::attr_w))); // attr reg
+ m_bus->io().install_write_handler(0x36, 0x36, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::scroll_w))); // scroll reg/common input
+ m_bus->io().install_read_handler (0x36, 0x36, emu::rw_delegate(*this, FUNC(idpartner_gdp_device::common_r))); // common input
+ m_bus->io().install_read_handler (0x38, 0x3f, emu::rw_delegate(m_avdc, FUNC(scn2674_device::read))); // AVDC SCN2674
+ m_bus->io().install_write_handler(0x38, 0x3f, emu::rw_delegate(m_avdc, FUNC(scn2674_device::write))); // AVDC SCN2674
}
void idpartner_gdp_device::porta_w(u8 data)
{
- //printf("porta_w:%02x\n",data);
+ //printf("porta_w:%02x\n",data);
}
void idpartner_gdp_device::portb_w(u8 data)
{
- //printf("portb_w:%02x\n",data);
+ //printf("portb_w:%02x\n",data);
}
void idpartner_gdp_device::msl_w(u8 data)
{
- //printf("msl_w:%02x\n",data);
+ //printf("msl_w:%02x\n",data);
}
void idpartner_gdp_device::vram_w(offs_t offset, u8 data)
{
- u16 addr = (m_scroll << 7) - offset;
- m_vram[addr] = data;
+ u16 addr = (m_scroll << 7) - offset;
+ m_vram[addr] = data;
}
u8 idpartner_gdp_device::vram_r(offs_t offset)
{
- u16 addr = (m_scroll << 7) - offset;
+ u16 addr = (m_scroll << 7) - offset;
return m_vram[addr];
}
// 16 * 4164 DRAM
void idpartner_gdp_device::gdc_map(address_map &map)
{
- map(0x0000, 0x1ffff).rw(FUNC(idpartner_gdp_device::vram_r), FUNC(idpartner_gdp_device::vram_w));
+ map(0x0000, 0x1ffff).rw(FUNC(idpartner_gdp_device::vram_r), FUNC(idpartner_gdp_device::vram_w));
}
@@ -140,15 +140,15 @@ void idpartner_gdp_device::gdc_map(address_map &map)
void idpartner_gdp_device::char_map(address_map &map)
{
map(0x0000, 0x0fff).ram().share("charram");
- map(0x1000, 0x2fff).ram(); // TODO: Check in schematics
+ map(0x1000, 0x2fff).ram(); // TODO: Check in schematics
}
// 2 * 6116 SRAM for attributes
void idpartner_gdp_device::attr_map(address_map &map)
{
map(0x0000, 0x0fff).ram().share("attrmap");
- map(0x1000, 0x2fff).ram(); // TODO: Check in schematics
-}
+ map(0x1000, 0x2fff).ram(); // TODO: Check in schematics
+}
/* F4 Character Displayer */
static const gfx_layout gdp_charlayout =
@@ -194,44 +194,44 @@ SCN2674_DRAW_CHARACTER_MEMBER( idpartner_gdp_device::draw_character )
void idpartner_gdp_device::device_add_mconfig(machine_config &config)
{
- screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER, rgb_t::green()));
- screen.set_screen_update(m_gdc, FUNC(ef9365_device::screen_update));
- screen.set_size(1024, 512);
- screen.set_visarea(0, 1024-1, 0, 512-1);
- screen.set_refresh_hz(50);
- PALETTE(config, "palette", palette_device::MONOCHROME_INVERTED);
+ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER, rgb_t::green()));
+ screen.set_screen_update(m_gdc, FUNC(ef9365_device::screen_update));
+ screen.set_size(1024, 512);
+ screen.set_visarea(0, 1024-1, 0, 512-1);
+ screen.set_refresh_hz(50);
+ PALETTE(config, "palette", palette_device::MONOCHROME_INVERTED);
- screen_device &screen2(SCREEN(config, "screen2", SCREEN_TYPE_RASTER, rgb_t::green()));
- screen2.set_screen_update(m_avdc, FUNC(scn2674_device::screen_update));
- screen2.set_size(1024, 512);
- screen2.set_visarea(0, 1024-1, 0, 512-1);
- screen2.set_refresh_hz(50);
+ screen_device &screen2(SCREEN(config, "screen2", SCREEN_TYPE_RASTER, rgb_t::green()));
+ screen2.set_screen_update(m_avdc, FUNC(scn2674_device::screen_update));
+ screen2.set_size(1024, 512);
+ screen2.set_visarea(0, 1024-1, 0, 512-1);
+ screen2.set_refresh_hz(50);
- GFXDECODE(config, "gfxdecode", "palette", gfx_partner);
+ GFXDECODE(config, "gfxdecode", "palette", gfx_partner);
- EF9365(config, m_gdc, XTAL(24'000'000) / 16); // EF9367 1.5 MHz
- m_gdc->set_screen("screen");
- m_gdc->set_addrmap(0, &idpartner_gdp_device::gdc_map);
- m_gdc->set_palette_tag("palette");
- m_gdc->set_nb_bitplanes(1);
- m_gdc->set_display_mode(ef9365_device::DISPLAY_MODE_1024x512);
- m_gdc->write_msl().set(FUNC(idpartner_gdp_device::msl_w));
+ EF9365(config, m_gdc, XTAL(24'000'000) / 16); // EF9367 1.5 MHz
+ m_gdc->set_screen("screen");
+ m_gdc->set_addrmap(0, &idpartner_gdp_device::gdc_map);
+ m_gdc->set_palette_tag("palette");
+ m_gdc->set_nb_bitplanes(1);
+ m_gdc->set_display_mode(ef9365_device::DISPLAY_MODE_1024x512);
+ m_gdc->write_msl().set(FUNC(idpartner_gdp_device::msl_w));
- TIMER(config, "scanline").configure_scanline(FUNC(idpartner_gdp_device::scanline), "screen", 0, 1);
+ TIMER(config, "scanline").configure_scanline(FUNC(idpartner_gdp_device::scanline), "screen", 0, 1);
- SCN2674(config, m_avdc, XTAL(24'000'000) / 16); // SCN2674B
- m_avdc->set_screen("screen2");
- m_avdc->set_character_width(12);
+ SCN2674(config, m_avdc, XTAL(24'000'000) / 16); // SCN2674B
+ m_avdc->set_screen("screen2");
+ m_avdc->set_character_width(12);
m_avdc->set_addrmap(0, &idpartner_gdp_device::char_map);
m_avdc->set_addrmap(1, &idpartner_gdp_device::attr_map);
- m_avdc->set_display_callback(FUNC(idpartner_gdp_device::draw_character));
- //m_avdc->intr_callback().set(FUNC(idpartner_gdp_device::nmi_w));
+ m_avdc->set_display_callback(FUNC(idpartner_gdp_device::draw_character));
+ //m_avdc->intr_callback().set(FUNC(idpartner_gdp_device::nmi_w));
- Z80PIO(config, m_pio, XTAL(8'000'000) / 2);
- m_pio->out_int_callback().set(FUNC(idpartner_gdp_device::int_w));
- m_pio->out_pa_callback().set(FUNC(idpartner_gdp_device::porta_w));
- m_pio->out_pb_callback().set(FUNC(idpartner_gdp_device::portb_w));
+ Z80PIO(config, m_pio, XTAL(8'000'000) / 2);
+ m_pio->out_int_callback().set(FUNC(idpartner_gdp_device::int_w));
+ m_pio->out_pa_callback().set(FUNC(idpartner_gdp_device::porta_w));
+ m_pio->out_pb_callback().set(FUNC(idpartner_gdp_device::portb_w));
}
} // anonymous namespace
diff --git a/src/devices/bus/idpartner/sasi.cpp b/src/devices/bus/idpartner/sasi.cpp
index cc9506a38c4..7fdeb141e88 100644
--- a/src/devices/bus/idpartner/sasi.cpp
+++ b/src/devices/bus/idpartner/sasi.cpp
@@ -16,46 +16,46 @@
namespace {
class idpartner_sasi_device :
- public device_t,
- public bus::idpartner::device_exp_card_interface
+ public device_t,
+ public bus::idpartner::device_exp_card_interface
{
public:
- // construction/destruction
- idpartner_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ // construction/destruction
+ idpartner_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
- // device_t implementation
- virtual void device_start() override;
- virtual void device_reset() override;
- virtual void device_add_mconfig(machine_config &config) override;
+ // device_t implementation
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ virtual void device_add_mconfig(machine_config &config) override;
- u8 stat_r();
- u8 data_r();
- void ctrl_w(u8 data);
- void data_w(u8 data);
- void reset_w(u8 data);
+ u8 stat_r();
+ u8 data_r();
+ void ctrl_w(u8 data);
+ void data_w(u8 data);
+ void reset_w(u8 data);
void req_w(int state);
- void io_w(int state);
+ void io_w(int state);
private:
required_device<nscsi_bus_device> m_sasibus;
required_device<nscsi_callback_device> m_sasi;
- int m_drq_enable;
- int m_data_enable;
- int m_prev_daq;
+ int m_drq_enable;
+ int m_data_enable;
+ int m_prev_daq;
};
idpartner_sasi_device::idpartner_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, IDPARTNER_SASI, tag, owner, clock)
- , bus::idpartner::device_exp_card_interface(mconfig, *this)
- , m_sasibus(*this, "sasibus")
+ : device_t(mconfig, IDPARTNER_SASI, tag, owner, clock)
+ , bus::idpartner::device_exp_card_interface(mconfig, *this)
+ , m_sasibus(*this, "sasibus")
, m_sasi(*this, "sasibus:7:scsicb")
- , m_drq_enable(0)
- , m_data_enable(0)
- , m_prev_daq(0)
+ , m_drq_enable(0)
+ , m_data_enable(0)
+ , m_prev_daq(0)
{
}
@@ -65,101 +65,101 @@ idpartner_sasi_device::idpartner_sasi_device(const machine_config &mconfig, cons
void idpartner_sasi_device::device_start()
{
- m_bus->io().install_read_handler (0x10, 0x10, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::stat_r))); // RDSTAT
- m_bus->io().install_read_handler (0x11, 0x11, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::data_r))); // RDDATA
- m_bus->io().install_write_handler(0x10, 0x10, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::ctrl_w))); // WRCONTR
- m_bus->io().install_write_handler(0x11, 0x11, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::data_w))); // WRDATA
- m_bus->io().install_write_handler(0x12, 0x12, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::reset_w))); // RESET
-
- save_item(NAME(m_drq_enable));
- save_item(NAME(m_data_enable));
- save_item(NAME(m_prev_daq));
+ m_bus->io().install_read_handler (0x10, 0x10, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::stat_r))); // RDSTAT
+ m_bus->io().install_read_handler (0x11, 0x11, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::data_r))); // RDDATA
+ m_bus->io().install_write_handler(0x10, 0x10, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::ctrl_w))); // WRCONTR
+ m_bus->io().install_write_handler(0x11, 0x11, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::data_w))); // WRDATA
+ m_bus->io().install_write_handler(0x12, 0x12, emu::rw_delegate(*this, FUNC(idpartner_sasi_device::reset_w))); // RESET
+
+ save_item(NAME(m_drq_enable));
+ save_item(NAME(m_data_enable));
+ save_item(NAME(m_prev_daq));
}
void idpartner_sasi_device::device_reset()
{
- m_drq_enable = 0;
- m_data_enable = 0;
- m_prev_daq = 0;
- m_bus->drq_w(0);
+ m_drq_enable = 0;
+ m_data_enable = 0;
+ m_prev_daq = 0;
+ m_bus->drq_w(0);
}
u8 idpartner_sasi_device::stat_r()
{
u8 data = (m_sasi->req_r() << 7)
- | (m_sasi->io_r() << 6)
- | (m_sasi->msg_r() << 5)
- | (m_sasi->cd_r() << 4)
- | (m_sasi->bsy_r() << 3);
- return data;
+ | (m_sasi->io_r() << 6)
+ | (m_sasi->msg_r() << 5)
+ | (m_sasi->cd_r() << 4)
+ | (m_sasi->bsy_r() << 3);
+ return data;
}
u8 idpartner_sasi_device::data_r()
{
- u8 data = m_sasi->read();
- if (m_data_enable)
- {
- m_sasi->ack_w(1);
- if (m_drq_enable)
- {
- m_bus->drq_w(0);
- m_prev_daq = 0;
- }
- }
- return data;
+ u8 data = m_sasi->read();
+ if (m_data_enable)
+ {
+ m_sasi->ack_w(1);
+ if (m_drq_enable)
+ {
+ m_bus->drq_w(0);
+ m_prev_daq = 0;
+ }
+ }
+ return data;
}
void idpartner_sasi_device::ctrl_w(u8 data)
{
- m_sasi->write(BIT(data,0));
- m_sasi->sel_w(BIT(data,0));
- m_data_enable = BIT(data,1);
- m_drq_enable = BIT(data,5);
- if (m_data_enable && m_drq_enable)
- {
- m_bus->drq_w(m_sasi->req_r());
- m_prev_daq = m_sasi->req_r();
- } else {
- if (m_prev_daq)
- m_bus->drq_w(0);
- m_prev_daq = 0;
- }
+ m_sasi->write(BIT(data,0));
+ m_sasi->sel_w(BIT(data,0));
+ m_data_enable = BIT(data,1);
+ m_drq_enable = BIT(data,5);
+ if (m_data_enable && m_drq_enable)
+ {
+ m_bus->drq_w(m_sasi->req_r());
+ m_prev_daq = m_sasi->req_r();
+ } else {
+ if (m_prev_daq)
+ m_bus->drq_w(0);
+ m_prev_daq = 0;
+ }
}
void idpartner_sasi_device::data_w(u8 data)
{
- m_sasi->write(data);
- if (m_data_enable)
- {
- m_sasi->ack_w(1);
- if (m_drq_enable)
- {
- m_bus->drq_w(0);
- m_prev_daq = 0;
- }
- }
+ m_sasi->write(data);
+ if (m_data_enable)
+ {
+ m_sasi->ack_w(1);
+ if (m_drq_enable)
+ {
+ m_bus->drq_w(0);
+ m_prev_daq = 0;
+ }
+ }
}
void idpartner_sasi_device::reset_w(u8 data)
{
- m_sasi->rst_w(1);
- m_sasi->rst_w(0);
+ m_sasi->rst_w(1);
+ m_sasi->rst_w(0);
}
void idpartner_sasi_device::req_w(int state)
{
- m_sasi->ack_w(0);
- if (m_data_enable && m_drq_enable)
- {
- m_bus->drq_w(state);
- m_prev_daq = state;
- }
+ m_sasi->ack_w(0);
+ if (m_data_enable && m_drq_enable)
+ {
+ m_bus->drq_w(state);
+ m_prev_daq = state;
+ }
}
void idpartner_sasi_device::io_w(int state)
{
- if (state)
- m_sasi->write(0); // clears lateched data
+ if (state)
+ m_sasi->write(0); // clears lateched data
}
void idpartner_sasi_device::device_add_mconfig(machine_config &config)
@@ -167,12 +167,14 @@ void idpartner_sasi_device::device_add_mconfig(machine_config &config)
NSCSI_BUS(config, m_sasibus);
NSCSI_CONNECTOR(config, "sasibus:0", default_scsi_devices, "s1410", true);
NSCSI_CONNECTOR(config, "sasibus:7", default_scsi_devices, "scsicb", true)
- .option_add_internal("scsicb", NSCSI_CB)
- .machine_config([this](device_t* device) {
- downcast<nscsi_callback_device&>(*device).req_callback().set(*this, FUNC(idpartner_sasi_device::req_w));
- downcast<nscsi_callback_device&>(*device).io_callback().set(*this, FUNC(idpartner_sasi_device::io_w));
- });
- }
+ .option_add_internal("scsicb", NSCSI_CB)
+ .machine_config(
+ [this] (device_t* device)
+ {
+ downcast<nscsi_callback_device&>(*device).req_callback().set(*this, FUNC(idpartner_sasi_device::req_w));
+ downcast<nscsi_callback_device&>(*device).io_callback().set(*this, FUNC(idpartner_sasi_device::io_w));
+ });
+ }
} // anonymous namespace
DEFINE_DEVICE_TYPE_PRIVATE(IDPARTNER_SASI, bus::idpartner::device_exp_card_interface, idpartner_sasi_device, "partner_sai", "Iskra Delta Partner SASI card")
diff --git a/src/devices/bus/pci/ess_maestro.cpp b/src/devices/bus/pci/ess_maestro.cpp
index 1bd479d0cf1..a6a3107d1ac 100644
--- a/src/devices/bus/pci/ess_maestro.cpp
+++ b/src/devices/bus/pci/ess_maestro.cpp
@@ -87,14 +87,14 @@ uint8_t es1946_solo1e_device::capptr_r()
void es1946_solo1e_device::config_map(address_map &map)
{
pci_card_device::config_map(map);
-// map(0x40, 0x41) Legacy Audio Control
-// map(0x50, 0x53) ES1946 Config
-// map(0x60, 0x61) DDMA Control
+// map(0x40, 0x41) Legacy Audio Control
+// map(0x50, 0x53) ES1946 Config
+// map(0x60, 0x61) DDMA Control
// ACPI
map(0xc0, 0xc0).lr8(NAME([] () { return 0x01; }));
map(0xc1, 0xc1).lr8(NAME([] () { return 0x00; })); // NULL pointer
-// map(0xc2, 0xc3) Power Management Capabilities
-// map(0xc4, 0xc5) Power Management Control/Status
+// map(0xc2, 0xc3) Power Management Capabilities
+// map(0xc4, 0xc5) Power Management Control/Status
}
void es1946_solo1e_device::extended_map(address_map &map)
diff --git a/src/devices/bus/pci/ess_maestro.h b/src/devices/bus/pci/ess_maestro.h
index 979c85641d5..bb65bc9ec8e 100644
--- a/src/devices/bus/pci/ess_maestro.h
+++ b/src/devices/bus/pci/ess_maestro.h
@@ -22,10 +22,10 @@ protected:
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
-// virtual const tiny_rom_entry *device_rom_region() const override;
+// virtual const tiny_rom_entry *device_rom_region() const override;
-// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
-// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
+// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
+// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
virtual void config_map(address_map &map) override;
diff --git a/src/devices/bus/pci/vt6306.cpp b/src/devices/bus/pci/vt6306.cpp
index a68bace280d..4af9cd01c48 100644
--- a/src/devices/bus/pci/vt6306.cpp
+++ b/src/devices/bus/pci/vt6306.cpp
@@ -33,7 +33,7 @@ vt6306_device::vt6306_device(const machine_config &mconfig, device_type type, co
{
set_ids(0x11063044, 0x00, 0x0c0010, 0x11063044);
// Sunix UFC3212V has these values
-// set_ids(0x11063044, 0x46, 0x0c0010, 0x1106e8c1);
+// set_ids(0x11063044, 0x46, 0x0c0010, 0x1106e8c1);
}
vt6306_device::vt6306_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
@@ -52,7 +52,7 @@ void vt6306_device::device_start()
add_map(2048, M_MEM, FUNC(vt6306_device::ohci_mmio_map));
add_map( 128, M_IO, FUNC(vt6306_device::vio_map));
-// add_map( 256, M_MEM, FUNC(vt6306_device::cardbus_map));
+// add_map( 256, M_MEM, FUNC(vt6306_device::cardbus_map));
// INTA#
intr_pin = 1;
@@ -81,11 +81,11 @@ u8 vt6306_device::capptr_r()
void vt6306_device::config_map(address_map &map)
{
pci_card_device::config_map(map);
-// map(0x40, 0x43) PCI HCI Control (?)
+// map(0x40, 0x43) PCI HCI Control (?)
// ACPI
map(0x50, 0x50).lr8(NAME([] () { return 0x01; }));
map(0x51, 0x51).lr8(NAME([] () { return 0x00; })); // NULL pointer
-// map(0x52, 0x57) PCI Power Management v1.1
+// map(0x52, 0x57) PCI Power Management v1.1
}
void vt6306_device::ohci_mmio_map(address_map &map)
diff --git a/src/devices/bus/pci/vt6306.h b/src/devices/bus/pci/vt6306.h
index ea8ea0f953d..a11c355b58c 100644
--- a/src/devices/bus/pci/vt6306.h
+++ b/src/devices/bus/pci/vt6306.h
@@ -20,8 +20,8 @@ protected:
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
-// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
-// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
+// virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
+// uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override;
virtual void config_map(address_map &map) override;
diff --git a/src/devices/bus/qbus/dvk_mx.cpp b/src/devices/bus/qbus/dvk_mx.cpp
index f164dbbe7ce..fb95431e270 100644
--- a/src/devices/bus/qbus/dvk_mx.cpp
+++ b/src/devices/bus/qbus/dvk_mx.cpp
@@ -2,19 +2,19 @@
// copyright-holders:Sergey Svishchev
/***************************************************************************
- DVK "MX" floppy controller (decimal ID 3.057.122)
+ DVK "MX" floppy controller (decimal ID 3.057.122)
- Supports four 5.25" drives (single- or double-sided, 40- or 80-track).
+ Supports four 5.25" drives (single- or double-sided, 40- or 80-track).
- Uses FM encoding and software-defined track format;
- usually 11 sectors of 256 bytes, with simple additive checksum.
+ Uses FM encoding and software-defined track format;
+ usually 11 sectors of 256 bytes, with simple additive checksum.
- RT-11 driver name: MX.SYS
+ RT-11 driver name: MX.SYS
- References:
- https://emuverse.ru/downloads/computers/DVK/docs/KMD/kngmd_MX_2.djvu
- https://torlus.com/floppy/forum/viewtopic.php?t=1384
- http://hobot.pdp-11.ru/ukdwk_archive/dwkwebcomplekt/DWKFiles/mx/README.mx1
+ References:
+ https://emuverse.ru/downloads/computers/DVK/docs/KMD/kngmd_MX_2.djvu
+ https://torlus.com/floppy/forum/viewtopic.php?t=1384
+ http://hobot.pdp-11.ru/ukdwk_archive/dwkwebcomplekt/DWKFiles/mx/README.mx1
***************************************************************************/
diff --git a/src/devices/bus/qbus/dvk_mx.h b/src/devices/bus/qbus/dvk_mx.h
index 186942d761e..6dc8482398e 100644
--- a/src/devices/bus/qbus/dvk_mx.h
+++ b/src/devices/bus/qbus/dvk_mx.h
@@ -2,7 +2,7 @@
// copyright-holders:Sergey Svishchev
/***************************************************************************
- DVK "MX" floppy controller (decimal ID 3.057.122)
+ DVK "MX" floppy controller (decimal ID 3.057.122)
***************************************************************************/
diff --git a/src/devices/bus/tim011/aycard.cpp b/src/devices/bus/tim011/aycard.cpp
index 02f19ed69f5..9969716fb44 100644
--- a/src/devices/bus/tim011/aycard.cpp
+++ b/src/devices/bus/tim011/aycard.cpp
@@ -4,7 +4,7 @@
TIM-011 AY Card
- Card created by Zoran Urosevic.
+ Card created by Zoran Urosevic.
**********************************************************************/
@@ -25,7 +25,7 @@ static INPUT_PORTS_START(joystick)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_BUTTON3)
PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON2)
-INPUT_PORTS_END
+INPUT_PORTS_END
class tim011_aycard_device :
public device_t,
diff --git a/src/devices/cpu/sh/sh7042.cpp b/src/devices/cpu/sh/sh7042.cpp
index 5a468b85969..35f559b47ce 100644
--- a/src/devices/cpu/sh/sh7042.cpp
+++ b/src/devices/cpu/sh/sh7042.cpp
@@ -84,7 +84,7 @@ u8 sh7042_device::adcr_r()
void sh7042_device::adcsr_w(u8 data)
{
logerror("adcsr_w %02x\n", data);
- // u8 prev = m_adcsr;
+ // u8 prev = m_adcsr;
m_adcsr = (data & 0x7f) | (m_adcsr & data & CSR_ADF);
}
diff --git a/src/devices/cpu/sh/sh7042.h b/src/devices/cpu/sh/sh7042.h
index 9c73063d4a6..dabcb7c272b 100644
--- a/src/devices/cpu/sh/sh7042.h
+++ b/src/devices/cpu/sh/sh7042.h
@@ -59,7 +59,7 @@ private:
u8 adcr_r();
void adcsr_w(u8 data);
void adcr_w(u8 data);
-
+
void do_sci_w(int sci, int state);
};
diff --git a/src/devices/cpu/t11/t11.h b/src/devices/cpu/t11/t11.h
index 1a7369521dc..b4e8032d165 100644
--- a/src/devices/cpu/t11/t11.h
+++ b/src/devices/cpu/t11/t11.h
@@ -56,21 +56,21 @@ protected:
// K1801 microcode constants
enum
{
- VM1_STACK = 0177674, // start of HALT mode save area
- VM1_SEL1 = 0177716, // DIP switch register (read) and HALT mode selector (write)
- SEL1_HALT = 010
+ VM1_STACK = 0177674, // start of HALT mode save area
+ VM1_SEL1 = 0177716, // DIP switch register (read) and HALT mode selector (write)
+ SEL1_HALT = 010
};
enum
{
// DEC command set extensions
- IS_LEIS = 1 << 0, // MARK, RTT, SOB, SXT, XOR
- IS_EIS = 1 << 1, // same plus ASH, ASHC, MUL, DIV
- IS_MFPT = 1 << 2, // MFPT
- IS_MXPS = 1 << 3, // MFPS, MTPS
- IS_T11 = 1 << 4, // LEIS without MARK
+ IS_LEIS = 1 << 0, // MARK, RTT, SOB, SXT, XOR
+ IS_EIS = 1 << 1, // same plus ASH, ASHC, MUL, DIV
+ IS_MFPT = 1 << 2, // MFPT
+ IS_MXPS = 1 << 3, // MFPS, MTPS
+ IS_T11 = 1 << 4, // LEIS without MARK
// K1801 command set extensions
- IS_VM1 = 1 << 5, // START, STEP
- IS_VM2 = 1 << 6, // same plus RSEL, MxUS, RCPx, WCPx
+ IS_VM1 = 1 << 5, // START, STEP
+ IS_VM2 = 1 << 6, // same plus RSEL, MxUS, RCPx, WCPx
};
t11_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
diff --git a/src/devices/machine/z80dma.cpp b/src/devices/machine/z80dma.cpp
index 56dda122074..34c40b6183c 100644
--- a/src/devices/machine/z80dma.cpp
+++ b/src/devices/machine/z80dma.cpp
@@ -493,7 +493,7 @@ TIMER_CALLBACK_MEMBER(z80dma_device::timerproc)
{
m_out_int_cb(CLEAR_LINE);
m_is_pulse = false;
- }
+ }
else
{
if ((m_byte_counter & 0xff)==PULSE_CTRL && is_ready())
diff --git a/src/devices/sound/swp30.cpp b/src/devices/sound/swp30.cpp
index f592ea4b66f..4f84d9f9ed3 100644
--- a/src/devices/sound/swp30.cpp
+++ b/src/devices/sound/swp30.cpp
@@ -1494,7 +1494,7 @@ void swp30_device::execute_run()
while(adr <= target_address) {
m_dpcm_current[chan] = m_dpcm_next[chan];
s32 sample = m_dpcm_next[chan] + m_dpcm[(m_rom_cache.read_dword(adr >> 2) >> (8*(adr & 3))) & 0xff];
- // logerror("## + sample %08x %02x %d\n", adr, (m_rom_cache.read_dword(adr >> 2) >> (8*(adr & 3))) & 0xff, sample);
+ // logerror("## + sample %08x %02x %d\n", adr, (m_rom_cache.read_dword(adr >> 2) >> (8*(adr & 3))) & 0xff, sample);
adr ++;
if(sample < -0x8000)
sample = -0x8000;
diff --git a/src/devices/video/atirage.cpp b/src/devices/video/atirage.cpp
index 8449eef0245..786e225e2ca 100644
--- a/src/devices/video/atirage.cpp
+++ b/src/devices/video/atirage.cpp
@@ -222,7 +222,7 @@ void atirageiidvd_device::device_start()
m_regs0[CONFIG_CHIP_ID] = 0x55;
m_regs0[CONFIG_CHIP_ID+1] = 0x47;
m_regs0[CONFIG_CHIP_ID+3] = 0x3a;
-// m_regs0[CRTC_GEN_CNTL+3] = 0;
+// m_regs0[CRTC_GEN_CNTL+3] = 0;
// TODO: opt-in Mach64 legacy x86 memory & i/o VGA bridge control
command = 0;