bstanwell/wch-uf2-example
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reboot into ram wip

Browse Source
This commit is contained in:
R
2024-04-14 17:36:13 +01:00
parent 397857a2a7
commit c2665c139d
8 changed files with 238 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootloader.c
+11 -11
View File
@@ -380,20 +380,16 @@ __attribute__((naked)) int main(void) {
ACTIVE_CONFIG = 0;
const uint8_t *outputting_desc = 0;
CTRL_XFER_DESC_SZ = 0;
ADDRESS_HI = 0;
// bits [31:24] = additional sense code
// bits [23:20] = sense key
// bits [7:0] = state
uint32_t msc_state = STATE_WANT_CBW;
// when reading:
// [31:16] = current lba
// [15:0] = blocks left
// when writing:
// [31:16] = ignored
// [15:0] = blocks left
UF2_GOT_BLOCKS[35] = 0;
while (1) {
uint32_t usb_int_status = R16_USBD_ISTR;
if (usb_int_status & (1 << 10)) {
@@ -849,7 +845,6 @@ __attribute__((naked)) int main(void) {
msc_state = (msc_state & 0xffffff00) | STATE_WANT_CBW;
break;
case STATE_SENT_CSW_REBOOT:
// todo reboot into ram
STK_CMPLR = (50 /* ms */ * 12000 /* assume 96 MHz system clock, div8 */);
STK_CTLR = 0b111000;
STK_CTLR = 0b111001;
@@ -858,10 +853,15 @@ __attribute__((naked)) int main(void) {
STK_SR = 0;
R16_USBD_CNTR = 0b11;
R32_EXTEN_CTR &= ~(1 << 1);
// wtf why does this work and the other stuff doesn't?
R16_BKP_DATAR10 = 0x4170;
PFIC_CFGR = 0xbeef0080;
while (1) { asm volatile(""); }
if (ADDRESS_HI >> 8 == 0x20) {
// ram boot
((void (*)())0x20000000)();
} else {
// wtf why does this work and the other stuff doesn't?
R16_BKP_DATAR10 = 0x4170;
PFIC_CFGR = 0xbeef0080;
while (1) { asm volatile(""); }
}
break;
case STATE_SENT_DATA_IN:
make_msc_csw(dCSWTag, 0);