Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-16 05:24:54 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

kim1: minor cleanup; added usage.

Browse Source
This commit is contained in:
Robbbert 2020-08-28 19:58:21 +10:00
parent 7839489ce1
commit d9f4c96fac
4 changed files with 73 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hash/kim1_cass.xml
View File

@ -12,6 +12,7 @@ license:CC0
<description>Microchess</description>
<year>1976</year>
<publisher>Micro-ware Ltd</publisher>
<info name="usage" value="Press F3, then -00F1=00 -17F9=C1 -1873 enter. When you see 0000 D8 pause tape. Press F3, then -1873 enter. When you see 0000 D8, press F3 enter" />
<!-- Typed in from book -->
<part name="cass" interface="kim1_cass">

1
scripts/target/mame/mess.lua
View File

@ -2896,7 +2896,6 @@ files {
createMESSProjects(_target, _subtarget, "mos")
files {
MAME_DIR .. "src/mame/drivers/kim1.cpp",
MAME_DIR .. "src/mame/includes/kim1.h",
}
createMESSProjects(_target, _subtarget, "motorola")

88
src/mame/drivers/kim1.cpp
View File

@ -59,23 +59,78 @@ TODO:
******************************************************************************/
#include "emu.h"
#include "includes/kim1.h"
#include "cpu/m6502/m6502.h"
#include "machine/mos6530.h"
#include "machine/timer.h"
#include "imagedev/cassette.h"
#include "formats/kim1_cas.h"
#include "speaker.h"
#include "kim1.lh"
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
class kim1_state : public driver_device
{
public:
kim1_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_riot2(*this, "miot_u2")
, m_cass(*this, "cassette")
, m_row(*this, "ROW%u", 0U)
, m_special(*this, "SPECIAL")
, m_digit(*this, "digit%u", 0U)
{ }
DECLARE_INPUT_CHANGED_MEMBER(trigger_reset);
DECLARE_INPUT_CHANGED_MEMBER(trigger_nmi);
void kim1(machine_config &config);
private:
uint8_t kim1_u2_read_a();
void kim1_u2_write_a(uint8_t data);
uint8_t kim1_u2_read_b();
void kim1_u2_write_b(uint8_t data);
// device overrides
virtual void machine_start() override;
virtual void machine_reset() override;
TIMER_DEVICE_CALLBACK_MEMBER(kim1_cassette_input);
TIMER_DEVICE_CALLBACK_MEMBER(kim1_update_leds);
void mem_map(address_map &map);
// devices
required_device<cpu_device> m_maincpu;
required_device<mos6530_device> m_riot2;
required_device<cassette_image_device> m_cass;
required_ioport_array<3> m_row;
required_ioport m_special;
output_finder<6> m_digit;
uint8_t m_u2_port_b;
uint8_t m_311_output;
uint32_t m_cassette_high_count;
uint8_t m_led_time[6];
};
//**************************************************************************
// ADDRESS MAPS
//**************************************************************************
void kim1_state::kim1_map(address_map &map)
void kim1_state::mem_map(address_map &map)
{
map(0x0000, 0x03ff).mirror(0xe000).ram();
map(0x1700, 0x173f).mirror(0xe000).rw("miot_u3", FUNC(mos6530_device::read), FUNC(mos6530_device::write));
map(0x1740, 0x177f).mirror(0xe000).rw(m_riot2, FUNC(mos6530_device::read), FUNC(mos6530_device::write));
map(0x1780, 0x17bf).mirror(0xe000).ram();
map(0x17c0, 0x17ff).mirror(0xe000).ram();
map(0x1800, 0x1bff).mirror(0xe000).rom();
map(0x1c00, 0x1fff).mirror(0xe000).rom();
map.global_mask(0x1fff);
map(0x0000, 0x03ff).ram();
map(0x1700, 0x173f).rw("miot_u3", FUNC(mos6530_device::read), FUNC(mos6530_device::write));
map(0x1740, 0x177f).rw(m_riot2, FUNC(mos6530_device::read), FUNC(mos6530_device::write));
map(0x1780, 0x17ff).ram();
map(0x1800, 0x1fff).rom().region("maincpu",0);
}
// RS and ST key input
@ -224,6 +279,7 @@ void kim1_state::machine_start()
save_item(NAME(m_u2_port_b));
save_item(NAME(m_311_output));
save_item(NAME(m_cassette_high_count));
save_item(NAME(m_led_time));
}
void kim1_state::machine_reset()
@ -244,8 +300,8 @@ void kim1_state::machine_reset()
void kim1_state::kim1(machine_config &config)
{
// basic machine hardware
M6502(config, m_maincpu, 1000000); /* 1 MHz */
m_maincpu->set_addrmap(AS_PROGRAM, &kim1_state::kim1_map);
M6502(config, m_maincpu, 1_MHz_XTAL);
m_maincpu->set_addrmap(AS_PROGRAM, &kim1_state::mem_map);
config.set_maximum_quantum(attotime::from_hz(60));
// video hardware
@ -254,13 +310,13 @@ void kim1_state::kim1(machine_config &config)
SPEAKER(config, "mono").front_center();
// devices
MOS6530(config, m_riot2, 1000000);
MOS6530(config, m_riot2, 1_MHz_XTAL);
m_riot2->in_pa_callback().set(FUNC(kim1_state::kim1_u2_read_a));
m_riot2->out_pa_callback().set(FUNC(kim1_state::kim1_u2_write_a));
m_riot2->in_pb_callback().set(FUNC(kim1_state::kim1_u2_read_b));
m_riot2->out_pb_callback().set(FUNC(kim1_state::kim1_u2_write_b));
MOS6530(config, "miot_u3", 1000000);
MOS6530(config, "miot_u3", 1_MHz_XTAL);
CASSETTE(config, m_cass);
m_cass->set_formats(kim1_cassette_formats);
@ -280,9 +336,9 @@ void kim1_state::kim1(machine_config &config)
//**************************************************************************
ROM_START(kim1)
ROM_REGION(0x10000,"maincpu",0)
ROM_LOAD("6530-003.bin", 0x1800, 0x0400, CRC(a2a56502) SHA1(60b6e48f35fe4899e29166641bac3e81e3b9d220))
ROM_LOAD("6530-002.bin", 0x1c00, 0x0400, CRC(2b08e923) SHA1(054f7f6989af3a59462ffb0372b6f56f307b5362))
ROM_REGION(0x0800,"maincpu",0)
ROM_LOAD("6530-003.bin", 0x0000, 0x0400, CRC(a2a56502) SHA1(60b6e48f35fe4899e29166641bac3e81e3b9d220))
ROM_LOAD("6530-002.bin", 0x0400, 0x0400, CRC(2b08e923) SHA1(054f7f6989af3a59462ffb0372b6f56f307b5362))
ROM_END
//**************************************************************************

72
src/mame/includes/kim1.h
View File

@ -1,72 +0,0 @@
// license:GPL-2.0+
// copyright-holders:Juergen Buchmueller
/*************************************************************************
includes/kim1.h
*************************************************************************/
#pragma once
#ifndef MAME_INCLUDES_KIM1_H
#define MAME_INCLUDES_KIM1_H
#include "softlist.h"
#include "cpu/m6502/m6502.h"
#include "machine/mos6530.h"
#include "machine/timer.h"
#include "imagedev/cassette.h"
#include "formats/kim1_cas.h"
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
class kim1_state : public driver_device
{
public:
kim1_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_riot2(*this, "miot_u2"),
m_cass(*this, "cassette"),
m_row(*this, "ROW%u", 0U),
m_special(*this, "SPECIAL"),
m_digit(*this, "digit%u", 0U)
{ }
DECLARE_INPUT_CHANGED_MEMBER(trigger_reset);
DECLARE_INPUT_CHANGED_MEMBER(trigger_nmi);
void kim1(machine_config &config);
private:
uint8_t kim1_u2_read_a();
void kim1_u2_write_a(uint8_t data);
uint8_t kim1_u2_read_b();
void kim1_u2_write_b(uint8_t data);
// device overrides
virtual void machine_start() override;
virtual void machine_reset() override;
TIMER_DEVICE_CALLBACK_MEMBER(kim1_cassette_input);
TIMER_DEVICE_CALLBACK_MEMBER(kim1_update_leds);
void kim1_map(address_map &map);
// devices
required_device<cpu_device> m_maincpu;
required_device<mos6530_device> m_riot2;
required_device<cassette_image_device> m_cass;
required_ioport_array<3> m_row;
required_ioport m_special;
output_finder<6> m_digit;
uint8_t m_u2_port_b;
uint8_t m_311_output;
uint32_t m_cassette_high_count;
uint8_t m_led_time[6];
};
#endif // MAME_INCLUDES_KIM1_H