From e181c0d460b0e26a015ce1a7503513cefe66fb8c Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 20 Nov 2024 20:39:27 +0800 Subject: [PATCH] use global allocator for simple-fatfs also initialize the disk image with some default data --- loader/src/platform/cramium/usb/driver.rs | 30 +++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/loader/src/platform/cramium/usb/driver.rs b/loader/src/platform/cramium/usb/driver.rs index c83dfd2b6..3f94f26a6 100644 --- a/loader/src/platform/cramium/usb/driver.rs +++ b/loader/src/platform/cramium/usb/driver.rs @@ -5,12 +5,23 @@ use cramium_hal::usb::compat::AtomicCsr; use cramium_hal::usb::driver::CorigineUsb; use cramium_hal::usb::driver::*; use cramium_hal::usb::utra::*; +use linked_list_allocator::LockedHeap; use super::*; +#[global_allocator] +static ALLOCATOR: LockedHeap = LockedHeap::empty(); + pub(crate) static mut USB: Option = None; pub fn init_usb() { + let heap_start = HEAP_ADDRESS; + let heap_end = HEAP_ADDRESS + HEAP_LEN; + let heap_size = heap_end - heap_start; + unsafe { + ALLOCATOR.lock().init(heap_start as *mut u8, heap_size); + } + let mut usb = unsafe { cramium_hal::usb::driver::CorigineUsb::new( 0, @@ -25,11 +36,23 @@ pub fn init_usb() { // initialize the "disk" area let disk = mass_storage::conjure_disk(); disk.fill(0); + // setup MBR disk[..MBR_TEMPLATE.len()].copy_from_slice(&MBR_TEMPLATE); + /* //set block size disk[0xb..0xd].copy_from_slice(&SECTOR_SIZE.to_le_bytes()); //set storage size disk[0x20..0x24].copy_from_slice(&(RAMDISK_LEN as u32 / SECTOR_SIZE as u32).to_le_bytes()); + */ + // populate an initial "windows-friendly" FAT layout, generated by plugging the empty disk + // into windows and letting it...do its thing, then snapshotting the data. + disk[TABLE_OFFSET_FAT1..TABLE_OFFSET_FAT1 + FAT_TABLE.len()].copy_from_slice(&FAT_TABLE); + disk[TABLE_OFFSET_FAT2..TABLE_OFFSET_FAT2 + FAT_TABLE.len()].copy_from_slice(&FAT_TABLE); + + disk[ROOT_DIR_OFFSET..ROOT_DIR_OFFSET + ROOT_DIR.len()].copy_from_slice(&ROOT_DIR); + disk[FAT_DATA1_OFFSET..FAT_DATA1_OFFSET + FAT_DATA1.len()].copy_from_slice(&FAT_DATA1); + disk[FAT_DATA2_OFFSET..FAT_DATA2_OFFSET + FAT_DATA2.len()].copy_from_slice(&FAT_DATA2); + disk[FAT_DATA3_OFFSET..FAT_DATA3_OFFSET + FAT_DATA3.len()].copy_from_slice(&FAT_DATA3); // install the interrupt handler // setup the stack & controller @@ -45,6 +68,7 @@ pub fn init_usb() { } } +#[allow(dead_code)] pub unsafe fn test_usb() { if let Some(ref mut usb_ref) = USB { let usb = &mut *core::ptr::addr_of_mut!(*usb_ref); @@ -181,7 +205,7 @@ fn handle_event(this: &mut CorigineUsb, event_trb: &mut EventTrbS) -> CrgEvent { // this.print_status(portsc_val); let portsc = PortSc(portsc_val); - crate::println!("{:?}", portsc); + // crate::println!("{:?}", portsc); if portsc.prc() && !portsc.pr() { crate::println!("update_current_speed() - reset done"); @@ -207,7 +231,7 @@ fn handle_event(this: &mut CorigineUsb, event_trb: &mut EventTrbS) -> CrgEvent { } else { udc_ep.deq_pt = AtomicPtr::new(deq_pt as *mut TransferTrbS); } - crate::println!("EventTransfer: comp_code {:?}, PEI {}", comp_code, pei); + // crate::println!("EventTransfer: comp_code {:?}, PEI {}", comp_code, pei); let dir = (pei & 1) != 0; if pei == 0 { @@ -252,6 +276,7 @@ fn handle_event(this: &mut CorigineUsb, event_trb: &mut EventTrbS) -> CrgEvent { let w_index = setup_pkt.w_index; let w_length = setup_pkt.w_length; + /* crate::println!( " b_request={:x}, b_request_type={:x}, w_value={:04x}, w_index=0x{:x}, w_length={}", setup_pkt.b_request, @@ -260,6 +285,7 @@ fn handle_event(this: &mut CorigineUsb, event_trb: &mut EventTrbS) -> CrgEvent { w_index, w_length ); + */ if (setup_pkt.b_request_type & USB_TYPE_MASK) == USB_TYPE_STANDARD { match setup_pkt.b_request {