Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 08:22:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

amiga keyboard: add some comments to break up the mass of code (nw)

Browse Source 
mac128k: fix code rot (nw)
This commit is contained in:
Vas Crabb 2018-08-24 18:09:15 +10:00
parent 5cb33a23c7
commit 858a0e29b3
2 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/devices/bus/amiga/keyboard/mitsumi.cpp
View File

@ -84,6 +84,10 @@
namespace {
//**************************************************************************
// ROM DEFINITIONS
//**************************************************************************
ROM_START(keyboard_old)
ROM_REGION(0x0800, "mcu", 0)
ROM_LOAD("6500-1", 0x0000, 0x0800, CRC(4a3fc332) SHA1(83b21d0c8b93fc9b9b3b287fde4ec8f3badac5a2) BAD_DUMP) // using newer program until we get a dump
@ -95,6 +99,10 @@ ROM_START(keyboard_new)
ROM_END
//**************************************************************************
// KEYBOARD BASE CLASSES
//**************************************************************************
class mitsumi_keyboard_base : public device_t, public device_amiga_keyboard_interface
{
public:
@ -400,6 +408,10 @@ protected:
};
//**************************************************************************
// COMMON PORT DEFINITIONS
//**************************************************************************
INPUT_PORTS_START(fullsize_cols)
PORT_START("COLS")
PORT_BIT(0xfc, IP_ACTIVE_LOW, IPT_CUSTOM) PORT_CUSTOM_MEMBER(DEVICE_SELF, mitsumi_keyboard_base, cols_r, nullptr)
@ -428,6 +440,10 @@ INPUT_PORTS_START(mitsumi_meta)
INPUT_PORTS_END
//**************************************************************************
// A1000 KEYBOARD PORT DEFINITIONS
//**************************************************************************
INPUT_PORTS_START(a1000_us)
PORT_INCLUDE(fullsize_cols)
PORT_INCLUDE(mitsumi_meta)
@ -498,6 +514,10 @@ INPUT_PORTS_START(a1000_gb)
INPUT_PORTS_END
//**************************************************************************
// FULL SIZE KEYBOARD PORT DEFINITIONS
//**************************************************************************
INPUT_PORTS_START(fullsize_us)
PORT_INCLUDE(fullsize_cols)
PORT_INCLUDE(mitsumi_meta)
@ -559,6 +579,10 @@ INPUT_PORTS_START(fullsize_gb)
INPUT_PORTS_END
//**************************************************************************
// COMPACT KEYBOARD PORT DEFINITIONS
//**************************************************************************
INPUT_PORTS_START(compact_us)
PORT_INCLUDE(compact_cols)
PORT_INCLUDE(mitsumi_meta)
@ -630,6 +654,10 @@ INPUT_PORTS_START(compact_gb)
INPUT_PORTS_END
//**************************************************************************
// A500 KEYBOARD CLASSES
//**************************************************************************
class a500_keyboard_us : public a500_keyboard_base
{
public:
@ -741,6 +769,10 @@ protected:
};
//**************************************************************************
// A600 KEYBOARD CLASSES
//**************************************************************************
class a600_keyboard_us : public a600_keyboard_base
{
public:
@ -852,6 +884,10 @@ protected:
};
//**************************************************************************
// A1000 KEYBOARD CLASSES
//**************************************************************************
class a1000_keyboard_us : public a1000_keyboard_base
{
public:
@ -930,6 +966,10 @@ protected:
};
//**************************************************************************
// A2000/A3000/A4000/CDTV KEYBOARD CLASSES
//**************************************************************************
class a2000_keyboard_us : public mitsumi_watchdog_keyboard_base
{
public:

12
src/mame/drivers/mac128.cpp
View File

@ -142,8 +142,8 @@ enum mac128model_t
class mac128_state : public driver_device
{
public:
mac128_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
mac128_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_via(*this, "via6522_0"),
m_ram(*this, RAM_TAG),
@ -252,6 +252,8 @@ private:
#ifndef MAC_USE_EMULATED_KBD
TIMER_CALLBACK_MEMBER(kbd_clock);
TIMER_CALLBACK_MEMBER(inquiry_timeout_func);
#else
DECLARE_WRITE_LINE_MEMBER(mac_kbd_clk_in);
#endif
DECLARE_WRITE_LINE_MEMBER(mac_via_out_cb2);
DECLARE_READ8_MEMBER(mac_via_in_a);
@ -951,8 +953,8 @@ WRITE_LINE_MEMBER(mac128_state::mac_kbd_clk_in)
WRITE_LINE_MEMBER(mac128_state::mac_via_out_cb2)
{
printf("Sending %d to kbd (PC=%x)\n", data, m_maincpu->pc());
m_mackbd->data_w((data & 1) ? ASSERT_LINE : CLEAR_LINE);
printf("Sending %d to kbd (PC=%x)\n", state, m_maincpu->pc());
m_mackbd->data_w(state ? ASSERT_LINE : CLEAR_LINE);
}
#else // keyboard HLE
@ -1346,7 +1348,7 @@ void mac128_state::mac512ke(machine_config &config)
m_screen->set_palette("palette");
palette_device &palette(PALETTE(config, "palette", 2));
palette.set_init(DEVICE_SELF_OWNER, FUNC(mac128_state::palette_init));
palette.set_init(DEVICE_SELF, FUNC(mac128_state::palette_init));
MCFG_VIDEO_START_OVERRIDE(mac128_state,mac)