little cleanup

This commit is contained in:
Polprzewodnikowy 2022-01-22 01:25:48 +01:00
parent 39c2edbb9a
commit ee43b5f7c0
4 changed files with 7 additions and 6 deletions

View File

@ -1,6 +1,5 @@
#include "boot.h" #include "boot.h"
#include "crc32.h" #include "crc32.h"
#include "init.h"
#include "io.h" #include "io.h"

View File

@ -258,7 +258,7 @@ void exception_fatal_handler (uint32_t exception_code, uint32_t interrupt_mask,
exception_init_screen(); exception_init_screen();
exception_print("----- SummerCart64 n64boot -----\n"); exception_print("----- n64boot SummerCart64 -----\n");
exception_print("branch: %s\n", version->git_branch); exception_print("branch: %s\n", version->git_branch);
exception_print("tag: %s\n", version->git_tag); exception_print("tag: %s\n", version->git_tag);
exception_print("sha: %s\n\n", version->git_sha); exception_print("sha: %s\n\n", version->git_sha);

View File

@ -7,8 +7,7 @@
#define DD_BUFFERS_OFFSET (SDRAM_BASE + 0x03BC0000UL) #define DD_BUFFERS_OFFSET (SDRAM_BASE + 0x03BC0000UL)
#define DD_THB_TABLE_OFFSET (DD_BUFFERS_OFFSET + 0x0000) #define DD_THB_TABLE_OFFSET (DD_BUFFERS_OFFSET + 0x0000)
#define DD_USB_BUFFER_OFFSET (DD_BUFFERS_OFFSET + 0x5000) #define DD_BLOCK_BUFFER_OFFSET (DD_BUFFERS_OFFSET + 0x5000)
#define DD_BLOCK_BUFFER_OFFSET (DD_USB_BUFFER_OFFSET + 0x10)
#define USB_DEBUG_ID_DD_BLOCK (0xF5) #define USB_DEBUG_ID_DD_BLOCK (0xF5)

View File

@ -251,10 +251,10 @@ void process_usb (void) {
p.event.callback(); p.event.callback();
} }
} }
p.state = STATE_IDLE;
if (p.cmd == 'L') { if (p.cmd == 'L') {
USB->SCR |= USB_SCR_FORCE_TX; USB->SCR |= USB_SCR_FORCE_TX;
} }
p.state = STATE_IDLE;
} else { } else {
p.state = STATE_RESPONSE; p.state = STATE_RESPONSE;
} }
@ -292,6 +292,9 @@ void process_usb (void) {
p.event.callback(); p.event.callback();
} }
} }
if (p.cmd == 'F') {
USB->SCR |= USB_SCR_FORCE_TX;
}
p.state = STATE_IDLE; p.state = STATE_IDLE;
} }
break; break;
@ -329,9 +332,9 @@ void process_usb (void) {
if (p.event.callback != NULL) { if (p.event.callback != NULL) {
p.event_callback_pending = true; p.event_callback_pending = true;
} }
USB->SCR |= USB_SCR_FORCE_TX;
p.event_pending = false; p.event_pending = false;
p.state = STATE_IDLE; p.state = STATE_IDLE;
USB->SCR |= USB_SCR_FORCE_TX;
} }
break; break;
} }