From 19620d800f8f3cb78937710e0cd9da4a57a25fb9 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 9 Sep 2025 18:40:52 +0800 Subject: [PATCH] some tweaks to accommodate a possibly larger ep_num --- libs/cramium-hal/src/usb/driver.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/cramium-hal/src/usb/driver.rs b/libs/cramium-hal/src/usb/driver.rs index 45cce7055..24a47a34a 100644 --- a/libs/cramium-hal/src/usb/driver.rs +++ b/libs/cramium-hal/src/usb/driver.rs @@ -36,7 +36,7 @@ const CRG_EVENT_RING_NUM: usize = 1; const CRG_ERST_SIZE: usize = 1; const CRG_EVENT_RING_SIZE: usize = 32; const CRG_EP0_TD_RING_SIZE: usize = 16; -pub const CRG_EP_NUM: usize = 4; +pub const CRG_EP_NUM: usize = 8; const CRG_TD_RING_SIZE: usize = 64; // was 1280 in original code. not even sure we need ... 64? const CRG_UDC_MAX_BURST: u32 = 15; const CRG_UDC_ISO_INTERVAL: u8 = 3; @@ -59,7 +59,7 @@ pub const CRG_UDC_EP0_REQBUFSIZE: usize = 256; pub const CRG_UDC_APP_BUF_LEN: usize = 512; pub const CRG_UDC_APP_BUFSIZE: usize = CRG_EP_NUM * 2 * CRG_UDC_APP_BUF_LEN; -pub const CRG_IFRAM_PAGES: usize = 7; +pub const CRG_IFRAM_PAGES: usize = 8; pub const CRG_UDC_MEMBASE: usize = utralib::HW_IFRAM1_MEM + utralib::HW_IFRAM1_MEM_LEN - CRG_IFRAM_PAGES * 0x1000; @@ -67,8 +67,8 @@ const CRG_UDC_ERST_OFFSET: usize = 0; // use relative offsets const CRG_UDC_EVENTRING_OFFSET: usize = CRG_UDC_ERST_OFFSET + CRG_UDC_ERSTSIZE; const CRG_UDC_EPCX_OFFSET: usize = CRG_UDC_EVENTRING_OFFSET + CRG_UDC_EVENTRINGSIZE; -const CRG_UDC_EP0_TR_OFFSET: usize = CRG_UDC_EPCX_OFFSET + CRG_UDC_EPCXSIZE; -const CRG_UDC_EP_TR_OFFSET: usize = CRG_UDC_EP0_TR_OFFSET + CRG_UDC_EP0_TRSIZE; +pub const CRG_UDC_EP0_TR_OFFSET: usize = CRG_UDC_EPCX_OFFSET + CRG_UDC_EPCXSIZE; +pub const CRG_UDC_EP_TR_OFFSET: usize = CRG_UDC_EP0_TR_OFFSET + CRG_UDC_EP0_TRSIZE; pub const CRG_UDC_EP0_BUF_OFFSET: usize = CRG_UDC_EP_TR_OFFSET + CRG_UDC_EP_TRSIZE; pub const CRG_UDC_APP_BUFOFFSET: usize = CRG_UDC_EP0_BUF_OFFSET + CRG_UDC_EP0_REQBUFSIZE; pub const CRG_UDC_TOTAL_MEM_LEN: usize = CRG_UDC_APP_BUFOFFSET + CRG_UDC_APP_BUFSIZE; @@ -913,6 +913,14 @@ impl CorigineUsb { UdcEp::default(), UdcEp::default(), UdcEp::default(), + UdcEp::default(), + UdcEp::default(), + UdcEp::default(), + UdcEp::default(), + UdcEp::default(), + UdcEp::default(), + UdcEp::default(), + UdcEp::default(), ], p_epcx: AtomicPtr::new(core::ptr::null_mut()), p_epcx_len: 0,