mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
use global allocator for simple-fatfs
also initialize the disk image with some default data
This commit is contained in:
parent
8cc80741ac
commit
e181c0d460
1 changed files with 28 additions and 2 deletions
|
|
@ -5,12 +5,23 @@ use cramium_hal::usb::compat::AtomicCsr;
|
||||||
use cramium_hal::usb::driver::CorigineUsb;
|
use cramium_hal::usb::driver::CorigineUsb;
|
||||||
use cramium_hal::usb::driver::*;
|
use cramium_hal::usb::driver::*;
|
||||||
use cramium_hal::usb::utra::*;
|
use cramium_hal::usb::utra::*;
|
||||||
|
use linked_list_allocator::LockedHeap;
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[global_allocator]
|
||||||
|
static ALLOCATOR: LockedHeap = LockedHeap::empty();
|
||||||
|
|
||||||
pub(crate) static mut USB: Option<CorigineUsb> = None;
|
pub(crate) static mut USB: Option<CorigineUsb> = None;
|
||||||
|
|
||||||
pub fn init_usb() {
|
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 {
|
let mut usb = unsafe {
|
||||||
cramium_hal::usb::driver::CorigineUsb::new(
|
cramium_hal::usb::driver::CorigineUsb::new(
|
||||||
0,
|
0,
|
||||||
|
|
@ -25,11 +36,23 @@ pub fn init_usb() {
|
||||||
// initialize the "disk" area
|
// initialize the "disk" area
|
||||||
let disk = mass_storage::conjure_disk();
|
let disk = mass_storage::conjure_disk();
|
||||||
disk.fill(0);
|
disk.fill(0);
|
||||||
|
// setup MBR
|
||||||
disk[..MBR_TEMPLATE.len()].copy_from_slice(&MBR_TEMPLATE);
|
disk[..MBR_TEMPLATE.len()].copy_from_slice(&MBR_TEMPLATE);
|
||||||
|
/*
|
||||||
//set block size
|
//set block size
|
||||||
disk[0xb..0xd].copy_from_slice(&SECTOR_SIZE.to_le_bytes());
|
disk[0xb..0xd].copy_from_slice(&SECTOR_SIZE.to_le_bytes());
|
||||||
//set storage size
|
//set storage size
|
||||||
disk[0x20..0x24].copy_from_slice(&(RAMDISK_LEN as u32 / SECTOR_SIZE as u32).to_le_bytes());
|
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
|
// install the interrupt handler
|
||||||
// setup the stack & controller
|
// setup the stack & controller
|
||||||
|
|
@ -45,6 +68,7 @@ pub fn init_usb() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
pub unsafe fn test_usb() {
|
pub unsafe fn test_usb() {
|
||||||
if let Some(ref mut usb_ref) = USB {
|
if let Some(ref mut usb_ref) = USB {
|
||||||
let usb = &mut *core::ptr::addr_of_mut!(*usb_ref);
|
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);
|
// this.print_status(portsc_val);
|
||||||
|
|
||||||
let portsc = PortSc(portsc_val);
|
let portsc = PortSc(portsc_val);
|
||||||
crate::println!("{:?}", portsc);
|
// crate::println!("{:?}", portsc);
|
||||||
|
|
||||||
if portsc.prc() && !portsc.pr() {
|
if portsc.prc() && !portsc.pr() {
|
||||||
crate::println!("update_current_speed() - reset done");
|
crate::println!("update_current_speed() - reset done");
|
||||||
|
|
@ -207,7 +231,7 @@ fn handle_event(this: &mut CorigineUsb, event_trb: &mut EventTrbS) -> CrgEvent {
|
||||||
} else {
|
} else {
|
||||||
udc_ep.deq_pt = AtomicPtr::new(deq_pt as *mut TransferTrbS);
|
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;
|
let dir = (pei & 1) != 0;
|
||||||
if pei == 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_index = setup_pkt.w_index;
|
||||||
let w_length = setup_pkt.w_length;
|
let w_length = setup_pkt.w_length;
|
||||||
|
|
||||||
|
/*
|
||||||
crate::println!(
|
crate::println!(
|
||||||
" b_request={:x}, b_request_type={:x}, w_value={:04x}, w_index=0x{:x}, w_length={}",
|
" b_request={:x}, b_request_type={:x}, w_value={:04x}, w_index=0x{:x}, w_length={}",
|
||||||
setup_pkt.b_request,
|
setup_pkt.b_request,
|
||||||
|
|
@ -260,6 +285,7 @@ fn handle_event(this: &mut CorigineUsb, event_trb: &mut EventTrbS) -> CrgEvent {
|
||||||
w_index,
|
w_index,
|
||||||
w_length
|
w_length
|
||||||
);
|
);
|
||||||
|
*/
|
||||||
|
|
||||||
if (setup_pkt.b_request_type & USB_TYPE_MASK) == USB_TYPE_STANDARD {
|
if (setup_pkt.b_request_type & USB_TYPE_MASK) == USB_TYPE_STANDARD {
|
||||||
match setup_pkt.b_request {
|
match setup_pkt.b_request {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue