Max
/
SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the printer not deadlock after a sudden termination

This commit is contained in:
Lior Halphon 2021-02-26 16:40:35 +02:00
parent cb721dae5d
commit ce44773caa
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Core/printer.c
View File

@ -11,7 +11,6 @@
static void handle_command(GB_gameboy_t *gb) static void handle_command(GB_gameboy_t *gb)
{ {
switch (gb->printer.command_id) { switch (gb->printer.command_id) {
case GB_PRINTER_INIT_COMMAND: case GB_PRINTER_INIT_COMMAND:
gb->printer.status = 0; gb->printer.status = 0;
@ -71,7 +70,7 @@ static void handle_command(GB_gameboy_t *gb)
} }
static void byte_reieve_completed(GB_gameboy_t *gb, uint8_t byte_received) static void byte_recieve_completed(GB_gameboy_t *gb, uint8_t byte_received)
{ {
gb->printer.byte_to_send = 0; gb->printer.byte_to_send = 0;
switch (gb->printer.command_state) { switch (gb->printer.command_state) {
@ -189,11 +188,16 @@ static void byte_reieve_completed(GB_gameboy_t *gb, uint8_t byte_received)
static void serial_start(GB_gameboy_t *gb, bool bit_received) static void serial_start(GB_gameboy_t *gb, bool bit_received)
{ {
if (gb->printer.idle_time > GB_get_unmultiplied_clock_rate(gb)) {
gb->printer.command_state = GB_PRINTER_COMMAND_MAGIC1;
gb->printer.bits_received = 0;
}
gb->printer.idle_time = 0;
gb->printer.byte_being_received <<= 1; gb->printer.byte_being_received <<= 1;
gb->printer.byte_being_received |= bit_received; gb->printer.byte_being_received |= bit_received;
gb->printer.bits_received++; gb->printer.bits_received++;
if (gb->printer.bits_received == 8) { if (gb->printer.bits_received == 8) {
byte_reieve_completed(gb, gb->printer.byte_being_received); byte_recieve_completed(gb, gb->printer.byte_being_received);
gb->printer.bits_received = 0; gb->printer.bits_received = 0;
gb->printer.byte_being_received = 0; gb->printer.byte_being_received = 0;
} }

3
Core/printer.h
View File

@ -48,8 +48,7 @@ typedef struct
uint8_t image[160 * 200]; uint8_t image[160 * 200];
uint16_t image_offset; uint16_t image_offset;
/* TODO: Delete me. */ uint64_t idle_time;
uint64_t padding;
uint8_t compression_run_lenth; uint8_t compression_run_lenth;
bool compression_run_is_compressed; bool compression_run_is_compressed;

3
Core/timing.c
View File

@ -198,6 +198,9 @@ main:
static void advance_serial(GB_gameboy_t *gb, uint8_t cycles) static void advance_serial(GB_gameboy_t *gb, uint8_t cycles)
{ {
if (gb->printer.command_state || gb->printer.bits_received) {
gb->printer.idle_time += cycles;
}
if (gb->serial_length == 0) { if (gb->serial_length == 0) {
gb->serial_cycles += cycles; gb->serial_cycles += cycles;
return; return;