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

Merge branch 'master' into LockFreeQueue

Browse Source
This commit is contained in:
Thomas Harte 2020-07-24 22:29:45 -04:00
commit f9f500c194
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Components/8530/z8530.cpp
View File

@ -316,6 +316,8 @@ void z8530::Channel::write(bool data, uint8_t pointer, uint8_t value) {
} }
LOG("Receive bit count: " << receive_bit_count); LOG("Receive bit count: " << receive_bit_count);
(void)receive_bit_count;
/* /*
b7,b6: b7,b6:
00 = 5 receive bits per character 00 = 5 receive bits per character

3
OSBindings/Qt/ClockSignal.pro
View File

@ -1,6 +1,9 @@
QT += core gui multimedia widgets QT += core gui multimedia widgets
# Be specific about C++17 but also try the vaguer C++1z for older
# versions of Qt.
CONFIG += c++17 CONFIG += c++17
CONFIG += c++1z
# Permit multiple source files in different directories to have the same file name. # Permit multiple source files in different directories to have the same file name.
CONFIG += object_parallel_to_source CONFIG += object_parallel_to_source

16
OSBindings/SDL/SConstruct
View File

@ -1,19 +1,19 @@
import glob import glob
import sys import sys
# establish UTF-8 encoding for Python 2 # Establish UTF-8 encoding for Python 2.
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
reload(sys) reload(sys)
sys.setdefaultencoding('utf-8') sys.setdefaultencoding('utf-8')
# create build environment # Create build environment.
env = Environment() env = Environment()
# determine compiler and linker flags for SDL # Determine compiler and linker flags for SDL.
env.ParseConfig('sdl2-config --cflags') env.ParseConfig('sdl2-config --cflags')
env.ParseConfig('sdl2-config --libs') env.ParseConfig('sdl2-config --libs')
# gather a list of source files # Gather a list of source files.
SOURCES = glob.glob('*.cpp') SOURCES = glob.glob('*.cpp')
SOURCES += glob.glob('../../Analyser/Dynamic/*.cpp') SOURCES += glob.glob('../../Analyser/Dynamic/*.cpp')
@ -118,11 +118,11 @@ SOURCES += glob.glob('../../Storage/Tape/*.cpp')
SOURCES += glob.glob('../../Storage/Tape/Formats/*.cpp') SOURCES += glob.glob('../../Storage/Tape/Formats/*.cpp')
SOURCES += glob.glob('../../Storage/Tape/Parsers/*.cpp') SOURCES += glob.glob('../../Storage/Tape/Parsers/*.cpp')
# add additional compiler flags # Add additional compiler flags; c++1z is insurance in case c++17 isn't fully implemented.
env.Append(CCFLAGS = ['--std=c++17', '-Wall', '-O2', '-DNDEBUG']) env.Append(CCFLAGS = ['--std=c++17', '--std=c++1z', '-Wall', '-O2', '-DNDEBUG'])
# add additional libraries to link against # Add additional libraries to link against.
env.Append(LIBS = ['libz', 'pthread', 'GL']) env.Append(LIBS = ['libz', 'pthread', 'GL'])
# build target # Build target.
env.Program(target = 'clksignal', source = SOURCES) env.Program(target = 'clksignal', source = SOURCES)

1
Storage/Disk/DiskImage/Formats/WOZ.cpp
View File

@ -166,6 +166,7 @@ std::shared_ptr<Track> WOZ::get_track_at_position(Track::Address address) {
number_of_bits = std::min(file_.get16le(), uint16_t(6646*8)); number_of_bits = std::min(file_.get16le(), uint16_t(6646*8));
break; break;
default:
case Type::WOZ2: { case Type::WOZ2: {
// In WOZ 2 an extra level of indirection allows for variable track sizes. // In WOZ 2 an extra level of indirection allows for variable track sizes.
const uint16_t starting_block = file_.get16le(); const uint16_t starting_block = file_.get16le();

4
Storage/Tape/Formats/TZX.cpp
View File

@ -247,10 +247,10 @@ void TZX::get_data_block(const DataBlock &data_block) {
void TZX::get_data(const Data &data) { void TZX::get_data(const Data &data) {
// Output data. // Output data.
for(unsigned int c = 0; c < data.data_length; c++) { for(decltype(data.data_length) c = 0; c < data.data_length; c++) {
uint8_t next_byte = file_.get8(); uint8_t next_byte = file_.get8();
unsigned int bits = (c != data.data_length-1) ? 8 : data.number_of_bits_in_final_byte; auto bits = (c != data.data_length-1) ? 8 : data.number_of_bits_in_final_byte;
while(bits--) { while(bits--) {
unsigned int pulse_length = (next_byte & 0x80) ? data.length_of_one_bit_pulse : data.length_of_zero_bit_pulse; unsigned int pulse_length = (next_byte & 0x80) ? data.length_of_one_bit_pulse : data.length_of_zero_bit_pulse;
next_byte <<= 1; next_byte <<= 1;

2
Storage/Tape/Formats/TZX.hpp
View File

@ -77,7 +77,7 @@ class TZX: public PulseQueuedTape {
unsigned int length_of_one_bit_pulse; unsigned int length_of_one_bit_pulse;
unsigned int number_of_bits_in_final_byte; unsigned int number_of_bits_in_final_byte;
unsigned int pause_after_block; unsigned int pause_after_block;
long data_length; uint32_t data_length;
}; };
struct DataBlock { struct DataBlock {