mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
trying to back-trace to a working bootloader state
This commit is contained in:
parent
3f75da8240
commit
ac7b58b702
2 changed files with 129 additions and 127 deletions
|
|
@ -176,6 +176,27 @@ impl TryFrom<u8> for EpType {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bitfield! {
|
||||||
|
#[derive(Copy, Clone, PartialEq, Eq, Default)]
|
||||||
|
pub struct PortSc(u32);
|
||||||
|
impl Debug;
|
||||||
|
pub ccs, set_ccs: 0;
|
||||||
|
pub pp, set_pp: 3;
|
||||||
|
pub pr, set_pr: 4;
|
||||||
|
pub pls, set_pl: 8, 5;
|
||||||
|
pub speed, set_speed: 13, 10;
|
||||||
|
pub lws, set_lws: 16;
|
||||||
|
pub csc, set_csc: 17;
|
||||||
|
pub ppc, set_ppc: 20;
|
||||||
|
pub prc, set_prc: 21;
|
||||||
|
pub plc, set_plc: 22;
|
||||||
|
pub cec, set_cec: 23;
|
||||||
|
pub wce, set_wce: 25;
|
||||||
|
pub wde, set_wde: 26;
|
||||||
|
pub wdr, set_wdr: 31;
|
||||||
|
}
|
||||||
|
|
||||||
#[repr(u32)]
|
#[repr(u32)]
|
||||||
pub enum PortSpeed {
|
pub enum PortSpeed {
|
||||||
Invalid = 0,
|
Invalid = 0,
|
||||||
|
|
@ -794,20 +815,21 @@ pub struct CorigineUsb {
|
||||||
|
|
||||||
udc_event: UdcEvent,
|
udc_event: UdcEvent,
|
||||||
|
|
||||||
|
/// A place to put data received from the hardware immediately, before it
|
||||||
|
/// is processed by the driver interface.
|
||||||
|
readout: [Option<[u8; CRG_UDC_APP_BUF_LEN]>; CRG_EP_NUM],
|
||||||
|
setup: Option<[u8; 8]>,
|
||||||
|
setup_tag: u8,
|
||||||
|
/// When `true`, indicates that hardware has auto-responded to set_address, and the stack's set_address
|
||||||
|
/// response should be ignored.
|
||||||
|
suppress_ep0_send_set_addr: bool,
|
||||||
|
|
||||||
// power management data
|
// power management data
|
||||||
sel_value: SelValue,
|
sel_value: SelValue,
|
||||||
|
|
||||||
setup_status: u8,
|
|
||||||
setup: Option<[u8; 8]>,
|
|
||||||
setup_tag: u8,
|
|
||||||
|
|
||||||
speed: UsbDeviceSpeed,
|
speed: UsbDeviceSpeed,
|
||||||
device_state: UsbDeviceState,
|
device_state: UsbDeviceState,
|
||||||
resume_state: u8,
|
|
||||||
dev_addr: u16,
|
|
||||||
set_tm: u8,
|
|
||||||
cur_interface_num: u8,
|
cur_interface_num: u8,
|
||||||
connected: u32,
|
|
||||||
|
|
||||||
// actual hardware pointer value to pass to UDC; not directly accessed by Rust
|
// actual hardware pointer value to pass to UDC; not directly accessed by Rust
|
||||||
ep0_buf: AtomicPtr<u8>,
|
ep0_buf: AtomicPtr<u8>,
|
||||||
|
|
@ -815,9 +837,6 @@ pub struct CorigineUsb {
|
||||||
u2_rwe: u32,
|
u2_rwe: u32,
|
||||||
feature_u1_enabled: u32,
|
feature_u1_enabled: u32,
|
||||||
feature_u2_enabled: u32,
|
feature_u2_enabled: u32,
|
||||||
|
|
||||||
portsc_on_reconnecting: u32,
|
|
||||||
max_speed: u32,
|
|
||||||
}
|
}
|
||||||
impl CorigineUsb {
|
impl CorigineUsb {
|
||||||
/// Safety: this function is generally pretty unsafe because the underlying hardware needs raw pointers,
|
/// Safety: this function is generally pretty unsafe because the underlying hardware needs raw pointers,
|
||||||
|
|
@ -862,22 +881,17 @@ impl CorigineUsb {
|
||||||
p_epcx: AtomicPtr::new(core::ptr::null_mut()),
|
p_epcx: AtomicPtr::new(core::ptr::null_mut()),
|
||||||
udc_event: UdcEvent::default(),
|
udc_event: UdcEvent::default(),
|
||||||
sel_value: SelValue::default(),
|
sel_value: SelValue::default(),
|
||||||
setup_status: 0,
|
readout: [None; CRG_EP_NUM],
|
||||||
setup_tag: 0,
|
|
||||||
setup: None,
|
setup: None,
|
||||||
|
suppress_ep0_send_set_addr: false,
|
||||||
|
setup_tag: 0,
|
||||||
speed: UsbDeviceSpeed::Unknown,
|
speed: UsbDeviceSpeed::Unknown,
|
||||||
device_state: UsbDeviceState::NotAttached,
|
device_state: UsbDeviceState::NotAttached,
|
||||||
resume_state: 0,
|
|
||||||
dev_addr: 0,
|
|
||||||
set_tm: 0,
|
|
||||||
cur_interface_num: 0,
|
cur_interface_num: 0,
|
||||||
connected: 0,
|
|
||||||
ep0_buf: AtomicPtr::new(core::ptr::null_mut()),
|
ep0_buf: AtomicPtr::new(core::ptr::null_mut()),
|
||||||
u2_rwe: 0,
|
u2_rwe: 0,
|
||||||
feature_u1_enabled: 0,
|
feature_u1_enabled: 0,
|
||||||
feature_u2_enabled: 0,
|
feature_u2_enabled: 0,
|
||||||
portsc_on_reconnecting: 0,
|
|
||||||
max_speed: 0,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -981,11 +995,6 @@ impl CorigineUsb {
|
||||||
|
|
||||||
self.csr.wo(DEVCONFIG, 0x80 | CRG_UDC_CFG0_MAXSPEED_FS);
|
self.csr.wo(DEVCONFIG, 0x80 | CRG_UDC_CFG0_MAXSPEED_FS);
|
||||||
|
|
||||||
#[cfg(not(feature = "std"))]
|
|
||||||
println!("config0: {:x}", self.csr.r(DEVCONFIG));
|
|
||||||
#[cfg(feature = "std")]
|
|
||||||
log::trace!("config0: {:x}", self.csr.r(DEVCONFIG));
|
|
||||||
|
|
||||||
self.csr.wo(
|
self.csr.wo(
|
||||||
EVENTCONFIG,
|
EVENTCONFIG,
|
||||||
self.csr.ms(EVENTCONFIG_CSC_ENABLE, 1)
|
self.csr.ms(EVENTCONFIG_CSC_ENABLE, 1)
|
||||||
|
|
@ -1069,16 +1078,6 @@ impl CorigineUsb {
|
||||||
self.csr.wo(DCBAPLO, self.ep_cx.vaddr.load(Ordering::SeqCst) as u32);
|
self.csr.wo(DCBAPLO, self.ep_cx.vaddr.load(Ordering::SeqCst) as u32);
|
||||||
self.csr.wo(DCBAPHI, 0);
|
self.csr.wo(DCBAPHI, 0);
|
||||||
compiler_fence(Ordering::SeqCst);
|
compiler_fence(Ordering::SeqCst);
|
||||||
#[cfg(not(feature = "std"))]
|
|
||||||
{
|
|
||||||
println!(" dcbaplo: {:x}", self.csr.r(DCBAPLO));
|
|
||||||
println!(" dcbaphi: {:x}", self.csr.r(DCBAPHI));
|
|
||||||
}
|
|
||||||
#[cfg(feature = "std")]
|
|
||||||
{
|
|
||||||
log::trace!(" dcbaplo: {:x}", self.csr.r(DCBAPLO));
|
|
||||||
log::trace!(" dcbaphi: {:x}", self.csr.r(DCBAPHI));
|
|
||||||
}
|
|
||||||
|
|
||||||
// initial ep0 transfer ring
|
// initial ep0 transfer ring
|
||||||
self.init_ep0();
|
self.init_ep0();
|
||||||
|
|
@ -1281,18 +1280,26 @@ impl CorigineUsb {
|
||||||
#[cfg(feature = "std")]
|
#[cfg(feature = "std")]
|
||||||
log::debug!("handle_event: {:x?}", event_trb);
|
log::debug!("handle_event: {:x?}", event_trb);
|
||||||
let pei = event_trb.get_endpoint_id();
|
let pei = event_trb.get_endpoint_id();
|
||||||
|
let ep_num = pei >> 1;
|
||||||
let udc_ep = &mut self.udc_ep[pei as usize];
|
let udc_ep = &mut self.udc_ep[pei as usize];
|
||||||
// println!("handle_event() event_trb: {:x?}", event_trb);
|
|
||||||
let mut ret = CrgEvent::None;
|
let mut ret = CrgEvent::None;
|
||||||
match event_trb.get_trb_type() {
|
match event_trb.get_trb_type() {
|
||||||
TrbType::EventPortStatusChange => {
|
TrbType::EventPortStatusChange => {
|
||||||
let portsc_val = self.csr.r(PORTSC);
|
let portsc_val = self.csr.r(PORTSC);
|
||||||
self.csr.wo(PORTSC, portsc_val);
|
self.csr.wo(PORTSC, portsc_val);
|
||||||
self.print_status(portsc_val);
|
|
||||||
|
let portsc = PortSc(portsc_val);
|
||||||
|
#[cfg(feature = "std")]
|
||||||
|
log::info!("{:?}", portsc);
|
||||||
|
|
||||||
|
if portsc.prc() {
|
||||||
|
ret = CrgEvent::Connect;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
let cs = (portsc_val & self.csr.ms(PORTSC_CCS, 1)) != 0;
|
let cs = (portsc_val & self.csr.ms(PORTSC_CCS, 1)) != 0;
|
||||||
let pp = (portsc_val & self.csr.ms(PORTSC_PP, 1)) != 0;
|
let pp = (portsc_val & self.csr.ms(PORTSC_PP, 1)) != 0;
|
||||||
#[cfg(feature = "std")]
|
// log::info!(" {:x} {:x?} PORT_STATUS_CHANGE", portsc_val, event_trb.dw3);
|
||||||
log::info!(" {:x} {:x?} PORT_STATUS_CHANGE", portsc_val, event_trb.dw3);
|
|
||||||
|
|
||||||
if portsc_val & self.csr.ms(PORTSC_CSC, 1) != 0 {
|
if portsc_val & self.csr.ms(PORTSC_CSC, 1) != 0 {
|
||||||
if cs {
|
if cs {
|
||||||
|
|
@ -1365,7 +1372,7 @@ impl CorigineUsb {
|
||||||
println!(" cable disconnect and power not present");
|
println!(" cable disconnect and power not present");
|
||||||
#[cfg(feature = "std")]
|
#[cfg(feature = "std")]
|
||||||
log::info!(" cable disconnect and power not present");
|
log::info!(" cable disconnect and power not present");
|
||||||
}
|
}*/
|
||||||
|
|
||||||
self.csr.rmwf(EVENTCONFIG_SETUP_ENABLE, 1);
|
self.csr.rmwf(EVENTCONFIG_SETUP_ENABLE, 1);
|
||||||
}
|
}
|
||||||
|
|
@ -1407,6 +1414,24 @@ impl CorigineUsb {
|
||||||
if comp_code == CompletionCode::Success || comp_code == CompletionCode::ShortPacket {
|
if comp_code == CompletionCode::Success || comp_code == CompletionCode::ShortPacket {
|
||||||
// xfer_complete
|
// xfer_complete
|
||||||
if dir == HOST_SEND {
|
if dir == HOST_SEND {
|
||||||
|
let addr = self.get_app_buf_ptr(ep_num, HOST_SEND);
|
||||||
|
let hw_buf = unsafe {
|
||||||
|
core::slice::from_raw_parts_mut(addr as *mut u8, CRG_UDC_APP_BUF_LEN)
|
||||||
|
};
|
||||||
|
// copy the whole hardware buffer contents -- even if it's bogus
|
||||||
|
let mut storage = [0u8; 512];
|
||||||
|
storage.copy_from_slice(hw_buf);
|
||||||
|
self.readout[ep_num as usize - 1] = Some(storage);
|
||||||
|
// re-enqueue the listener
|
||||||
|
self.intr_xfer(
|
||||||
|
ep_num,
|
||||||
|
dir,
|
||||||
|
addr,
|
||||||
|
CRG_UDC_APP_BUF_LEN,
|
||||||
|
CRG_INT_TARGET,
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
);
|
||||||
ret = CrgEvent::Data((pei / 2) as u16, 0, 0);
|
ret = CrgEvent::Data((pei / 2) as u16, 0, 0);
|
||||||
} else {
|
} else {
|
||||||
ret = CrgEvent::Data(0, (pei / 2) as u16, 0);
|
ret = CrgEvent::Data(0, (pei / 2) as u16, 0);
|
||||||
|
|
@ -1427,7 +1452,7 @@ impl CorigineUsb {
|
||||||
self.setup_tag = event_trb.get_setup_tag();
|
self.setup_tag = event_trb.get_setup_tag();
|
||||||
|
|
||||||
// demo of setup packets working in loader
|
// demo of setup packets working in loader
|
||||||
#[cfg(not(feature = "std"))]
|
// #[cfg(not(feature = "std"))]
|
||||||
{
|
{
|
||||||
let request_type = setup_storage[0];
|
let request_type = setup_storage[0];
|
||||||
let request = setup_storage[1];
|
let request = setup_storage[1];
|
||||||
|
|
@ -1457,7 +1482,7 @@ impl CorigineUsb {
|
||||||
ep0_buf.add(6).write_volatile(0x0);
|
ep0_buf.add(6).write_volatile(0x0);
|
||||||
ep0_buf.add(7).write_volatile(0x8);
|
ep0_buf.add(7).write_volatile(0x8);
|
||||||
}
|
}
|
||||||
println!("EP0 send");
|
// println!("EP0 send");
|
||||||
self.ep0_send(base_ptr, 8, 0);
|
self.ep0_send(base_ptr, 8, 0);
|
||||||
println!("EP0 sent");
|
println!("EP0 sent");
|
||||||
}
|
}
|
||||||
|
|
@ -1523,12 +1548,17 @@ impl CorigineUsb {
|
||||||
let udc_ep = &mut self.udc_ep[0];
|
let udc_ep = &mut self.udc_ep[0];
|
||||||
let enq_pt =
|
let enq_pt =
|
||||||
unsafe { udc_ep.enq_pt.load(Ordering::SeqCst).as_mut().expect("couldn't deref pointer") };
|
unsafe { udc_ep.enq_pt.load(Ordering::SeqCst).as_mut().expect("couldn't deref pointer") };
|
||||||
enq_pt.control_status_trb(udc_ep.pcs, true, false, self.setup_tag, target, false);
|
enq_pt.control_status_trb(udc_ep.pcs, true, false, self.setup_tag, target, HOST_SEND);
|
||||||
|
|
||||||
// TODO: fix raw pointer manips with something more sane?
|
// TODO: fix raw pointer manips with something more sane?
|
||||||
let (_enq_pt, _pcs) = udc_ep.increment_enq_pt();
|
let (_enq_pt, _pcs) = udc_ep.increment_enq_pt();
|
||||||
|
if addr != 0 {
|
||||||
|
self.suppress_ep0_send_set_addr = true; // signal to the usb_device stack that the HW has already ack'd this with a 0-length write
|
||||||
|
}
|
||||||
compiler_fence(Ordering::SeqCst);
|
compiler_fence(Ordering::SeqCst);
|
||||||
self.knock_doorbell(0);
|
self.knock_doorbell(0);
|
||||||
|
#[cfg(feature = "std")]
|
||||||
|
log::info!(" ******* set address done {}", addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
// knock door bell then controller will start transfer for the specific endpoint
|
// knock door bell then controller will start transfer for the specific endpoint
|
||||||
|
|
@ -1610,27 +1640,11 @@ impl CorigineUsb {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn start(&mut self) {
|
pub fn start(&mut self) {
|
||||||
#[cfg(not(feature = "std"))]
|
|
||||||
println!(
|
|
||||||
"****** cfg0/1 {:x}/{:x}, cmd {:x}",
|
|
||||||
self.csr.r(DEVCONFIG),
|
|
||||||
self.csr.r(EVENTCONFIG),
|
|
||||||
self.csr.r(USBCMD)
|
|
||||||
);
|
|
||||||
#[cfg(feature = "std")]
|
|
||||||
log::trace!(
|
|
||||||
"****** cfg0/1 {:x}/{:x}, cmd {:x}",
|
|
||||||
self.csr.r(DEVCONFIG),
|
|
||||||
self.csr.r(EVENTCONFIG),
|
|
||||||
self.csr.r(USBCMD)
|
|
||||||
);
|
|
||||||
self.print_status(self.csr.r(PORTSC));
|
|
||||||
|
|
||||||
self.csr.wo(
|
self.csr.wo(
|
||||||
EVENTCONFIG,
|
EVENTCONFIG,
|
||||||
self.csr.ms(EVENTCONFIG_CSC_ENABLE, 1)
|
self.csr.ms(EVENTCONFIG_CSC_ENABLE, 1)
|
||||||
| self.csr.ms(EVENTCONFIG_PEC_ENABLE, 1)
|
| self.csr.ms(EVENTCONFIG_PEC_ENABLE, 1)
|
||||||
| self.csr.ms(EVENTCONFIG_PPC_ENABLE, 1)
|
// | self.csr.ms(EVENTCONFIG_PPC_ENABLE, 1)
|
||||||
| self.csr.ms(EVENTCONFIG_PRC_ENABLE, 1)
|
| self.csr.ms(EVENTCONFIG_PRC_ENABLE, 1)
|
||||||
| self.csr.ms(EVENTCONFIG_PLC_ENABLE, 1)
|
| self.csr.ms(EVENTCONFIG_PLC_ENABLE, 1)
|
||||||
| self.csr.ms(EVENTCONFIG_CEC_ENABLE, 1)
|
| self.csr.ms(EVENTCONFIG_CEC_ENABLE, 1)
|
||||||
|
|
@ -1646,21 +1660,6 @@ impl CorigineUsb {
|
||||||
| self.csr.ms(USBCMD_INT_ENABLE, 1)
|
| self.csr.ms(USBCMD_INT_ENABLE, 1)
|
||||||
| self.csr.ms(USBCMD_RUN_STOP, 1),
|
| self.csr.ms(USBCMD_RUN_STOP, 1),
|
||||||
);
|
);
|
||||||
#[cfg(not(feature = "std"))]
|
|
||||||
println!(
|
|
||||||
"====== cfg0/1 {:x}/{:x}, cmd {:x}",
|
|
||||||
self.csr.r(DEVCONFIG),
|
|
||||||
self.csr.r(EVENTCONFIG),
|
|
||||||
self.csr.r(USBCMD)
|
|
||||||
);
|
|
||||||
#[cfg(feature = "std")]
|
|
||||||
log::trace!(
|
|
||||||
"====== cfg0/1 {:x}/{:x}, cmd {:x}",
|
|
||||||
self.csr.r(DEVCONFIG),
|
|
||||||
self.csr.r(EVENTCONFIG),
|
|
||||||
self.csr.r(USBCMD)
|
|
||||||
);
|
|
||||||
self.print_status(self.csr.r(PORTSC));
|
|
||||||
|
|
||||||
#[cfg(feature = "std")]
|
#[cfg(feature = "std")]
|
||||||
if !INTERRUPT_INIT_DONE.fetch_or(true, Ordering::SeqCst) {
|
if !INTERRUPT_INIT_DONE.fetch_or(true, Ordering::SeqCst) {
|
||||||
|
|
@ -1683,10 +1682,16 @@ impl CorigineUsb {
|
||||||
|
|
||||||
self.print_status(self.csr.r(PORTSC));
|
self.print_status(self.csr.r(PORTSC));
|
||||||
|
|
||||||
self.set_addr(0, 0);
|
self.set_addr(0, CRG_INT_TARGET);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn ep0_send(&mut self, addr: usize, len: usize, intr_target: u32) {
|
pub fn ep0_send(&mut self, addr: usize, len: usize, intr_target: u32) {
|
||||||
|
if self.suppress_ep0_send_set_addr {
|
||||||
|
#[cfg(feature = "std")]
|
||||||
|
log::info!("ep0 ack suppressed");
|
||||||
|
self.suppress_ep0_send_set_addr = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
let udc_ep = &mut self.udc_ep[0];
|
let udc_ep = &mut self.udc_ep[0];
|
||||||
let mut enq_pt =
|
let mut enq_pt =
|
||||||
unsafe { udc_ep.enq_pt.load(Ordering::SeqCst).as_mut().expect("couldn't deref pointer") };
|
unsafe { udc_ep.enq_pt.load(Ordering::SeqCst).as_mut().expect("couldn't deref pointer") };
|
||||||
|
|
@ -1697,7 +1702,7 @@ impl CorigineUsb {
|
||||||
(enq_pt, pcs) = udc_ep.increment_enq_pt();
|
(enq_pt, pcs) = udc_ep.increment_enq_pt();
|
||||||
}
|
}
|
||||||
|
|
||||||
enq_pt.control_status_trb(pcs, false, false, tag, intr_target, true);
|
enq_pt.control_status_trb(pcs, false, false, tag, intr_target, HOST_RECV);
|
||||||
|
|
||||||
let (_enq_pt, _pcs) = udc_ep.increment_enq_pt();
|
let (_enq_pt, _pcs) = udc_ep.increment_enq_pt();
|
||||||
compiler_fence(Ordering::SeqCst);
|
compiler_fence(Ordering::SeqCst);
|
||||||
|
|
@ -1957,7 +1962,7 @@ impl UsbBus for CorigineWrapper {
|
||||||
/// control transfer, not after.
|
/// control transfer, not after.
|
||||||
///
|
///
|
||||||
/// The default value for this constant is `false`, which corresponds to the USB 2.0 spec, 9.4.6
|
/// The default value for this constant is `false`, which corresponds to the USB 2.0 spec, 9.4.6
|
||||||
const QUIRK_SET_ADDRESS_BEFORE_STATUS: bool = true;
|
const QUIRK_SET_ADDRESS_BEFORE_STATUS: bool = false;
|
||||||
|
|
||||||
/// Allocates an endpoint and specified endpoint parameters. This method is called by the device
|
/// Allocates an endpoint and specified endpoint parameters. This method is called by the device
|
||||||
/// and class implementations to allocate endpoints, and can only be called before
|
/// and class implementations to allocate endpoints, and can only be called before
|
||||||
|
|
@ -2045,10 +2050,7 @@ impl UsbBus for CorigineWrapper {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets the device USB address to `addr`.
|
/// Sets the device USB address to `addr`.
|
||||||
fn set_device_address(&self, addr: u8) {
|
fn set_device_address(&self, addr: u8) { self.hw.lock().unwrap().set_addr(addr, CRG_INT_TARGET); }
|
||||||
self.hw.lock().unwrap().set_addr(addr, CRG_INT_TARGET);
|
|
||||||
log::info!(" ********** set address {}", addr);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Writes a single packet of data to the specified endpoint and returns number of bytes
|
/// Writes a single packet of data to the specified endpoint and returns number of bytes
|
||||||
/// actually written.
|
/// actually written.
|
||||||
|
|
@ -2068,7 +2070,6 @@ impl UsbBus for CorigineWrapper {
|
||||||
///
|
///
|
||||||
/// Implementations may also return other errors if applicable.
|
/// Implementations may also return other errors if applicable.
|
||||||
fn write(&self, ep_addr: EndpointAddress, buf: &[u8]) -> Result<usize> {
|
fn write(&self, ep_addr: EndpointAddress, buf: &[u8]) -> Result<usize> {
|
||||||
log::info!(" ******** WRITE: {:?}({}): {:x?}", ep_addr.index(), buf.len(), &buf[..8.min(buf.len())]);
|
|
||||||
if ep_addr.index() == 0 {
|
if ep_addr.index() == 0 {
|
||||||
let base_ptr = self.core().ifram_base_ptr;
|
let base_ptr = self.core().ifram_base_ptr;
|
||||||
assert!(buf.len() < CRG_UDC_EP0_REQBUFSIZE, "maximum transfer size exceeded");
|
assert!(buf.len() < CRG_UDC_EP0_REQBUFSIZE, "maximum transfer size exceeded");
|
||||||
|
|
@ -2080,9 +2081,16 @@ impl UsbBus for CorigineWrapper {
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
ep0_buf[..buf.len().min(CRG_UDC_EP_TRSIZE)].copy_from_slice(buf);
|
ep0_buf[..buf.len().min(CRG_UDC_EP_TRSIZE)].copy_from_slice(buf);
|
||||||
|
log::info!(" ******** WRITE_EP0({}): : {:x?}", buf.len(), &buf[..8.min(buf.len())]);
|
||||||
self.core().ep0_send(base_ptr + CRG_UDC_EP0_BUF_OFFSET, buf.len(), CRG_INT_TARGET);
|
self.core().ep0_send(base_ptr + CRG_UDC_EP0_BUF_OFFSET, buf.len(), CRG_INT_TARGET);
|
||||||
Ok(buf.len())
|
Ok(buf.len())
|
||||||
} else {
|
} else {
|
||||||
|
log::info!(
|
||||||
|
" ******** WRITE: {:?}({}): {:x?}",
|
||||||
|
ep_addr.index(),
|
||||||
|
buf.len(),
|
||||||
|
&buf[..8.min(buf.len())]
|
||||||
|
);
|
||||||
let addr = self.core().get_app_buf_ptr(ep_addr.index() as u8, HOST_RECV);
|
let addr = self.core().get_app_buf_ptr(ep_addr.index() as u8, HOST_RECV);
|
||||||
let hw_buf = unsafe { core::slice::from_raw_parts_mut(addr as *mut u8, CRG_UDC_APP_BUF_LEN) };
|
let hw_buf = unsafe { core::slice::from_raw_parts_mut(addr as *mut u8, CRG_UDC_APP_BUF_LEN) };
|
||||||
assert!(buf.len() < CRG_UDC_APP_BUF_LEN, "write buffer size exceeded");
|
assert!(buf.len() < CRG_UDC_APP_BUF_LEN, "write buffer size exceeded");
|
||||||
|
|
@ -2118,38 +2126,26 @@ impl UsbBus for CorigineWrapper {
|
||||||
///
|
///
|
||||||
/// Implementations may also return other errors if applicable.
|
/// Implementations may also return other errors if applicable.
|
||||||
fn read(&self, ep_addr: EndpointAddress, buf: &mut [u8]) -> Result<usize> {
|
fn read(&self, ep_addr: EndpointAddress, buf: &mut [u8]) -> Result<usize> {
|
||||||
log::info!(" ******** READ: {:?}({})", ep_addr, buf.len());
|
|
||||||
if ep_addr.index() == 0 {
|
if ep_addr.index() == 0 {
|
||||||
if let Some(data) = self.core().setup.take() {
|
if let Some(data) = self.core().setup.take() {
|
||||||
buf[..8].copy_from_slice(&data);
|
buf[..8].copy_from_slice(&data);
|
||||||
log::debug!(" {:x?}", &buf[..8]);
|
log::debug!(" ******** STATUS_READ: {:x?})", &buf[..8]);
|
||||||
Ok(8)
|
Ok(8)
|
||||||
} else {
|
} else {
|
||||||
Err(usb_device::UsbError::WouldBlock)
|
Err(UsbError::WouldBlock)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// data is already in the memory at this point
|
if buf.len() > CRG_UDC_APP_BUF_LEN {
|
||||||
let addr = self.core().get_app_buf_ptr(ep_addr.index() as u8, HOST_SEND);
|
Err(UsbError::BufferOverflow)
|
||||||
let hw_buf = unsafe { core::slice::from_raw_parts_mut(addr as *mut u8, CRG_UDC_APP_BUF_LEN) };
|
} else {
|
||||||
assert!(buf.len() < CRG_UDC_APP_BUF_LEN, "read buffer size exceeded");
|
if let Some(data) = self.core().readout[ep_addr.index() - 1] {
|
||||||
buf.copy_from_slice(&hw_buf[..buf.len()]);
|
buf.copy_from_slice(&data[..buf.len()]);
|
||||||
log::info!(" {:x?}", &buf[..8.min(buf.len())]);
|
log::info!(" ******** READ: {:x?})", &buf[..8.min(buf.len())]);
|
||||||
|
Ok(buf.len())
|
||||||
// re-enqueue the listener
|
} else {
|
||||||
let dir = match ep_addr.direction() {
|
Err(UsbError::WouldBlock)
|
||||||
UsbDirection::Out => HOST_SEND,
|
}
|
||||||
UsbDirection::In => HOST_RECV,
|
}
|
||||||
};
|
|
||||||
self.core().intr_xfer(
|
|
||||||
ep_addr.index() as u8,
|
|
||||||
dir,
|
|
||||||
addr,
|
|
||||||
CRG_UDC_APP_BUF_LEN,
|
|
||||||
CRG_INT_TARGET,
|
|
||||||
false,
|
|
||||||
false,
|
|
||||||
);
|
|
||||||
Ok(buf.len())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2164,7 +2160,9 @@ impl UsbBus for CorigineWrapper {
|
||||||
/// update during configuration. This is for devices that support an EP0 which can only either
|
/// update during configuration. This is for devices that support an EP0 which can only either
|
||||||
/// be IN or OUT, but not both at the same time. Devices with both IN/OUT may leave this as
|
/// be IN or OUT, but not both at the same time. Devices with both IN/OUT may leave this as
|
||||||
/// an empty stub.
|
/// an empty stub.
|
||||||
fn set_ep0_out(&self) {}
|
fn set_ep0_out(&self) {
|
||||||
|
log::info!(" ******* set EP0 out");
|
||||||
|
}
|
||||||
|
|
||||||
/// Causes the USB peripheral to enter USB suspend mode, lowering power consumption and
|
/// Causes the USB peripheral to enter USB suspend mode, lowering power consumption and
|
||||||
/// preparing to detect a USB wakeup event. This will be called after
|
/// preparing to detect a USB wakeup event. This will be called after
|
||||||
|
|
@ -2211,6 +2209,10 @@ impl UsbBus for CorigineWrapper {
|
||||||
/// simulating a disconnect or it has not been enabled at creation time.
|
/// simulating a disconnect or it has not been enabled at creation time.
|
||||||
fn force_reset(&self) -> Result<()> {
|
fn force_reset(&self) -> Result<()> {
|
||||||
log::info!(" ******* force_reset");
|
log::info!(" ******* force_reset");
|
||||||
|
self.core().reset();
|
||||||
|
self.core().init();
|
||||||
|
self.core().start();
|
||||||
|
/*
|
||||||
for (index, &maybe_ep) in self.free_ep.iter().enumerate() {
|
for (index, &maybe_ep) in self.free_ep.iter().enumerate() {
|
||||||
if index == 0 {
|
if index == 0 {
|
||||||
// EP0 -> reset & start the machine. Happens before the code below.
|
// EP0 -> reset & start the machine. Happens before the code below.
|
||||||
|
|
@ -2241,6 +2243,7 @@ impl UsbBus for CorigineWrapper {
|
||||||
}
|
}
|
||||||
log::info!("enabled EPs: {:x}", self.core().csr.r(EPENABLE));
|
log::info!("enabled EPs: {:x}", self.core().csr.r(EPENABLE));
|
||||||
log::info!("running EPs: {:x}", self.core().csr.r(EPRUNNING));
|
log::info!("running EPs: {:x}", self.core().csr.r(EPRUNNING));
|
||||||
|
*/
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -657,7 +657,21 @@ pub fn early_init() {
|
||||||
let mut vbus_on = false;
|
let mut vbus_on = false;
|
||||||
let mut vbus_on_count = 0;
|
let mut vbus_on_count = 0;
|
||||||
let mut in_u0 = false;
|
let mut in_u0 = false;
|
||||||
|
let mut last_sc = 0;
|
||||||
loop {
|
loop {
|
||||||
|
let next_sc = csr.r(cramium_hal::usb::utra::PORTSC);
|
||||||
|
if last_sc != next_sc {
|
||||||
|
last_sc = next_sc;
|
||||||
|
crate::println!("**** SC update {:x?}", cramium_hal::usb::driver::PortSc(next_sc));
|
||||||
|
/*
|
||||||
|
if cramium_hal::usb::driver::PortSc(next_sc).pr() {
|
||||||
|
crate::println!(" >>reset<<");
|
||||||
|
usb.start();
|
||||||
|
in_u0 = false;
|
||||||
|
vbus_on_count = 0;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
let event = usb.udc_handle_interrupt();
|
let event = usb.udc_handle_interrupt();
|
||||||
if event == cramium_hal::usb::driver::CrgEvent::None {
|
if event == cramium_hal::usb::driver::CrgEvent::None {
|
||||||
idle_timer += 1;
|
idle_timer += 1;
|
||||||
|
|
@ -666,29 +680,16 @@ pub fn early_init() {
|
||||||
idle_timer = 0;
|
idle_timer = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if csr.r(cramium_hal::usb::utra::USBSTS) != 0 {
|
|
||||||
crate::println!("top-line irq");
|
|
||||||
let irq1 = irq_csr.r(utralib::utra::irqarray1::EV_PENDING);
|
|
||||||
crate::println!(" irq1: {:x}", irq1);
|
|
||||||
crate::println!(" status: {:x}", csr.r(cramium_hal::usb::utra::USBSTS));
|
|
||||||
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");
|
|
||||||
usb.reset();
|
usb.reset();
|
||||||
crate::println!(" aft reset");
|
|
||||||
usb.init();
|
usb.init();
|
||||||
crate::println!(" aft init");
|
|
||||||
usb.start();
|
usb.start();
|
||||||
crate::println!(" aft start");
|
|
||||||
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}, status: {:x}", irq1, csr.r(cramium_hal::usb::utra::USBSTS));
|
||||||
crate::println!("status: {:x}", csr.r(cramium_hal::usb::utra::USBSTS));
|
|
||||||
irq_csr.wo(utralib::utra::irqarray1::EV_PENDING, irq1);
|
irq_csr.wo(utralib::utra::irqarray1::EV_PENDING, irq1);
|
||||||
// restore this to go on to boot
|
// restore this to go on to boot
|
||||||
// break;
|
// break;
|
||||||
|
|
@ -711,17 +712,15 @@ pub fn early_init() {
|
||||||
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!("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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
udma_uart.write("Press any key to continue...".as_bytes());
|
// udma_uart.write("Press any key to continue...".as_bytes());
|
||||||
getc();
|
// getc();
|
||||||
crate::println!("\n\rBooting!\n\r");
|
udma_uart.write(b"\n\rBooting!\n\r");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "platform-tests")]
|
#[cfg(feature = "platform-tests")]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue