summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2022-05-19 13:06:28 -0400
committer AJR <ajrhacker@users.noreply.github.com>2022-05-19 13:12:25 -0400
commit83ce568f51f182779f307241c28db657371d6045 (patch)
treec28bc5654fbe7edc539a5d8d9c45f3d5cd74da42 /src/mame/includes
parent239baf84a99f6a89c088112e1a48be8a13513104 (diff)
atarist.cpp: Cleanups and minor fixes
- Add cartridge software list and IPF floppy format to all sets - Add missing handlers to (still non-working) ste, megast and megaste memory maps, making megaste a megast derivative - Give HD6301 its own XTAL - Use array finders for HD6301 keyboard and joystick ports - Swap players for joystick and button inputs (needed for mouse to work) - Remove shifter mode 1 kludge that seems to hurt more than help
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/atarist.h45
1 files changed, 8 insertions, 37 deletions
diff --git a/src/mame/includes/atarist.h b/src/mame/includes/atarist.h
index 5cf2fbd28af..662a0ff9784 100644
--- a/src/mame/includes/atarist.h
+++ b/src/mame/includes/atarist.h
@@ -96,23 +96,8 @@ public:
m_ram(*this, RAM_TAG),
m_rs232(*this, RS232_TAG),
m_ymsnd(*this, YM2149_TAG),
- m_p31(*this, "P31"),
- m_p32(*this, "P32"),
- m_p33(*this, "P33"),
- m_p34(*this, "P34"),
- m_p35(*this, "P35"),
- m_p36(*this, "P36"),
- m_p37(*this, "P37"),
- m_p40(*this, "P40"),
- m_p41(*this, "P41"),
- m_p42(*this, "P42"),
- m_p43(*this, "P43"),
- m_p44(*this, "P44"),
- m_p45(*this, "P45"),
- m_p46(*this, "P46"),
- m_p47(*this, "P47"),
- m_joy0(*this, "IKBD_JOY0"),
- m_joy1(*this, "IKBD_JOY1"),
+ m_keys(*this, "P%o", 030),
+ m_joy(*this, "IKBD_JOY%u", 0U),
m_mousex(*this, "IKBD_MOUSEX"),
m_mousey(*this, "IKBD_MOUSEY"),
m_config(*this, "config"),
@@ -144,23 +129,8 @@ protected:
required_device<ram_device> m_ram;
required_device<rs232_port_device> m_rs232;
required_device<ym2149_device> m_ymsnd;
- required_ioport m_p31;
- required_ioport m_p32;
- required_ioport m_p33;
- required_ioport m_p34;
- required_ioport m_p35;
- required_ioport m_p36;
- required_ioport m_p37;
- required_ioport m_p40;
- required_ioport m_p41;
- required_ioport m_p42;
- required_ioport m_p43;
- required_ioport m_p44;
- required_ioport m_p45;
- required_ioport m_p46;
- required_ioport m_p47;
- optional_ioport m_joy0;
- optional_ioport m_joy1;
+ required_ioport_array<16> m_keys;
+ optional_ioport_array<2> m_joy;
optional_ioport m_mousex;
optional_ioport m_mousey;
optional_ioport m_config;
@@ -337,8 +307,12 @@ protected:
void ikbd_map(address_map &map);
void cpu_space_map(address_map &map);
void st_map(address_map &map);
+ void megast_map(address_map &map);
void keyboard(machine_config &config);
+ uint16_t fpu_r();
+ void fpu_w(uint16_t data);
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override;
virtual void machine_start() override;
virtual void video_start() override;
@@ -353,10 +327,7 @@ public:
: st_state(mconfig, type, tag)
{ }
- uint16_t fpu_r();
- void fpu_w(uint16_t data);
void megast(machine_config &config);
- void megast_map(address_map &map);
};
class ste_state : public st_state