summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/xtal.cpp1
-rw-r--r--src/mame/drivers/hektor.cpp340
-rw-r--r--src/mame/mame.lst2
3 files changed, 236 insertions, 107 deletions
diff --git a/src/emu/xtal.cpp b/src/emu/xtal.cpp
index ca69a8c54f9..058fa21b683 100644
--- a/src/emu/xtal.cpp
+++ b/src/emu/xtal.cpp
@@ -125,6 +125,7 @@ const double XTAL::known_xtals[] = {
5'911'000, /* 5.911_MHz_XTAL Philips Videopac Plus G7400 */
5'990'400, /* 5.9904_MHz_XTAL Luxor ABC 800 keyboard (Keytronic custom part #48-300-008 is equivalent) */
6'000'000, /* 6_MHz_XTAL American Poker II, Taito SJ System */
+ 6'048'000, /* 6.048_MHz_XTAL Hektor II */
6'144'000, /* 6.144_MHz_XTAL Used on Alpha Denshi early 80's games sound board, Casio FP-200 and Namco Universal System 16 */
6'400'000, /* 6.4_MHz_XTAL Textel Compact */
6'500'000, /* 6.5_MHz_XTAL Jupiter Ace, Roland QDD interface */
diff --git a/src/mame/drivers/hektor.cpp b/src/mame/drivers/hektor.cpp
index 0342dc91160..2ccaf6e621e 100644
--- a/src/mame/drivers/hektor.cpp
+++ b/src/mame/drivers/hektor.cpp
@@ -4,6 +4,19 @@
Open University Hektor
+ Hektor usage notes:
+ - G197B - tune machine (requires PT502 Peripheral Board)
+
+ Hektor 2 usage notes:
+ - G1B38 - tune machine (via TV speaker and PT502 Peripheral Board)
+
+ Hektor/Hektor 2 monitor commands:
+ - E - execute editor
+ - G - (go to) execute from addr
+ - T - test subsystems
+ - H - (high-level language) enter BASIC
+ - W - (warm start) re-enter BASIC
+
Hektor III usage notes:
- t - system test
- a1 - audio test (plays The Entertainer)
@@ -11,9 +24,59 @@
- ay - run analyser software in ROM1
- az - run analyser software in ROM2
+
+ Known PT502 Modules:
+
+ ME83A - Memory Expansion Module:
+
+ RAM: 6166/400ns
+ IC6 4000 - 47FF
+ IC5 4800 - 4FFF
+ IC4 5000 - 57FF
+ IC3 5800 - 5FFF
+
+ EPROM: 2732/400ns
+ IC2 C000
+ IC1 D000
+
+ EP83 - Eprom Programmer:
+
+ Hektor 1:
+ Read 2716 into RAM ... G1BBC
+ Write 2716 from RAM ... G1BBF
+ Read 2732 into RAM ... G1ACD
+ Write 2732 from RAM ... G1AD0
+
+ Hektor 1 RAM area 3000-3FFF
+
+ Hektor 2:
+ Read 2732 into RAM ... G1EA7
+ Write 2732 from RAM ... G1EAA
+
+ Hektor 2 RAM area 3000-3FFF
+
+ IO83 - Input/Output Prototyping Module:
+
+ 8155 Register Addresses:
+ 1. CS Register.........40H
+ 2. PA Register.........41H
+ 3. PB Register.........42H
+ 4. PC Register.........43H
+ 5. Timer Low Byte......44H
+ 6. Timer High Byte.....45H
+
+ Notes:
+ 1. The CS register sets the
+ port configuration:
+ Starts and stops the timer.
+ 2. Bits 0 to 13 in timer register
+ set count length; bits 14,15
+ set timer mode.
+
+
TODO:
- - Dump Hektor II ROMs, maybe 2 or 3 versions.
- - Emulate Expansion Bus and Peripheral Boards.
+ - Fix Hektor cassette interface, test with T.
+ - Add Expansion Bus and Peripheral Boards (probably not useful).
**********************************************************************/
@@ -22,7 +85,6 @@
#include "cpu/i8085/i8085.h"
#include "machine/i8155.h"
#include "machine/i8255.h"
-#include "machine/ram.h"
#include "sound/spkrdev.h"
#include "video/ef9364.h"
#include "video/mc6845.h"
@@ -33,13 +95,12 @@
#include "screen.h"
-class hektor_state : public driver_device
+class hektor_base_state : public driver_device
{
public:
- hektor_state(const machine_config &mconfig, device_type type, const char *tag)
+ hektor_base_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
- , m_maincpu_region(*this, "maincpu")
, m_i8155(*this, "i8155")
, m_kbd(*this, "KEY%u", 0)
, m_screen(*this, "screen")
@@ -47,19 +108,24 @@ public:
, m_speaker(*this, "speaker")
, m_cassette(*this, "cassette")
, m_rs232(*this, "rs232")
+ , m_kbd_row(0)
+ , m_motor(0)
{ }
+ DECLARE_INPUT_CHANGED_MEMBER(trigger_reset);
+ DECLARE_INPUT_CHANGED_MEMBER(trigger_rst65);
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
void i8155_porta_w(uint8_t data);
uint8_t i8155_portb_r();
+
DECLARE_READ_LINE_MEMBER(sid_r);
DECLARE_WRITE_LINE_MEMBER(sod_w);
- DECLARE_INPUT_CHANGED_MEMBER(trigger_reset);
- DECLARE_INPUT_CHANGED_MEMBER(trigger_rst65);
-
-protected:
required_device<i8085a_cpu_device> m_maincpu;
- required_memory_region m_maincpu_region;
required_device<i8155_device> m_i8155;
required_ioport_array<8> m_kbd;
required_device<screen_device> m_screen;
@@ -69,67 +135,78 @@ protected:
required_device<rs232_port_device> m_rs232;
uint8_t m_kbd_row;
- uint8_t m_i8155_portc;
-
-private:
- virtual void machine_start() override;
- virtual void machine_reset() override;
+ bool m_motor;
};
-class hektor2_state : public hektor_state
+class hektor_state : public hektor_base_state
{
public:
- hektor2_state(const machine_config &mconfig, device_type type, const char *tag)
- : hektor_state(mconfig, type, tag)
+ hektor_state(const machine_config &mconfig, device_type type, const char *tag)
+ : hektor_base_state(mconfig, type, tag)
, m_ef9364(*this, "ef9364")
+ , m_pt_i8155(*this, "pt_i8155")
+ , m_ef9364_st(0)
{ }
+ void hektor(machine_config &config);
void hektor2(machine_config &config);
+protected:
+ virtual void machine_start() override;
+
private:
+ void hektor_mem(address_map &map);
+ void hektor_io(address_map &map);
void hektor2_mem(address_map &map);
void i8155_portc_w(uint8_t data);
required_device<ef9364_device> m_ef9364;
+ required_device<i8155_device> m_pt_i8155;
+
+ int m_ef9364_st;
};
-class hektor3_state : public hektor_state
+class hektor3_state : public hektor_base_state
{
public:
hektor3_state(const machine_config &mconfig, device_type type, const char *tag)
- : hektor_state(mconfig, type, tag)
+ : hektor_base_state(mconfig, type, tag)
+ , m_rom(*this, "maincpu")
, m_ram(*this, "ram")
+ , m_bank(*this, "bank")
, m_hd6845(*this, "hd6845")
, m_i8255(*this, "i8255")
{ }
void hektor3(machine_config &config);
+protected:
+ virtual void machine_start() override;
+
private:
void hektor3_mem(address_map &map);
void hektor3_io(address_map &map);
- uint8_t mem_r(offs_t offset);
- void mem_w(offs_t offset, uint8_t data);
-
void i8155_portc_w(uint8_t data);
MC6845_UPDATE_ROW(crtc_update_row);
- required_device<ram_device> m_ram;
+ required_memory_region m_rom;
+ required_shared_ptr<uint8_t> m_ram;
+ required_memory_bank m_bank;
required_device<hd6845s_device> m_hd6845;
required_device<i8255_device> m_i8255;
};
-void hektor_state::i8155_porta_w(uint8_t data)
+void hektor_base_state::i8155_porta_w(uint8_t data)
{
m_kbd_row = data;
}
-uint8_t hektor_state::i8155_portb_r()
+uint8_t hektor_base_state::i8155_portb_r()
{
for (int col = 0; col < 8; col++)
{
@@ -139,72 +216,60 @@ uint8_t hektor_state::i8155_portb_r()
return 0xff;
}
-void hektor2_state::i8155_portc_w(uint8_t data)
+void hektor_state::i8155_portc_w(uint8_t data)
{
- m_i8155_portc = data;
-
/* bit 0: EF9364 strobe ST */
/* bit 1: EF9364 command C0 */
/* bit 2: EF9364 command C1 */
/* bit 3: EF9364 command C2 */
- m_ef9364->command_w((data & 0x1f) >> 1);
+ if (!m_ef9364_st && BIT(data, 0))
+ m_ef9364->command_w(data >> 1);
+ m_ef9364_st = BIT(data, 0);
- /* bit 5: cassette motor */
- m_cassette->change_state(BIT(data, 5) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR);
+ /* bit 4: enable latch output */
- /* bit 6: audio out */
- m_speaker->level_w(BIT(data, 6)); // TODO: verify which bit
+ /* bit 5: cassette motor */
+ m_motor = BIT(data, 5);
+ m_cassette->change_state(m_motor ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR);
}
void hektor3_state::i8155_portc_w(uint8_t data)
{
- m_i8155_portc = data;
-
/* bit 2: audio out */
m_speaker->level_w(BIT(data, 2));
/* bit 3: cassette motor */
- m_cassette->change_state(BIT(data, 3) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR);
+ m_motor = BIT(data, 3);
+ m_cassette->change_state(m_motor ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR);
/* bit 5: ROM enable */
+ if (BIT(data, 5))
+ m_bank->set_base(m_rom->base());
+ else
+ m_bank->set_base(m_ram);
}
-READ_LINE_MEMBER(hektor_state::sid_r)
+READ_LINE_MEMBER(hektor_base_state::sid_r)
{
- if (BIT(m_i8155_portc, 3))
- return (m_cassette->input() < 0.03);
+ if (m_motor)
+ return (m_cassette->input() > 0.0 ? 1 : 0);
else
return m_rs232->rxd_r();
}
-WRITE_LINE_MEMBER(hektor_state::sod_w)
+WRITE_LINE_MEMBER(hektor_base_state::sod_w)
{
- if (BIT(m_i8155_portc, 3))
+ /* tv out (confirmed for Hektor 2 only) */
+ m_speaker->level_w(state);
+
+ if (m_motor)
m_cassette->output(state ? -1.0 : +1.0);
else
m_rs232->write_txd(state);
}
-uint8_t hektor3_state::mem_r(offs_t offset)
-{
- uint8_t data;
-
- if (BIT(m_i8155_portc, 5))
- data = m_maincpu_region->base()[offset];
- else
- data = m_ram->pointer()[offset];
-
- return data;
-}
-
-void hektor3_state::mem_w(offs_t offset, uint8_t data)
-{
- m_ram->pointer()[offset] = data;
-}
-
-
MC6845_UPDATE_ROW(hektor3_state::crtc_update_row)
{
const pen_t *pen = m_palette->pens();
@@ -212,7 +277,7 @@ MC6845_UPDATE_ROW(hektor3_state::crtc_update_row)
for (int x = 0; x < x_count; x++)
{
uint16_t offset = (ra << 11) | ((ma + x) & 0x7ff);
- uint8_t data = m_ram->pointer()[~offset & 0xffff];
+ uint8_t data = m_ram[~offset & 0xffff];
if (x == cursor_x) data ^= 0xff;
bitmap.pix(y, x * 8 + 0) = pen[BIT(data, 7)];
@@ -227,25 +292,48 @@ MC6845_UPDATE_ROW(hektor3_state::crtc_update_row)
}
-void hektor2_state::hektor2_mem(address_map &map)
+void hektor_state::hektor_mem(address_map &map)
{
- map(0x0000, 0x0fff).mirror(0x8000).rom();
- map(0x1000, 0x1fff).mirror(0x8000).rom();
+ map(0x0000, 0x0fff).mirror(0x8000).rom().region("maincpu", 0x0000); // skt0
+ map(0x1000, 0x1fff).mirror(0x8000).rom().region("maincpu", 0x1000); // skt1
+ map(0x2800, 0x2bff).mirror(0x8000).w(m_ef9364, FUNC(ef9364_device::char_latch_w));
+ map(0x2c00, 0x2cff).mirror(0x0300).rw(m_i8155, FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w));
+ map(0x3000, 0x33ff).mirror(0x8000).ram(); // skt2
+ map(0x3400, 0x37ff).mirror(0x8000).ram(); // skt3
+ map(0x3800, 0x3bff).mirror(0x8000).ram(); // skt4
+ map(0x3c00, 0x3fff).mirror(0x8000).ram(); // skt5
+ map(0x4000, 0x40ff).mirror(0x8000).rw(m_pt_i8155, FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w)); // pt502 peripheral board
+ map(0xac00, 0xac07).mirror(0x03f8).rw(m_i8155, FUNC(i8155_device::io_r), FUNC(i8155_device::io_w));
+}
+
+void hektor_state::hektor_io(address_map &map)
+{
+ // pt502 peripheral board - PA = unknown, PB = b4 sound, PC = unknown
+ map(0x40, 0x47).rw(m_pt_i8155, FUNC(i8155_device::io_r), FUNC(i8155_device::io_w));
+
+ // tm222 peripheral board - PA = board switches, PB = board leds, PC = board pushbuttons
+ //map(0x80, 0x83).rw(m_tm_i8255, FUNC(i8255_device::read), FUNC(i8255_device::write));
+}
+
+
+void hektor_state::hektor2_mem(address_map &map)
+{
+ map(0x0000, 0x0fff).mirror(0x8000).rom().region("maincpu", 0x0000); // skt0
+ map(0x1000, 0x1fff).mirror(0x8000).rom().region("maincpu", 0x1000); // skt1
map(0x2000, 0x23ff).mirror(0x8000).w(m_ef9364, FUNC(ef9364_device::char_latch_w));
- map(0x2400, 0x27ff).rw("i8155", FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w));
- map(0x2800, 0x2fff).mirror(0x8000).ram();
- map(0x3000, 0x37ff).mirror(0x8000).ram();
- map(0x3800, 0x3fff).mirror(0x8000).ram();
- map(0x4000, 0x5fff).mirror(0x8000).noprw();
- map(0x6000, 0x6fff).mirror(0x8000).noprw();
- map(0x7000, 0x7fff).mirror(0x8000).rom();
- map(0xa400, 0xa7ff).rw("i8155", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w));
+ map(0x2400, 0x24ff).mirror(0x0300).rw(m_i8155, FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w));
+ map(0x2800, 0x2fff).mirror(0x8000).ram(); // skt3
+ map(0x3000, 0x37ff).mirror(0x8000).ram(); // skt4
+ map(0x3800, 0x3fff).mirror(0x8000).ram(); // skt5
+ map(0x4000, 0x40ff).mirror(0x8000).rw(m_pt_i8155, FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w)); // pt502 peripheral board
+ map(0x7000, 0x7fff).mirror(0x8000).rom().region("maincpu", 0x2000); // skt2
+ map(0xa400, 0xa407).mirror(0x03f8).rw(m_i8155, FUNC(i8155_device::io_r), FUNC(i8155_device::io_w));
}
void hektor3_state::hektor3_mem(address_map &map)
{
- map(0x0000, 0xffff).rw(FUNC(hektor3_state::mem_r), FUNC(hektor3_state::mem_w));
+ map(0x0000, 0xffff).bankr("bank").writeonly().share("ram");
}
void hektor3_state::hektor3_io(address_map &map)
@@ -257,7 +345,7 @@ void hektor3_state::hektor3_io(address_map &map)
}
-static INPUT_PORTS_START(hektor2)
+static INPUT_PORTS_START(hektor)
PORT_START("KEY0")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
@@ -339,22 +427,22 @@ static INPUT_PORTS_START(hektor2)
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
PORT_START("RESET")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Reset") PORT_CODE(KEYCODE_ESC) PORT_CHANGED_MEMBER(DEVICE_SELF, hektor_state, trigger_reset, 0)
- PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Break") PORT_CODE(KEYCODE_TAB) PORT_CHANGED_MEMBER(DEVICE_SELF, hektor_state, trigger_rst65, 0)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Reset") PORT_CODE(KEYCODE_ESC) PORT_CHANGED_MEMBER(DEVICE_SELF, hektor_base_state, trigger_reset, 0)
+ PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Break") PORT_CODE(KEYCODE_TAB) PORT_CHANGED_MEMBER(DEVICE_SELF, hektor_base_state, trigger_rst65, 0)
INPUT_PORTS_END
-INPUT_CHANGED_MEMBER(hektor_state::trigger_reset)
+INPUT_CHANGED_MEMBER(hektor_base_state::trigger_reset)
{
m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? CLEAR_LINE : ASSERT_LINE);
}
-INPUT_CHANGED_MEMBER(hektor_state::trigger_rst65)
+INPUT_CHANGED_MEMBER(hektor_base_state::trigger_rst65)
{
m_maincpu->set_input_line(I8085_RST65_LINE, newval ? CLEAR_LINE : ASSERT_LINE);
}
static INPUT_PORTS_START(hektor3)
- PORT_INCLUDE(hektor2)
+ PORT_INCLUDE(hektor)
PORT_MODIFY("KEY1")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Caps Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
@@ -369,26 +457,41 @@ static INPUT_PORTS_START(hektor3)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0 _") PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('_')
PORT_MODIFY("RESET")
- PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) PORT_CHANGED_MEMBER(DEVICE_SELF, hektor_state, trigger_reset, 0)
+ PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC)) PORT_CHANGED_MEMBER(DEVICE_SELF, hektor_base_state, trigger_reset, 0)
INPUT_PORTS_END
-void hektor_state::machine_start()
+void hektor_base_state::machine_start()
{
save_item(NAME(m_kbd_row));
- save_item(NAME(m_i8155_portc));
+ save_item(NAME(m_motor));
+}
+
+void hektor_state::machine_start()
+{
+ hektor_base_state::machine_start();
+
+ save_item(NAME(m_ef9364_st));
+}
+
+void hektor3_state::machine_start()
+{
+ hektor_base_state::machine_start();
+
+ m_bank->set_base(m_rom->base());
}
-void hektor_state::machine_reset()
+void hektor_base_state::machine_reset()
{
- m_i8155_portc = 0xff;
+ m_maincpu->set_input_line(I8085_TRAP_LINE, CLEAR_LINE);
}
-void hektor2_state::hektor2(machine_config &config)
+void hektor_state::hektor(machine_config &config)
{
- I8085A(config, m_maincpu, 6.144_MHz_XTAL); // TODO: verify crystal, manual says 6.048_MHz_XTAL
- m_maincpu->set_addrmap(AS_PROGRAM, &hektor2_state::hektor2_mem);
+ I8085A(config, m_maincpu, 6.144_MHz_XTAL);
+ m_maincpu->set_addrmap(AS_PROGRAM, &hektor_state::hektor_mem);
+ m_maincpu->set_addrmap(AS_IO, &hektor_state::hektor_io);
m_maincpu->in_sid_func().set(FUNC(hektor_state::sid_r));
m_maincpu->out_sod_func().set(FUNC(hektor_state::sod_w));
m_maincpu->set_clk_out("i8155", FUNC(i8155_device::set_unscaled_clock_int));
@@ -396,7 +499,7 @@ void hektor2_state::hektor2(machine_config &config)
I8155(config, m_i8155, 6.144_MHz_XTAL / 2);
m_i8155->out_pa_callback().set(FUNC(hektor_state::i8155_porta_w));
m_i8155->in_pb_callback().set(FUNC(hektor_state::i8155_portb_r));
- m_i8155->out_pc_callback().set(FUNC(hektor2_state::i8155_portc_w));
+ m_i8155->out_pc_callback().set(FUNC(hektor_state::i8155_portc_w));
m_i8155->out_to_callback().set_inputline(m_maincpu, I8085_TRAP_LINE);
CASSETTE(config, m_cassette);
@@ -413,14 +516,31 @@ void hektor2_state::hektor2(machine_config &config)
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_refresh_hz(50);
m_screen->set_screen_update("ef9364", FUNC(ef9364_device::screen_update));
- m_screen->set_size(64 * 8, 16 * 8);
- m_screen->set_visarea(0, 64 * 8 - 1, 0, 16 * 8 - 1);
+ m_screen->set_size(64 * 8, 16 * (8 + 4));
+ m_screen->set_visarea(0, 64 * 8 - 1, 0, 16 * (8 + 4) - 1);
PALETTE(config, m_palette, palette_device::MONOCHROME);
EF9364(config, m_ef9364, 6.144_MHz_XTAL / 6);
m_ef9364->set_palette_tag("palette");
m_ef9364->set_nb_of_pages(1);
+ m_ef9364->set_erase(0x20);
+
+ // pt502 peripheral board
+ I8155(config, m_pt_i8155, 6.144_MHz_XTAL / 2);
+ m_pt_i8155->out_pb_callback().set(m_speaker, FUNC(speaker_sound_device::level_w)).bit(4);
+}
+
+
+void hektor_state::hektor2(machine_config &config)
+{
+ hektor(config);
+
+ m_maincpu->set_clock(6.048_MHz_XTAL);
+ m_maincpu->set_addrmap(AS_PROGRAM, &hektor_state::hektor2_mem);
+ m_maincpu->set_addrmap(AS_IO, &hektor_state::hektor_io);
+
+ m_ef9364->set_clock(6.048_MHz_XTAL / 6);
}
@@ -429,13 +549,13 @@ void hektor3_state::hektor3(machine_config &config)
I8085A(config, m_maincpu, 16_MHz_XTAL / 2); // TODO: divider guessed
m_maincpu->set_addrmap(AS_PROGRAM, &hektor3_state::hektor3_mem);
m_maincpu->set_addrmap(AS_IO, &hektor3_state::hektor3_io);
- m_maincpu->in_sid_func().set(FUNC(hektor_state::sid_r));
- m_maincpu->out_sod_func().set(FUNC(hektor_state::sod_w));
+ m_maincpu->in_sid_func().set(FUNC(hektor3_state::sid_r));
+ m_maincpu->out_sod_func().set(FUNC(hektor3_state::sod_w));
m_maincpu->set_clk_out("i8155", FUNC(i8155_device::set_unscaled_clock_int));
I8155(config, m_i8155, 16_MHz_XTAL / 4);
- m_i8155->out_pa_callback().set(FUNC(hektor_state::i8155_porta_w));
- m_i8155->in_pb_callback().set(FUNC(hektor_state::i8155_portb_r));
+ m_i8155->out_pa_callback().set(FUNC(hektor3_state::i8155_porta_w));
+ m_i8155->in_pb_callback().set(FUNC(hektor3_state::i8155_portb_r));
m_i8155->out_pc_callback().set(FUNC(hektor3_state::i8155_portc_w));
m_i8155->out_to_callback().set_inputline(m_maincpu, I8085_TRAP_LINE);
@@ -452,8 +572,6 @@ void hektor3_state::hektor3(machine_config &config)
I8255(config, m_i8255); // I/O Port
- RAM(config, m_ram).set_default_size("64K").set_default_value(0xff);
-
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_raw(16_MHz_XTAL, 1024, 0, 640, 312, 0, 240);
m_screen->set_screen_update("hd6845", FUNC(hd6845s_device::screen_update));
@@ -468,17 +586,24 @@ void hektor3_state::hektor3(machine_config &config)
}
-#ifdef UNUSED_DEFINITION
+ROM_START(hektor)
+ ROM_REGION(0x2000, "maincpu", 0)
+ ROM_LOAD("hek1a_skt0.rom", 0x0000, 0x1000, CRC(cadf4d57) SHA1(ffcecac16cc8cf12e65acb359c3dfe26b06e43d1))
+ ROM_LOAD("hek1a_skt1.rom", 0x1000, 0x1000, CRC(dbcaa026) SHA1(fa83e65f6125a3ef2a219ef69a3dd939888cb545))
+
+ ROM_REGION(0x800, "ef9364", 0)
+ ROM_LOAD("hek1a.ic5", 0x0000, 0x0800, CRC(a04e2061) SHA1(01d95d7e2f62d9c1b952888133e6b0dedf971987))
+ROM_END
+
ROM_START(hektor2)
- ROM_REGION(0x8000, "maincpu", 0)
- ROM_LOAD("hek1a_skt0.rom", 0x0000, 0x1000, NO_DUMP)
- ROM_LOAD("hek1a_skt1.rom", 0x1000, 0x1000, NO_DUMP)
- ROM_LOAD("hek1a_ic5.rom", 0x7000, 0x1000, NO_DUMP)
+ ROM_REGION(0x3000, "maincpu", 0)
+ ROM_LOAD("hek2_skt0.rom", 0x0000, 0x1000, CRC(2cc5cf07) SHA1(ce40a594be17532e636a7cbcc75c7d18377f3dca))
+ ROM_LOAD("hek2_skt1.rom", 0x1000, 0x1000, CRC(b2388185) SHA1(d084df17aa5e333831fa94e02699673b088ee5ca))
+ ROM_LOAD("hek2_skt2.rom", 0x2000, 0x1000, CRC(805c62a4) SHA1(f698d78274133124ee9f5420a5b5142b84a22922))
ROM_REGION(0x800, "ef9364", 0)
- ROM_LOAD("charset.bin", 0x0000, 0x0800, NO_DUMP)
+ ROM_LOAD("hek2.ic5", 0x0000, 0x0800, CRC(1e9ec285) SHA1(f1cbbff8460d69b231e41e0779f2c3572982051a))
ROM_END
-#endif
ROM_START(hektor3)
ROM_REGION(0x10000, "maincpu", 0)
@@ -489,6 +614,7 @@ ROM_START(hektor3)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-//COMP( 1982, hektor2, 0, 0, hektor2, hektor2, hektor2_state, empty_init, "The Open University", "Hektor II (PT502)", MACHINE_NOT_WORKING )
-COMP( 1984, hektor3, 0, 0, hektor3, hektor3, hektor3_state, empty_init, "The Open University", "Hektor III", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1981, hektor, hektor2, 0, hektor, hektor, hektor_state, empty_init, "The Open University", "Hektor", 0 )
+COMP( 1982, hektor2, 0, 0, hektor2, hektor, hektor_state, empty_init, "The Open University", "Hektor II", 0 )
+COMP( 1984, hektor3, 0, 0, hektor3, hektor3, hektor3_state, empty_init, "The Open University", "Hektor III", 0 )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 68bd96f5aad..a699c3100f7 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -15943,6 +15943,8 @@ interact //
victor //
@source:hektor.cpp
+hektor // Hektor
+hektor2 // Hektor II
hektor3 // Hektor III
@source:hexion.cpp