working demo of first couple packets in loader

This commit is contained in:
bunnie 2024-06-09 23:51:30 +08:00
parent 546b12eda4
commit 99be442d16
2 changed files with 6 additions and 11 deletions

View file

@ -671,32 +671,27 @@ pub fn early_init() {
let irq1 = irq_csr.r(utralib::utra::irqarray1::EV_PENDING); let irq1 = irq_csr.r(utralib::utra::irqarray1::EV_PENDING);
crate::println!(" irq1: {:x}", irq1); crate::println!(" irq1: {:x}", irq1);
crate::println!(" status: {:x}", csr.r(cramium_hal::usb::utra::USBSTS)); crate::println!(" status: {:x}", csr.r(cramium_hal::usb::utra::USBSTS));
usb.print_status(csr.r(cramium_hal::usb::utra::PORTSC));
irq_csr.wo(utralib::utra::irqarray1::EV_PENDING, irq1); irq_csr.wo(utralib::utra::irqarray1::EV_PENDING, irq1);
} }
if !vbus_on && vbus_on_count == 4 { if !vbus_on && vbus_on_count == 4 {
crate::println!("*Vbus on"); crate::println!("*Vbus on");
crate::println!(" bef reset"); crate::println!(" bef reset");
usb.print_status(csr.r(cramium_hal::usb::utra::PORTSC));
usb.reset(); usb.reset();
crate::println!(" aft reset"); crate::println!(" aft reset");
usb.print_status(csr.r(cramium_hal::usb::utra::PORTSC));
usb.init(); usb.init();
crate::println!(" aft init"); crate::println!(" aft init");
usb.print_status(csr.r(cramium_hal::usb::utra::PORTSC));
usb.start(); usb.start();
crate::println!(" aft start"); crate::println!(" aft start");
usb.print_status(csr.r(cramium_hal::usb::utra::PORTSC));
vbus_on = true; vbus_on = true;
in_u0 = false; in_u0 = false;
let irq1 = irq_csr.r(utralib::utra::irqarray1::EV_PENDING); let irq1 = irq_csr.r(utralib::utra::irqarray1::EV_PENDING);
crate::println!("irq1: {:x}", irq1); crate::println!("irq1: {:x}", irq1);
crate::println!("status: {:x}", csr.r(cramium_hal::usb::utra::USBSTS)); crate::println!("status: {:x}", csr.r(cramium_hal::usb::utra::USBSTS));
usb.print_status(csr.r(cramium_hal::usb::utra::PORTSC));
irq_csr.wo(utralib::utra::irqarray1::EV_PENDING, irq1); irq_csr.wo(utralib::utra::irqarray1::EV_PENDING, irq1);
break; // restore this to go on to boot
// break;
} else if usb.pp() && !vbus_on { } else if usb.pp() && !vbus_on {
vbus_on_count += 1; vbus_on_count += 1;
crate::println!("*Vbus_on_count: {}", vbus_on_count); crate::println!("*Vbus_on_count: {}", vbus_on_count);
@ -712,13 +707,13 @@ pub fn early_init() {
// usb.udc_handle_interrupt(); // usb.udc_handle_interrupt();
// TODO // TODO
} else if usb.ccs() && vbus_on { } else if usb.ccs() && vbus_on {
usb.print_status(usb.csr.r(cramium_hal::usb::utra::PORTSC)); // usb.print_status(usb.csr.r(cramium_hal::usb::utra::PORTSC));
crate::println!("*Enter U0"); crate::println!("*Enter U0");
in_u0 = true; in_u0 = true;
let irq1 = irq_csr.r(utralib::utra::irqarray1::EV_PENDING); let irq1 = irq_csr.r(utralib::utra::irqarray1::EV_PENDING);
crate::println!("irq1: {:x}", irq1); crate::println!("irq1: {:x}", irq1);
crate::println!("status: {:x}", csr.r(cramium_hal::usb::utra::USBSTS)); crate::println!("status: {:x}", csr.r(cramium_hal::usb::utra::USBSTS));
usb.print_status(csr.r(cramium_hal::usb::utra::PORTSC)); // usb.print_status(csr.r(cramium_hal::usb::utra::PORTSC));
irq_csr.wo(utralib::utra::irqarray1::EV_PENDING, irq1); irq_csr.wo(utralib::utra::irqarray1::EV_PENDING, irq1);
} }
} }

View file

@ -86,12 +86,12 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
_edata = .; _edata = .;
} > REGION_DATA AT > REGION_RODATA } > REGION_DATA AT > REGION_RODATA
/*
.fonts : ALIGN(65536) .fonts : ALIGN(65536)
{ {
KEEP(*(.fontdata)); KEEP(*(.fontdata));
} > FONTS } > FONTS
*/
.bss (NOLOAD) : .bss (NOLOAD) :
{ {
_sbss = .; _sbss = .;