6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-30 19:30:17 +00:00
Code Issues Projects Releases Wiki Activity
57bfec285f
CLK/Machines/AmstradCPC/AmstradCPC.hpp

67 lines
2.1 KiB
C++
Raw Normal View History

Performed sufficient wiring to get to the point where attempting to load a CDT creates an instance of the Amstrad CPC and then fails only because the thing vends a `nullptr` CRT.
2017-07-31 02:05:29 +00:00
//
// AmstradCPC.hpp
// Clock Signal
//
// Created by Thomas Harte on 30/07/2017.
// Copyright © 2017 Thomas Harte. All rights reserved.
//
#ifndef AmstradCPC_hpp
#define AmstradCPC_hpp
#include "../ConfigurationTarget.hpp"
#include "../CRTMachine.hpp"
Formally declared the ZX80/81 and Amstrad CPC as keyboard machines in their public interface. Which means not having to repeat the meaning of set_key_state and clear_all_keys. So: a minor DRY improvement.
2017-08-03 16:38:22 +00:00
#include "../KeyboardMachine.hpp"
Performed sufficient wiring to get to the point where attempting to load a CDT creates an instance of the Amstrad CPC and then fails only because the thing vends a `nullptr` CRT.
2017-07-31 02:05:29 +00:00
Minor tidiness: included missing headers, and spaced out the ROM type and key lists for readability.
2017-08-03 16:45:42 +00:00
#include <cstdint>
#include <vector>
Performed sufficient wiring to get to the point where attempting to load a CDT creates an instance of the Amstrad CPC and then fails only because the thing vends a `nullptr` CRT.
2017-07-31 02:05:29 +00:00
namespace AmstradCPC {
Sought: (i) to instruct the CPC that it should be a 664, not a 464, if given a disk image (at least until I have RAM paging implemented for a 6128); (ii) to support ROM selection within the CPC and allow paging in of AMSDOS.
2017-08-05 23:20:38 +00:00
enum ROMType: int {
OS464 = 0, BASIC464,
OS664, BASIC664,
OS6128, BASIC6128,
Ensured that ROM images are loaded and passed to the Amstrad CPC.
2017-07-31 22:44:49 +00:00
AMSDOS
};
Added enough stuff to put the emulated Amstrad CPC in a state of knowing whether its '0' key is pressed.
2017-08-01 21:31:56 +00:00
enum Key: uint16_t {
#define Line(l, k1, k2, k3, k4, k5, k6, k7, k8) \
Minor tidiness: included missing headers, and spaced out the ROM type and key lists for readability.
2017-08-03 16:45:42 +00:00
k1 = (l << 4) | 0x07, k2 = (l << 4) | 0x06, k3 = (l << 4) | 0x05, k4 = (l << 4) | 0x04,\
k5 = (l << 4) | 0x03, k6 = (l << 4) | 0x02, k7 = (l << 4) | 0x01, k8 = (l << 4) | 0x00,
Line(0, KeyFDot, KeyEnter, KeyF3, KeyF6, KeyF9, KeyDown, KeyRight, KeyUp)
Line(1, KeyF0, KeyF2, KeyF1, KeyF5, KeyF8, KeyF7, KeyCopy, KeyLeft)
Line(2, KeyControl, KeyBackSlash, KeyShift, KeyF4, KeyRightSquareBracket, KeyReturn, KeyLeftSquareBracket, KeyClear)
Line(3, KeyFullStop, KeyForwardSlash, KeyColon, KeySemicolon, KeyP, KeyAt, KeyMinus, KeyCaret)
Line(4, KeyComma, KeyM, KeyK, KeyL, KeyI, KeyO, Key9, Key0)
Line(5, KeySpace, KeyN, KeyJ, KeyH, KeyY, KeyU, Key7, Key8)
Line(6, KeyV, KeyB, KeyF, KeyG, KeyT, KeyR, Key5, Key6)
Line(7, KeyX, KeyC, KeyD, KeyS, KeyW, KeyE, Key3, Key4)
Line(8, KeyZ, KeyCapsLock, KeyA, KeyTab, KeyQ, KeyEscape, Key2, Key1)
Line(9, KeyDelete, KeyJoy1Fire3, KeyJoy2Fire2, KeyJoy1Fire1, KeyJoy1Right, KeyJoy1Left, KeyJoy1Down, KeyJoy1Up)
Added enough stuff to put the emulated Amstrad CPC in a state of knowing whether its '0' key is pressed.
2017-08-01 21:31:56 +00:00
#undef Line
};
Upped the documentation.
2017-08-03 00:37:26 +00:00
/*!
Corrected typo and removed replication of what's already declared formally.
2017-08-16 18:53:03 +00:00
Models an Amstrad CPC.
Upped the documentation.
2017-08-03 00:37:26 +00:00
*/
Performed sufficient wiring to get to the point where attempting to load a CDT creates an instance of the Amstrad CPC and then fails only because the thing vends a `nullptr` CRT.
2017-07-31 02:05:29 +00:00
class Machine:
public CRTMachine::Machine,
Formally declared the ZX80/81 and Amstrad CPC as keyboard machines in their public interface. Which means not having to repeat the meaning of set_key_state and clear_all_keys. So: a minor DRY improvement.
2017-08-03 16:38:22 +00:00
public ConfigurationTarget::Machine,
public KeyboardMachine::Machine {
Performed sufficient wiring to get to the point where attempting to load a CDT creates an instance of the Amstrad CPC and then fails only because the thing vends a `nullptr` CRT.
2017-07-31 02:05:29 +00:00
public:
Ensured that a virtual destructor is declared, so that the various automatically-generated real constructors get in on the action.
2017-08-11 16:07:48 +00:00
virtual ~Machine();
Moves the Electron implementation behind a more opaque interface, in line with changes elsewhere.
2017-08-16 19:33:40 +00:00
/// Creates and returns an Amstrad CPC.
As per my keenness for cleanliness improvements corresponding to my ever-increasing C++ ability: turned the Amstrad into something that a factory produces, allowing me completely to hide a bunch of implementation details.
2017-08-01 02:32:04 +00:00
static Machine *AmstradCPC();
Added enough stuff to put the emulated Amstrad CPC in a state of knowing whether its '0' key is pressed.
2017-08-01 21:31:56 +00:00
Upped the documentation.
2017-08-03 00:37:26 +00:00
/// Sets the contents of rom @c type to @c data. Assumed to be a setup step; has no effect once a machine is running.
As per my keenness for cleanliness improvements corresponding to my ever-increasing C++ ability: turned the Amstrad into something that a factory produces, allowing me completely to hide a bunch of implementation details.
2017-08-01 02:32:04 +00:00
virtual void set_rom(ROMType type, std::vector<uint8_t> data) = 0;
Performed sufficient wiring to get to the point where attempting to load a CDT creates an instance of the Amstrad CPC and then fails only because the thing vends a `nullptr` CRT.
2017-07-31 02:05:29 +00:00
};
}
#endif /* AmstradCPC_hpp */
Reference in New Issue Copy Permalink