summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2020-07-03 22:54:58 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2020-07-03 22:54:58 +1000
commit1292022f0311b80864d07df957d9afe79458b153 (patch)
tree8e404956f559d35aa2b69f435e9fd4a5bed01f45 /src
parentc6fe2bed3fbb40155d39d77bcd5b8f07ee86e212 (diff)
galeb: cleanup, preliminary cassette, notes
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/galeb.cpp256
-rw-r--r--src/mame/drivers/orao.cpp8
-rw-r--r--src/mame/includes/galeb.h59
-rw-r--r--src/mame/video/galeb.cpp45
4 files changed, 210 insertions, 158 deletions
diff --git a/src/mame/drivers/galeb.cpp b/src/mame/drivers/galeb.cpp
index 5df4892a2bf..091a1a362ee 100644
--- a/src/mame/drivers/galeb.cpp
+++ b/src/mame/drivers/galeb.cpp
@@ -2,82 +2,183 @@
// copyright-holders:Miodrag Milanovic
/***************************************************************************
- Galeb driver by Miodrag Milanovic
-
- 01/03/2008 Updated to work with latest SVN code
- 23/02/2008 Sound support added.
- 22/02/2008 Preliminary driver.
-
- Driver is based on work of Josip Perusanec
+Galeb driver by Miodrag Milanovic
+
+2008-02-22 Preliminary driver.
+2008-02-23 Sound support added.
+2008-03-01 Updated to work with latest SVN code
+
+Driver is based on work of Josip Perusanec.
+
+Galeb (seagull) based on the OSI UK101. Due to its expense it is quite rare.
+It was succeeded by the Orao (eagle).
+
+All commands in Monitor and in Basic must be in UPPERCASE. So, the very first
+thing to do is to press ^A to enter caps mode.
+
+Commands:
+A nnnn Mini-assembler
+B
+C aaaabbbb show checksum of memory from a to b
+E aaaabbbb Hex dump from a to b
+F aaaabbbbcc Fill memory from a to b with c
+L Load tape
+M nnnn Modify memory starting at byte nnnn (enter to escape)
+P
+Q ccccaaaabbbb Copy memory range a to b, over to c
+R
+S
+T
+U nnnn Go to nnnn
+X nnnn disassemble
+$
+^A caps lock
+^B Start Basic
+^G keyclick
+^L clear screen
+Alt\
+
+
+Cassette:
+- Unable to locate a schematic, but it appears that a 6850 is the uart.
+ The UK101 used a 6850 and Kansas City tape encoding, and so it is assumed
+ that this computer is the same.
+
+Screen:
+- The T command can cause the system to expand the video to 4k
+ instead of 1k. Therefore the writing goes off the bottom and doesn't scroll.
+ It is not known if this is intentional, or a bug. The video routine has been
+ modified to cope, in case it's a real feature. (T 0000 0022 is an example)
+
+ToDo:
+- BASIC SAVE command is weird... need instructions
+- Therefore, cassette is considered to be not working.
****************************************************************************/
#include "emu.h"
-#include "includes/galeb.h"
-
#include "cpu/m6502/m6502.h"
+#include "machine/clock.h"
#include "sound/volt_reg.h"
#include "screen.h"
#include "speaker.h"
+#include "machine/6850acia.h"
+#include "machine/timer.h"
+#include "imagedev/cassette.h"
+#include "sound/dac.h"
+#include "emupal.h"
-
-static GFXDECODE_START( gfx_galeb )
- GFXDECODE_ENTRY( "gfx1", 0x0000, galeb_charlayout, 0, 1 )
-GFXDECODE_END
+class galeb_state : public driver_device
+{
+public:
+ galeb_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag)
+ , m_ram(*this, "mainram")
+ , m_vram(*this, "videoram")
+ , m_maincpu(*this, "maincpu")
+ , m_gfxdecode(*this, "gfxdecode")
+ , m_palette(*this, "palette")
+ , m_io_keyboard(*this, "LINE%u", 0U)
+ , m_cass(*this, "cassette")
+ , m_acia(*this, "acia")
+ , m_dac(*this, "dac")
+ { }
+
+ void galeb(machine_config &config);
+
+private:
+ TIMER_DEVICE_CALLBACK_MEMBER(kansas_w);
+ TIMER_DEVICE_CALLBACK_MEMBER(kansas_r);
+ void dac_w(u8 data);
+ u8 keyboard_r(offs_t offset);
+ u32 screen_update_galeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ u8 m_cass_data[4];
+ bool m_cassbit;
+ bool m_cassold;
+ required_shared_ptr<u8> m_ram;
+ required_shared_ptr<u8> m_vram;
+ required_device<cpu_device> m_maincpu;
+ required_device<gfxdecode_device> m_gfxdecode;
+ required_device<palette_device> m_palette;
+ required_ioport_array<8> m_io_keyboard;
+ required_device<cassette_image_device> m_cass;
+ required_device<acia6850_device> m_acia;
+ required_device<dac_1bit_device> m_dac;
+
+ void mem_map(address_map &map);
+
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+ bool m_dac_state;
+};
void galeb_state::machine_start()
{
save_item(NAME(m_dac_state));
+ save_item(NAME(m_cass_data));
+ save_item(NAME(m_cassbit));
+ save_item(NAME(m_cassold));
+}
+void galeb_state::machine_reset()
+{
+ m_dac_state = 0;
m_dac->write(m_dac_state);
}
void galeb_state::dac_w(uint8_t data)
{
- m_dac_state = !m_dac_state;
+ m_dac_state ^= 1;
m_dac->write(m_dac_state);
}
-uint8_t galeb_state::keyboard_r(offs_t offset)
+u8 galeb_state::keyboard_r(offs_t offset)
{
- return m_keyboard[offset]->read();
+ return m_io_keyboard[offset]->read();
}
-uint8_t galeb_state::tape_status_r()
+TIMER_DEVICE_CALLBACK_MEMBER( galeb_state::kansas_w )
{
- int status = 0;
- status |= 2; /// send ready
- status |= 1; /// receive ready
- return status;
+ m_cass_data[3]++;
+
+ if (m_cassbit != m_cassold)
+ {
+ m_cass_data[3] = 0;
+ m_cassold = m_cassbit;
+ }
+
+ if (m_cassbit)
+ m_cass->output(BIT(m_cass_data[3], 0) ? -1.0 : +1.0); // 2400Hz
+ else
+ m_cass->output(BIT(m_cass_data[3], 1) ? -1.0 : +1.0); // 1200Hz
}
-void galeb_state::tape_data_w(uint8_t data)
+TIMER_DEVICE_CALLBACK_MEMBER( galeb_state::kansas_r)
{
- logerror("tape_data_w %02x\n", data);
+ /* cassette - turn 1200/2400Hz to a bit */
+ m_cass_data[1]++;
+ u8 cass_ws = (m_cass->input() > +0.03) ? 1 : 0;
+
+ if (cass_ws != m_cass_data[0])
+ {
+ m_cass_data[0] = cass_ws;
+ m_acia->write_rxd((m_cass_data[1] < 12) ? 1 : 0);
+ m_cass_data[1] = 0;
+ }
}
-uint8_t galeb_state::tape_data_r()
-{
- logerror("tape_data_r (press escape to cancel load)\n");
- return 0x00;
-}
/* Address maps */
-void galeb_state::galeb_mem(address_map &map)
+void galeb_state::mem_map(address_map &map)
{
- map(0x0000, 0x1fff).ram(); // RAM
+ map(0x0000, 0x1fff).ram().share("mainram");
+ map(0xb000, 0xbfdf).ram().share("videoram");
map(0xbfe0, 0xbfe7).r(FUNC(galeb_state::keyboard_r));
map(0xbfe0, 0xbfe0).w(FUNC(galeb_state::dac_w));
- map(0xbffe, 0xbffe).r(FUNC(galeb_state::tape_status_r));
- map(0xbfff, 0xbfff).rw(FUNC(galeb_state::tape_data_r), FUNC(galeb_state::tape_data_w));
- map(0xb000, 0xb3ff).ram().share("video_ram"); // video ram
- map(0xc000, 0xc7ff).rom(); // BASIC 01 ROM
- map(0xc800, 0xcfff).rom(); // BASIC 02 ROM
- map(0xd000, 0xd7ff).rom(); // BASIC 03 ROM
- map(0xd800, 0xdfff).rom(); // BASIC 04 ROM
- map(0xf000, 0xf7ff).rom(); // Monitor ROM
- map(0xf800, 0xffff).rom(); // System ROM
+ map(0xbffe, 0xbfff).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
+ map(0xc000, 0xffff).rom().region("maincpu",0);
}
/* Input ports */
@@ -163,12 +264,46 @@ static INPUT_PORTS_START( galeb )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
INPUT_PORTS_END
+const gfx_layout charlayout =
+{
+ 8, 8, /* 8x8 characters */
+ 256, /* 256 characters */
+ 1, /* 1 bits per pixel */
+ {0}, /* no bitplanes; 1 bit per pixel */
+ {7, 6, 5, 4, 3, 2, 1, 0},
+ {0 * 8, 1 * 8, 2 * 8, 3 * 8, 4 * 8, 5 * 8, 6 * 8, 7 * 8},
+ 8*8 /* size of one char */
+};
+
+static GFXDECODE_START( gfx_galeb )
+ GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
+GFXDECODE_END
+
+u32 galeb_state::screen_update_galeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ u16 ma = (m_ram[0xff]*256+m_ram[0xfe]) & 0xfff;
+ if (ma < 0x400)
+ ma = 15;
+ else
+ ma -= 0x3bb;
+
+ for(u8 y = 0; y < 16; y++ )
+ {
+ for(u8 x = 0; x < 48; x++ )
+ {
+ u8 code = m_vram[ma + x + y*64];
+ m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0, 0, x*8,y*8);
+ }
+ }
+ return 0;
+}
+
/* Machine driver */
void galeb_state::galeb(machine_config &config)
{
/* basic machine hardware */
M6502(config, m_maincpu, 1000000);
- m_maincpu->set_addrmap(AS_PROGRAM, &galeb_state::galeb_mem);
+ m_maincpu->set_addrmap(AS_PROGRAM, &galeb_state::mem_map);
/* video hardware */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -184,26 +319,43 @@ void galeb_state::galeb(machine_config &config)
PALETTE(config, m_palette, palette_device::MONOCHROME);
/* audio hardware */
- SPEAKER(config, "speaker").front_center();
- DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.0625); // unknown DAC
+ SPEAKER(config, "mono").front_center();
+ DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "mono", 0.0625); // unknown DAC
voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+
+ clock_device &acia_clock(CLOCK(config, "acia_clock", 4'800)); // 300 baud x 16(divider) = 4800
+ acia_clock.signal_handler().set(m_acia, FUNC(acia6850_device::write_txc));
+ acia_clock.signal_handler().append(m_acia, FUNC(acia6850_device::write_rxc));
+
+ ACIA6850(config, m_acia, 0);
+ m_acia->txd_handler().set([this] (bool state) { m_cassbit = state; });
+
+ /* cassette */
+ CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
+ TIMER(config, "kansas_w").configure_periodic(FUNC(galeb_state::kansas_w), attotime::from_hz(4800)); // cass write
+ TIMER(config, "kansas_r").configure_periodic(FUNC(galeb_state::kansas_r), attotime::from_hz(40000)); // cass read
}
/* ROM definition */
ROM_START( galeb )
- ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
- ROM_LOAD( "bas01.rom", 0xc000, 0x0800, CRC(9b19ed58) SHA1(ebfc27af8dbabfb233f9888e6a0a0dfc87ae1691) )
- ROM_LOAD( "bas02.rom", 0xc800, 0x0800, CRC(3f320a84) SHA1(4ea082b4269dca6152426b1f720c7508122d3cb7) )
- ROM_LOAD( "bas03.rom", 0xd000, 0x0800, CRC(f122ad10) SHA1(3c7c1dd67268230d179a00b0f8b35be80c2b7035) )
- ROM_LOAD( "bas04.rom", 0xd800, 0x0800, CRC(b5372a83) SHA1(f93b73d98b943c6791f46617418fb5e4238d75bd) )
- ROM_LOAD( "exmd.rom", 0xf000, 0x0800, CRC(1bcb1375) SHA1(fda3361d238720a3d309644093da9832d5aff661) )
- ROM_LOAD( "makbug.rom",0xf800, 0x0800, CRC(91e38e79) SHA1(2b6439a09a470cda9c81b9d453c6380b99716989) )
- ROM_REGION(0x0800, "gfx1",0)
- ROM_LOAD ("chrgen.bin", 0x0000, 0x0800, CRC(409a800e) SHA1(0efe429dd6c0568032636e691d9865a623afeb55))
+ ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
+ // BASIC ROMS
+ ROM_LOAD( "bas01.rom", 0x0000, 0x0800, CRC(9b19ed58) SHA1(ebfc27af8dbabfb233f9888e6a0a0dfc87ae1691) )
+ ROM_LOAD( "bas02.rom", 0x0800, 0x0800, CRC(3f320a84) SHA1(4ea082b4269dca6152426b1f720c7508122d3cb7) )
+ ROM_LOAD( "bas03.rom", 0x1000, 0x0800, CRC(f122ad10) SHA1(3c7c1dd67268230d179a00b0f8b35be80c2b7035) )
+ ROM_LOAD( "bas04.rom", 0x1800, 0x0800, CRC(b5372a83) SHA1(f93b73d98b943c6791f46617418fb5e4238d75bd) )
+ // MONITOR
+ ROM_LOAD( "exmd.rom", 0x3000, 0x0800, CRC(1bcb1375) SHA1(fda3361d238720a3d309644093da9832d5aff661) )
+ // SYSTEM
+ ROM_LOAD( "makbug.rom", 0x3800, 0x0800, CRC(91e38e79) SHA1(2b6439a09a470cda9c81b9d453c6380b99716989) )
+
+ ROM_REGION(0x0800, "chargen",0)
+ ROM_LOAD ("chrgen.bin", 0x0000, 0x0800, CRC(409a800e) SHA1(0efe429dd6c0568032636e691d9865a623afeb55) )
ROM_END
/* Driver */
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1981, galeb, 0, 0, galeb, galeb, galeb_state, empty_init, "PEL Varazdin", "Galeb", 0 )
+COMP( 1981, galeb, 0, 0, galeb, galeb, galeb_state, empty_init, "PEL Varazdin", "Galeb", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/orao.cpp b/src/mame/drivers/orao.cpp
index 83f5f42fd42..d6ec83ef9b3 100644
--- a/src/mame/drivers/orao.cpp
+++ b/src/mame/drivers/orao.cpp
@@ -13,8 +13,12 @@ Driver is based on work of Josip Perusanec
Ctrl-V turns on keyclick
Ctrl-S turns on reversed video
+BC starts BASIC. orao103: EXIT to quit. orao: unknown how to quit.
+
Todo:
- When pasting, shift key doesn't work
+- orao103: loads its own tapes, but can't load software items
+- orao: can't load anything
****************************************************************************/
@@ -236,7 +240,7 @@ u8 orao_state::kbd_r(offs_t offset)
case 0x03FE : return m_io_keyboard[18]->read();
case 0x03FF : return m_io_keyboard[19]->read();
/* Tape */
- case 0x07FF : return (m_cassette->input() > 0.004) ? 0xff : 0;
+ case 0x07FF : return (m_cassette->input() > 0.002) ? 0xff : 0;
}
return 0xff;
@@ -315,5 +319,5 @@ ROM_END
/* Driver */
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1984, orao, 0, 0, orao, orao, orao_state, init_orao, "PEL Varazdin", "Orao 102", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, orao, 0, 0, orao, orao, orao_state, init_orao, "PEL Varazdin", "Orao 102", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
COMP( 1985, orao103, orao, 0, orao, orao, orao_state, init_orao, "PEL Varazdin", "Orao 103", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/includes/galeb.h b/src/mame/includes/galeb.h
deleted file mode 100644
index 64356ef7526..00000000000
--- a/src/mame/includes/galeb.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/*****************************************************************************
- *
- * includes/galeb.h
- *
- ****************************************************************************/
-#ifndef MAME_INCLUDES_GALEB_H
-#define MAME_INCLUDES_GALEB_H
-
-#pragma once
-
-#include "sound/dac.h"
-#include "emupal.h"
-
-class galeb_state : public driver_device
-{
-public:
- galeb_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_video_ram(*this, "video_ram"),
- m_maincpu(*this, "maincpu"),
- m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette"),
- m_keyboard(*this, "LINE%u", 0),
- m_dac(*this, "dac"),
- m_dac_state(0)
- {
- }
-
- void galeb(machine_config &config);
-
-private:
- required_shared_ptr<uint8_t> m_video_ram;
- void dac_w(uint8_t data);
- uint8_t keyboard_r(offs_t offset);
- uint8_t tape_status_r();
- uint8_t tape_data_r();
- void tape_data_w(uint8_t data);
- virtual void video_start() override;
- uint32_t screen_update_galeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- required_device<cpu_device> m_maincpu;
- required_device<gfxdecode_device> m_gfxdecode;
- required_device<palette_device> m_palette;
- required_ioport_array<8> m_keyboard;
- required_device<dac_1bit_device> m_dac;
-
- void galeb_mem(address_map &map);
-
- virtual void machine_start() override;
-
- int m_dac_state;
-};
-
-/*----------- defined in video/galeb.c -----------*/
-
-extern const gfx_layout galeb_charlayout;
-
-#endif // MAME_INCLUDES_GALEB_H
diff --git a/src/mame/video/galeb.cpp b/src/mame/video/galeb.cpp
deleted file mode 100644
index e7c4b132442..00000000000
--- a/src/mame/video/galeb.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
- Galeb video driver by Miodrag Milanovic
-
- 01/03/2008 Updated to work with latest SVN code
- 22/02/2008 Preliminary driver.
-
-****************************************************************************/
-
-
-#include "emu.h"
-#include "includes/galeb.h"
-
-
-const gfx_layout galeb_charlayout =
-{
- 8, 8, /* 8x8 characters */
- 256, /* 256 characters */
- 1, /* 1 bits per pixel */
- {0}, /* no bitplanes; 1 bit per pixel */
- {7, 6, 5, 4, 3, 2, 1, 0},
- {0 * 8, 1 * 8, 2 * 8, 3 * 8, 4 * 8, 5 * 8, 6 * 8, 7 * 8},
- 8*8 /* size of one char */
-};
-
-void galeb_state::video_start()
-{
-}
-
-uint32_t galeb_state::screen_update_galeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- int x,y;
-
- for(y = 0; y < 16; y++ )
- {
- for(x = 0; x < 48; x++ )
- {
- int code = m_video_ram[15 + x + y*64];
- m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code , 0, 0,0, x*8,y*8);
- }
- }
- return 0;
-}