summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/devices/bus/hp_dio/hp98620.cpp6
-rw-r--r--src/devices/sound/roland_gp.h10
-rw-r--r--src/devices/sound/roland_lp.h6
-rw-r--r--src/mame/hp/hp98x6.cpp48
4 files changed, 37 insertions, 33 deletions
diff --git a/src/devices/bus/hp_dio/hp98620.cpp b/src/devices/bus/hp_dio/hp98620.cpp
index 0e0be50d216..ec0077c48e2 100644
--- a/src/devices/bus/hp_dio/hp98620.cpp
+++ b/src/devices/bus/hp_dio/hp98620.cpp
@@ -37,7 +37,6 @@ protected:
void irq_w(int state);
- int m_icount;
private:
static constexpr int REG0_RESET_ARM_INT = 0x00;
@@ -104,9 +103,10 @@ private:
void update_ctrl(const int channel, const uint16_t data, const bool is_1tq4);
bool m_installed_io;
+ int m_icount;
uint8_t m_control;
uint8_t m_data;
- bool m_irq_state;
+ bool m_irq_state;
struct dma_regs {
uint32_t address = 0;
@@ -139,8 +139,8 @@ dio16_98620_device::dio16_98620_device(const machine_config &mconfig, device_typ
device_t{mconfig, type, tag, owner, clock},
device_execute_interface{mconfig, *this},
device_dio16_card_interface{mconfig, *this},
- m_icount{0},
m_installed_io{false},
+ m_icount{0},
m_control{0},
m_data{0},
m_irq_state{false},
diff --git a/src/devices/sound/roland_gp.h b/src/devices/sound/roland_gp.h
index 0d0bf3a9a91..06023f85791 100644
--- a/src/devices/sound/roland_gp.h
+++ b/src/devices/sound/roland_gp.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:giulioz
-#ifndef MAME_SOUND_ROLANDGP_H
-#define MAME_SOUND_ROLANDGP_H
+#ifndef MAME_SOUND_ROLAND_GP_H
+#define MAME_SOUND_ROLAND_GP_H
#pragma once
@@ -10,6 +10,8 @@
class tc6116_device : public device_t, public device_sound_interface, public device_rom_interface<23>
{
public:
+ static constexpr feature_type unemulated_features() { return feature::SOUND; }
+
tc6116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
auto int_callback() { return m_int_callback.bind(); }
@@ -74,11 +76,11 @@ private:
uint32_t m_clock; // clock
uint32_t m_rate; // sample rate (usually 32000 Hz)
- sound_stream* m_stream; // stream handle
+ sound_stream *m_stream; // stream handle
pcm_channel m_chns[NUM_CHANNELS]; // channel memory
[[maybe_unused]] uint8_t m_sel_chn; // selected channel
};
DECLARE_DEVICE_TYPE(TC6116, tc6116_device)
-#endif // MAME_SOUND_ROLANDGP_H
+#endif // MAME_SOUND_ROLAND_GP_H
diff --git a/src/devices/sound/roland_lp.h b/src/devices/sound/roland_lp.h
index 24db843fd36..200c8f29206 100644
--- a/src/devices/sound/roland_lp.h
+++ b/src/devices/sound/roland_lp.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Valley Bell
-#ifndef MAME_SOUND_ROLANDLP_H
-#define MAME_SOUND_ROLANDLP_H
+#ifndef MAME_SOUND_ROLAND_LP_H
+#define MAME_SOUND_ROLAND_LP_H
#pragma once
@@ -66,4 +66,4 @@ private:
DECLARE_DEVICE_TYPE(MB87419_MB87420, mb87419_mb87420_device)
-#endif // MAME_SOUND_ROLANDLP_H
+#endif // MAME_SOUND_ROLAND_LP_H
diff --git a/src/mame/hp/hp98x6.cpp b/src/mame/hp/hp98x6.cpp
index a066eacd3e1..62131e52d42 100644
--- a/src/mame/hp/hp98x6.cpp
+++ b/src/mame/hp/hp98x6.cpp
@@ -143,6 +143,13 @@ protected:
virtual void machine_start() override;
virtual void machine_reset() override;
+ void hp98x6_base(machine_config &mconfig, unsigned dot_clock, int char_width);
+ virtual void cpu_mem_map(address_map &map);
+ void diag_led_w(uint8_t data);
+ virtual void cpu_reset_w(int state);
+ void hpib_irq_w(int state);
+ void upi_irq7_w(int state);
+
required_device<m68000_device> m_cpu;
required_device<ram_device> m_ram;
required_device<mc6845_device> m_crtc;
@@ -154,13 +161,6 @@ protected:
// Character generator
required_region_ptr<uint8_t> m_chargen;
- void hp98x6_base(machine_config &mconfig, unsigned dot_clock, int char_width);
- virtual void cpu_mem_map(address_map &map);
- void diag_led_w(uint8_t data);
- virtual void cpu_reset_w(int state);
- void hpib_irq_w(int state);
- void upi_irq7_w(int state);
-
bool m_hsync_en;
bool m_graphic_en;
bool m_hpib_irq;
@@ -843,17 +843,6 @@ protected:
virtual void machine_reset() override;
virtual void device_post_load() override;
- required_device<fd1793_device> m_fdc;
- required_device<floppy_connector> m_drive0;
- optional_device<floppy_connector> m_drive1;
- required_device_array<ttl74123_device, 2> m_ss;
- required_device<timer_device> m_fdc_timer;
- required_ioport m_sw1;
- required_ioport m_sys_ctrl_sw;
-
- // ID PROM
- required_region_ptr<uint8_t> m_idprom;
-
TIMER_DEVICE_CALLBACK_MEMBER(fdc_ram_io);
void hp9826_36(machine_config &mconfig, unsigned dot_clock, int char_width);
@@ -876,6 +865,17 @@ protected:
void hpib_w(offs_t offset, uint8_t data);
uint16_t id_prom_r(offs_t offset);
+ required_device<fd1793_device> m_fdc;
+ required_device<floppy_connector> m_drive0;
+ optional_device<floppy_connector> m_drive1;
+ required_device_array<ttl74123_device, 2> m_ss;
+ required_device<timer_device> m_fdc_timer;
+ required_ioport m_sw1;
+ required_ioport m_sys_ctrl_sw;
+
+ // ID PROM
+ required_region_ptr<uint8_t> m_idprom;
+
uint8_t m_floppy_ctrl;
uint8_t m_floppy_buffer[256];
uint8_t m_buffer_addr;
@@ -919,6 +919,8 @@ void hp9826_36_state::machine_reset()
void hp9826_36_state::device_post_load()
{
+ hp98x6_base_state::device_post_load();
+
m_curr_floppy = nullptr;
// Bring m_curr_floppy in synch
floppy_update_sel();
@@ -1437,8 +1439,6 @@ private:
static inline constexpr unsigned TEXT_VRAM_SIZE = 2048;
static inline constexpr unsigned GRAPHIC_VRAM_SIZE = 16384;
- required_ioport m_frame_rate_sw;
-
virtual void cpu_mem_map(address_map &map) override;
uint16_t text_r(offs_t offset, uint16_t mem_mask);
void text_w(offs_t offset, uint16_t data, uint16_t mem_mask);
@@ -1447,6 +1447,8 @@ private:
MC6845_UPDATE_ROW(crtc_update_row);
+ required_ioport m_frame_rate_sw;
+
uint16_t m_text_vram[TEXT_VRAM_SIZE];
uint16_t m_graphic_vram[GRAPHIC_VRAM_SIZE];
bool m_60hz;
@@ -1789,9 +1791,6 @@ private:
static inline constexpr unsigned TEXT_VRAM_SIZE = 2048;
static inline constexpr unsigned GRAPHIC_VRAM_SIZE = 131072;
- required_ioport m_frame_rate_sw;
- memory_share_creator<uint8_t> m_clut;
-
virtual void cpu_mem_map(address_map &map) override;
uint16_t text_r(offs_t offset, uint16_t mem_mask);
void text_w(offs_t offset, uint16_t data, uint16_t mem_mask);
@@ -1800,6 +1799,9 @@ private:
MC6845_UPDATE_ROW(crtc_update_row);
+ required_ioport m_frame_rate_sw;
+ memory_share_creator<uint8_t> m_clut;
+
uint16_t m_text_vram[TEXT_VRAM_SIZE];
uint16_t m_graphic_vram[GRAPHIC_VRAM_SIZE];
bool m_60hz;