6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-10 12:29:01 +00:00
Code Issues Projects Releases Wiki Activity

Begins work on a functioning keyboard.

Browse Source
This commit is contained in:
Thomas Harte 2019-05-08 12:34:26 -04:00
parent 7e6d4f5a3e
commit 7b466e6d0a
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Machines/Apple/Macintosh/Keyboard.hpp Normal file
View File

@ -0,0 +1,25 @@
//
// Keyboard.h
// Clock Signal
//
// Created by Thomas Harte on 08/05/2019.
// Copyright © 2019 Thomas Harte. All rights reserved.
//
#ifndef Keyboard_hpp
#define Keyboard_hpp
namespace Apple {
namespace Macintosh {
class Keyboard {
public:
void set_input(bool data) {
printf("");
}
};
}
}
#endif /* Keyboard_h */

23
Machines/Apple/Macintosh/Macintosh.cpp
View File

@ -10,8 +10,9 @@
#include <array> #include <array>
#include "Video.hpp" #include "Keyboard.hpp"
#include "RealTimeClock.hpp" #include "RealTimeClock.hpp"
#include "Video.hpp"
#include "../../CRTMachine.hpp" #include "../../CRTMachine.hpp"
@ -39,7 +40,7 @@ class ConcreteMachine:
mc68000_(*this), mc68000_(*this),
video_(ram_.data()), video_(ram_.data()),
via_(via_port_handler_), via_(via_port_handler_),
via_port_handler_(*this, clock_), via_port_handler_(*this, clock_, keyboard_),
iwm_(CLOCK_RATE) { iwm_(CLOCK_RATE) {
// Grab a copy of the ROM and convert it into big-endian data. // Grab a copy of the ROM and convert it into big-endian data.
@ -212,13 +213,10 @@ class ConcreteMachine:
} }
private: private:
class Keyboard {
public:
};
class VIAPortHandler: public MOS::MOS6522::PortHandler { class VIAPortHandler: public MOS::MOS6522::PortHandler {
public: public:
VIAPortHandler(ConcreteMachine &machine, RealTimeClock &clock) : machine_(machine), clock_(clock) {} VIAPortHandler(ConcreteMachine &machine, RealTimeClock &clock, Keyboard &keyboard) :
machine_(machine), clock_(clock), keyboard_(keyboard) {}
using Port = MOS::MOS6522::Port; using Port = MOS::MOS6522::Port;
using Line = MOS::MOS6522::Line; using Line = MOS::MOS6522::Line;
@ -240,8 +238,9 @@ class ConcreteMachine:
b2–b0: audio output volume b2–b0: audio output volume
*/ */
// printf("6522 A: %02x\n", value); // printf("6522 A: %02x\n", value);
machine_.set_rom_is_overlay(!!(value & 0x10));
machine_.set_use_alternate_screen_buffer(!(value & 0x40)); machine_.set_use_alternate_screen_buffer(!(value & 0x40));
machine_.set_rom_is_overlay(!!(value & 0x10));
break; break;
case Port::B: case Port::B:
@ -277,17 +276,20 @@ class ConcreteMachine:
void set_control_line_output(Port port, Line line, bool value) { void set_control_line_output(Port port, Line line, bool value) {
/* /*
Keyboard wiring (I believe): Keyboard wiring (I believe):
CB2 = data CB2 = data (output)
CB1 = clock CB1 = clock (input)
CA2 is used for receiving RTC interrupts. CA2 is used for receiving RTC interrupts.
CA1 is used for receiving vsync maybe?
*/ */
if(port == Port::B && line == Line::Two) keyboard_.set_input(value);
// printf("6522 line %c%d: %c\n", port ? 'B' : 'A', int(line), value ? 't' : 'f'); // printf("6522 line %c%d: %c\n", port ? 'B' : 'A', int(line), value ? 't' : 'f');
} }
private: private:
ConcreteMachine &machine_; ConcreteMachine &machine_;
RealTimeClock &clock_; RealTimeClock &clock_;
Keyboard &keyboard_;
}; };
std::array<uint16_t, 32*1024> rom_; std::array<uint16_t, 32*1024> rom_;
@ -297,6 +299,7 @@ class ConcreteMachine:
Video video_; Video video_;
RealTimeClock clock_; RealTimeClock clock_;
Keyboard keyboard_;
MOS::MOS6522::MOS6522<VIAPortHandler> via_; MOS::MOS6522::MOS6522<VIAPortHandler> via_;
VIAPortHandler via_port_handler_; VIAPortHandler via_port_handler_;