Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 09:57:47 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

heathkit/h19.cpp: Implemented Shift-Reset functionality. (#11339)

Browse Source 
heathkit/h89.cpp: Hold the main CPU in reset while keys pressed.

heathkit/z37_fdc.cpp: Implemented device reset.
This commit is contained in:
Mark Garlanger 2023-06-18 10:33:28 -05:00 committed by GitHub
parent cd9ae37cb4
commit ec8a319154
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 131 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mame/heathkit/h89.cpp
View File

@ -123,6 +123,7 @@ private:
uint8_t raise_NMI_r();
void raise_NMI_w(uint8_t data);
void console_intr(uint8_t data);
void reset_line(int data);
};
/*
@ -364,7 +365,6 @@ void h89_state::machine_reset()
update_mem_view();
}
uint8_t h89_state::raise_NMI_r()
{
m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::from_usec(2));
@ -389,6 +389,15 @@ void h89_state::console_intr(uint8_t data)
}
}
void h89_state::reset_line(int data)
{
if (data == ASSERT_LINE)
{
reset();
}
m_maincpu->set_input_line(INPUT_LINE_RESET, data);
}
TIMER_DEVICE_CALLBACK_MEMBER(h89_state::h89_irq_timer)
{
if (m_timer_intr_enabled)
@ -448,6 +457,8 @@ void h89_state::h89(machine_config & config)
m_console->out_tx_callback().set(m_tlb, FUNC(heath_tlb_device::cb1_w));
m_tlb->serial_data_callback().set(m_console, FUNC(ins8250_uart_device::rx_w));
m_tlb->reset_cb().set(FUNC(h89_state::reset_line));
HEATH_Z37_FDC(config, m_h37);
m_h37->drq_cb().set(m_intr_cntrl, FUNC(z37_intr_cntrl::set_drq));
m_h37->irq_cb().set(m_intr_cntrl, FUNC(z37_intr_cntrl::set_intrq));

9
src/mame/heathkit/intr_cntrl.cpp
View File

@ -31,6 +31,10 @@ void heath_intr_cntrl::device_start()
m_intr_lines = 0;
}
void heath_intr_cntrl::device_reset()
{
}
void heath_intr_cntrl::update_intr_line()
{
@ -166,6 +170,11 @@ void z37_intr_cntrl::device_start()
m_fd_irq_raised = false;
}
void z37_intr_cntrl::device_reset()
{
heath_intr_cntrl::device_reset();
}
void z37_intr_cntrl::block_interrupts(uint8_t data)
{
m_interrupts_blocked = (data != CLEAR_LINE);

2
src/mame/heathkit/intr_cntrl.h
View File

@ -36,6 +36,7 @@ protected:
virtual void update_intr_line();
virtual void device_start() override;
virtual void device_reset() override;
devcb_write8 m_irq_line;
@ -61,6 +62,7 @@ protected:
virtual void update_intr_line() override;
virtual void device_start() override;
virtual void device_reset() override;
private:
bool m_interrupts_blocked;

86
src/mame/heathkit/tlb.cpp
View File

@ -19,12 +19,14 @@
TODO:
- determine why ULTRA ROM's self-diag (ESC |) fails for the ROM and
scratchpad memory
- when pressing "REPEAT", the other pressed key should repeatedly trigger
****************************************************************************/
/***************************************************************************
Memory Layout
The U435 three-to-eight line decoder uses A14 and A15 to generate three memory addresses:
The U435 three-to-eight line decoder uses A14 and A15 to generate
three memory addresses:
1. Program ROM 0x0000
2. Scratchpad RAM 0x4000
@ -33,7 +35,8 @@
Port Layout
Only address lines A5, A6, A7 are used by the U442 three-to-eight line decoder
Only address lines A5, A6, A7 are used by the U442 three-to-eight
line decoder
Address Description
----------------------------------------------------
@ -81,6 +84,7 @@ heath_tlb_device::heath_tlb_device(const machine_config &mconfig, device_type ty
device_t(mconfig, type, tag, owner, clock),
m_maincpu(*this, "maincpu"),
m_write_sd(*this),
m_reset(*this),
m_palette(*this, "palette"),
m_crtc(*this, "crtc"),
m_ace(*this, "ins8250"),
@ -151,23 +155,33 @@ static constexpr uint8_t KB_STATUS_ONLINE_KEY_MASK = 0x08;
static constexpr uint8_t KB_STATUS_REPEAT_KEYS_MASK = 0x40;
static constexpr uint8_t KB_STATUS_KEYBOARD_STROBE_MASK = 0x80;
void heath_tlb_device::device_start()
{
save_item(NAME(m_transchar));
save_item(NAME(m_strobe));
save_item(NAME(m_keyclickactive));
save_item(NAME(m_bellactive));
save_item(NAME(m_reset_pending));
save_item(NAME(m_right_shift));
save_item(NAME(m_reset_key));
m_strobe = false;
m_keyclickactive = false;
m_bellactive = false;
m_reset_pending = false;
m_right_shift = false;
m_reset_key = false;
m_key_click_timer = timer_alloc(FUNC(heath_tlb_device::key_click_off), this);
m_bell_timer = timer_alloc(FUNC(heath_tlb_device::bell_off), this);
}
void heath_tlb_device::device_reset()
{
m_strobe = false;
m_keyclickactive = false;
m_bellactive = false;
}
void heath_tlb_device::key_click_w(uint8_t data)
{
@ -212,17 +226,18 @@ uint8_t heath_tlb_device::kbd_key_r()
m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
m_strobe = false;
// high bit is for control key pressed, this is handled in the ROM, no processing needed.
// high bit is for control key pressed, this is handled in the ROM,
// no processing needed.
return m_transchar;
}
uint8_t heath_tlb_device::kbd_flags_r()
{
uint16_t modifiers = m_kbspecial->read();
uint8_t rv = modifiers & 0x7f;
uint8_t rv = modifiers & 0x7e;
// check both shifts
if ((modifiers & 0x020) == 0 || (modifiers & 0x100) == 0)
if ((modifiers & 0x120) != 0x120)
{
rv |= KB_STATUS_SHIFT_KEYS_MASK;
}
@ -237,12 +252,12 @@ uint8_t heath_tlb_device::kbd_flags_r()
int heath_tlb_device::mm5740_shift_r()
{
return ((m_kbspecial->read() ^ 0x120) & 0x120) ? ASSERT_LINE : CLEAR_LINE;
return ((m_kbspecial->read() & 0x120) != 0x120) ? ASSERT_LINE : CLEAR_LINE;
}
int heath_tlb_device::mm5740_control_r()
{
return ((m_kbspecial->read() ^ 0x10) & 0x10) ? ASSERT_LINE: CLEAR_LINE;
return (m_kbspecial->read() & 0x10) ? CLEAR_LINE : ASSERT_LINE;
}
void heath_tlb_device::mm5740_data_ready_w(int state)
@ -257,6 +272,37 @@ void heath_tlb_device::mm5740_data_ready_w(int state)
}
}
void heath_tlb_device::check_for_reset()
{
if (m_reset_key && m_right_shift)
{
m_reset_pending = true;
m_reset(ASSERT_LINE);
m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
else if (m_reset_pending)
{
m_reset_pending = false;
reset();
m_maincpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
m_reset(CLEAR_LINE);
}
}
void heath_tlb_device::reset_key_w(int state)
{
m_reset_key = (state == CLEAR_LINE);
check_for_reset();
}
void heath_tlb_device::right_shift_w(int state)
{
m_right_shift = (state == CLEAR_LINE);
check_for_reset();
}
MC6845_UPDATE_ROW(heath_tlb_device::crtc_update_row)
{
if (!de)
@ -326,8 +372,8 @@ static INPUT_PORTS_START( tlb )
PORT_BIT(0x020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("LeftShift") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
PORT_BIT(0x040, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Repeat") PORT_CODE(KEYCODE_LALT)
// bit 7 - 0x080 is low if a key is pressed
PORT_BIT(0x100, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("RightShift") PORT_CODE(KEYCODE_RSHIFT)
PORT_BIT(0x200, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Reset") PORT_CODE(KEYCODE_F10)
PORT_BIT(0x100, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("RightShift") PORT_CODE(KEYCODE_RSHIFT) PORT_WRITE_LINE_MEMBER(heath_tlb_device, right_shift_w)
PORT_BIT(0x200, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Reset") PORT_CODE(KEYCODE_F10) PORT_WRITE_LINE_MEMBER(heath_tlb_device, reset_key_w)
PORT_START("X1")
PORT_BIT(0x001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("/") PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
@ -378,15 +424,15 @@ static INPUT_PORTS_START( tlb )
PORT_BIT(0x200, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_START("X5")
PORT_BIT(0x001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1)
PORT_BIT(0x002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F2") PORT_CODE(KEYCODE_F2)
PORT_BIT(0x004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F3") PORT_CODE(KEYCODE_F3)
PORT_BIT(0x008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4)
PORT_BIT(0x010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5)
PORT_BIT(0x020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Erase") PORT_CODE(KEYCODE_F6)
PORT_BIT(0x040, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Blue") PORT_CODE(KEYCODE_F7)
PORT_BIT(0x080, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Red") PORT_CODE(KEYCODE_F8)
PORT_BIT(0x100, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Gray") PORT_CODE(KEYCODE_F9)
PORT_BIT(0x001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1))
PORT_BIT(0x002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F2") PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2))
PORT_BIT(0x004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F3") PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3))
PORT_BIT(0x008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4))
PORT_BIT(0x010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5))
PORT_BIT(0x020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Erase") PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6))
PORT_BIT(0x040, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Blue") PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7))
PORT_BIT(0x080, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Red") PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8))
PORT_BIT(0x100, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Gray") PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9))
PORT_BIT(0x200, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_START("X6")

11
src/mame/heathkit/tlb.h
View File

@ -27,15 +27,20 @@ public:
// interface routines
auto serial_data_callback() { return m_write_sd.bind(); }
auto reset_cb() { return m_reset.bind(); }
void cb1_w(int state);
void reset_key_w(int state);
void right_shift_w(int state);
protected:
heath_tlb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 0);
virtual ioport_constructor device_input_ports() const override;
virtual const tiny_rom_entry *device_rom_region() const override;
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
void mem_map(address_map &map);
@ -46,6 +51,7 @@ protected:
private:
void key_click_w(uint8_t data);
void bell_w(uint8_t data);
void check_for_reset();
uint8_t kbd_key_r();
uint8_t kbd_flags_r();
uint16_t translate_mm5740_b(uint16_t b);
@ -67,6 +73,7 @@ private:
emu_timer *m_bell_timer;
devcb_write_line m_write_sd;
devcb_write_line m_reset;
required_device<palette_device> m_palette;
required_device<mc6845_device> m_crtc;
@ -82,7 +89,9 @@ private:
bool m_strobe;
bool m_keyclickactive;
bool m_bellactive;
bool m_reset_pending;
bool m_right_shift;
bool m_reset_key;
};
class heath_super19_tlb_device : public heath_tlb_device

12
src/mame/heathkit/z37_fdc.cpp
View File

@ -170,6 +170,18 @@ void heath_z37_fdc_device::device_start()
m_access_track_sector = false;
}
void heath_z37_fdc_device::device_reset()
{
m_control_reg = 0;
m_interface_reg = 0;
m_intrq_allowed = false;
m_drq_allowed = false;
m_access_track_sector = false;
m_fd_irq_cb(CLEAR_LINE);
m_drq_cb(CLEAR_LINE);
}
static void z37_floppies(device_slot_interface &device)
{
// H-17-1

5
src/mame/heathkit/z37_fdc.h
View File

@ -27,7 +27,10 @@ public:
auto block_interrupt_cb() { return m_block_interrupt_cb.bind(); }
protected : virtual void device_start() override;
protected:
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_add_mconfig(machine_config &config) override;
void ctrl_w(uint8_t val);