1
0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-09 17:31:18 +00:00

Minor tidiness: included missing headers, and spaced out the ROM type and key lists for readability.

This commit is contained in:
Thomas Harte 2017-08-03 12:45:42 -04:00
parent 45cbab6751
commit 33ed27c3ad

View File

@ -13,6 +13,9 @@
#include "../CRTMachine.hpp"
#include "../KeyboardMachine.hpp"
#include <cstdint>
#include <vector>
namespace AmstradCPC {
enum ROMType: uint8_t {
@ -23,14 +26,8 @@ enum ROMType: uint8_t {
enum Key: uint16_t {
#define Line(l, k1, k2, k3, k4, k5, k6, k7, k8) \
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,
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)
@ -47,7 +44,7 @@ enum Key: uint16_t {
};
/*!
Models an Amstrad CPC, a CRT-outputting machine that can accept configuration targets.
Models an Amstrad CPC, a CRT-outputting machine with a keyboard that can accept configuration targets.
*/
class Machine:
public CRTMachine::Machine,