summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2020-07-02 22:14:53 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2020-07-02 22:14:53 +1000
commit3a2bf1c61bcef3384e8f2439392f7a698e68fb71 (patch)
tree175b46def0d5fae9964a3d8b8535786537557bcc /src
parent13b966c537fb1457ebde81bcf4bda34c5d17a64c (diff)
mikro80: cleanup
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/mikro80.cpp112
-rw-r--r--src/mame/includes/mikro80.h80
-rw-r--r--src/mame/machine/mikro80.cpp86
-rw-r--r--src/mame/video/mikro80.cpp40
4 files changed, 143 insertions, 175 deletions
diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp
index 1d0d2cdef28..d9952df0e55 100644
--- a/src/mame/drivers/mikro80.cpp
+++ b/src/mame/drivers/mikro80.cpp
@@ -2,9 +2,14 @@
// copyright-holders:Miodrag Milanovic
/***************************************************************************
- MIKRO80 driver by Miodrag Milanovic
+MIKRO80 driver by Miodrag Milanovic
- 10/03/2008 Preliminary driver.
+2008-03-10 Preliminary driver.
+
+
+ToDo:
+- Cassette save produces incorrect signal - need schematic of CMT.
+- Kristall doesn't seem to have any tape load/save facility?
****************************************************************************/
@@ -22,35 +27,36 @@
/* Address maps */
void mikro80_state::mikro80_mem(address_map &map)
{
- map(0x0000, 0x07ff).bankrw("bank1"); // First bank
- map(0x0800, 0xdfff).ram(); // RAM
- map(0xe000, 0xe7ff).ram().share("cursor_ram");// Video RAM
- map(0xe800, 0xefff).ram().share("video_ram"); // Video RAM
- map(0xf000, 0xf7ff).ram(); // RAM
- map(0xf800, 0xffff).rom(); // System ROM
+ map(0x0000, 0xdfff).ram().share("mainram");
+ map(0xe000, 0xe7ff).ram().share("attrram");
+ map(0xe800, 0xefff).ram().share("videoram");
+ map(0xf000, 0xf7ff).ram();
+ map(0xf800, 0xffff).rom().region("maincpu",0);
}
void mikro80_state::mikro80_io(address_map &map)
{
map.unmap_value_high();
- map(0x01, 0x01).rw(FUNC(mikro80_state::mikro80_tape_r), FUNC(mikro80_state::mikro80_tape_w));
- map(0x04, 0x07).rw(FUNC(mikro80_state::mikro80_keyboard_r), FUNC(mikro80_state::mikro80_keyboard_w));
+ map(0x01, 0x01).rw(FUNC(mikro80_state::tape_r), FUNC(mikro80_state::tape_w));
+ map(0x04, 0x07).lr8(NAME([this] (offs_t offset) { return m_ppi->read(offset^3); })).lw8(NAME([this] (offs_t offset, u8 data) { m_ppi->write(offset^3, data); }));
}
void mikro80_state::kristall_io(address_map &map)
{
map.unmap_value_high();
- map(0x00, 0x03).rw(m_ppi8255, FUNC(i8255_device::read), FUNC(i8255_device::write));
+ map(0x00, 0x03).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
+ // map(0x20, 0x23). init byte 8B, so possibly another ppi with reversed offset like mikro80
}
void mikro80_state::radio99_io(address_map &map)
{
map.unmap_value_high();
- map(0x01, 0x01).rw(FUNC(mikro80_state::mikro80_tape_r), FUNC(mikro80_state::mikro80_tape_w));
- map(0x04, 0x04).w(FUNC(mikro80_state::radio99_sound_w));
- map(0x05, 0x05).rw(FUNC(mikro80_state::mikro80_8255_portc_r), FUNC(mikro80_state::mikro80_8255_portc_w));
- map(0x06, 0x06).r(FUNC(mikro80_state::mikro80_8255_portb_r));
- map(0x07, 0x07).w(FUNC(mikro80_state::mikro80_8255_porta_w));
+ map(0x01, 0x01).rw(FUNC(mikro80_state::tape_r), FUNC(mikro80_state::tape_w));
+ // no init byte, so ppi has been replaced by ordinary latches
+ map(0x04, 0x04).w(FUNC(mikro80_state::sound_w));
+ map(0x05, 0x05).rw(FUNC(mikro80_state::portc_r), FUNC(mikro80_state::portc_w));
+ map(0x06, 0x06).r(FUNC(mikro80_state::portb_r));
+ map(0x07, 0x07).w(FUNC(mikro80_state::porta_w));
}
/* Input ports */
@@ -147,7 +153,7 @@ static INPUT_PORTS_START( mikro80 )
INPUT_PORTS_END
/* F4 Character Displayer */
-static const gfx_layout mikro80_charlayout =
+static const gfx_layout charlayout =
{
8, 8, /* 8 x 8 characters */
256, /* 256 characters */
@@ -161,9 +167,42 @@ static const gfx_layout mikro80_charlayout =
};
static GFXDECODE_START( gfx_mikro80 )
- GFXDECODE_ENTRY( "gfx1", 0x0000, mikro80_charlayout, 0, 1 )
+ GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
GFXDECODE_END
+u32 mikro80_state::screen_update_mikro80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ u16 sy=0,ma=0;
+
+ for (u8 y = 0; y < 32; y++)
+ {
+ for (u8 ra = 0; ra < 8; ra++)
+ {
+ u16 *p = &bitmap.pix16(sy++);
+
+ for (u16 x = ma; x < ma + 64; x++)
+ {
+ bool attr = BIT(m_aram[x+1], 7);
+ u8 chr = m_vram[x];
+ u8 gfx = m_p_chargen[(chr<<3) | ra ] ^ (attr ? 0xff : 0);
+
+ /* Display a scanline of a character */
+ *p++ = BIT(gfx, 7);
+ *p++ = BIT(gfx, 6);
+ *p++ = BIT(gfx, 5);
+ *p++ = BIT(gfx, 4);
+ *p++ = BIT(gfx, 3);
+ *p++ = BIT(gfx, 2);
+ *p++ = BIT(gfx, 1);
+ *p++ = BIT(gfx, 0);
+ }
+ }
+ ma+=64;
+ }
+ return 0;
+}
+
+
void mikro80_state::mikro80(machine_config &config)
{
/* basic machine hardware */
@@ -171,10 +210,10 @@ void mikro80_state::mikro80(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &mikro80_state::mikro80_mem);
m_maincpu->set_addrmap(AS_IO, &mikro80_state::mikro80_io);
- I8255(config, m_ppi8255);
- m_ppi8255->out_pa_callback().set(FUNC(mikro80_state::mikro80_8255_porta_w));
- m_ppi8255->in_pb_callback().set(FUNC(mikro80_state::mikro80_8255_portb_r));
- m_ppi8255->in_pc_callback().set(FUNC(mikro80_state::mikro80_8255_portc_r));
+ I8255(config, m_ppi);
+ m_ppi->out_pa_callback().set(FUNC(mikro80_state::porta_w));
+ m_ppi->in_pb_callback().set(FUNC(mikro80_state::portb_r));
+ m_ppi->in_pc_callback().set(FUNC(mikro80_state::portc_r));
/* video hardware */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -206,7 +245,7 @@ void mikro80_state::radio99(machine_config &config)
/* basic machine hardware */
m_maincpu->set_addrmap(AS_IO, &mikro80_state::radio99_io);
- DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.12);
+ DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.50);
voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
}
@@ -221,29 +260,32 @@ void mikro80_state::kristall(machine_config &config)
/* ROM definition */
ROM_START( mikro80 )
- ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
- ROM_LOAD( "mikro80.rom", 0xf800, 0x0800, CRC(63a4b72a) SHA1(6bd3e396539a15e2ccffa7486cae06ef6ddd1d03))
- ROM_REGION(0x0800, "gfx1",0)
+ ROM_REGION( 0x0800, "maincpu", 0 )
+ ROM_LOAD( "mikro80.rom", 0x0000, 0x0800, CRC(63a4b72a) SHA1(6bd3e396539a15e2ccffa7486cae06ef6ddd1d03))
+
+ ROM_REGION(0x0800, "chargen",0)
ROM_LOAD ("mikro80.fnt", 0x0000, 0x0800, CRC(43eb72bb) SHA1(761319cc6747661b33e84aa449cec83800543b5b) )
ROM_END
ROM_START( radio99 )
- ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
- ROM_LOAD( "monrk88.bin", 0xf800, 0x0800, CRC(5415d847) SHA1(c8233c72548bc79846b9d998766a10df349c5bda))
- ROM_REGION(0x0800, "gfx1",0)
+ ROM_REGION( 0x0800, "maincpu", 0 )
+ ROM_LOAD( "monrk88.bin", 0x0000, 0x0800, CRC(5415d847) SHA1(c8233c72548bc79846b9d998766a10df349c5bda))
+
+ ROM_REGION(0x0800, "chargen",0)
ROM_LOAD ("mikro80.fnt", 0x0000, 0x0800, CRC(43eb72bb) SHA1(761319cc6747661b33e84aa449cec83800543b5b) )
ROM_END
ROM_START( kristall2 )
- ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
- ROM_LOAD( "kristall-2.rom", 0xf800, 0x0800, CRC(e1b5c60f) SHA1(8ce5158def7fca91ec7e11efbb10aa5d70b7c36d))
- ROM_REGION(0x0800, "gfx1",0)
+ ROM_REGION( 0x0800, "maincpu", 0 )
+ ROM_LOAD( "kristall-2.rom", 0x0000, 0x0800, CRC(e1b5c60f) SHA1(8ce5158def7fca91ec7e11efbb10aa5d70b7c36d))
+
+ ROM_REGION(0x0800, "chargen",0)
ROM_LOAD( "kristall-2.fnt", 0x0000, 0x0800, CRC(9661c9f5) SHA1(830c38735dcb1c8a271fa0027f94b4e034848fc8))
ROM_END
/* Driver */
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, mikro80, 0, 0, mikro80, mikro80, mikro80_state, init_mikro80, "<unknown>", "Mikro-80", 0)
-COMP( 1993, radio99, mikro80, 0, radio99, mikro80, mikro80_state, init_radio99, "<unknown>", "Radio-99DM", 0)
-COMP( 1987, kristall2, mikro80, 0, kristall, mikro80, mikro80_state, init_mikro80, "<unknown>", "Kristall-2", 0)
+COMP( 1983, mikro80, 0, 0, mikro80, mikro80, mikro80_state, init_mikro80, "<unknown>", "Mikro-80", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1993, radio99, mikro80, 0, radio99, mikro80, mikro80_state, init_radio99, "<unknown>", "Radio-99DM", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1987, kristall2, mikro80, 0, kristall, mikro80, mikro80_state, init_mikro80, "<unknown>", "Kristall-2", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/includes/mikro80.h b/src/mame/includes/mikro80.h
index de40452d1ea..bb1dbd15e8e 100644
--- a/src/mame/includes/mikro80.h
+++ b/src/mame/includes/mikro80.h
@@ -23,26 +23,18 @@ public:
TIMER_RESET
};
- mikro80_state(const machine_config &mconfig, device_type type, const char *tag) :
- driver_device(mconfig, type, tag),
- m_cursor_ram(*this, "cursor_ram"),
- m_video_ram(*this, "video_ram"),
- m_ppi8255(*this, "ppi8255"),
- m_cassette(*this, "cassette"),
- m_region_maincpu(*this, "maincpu"),
- m_region_gfx1(*this, "gfx1"),
- m_bank1(*this, "bank1"),
- m_io_line0(*this, "LINE0"),
- m_io_line1(*this, "LINE1"),
- m_io_line2(*this, "LINE2"),
- m_io_line3(*this, "LINE3"),
- m_io_line4(*this, "LINE4"),
- m_io_line5(*this, "LINE5"),
- m_io_line6(*this, "LINE6"),
- m_io_line7(*this, "LINE7"),
- m_io_line8(*this, "LINE8") ,
- m_dac(*this, "dac"),
- m_maincpu(*this, "maincpu")
+ mikro80_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag)
+ , m_aram(*this, "attrram")
+ , m_vram(*this, "videoram")
+ , m_ppi(*this, "ppi8255")
+ , m_cassette(*this, "cassette")
+ , m_rom(*this, "maincpu")
+ , m_ram(*this, "mainram")
+ , m_p_chargen(*this, "chargen")
+ , m_io_keyboard(*this, "LINE%u", 0U)
+ , m_dac(*this, "dac")
+ , m_maincpu(*this, "maincpu")
{ }
void kristall(machine_config &config);
@@ -53,43 +45,33 @@ public:
void init_mikro80();
private:
- required_shared_ptr<uint8_t> m_cursor_ram;
- required_shared_ptr<uint8_t> m_video_ram;
- int m_keyboard_mask;
- int m_key_mask;
- void radio99_sound_w(uint8_t data);
- uint8_t mikro80_8255_portb_r();
- uint8_t mikro80_8255_portc_r();
- void mikro80_8255_porta_w(uint8_t data);
- void mikro80_8255_portc_w(uint8_t data);
- uint8_t mikro80_keyboard_r(offs_t offset);
- void mikro80_keyboard_w(offs_t offset, uint8_t data);
- void mikro80_tape_w(uint8_t data);
- uint8_t mikro80_tape_r();
+ u8 m_keyboard_mask;
+ u8 m_key_mask;
+ void sound_w(u8 data);
+ u8 portb_r();
+ u8 portc_r();
+ void porta_w(u8 data);
+ void portc_w(u8 data);
+ void tape_w(u8 data);
+ u8 tape_r();
virtual void machine_reset() override;
- virtual void video_start() override;
- uint32_t screen_update_mikro80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ virtual void machine_start() override;
+ u32 screen_update_mikro80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void kristall_io(address_map &map);
void mikro80_io(address_map &map);
void mikro80_mem(address_map &map);
void radio99_io(address_map &map);
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- required_device<i8255_device> m_ppi8255;
+ memory_passthrough_handler *m_rom_shadow_tap;
+ required_shared_ptr<uint8_t> m_aram;
+ required_shared_ptr<uint8_t> m_vram;
+ required_device<i8255_device> m_ppi;
required_device<cassette_image_device> m_cassette;
- required_memory_region m_region_maincpu;
- required_memory_region m_region_gfx1;
- required_memory_bank m_bank1;
- required_ioport m_io_line0;
- required_ioport m_io_line1;
- required_ioport m_io_line2;
- required_ioport m_io_line3;
- required_ioport m_io_line4;
- required_ioport m_io_line5;
- required_ioport m_io_line6;
- required_ioport m_io_line7;
- required_ioport m_io_line8;
+ required_region_ptr<u8> m_rom;
+ required_shared_ptr<u8> m_ram;
+ required_region_ptr<u8> m_p_chargen;
+ required_ioport_array<9> m_io_keyboard;
optional_device<dac_bit_interface> m_dac;
required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/machine/mikro80.cpp b/src/mame/machine/mikro80.cpp
index b0dd9598adf..7252ea5096d 100644
--- a/src/mame/machine/mikro80.cpp
+++ b/src/mame/machine/mikro80.cpp
@@ -16,95 +16,79 @@
/* Driver initialization */
void mikro80_state::init_mikro80()
{
- /* set initialy ROM to be visible on first bank */
- uint8_t *RAM = m_region_maincpu->base();
- memset(RAM,0x0000,0x0800); // make frist page empty by default
- m_bank1->configure_entries(1, 2, RAM, 0x0000);
- m_bank1->configure_entries(0, 2, RAM, 0xf800);
m_key_mask = 0x7f;
}
void mikro80_state::init_radio99()
{
- init_mikro80();
m_key_mask = 0xff;
}
-uint8_t mikro80_state::mikro80_8255_portb_r()
+u8 mikro80_state::portb_r()
{
- uint8_t key = 0xff;
- if ((m_keyboard_mask & 0x01)!=0) { key &= m_io_line0->read(); }
- if ((m_keyboard_mask & 0x02)!=0) { key &= m_io_line1->read(); }
- if ((m_keyboard_mask & 0x04)!=0) { key &= m_io_line2->read(); }
- if ((m_keyboard_mask & 0x08)!=0) { key &= m_io_line3->read(); }
- if ((m_keyboard_mask & 0x10)!=0) { key &= m_io_line4->read(); }
- if ((m_keyboard_mask & 0x20)!=0) { key &= m_io_line5->read(); }
- if ((m_keyboard_mask & 0x40)!=0) { key &= m_io_line6->read(); }
- if ((m_keyboard_mask & 0x80)!=0) { key &= m_io_line7->read(); }
+ u8 key = 0xff;
+ for (u8 i = 0; i < 8; i++)
+ if (BIT(m_keyboard_mask, i))
+ key &= m_io_keyboard[i]->read();
+
return key & m_key_mask;
}
-uint8_t mikro80_state::mikro80_8255_portc_r()
+u8 mikro80_state::portc_r()
{
- return m_io_line8->read();
+ return m_io_keyboard[8]->read();
}
-void mikro80_state::mikro80_8255_porta_w(uint8_t data)
+void mikro80_state::porta_w(u8 data)
{
m_keyboard_mask = data ^ 0xff;
}
-void mikro80_state::mikro80_8255_portc_w(uint8_t data)
+void mikro80_state::portc_w(u8 data)
{
}
-void mikro80_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+void mikro80_state::machine_start()
{
- switch (id)
- {
- case TIMER_RESET:
- m_bank1->set_entry(0);
- break;
- default:
- throw emu_fatalerror("Unknown id in mikro80_state::device_timer");
- }
+ save_item(NAME(m_keyboard_mask));
+ save_item(NAME(m_key_mask));
}
void mikro80_state::machine_reset()
{
- timer_set(attotime::from_usec(10), TIMER_RESET);
- m_bank1->set_entry(1);
m_keyboard_mask = 0;
-}
-
-
-uint8_t mikro80_state::mikro80_keyboard_r(offs_t offset)
-{
- return m_ppi8255->read(offset^0x03);
-}
-void mikro80_state::mikro80_keyboard_w(offs_t offset, uint8_t data)
-{
- m_ppi8255->write(offset^0x03, data);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
+ program.install_rom(0x0000, 0x07ff, m_rom); // do it here for F3
+ m_rom_shadow_tap = program.install_read_tap(0xf800, 0xffff, "rom_shadow_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+ {
+ if (!machine().side_effects_disabled())
+ {
+ // delete this tap
+ m_rom_shadow_tap->remove();
+
+ // reinstall ram over the rom shadow
+ m_maincpu->space(AS_PROGRAM).install_ram(0x0000, 0x07ff, m_ram);
+ }
+
+ // return the original data
+ return data;
+ });
}
-
-void mikro80_state::mikro80_tape_w(uint8_t data)
+void mikro80_state::tape_w(u8 data)
{
- m_cassette->output(data & 0x01 ? 1 : -1);
+ // Todo: this is incorrect, to be fixed when the CMT schematic can be found
+ m_cassette->output(BIT(data, 0) ? 1.0 : -1.0);
}
-uint8_t mikro80_state::mikro80_tape_r()
+u8 mikro80_state::tape_r()
{
- double level = m_cassette->input();
- if (level < 0) {
- return 0x00;
- }
- return 0xff;
+ return m_cassette->input() ? 0xff : 0;
}
-void mikro80_state::radio99_sound_w(uint8_t data)
+void mikro80_state::sound_w(u8 data)
{
m_dac->write(BIT(data, 1));
}
diff --git a/src/mame/video/mikro80.cpp b/src/mame/video/mikro80.cpp
deleted file mode 100644
index 7ca56804a6b..00000000000
--- a/src/mame/video/mikro80.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
- Mikro-80 video driver by Miodrag Milanovic
-
- 10/03/2008 Preliminary driver.
-
-****************************************************************************/
-
-
-#include "emu.h"
-#include "includes/mikro80.h"
-
-
-void mikro80_state::video_start()
-{
-}
-
-uint32_t mikro80_state::screen_update_mikro80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- uint8_t *gfx = m_region_gfx1->base();
- int x,y,b;
-
- for(y = 0; y < 32*8; y++ )
- {
- for(x = 0; x < 64; x++ )
- {
- int addr = x + (y / 8)*64;
- uint8_t code = gfx[m_video_ram [addr]*8+ (y % 8)];
- uint8_t attr = m_cursor_ram[addr+1] & 0x80 ? 1 : 0;
- for (b = 7; b >= 0; b--)
- {
- uint8_t col = (code >> b) & 0x01;
- bitmap.pix16(y, x*8+(7-b)) = attr ? col ^ 1 : col;
- }
- }
- }
- return 0;
-}