8000 pio usb working, though core1 is not fully run from SRAM just yet by hathach · Pull Request #18 · tannewt/circuitpython · GitHub
[go: up one dir, main page]
Skip to content

pio usb working, though core1 is not fully run from SRAM just yet #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 17 commits into from
Closed

pio usb working, though core1 is not fully run from SRAM just yet #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b70c59e
start of usb host
tannewt May 2, 2023
8e93015
add flash target to flash imxrt elf with jlink
hathach May 19, 2023
00d3125
bump up tinyusb to include dcache support for ehci imxrt
hathach May 19, 2023
a509db7
change usb usage on imxrt 1060 to match evk user manual
hathach May 19, 2023
06c7be5
Add set_configuration and start to test read. Move ehci ISR functions…
tannewt Jun 8, 2023
3a2a109
Only open once. Read works
tannewt Jun 9, 2023
8a145cd
Start usb host workflow
tannewt Jun 22, 2023
36b1112
Start adding rp2040 usb host support
tannewt Jun 22, 2023
0bc6ec3
More work on RP2040 usb host
tannewt Jun 23, 2023
803f0ae
Move SOF to loop on core1
8000 tannewt Jun 26, 2023
f104e4e
Never reset USB pins
tannewt Jun 27, 2023
02c5fc1
RP2040 works. fixes for ctrl_transfer
tannewt Jun 28, 2023
3650929
Use host debugging tinyusb commit
tannewt Jun 28, 2023
4d36498
Schedule usb background task anytime there is work in the queue
tannewt Jun 28, 2023
4bc2bf1
get pio usb working with cpy, though core1 is not fully run from SRAM…
hathach Jun 29, 2023
d053b97
Merge branch 'imx_usb_host' into imx_usb_host-patch
hathach Jun 29, 2023
7ef89c3
pre-commit style
hathach Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Only open once. Read works
  • Loading branch information
@tannewt
tannewt committed Jun 9, 2023
commit 3a2a10986c3afff6dd2da72a609df01f8a1fd6a2
63 changes: 32 additions & 31 deletions shared-module/usb/core/Device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "shared-module/usb/utf16le.h"
#include "supervisor/shared/tick.h"

STATIC xfer_result_t _xfer_result;
bool common_hal_usb_core_device_construct(usb_core_device_obj_t *self, uint8_t device_number) {
if (device_number == 0 || device_number > CFG_TUH_DEVICE_MAX + CFG_TUH_HUB) {
return false;
Expand All @@ -43,6 +44,7 @@ bool common_hal_usb_core_device_construct(usb_core_device_obj_t *self, uint8_t d
return false;
}
self->device_number = device_number;
_xfer_result = 0xff;
return true;
}

Expand All @@ -60,20 +62,21 @@ uint16_t common_hal_usb_core_device_get_idProduct(usb_core_device_obj_t *self) {
return pid;
}

STATIC xfer_result_t _get_string_result;
STATIC void _transfer_done_cb(tuh_xfer_t *xfer) {
// Store the result so we stop waiting for the transfer.
_get_string_result = xfer->result;
_xfer_result = xfer->result;
}

STATIC bool _wait_for_callback(void) {
while (!mp_hal_is_interrupted() &&
_get_string_result == 0xff) {
_xfer_result == 0xff) {
// The background tasks include TinyUSB which will call the function
// we provided above. In other words, the callback isn't in an interrupt.
RUN_BACKGROUND_TASKS;
}
return _get_string_result == XFER_RESULT_SUCCESS;
xfer_result_t result = _xfer_result;
_xfer_result = 0xff;
return result == XFER_RESULT_SUCCESS;
}

STATIC mp_obj_t _get_string(const uint16_t *temp_buf) {
Expand All @@ -85,7 +88,6 @@ STATIC mp_obj_t _get_string(const uint16_t *temp_buf) {
}

mp_obj_t common_hal_usb_core_device_get_serial_number(usb_core_device_obj_t *self) {
_get_string_result = 0xff;
uint16_t temp_buf[127];
if (!tuh_descriptor_get_serial_string(self->device_number, 0, temp_buf, MP_ARRAY_SIZE(temp_buf), _transfer_done_cb, 0) ||
!_wait_for_callback()) {
Expand All @@ -95,7 +97,6 @@ mp_obj_t common_hal_usb_core_device_get_serial_number(usb_core_device_obj_t *sel
}

mp_obj_t common_hal_usb_core_device_get_product(usb_core_device_obj_t *self) {
_get_string_result = 0xff;
uint16_t temp_buf[127];
if (!tuh_descriptor_get_product_string(self->device_number, 0, temp_buf, MP_ARRAY_SIZE(temp_buf), _transfer_done_cb, 0) ||
!_wait_for_callback()) {
Expand All @@ -105,7 +106,6 @@ mp_obj_t common_hal_usb_core_device_get_product(usb_core_device_obj_t *self) {
}

mp_obj_t common_hal_usb_core_device_get_manufacturer(usb_core_device_obj_t *self) {
_get_string_result = 0xff;
uint16_t temp_buf[127];
if (!tuh_descriptor_get_manufacturer_string(self->device_number, 0, temp_buf, MP_ARRAY_SIZE(temp_buf), _transfer_done_cb, 0) ||
!_wait_for_callback()) {
Expand All @@ -127,29 +127,26 @@ void common_hal_usb_core_device_set_configuration(usb_core_device_obj_t *self, m
_wait_for_callback();
}

xfer_result_t xfer_result;
STATIC void _xfer_complete_cb(tuh_xfer_t *xfer) {
xfer_result = xfer->result;
}

STATIC size_t _xfer(tuh_xfer_t *xfer, mp_int_t timeout) {
xfer_result = XFER_RESULT_STALLED;
xfer->complete_cb = _xfer_complete_cb;
_xfer_result = 0xff;
xfer->complete_cb = _transfer_done_cb;
if (!tuh_edpt_xfer(xfer)) {
mp_raise_usb_core_USBError(NULL);
}
uint32_t start_time = supervisor_ticks_ms32();
while (supervisor_ticks_ms32() - start_time < (uint32_t)timeout &&
while ((timeout == 0 || supervisor_ticks_ms32() - start_time < (uint32_t)timeout) &&
!mp_hal_is_interrupted() &&
xfer_result == XFER_RESULT_STALLED) {
_xfer_result == 0xff) {
// The background tasks include TinyUSB which will call the function
// we provided above. In other words, the callback isn't in an interrupt.
RUN_BACKGROUND_TASKS;
}
if (xfer_result == XFER_RESULT_STALLED) {
xfer_result_t result = _xfer_result;
_xfer_result = 0xff;
if (result == XFER_RESULT_STALLED || result == 0xff) {
mp_raise_usb_core_USBTimeoutError();
}
if (xfer_result == XFER_RESULT_SUCCESS) {
if (result == XFER_RESULT_SUCCESS) {
return xfer->actual_len;
}

Expand All @@ -158,9 +155,13 @@ STATIC size_t _xfer(tuh_xfer_t *xfer, mp_int_t timeout) {

STATIC bool _open_endpoint(usb_core_device_obj_t *self, mp_int_t endpoint) {
bool endpoint_open = false;
for (size_t i = 0; i < sizeof(self->open_endpoints); i++) {
size_t open_size = sizeof(self->open_endpoints);
size_t first_free = open_size;
for (size_t i = 0; i < open_size; i++) {
if (self->open_endpoints[i] == endpoint) {
endpoint_open = true;
} else if (first_free == open_size && self->open_endpoints[i] == 0) {
first_free = i;
}
}
if (endpoint_open) {
Expand All @@ -180,7 +181,6 @@ STATIC bool _open_endpoint(usb_core_device_obj_t *self, mp_int_t endpoint) {

// parse each interfaces
while (p_desc < desc_end) {
console_uart_printf("usb desc %p %d\r\n", p_desc, tu_desc_type(p_desc));
if (TUSB_DESC_ENDPOINT == tu_desc_type(p_desc)) {
tusb_desc_endpoint_t const *desc_ep = (tusb_desc_endpoint_t const *)p_desc;
if (desc_ep->bEndpointAddress == endpoint) {
Expand All @@ -195,7 +195,11 @@ STATIC bool _open_endpoint(usb_core_device_obj_t *self, mp_int_t endpoint) {
}
tusb_desc_endpoint_t const *desc_ep = (tusb_desc_endpoint_t const *)p_desc;

return tuh_edpt_open(self->device_number, desc_ep);
bool open = tuh_edpt_open(self->device_number, desc_ep);
if (open) {
self->open_endpoints[first_free] = endpoint;
}
return open;
}

mp_int_t common_hal_usb_core_device_write(usb_core_device_obj_t *self, mp_int_t endpoint, const uint8_t *buffer, mp_int_t len, mp_int_t timeout) {
Expand All @@ -222,11 +226,6 @@ mp_int_t common_hal_usb_core_device_read(usb_core_device_obj_t *self, mp_int_t e
return _xfer(&xfer, timeout);
}

xfer_result_t control_result;
STATIC void _control_complete_cb(tuh_xfer_t *xfer) {
control_result = xfer->result;
}

mp_int_t common_hal_usb_core_device_ctrl_transfer(usb_core_device_obj_t *self,
mp_int_t bmRequestType, mp_int_t bRequest,
mp_int_t wValue, mp_int_t wIndex,
Expand All @@ -245,26 +244,28 @@ mp_int_t common_hal_usb_core_device_ctrl_transfer(usb_core_device_obj_t *self,
.ep_addr = 0,
.setup = &request,
.buffer = buffer,
.complete_cb = _control_complete_cb,
.complete_cb = _transfer_done_cb,
};

control_result = XFER_RESULT_STALLED;
_xfer_result = 0xff;

if (!tuh_control_xfer(&xfer)) {
mp_raise_usb_core_USBError(NULL);
}
uint32_t start_time = supervisor_ticks_ms32();
while (supervisor_ticks_ms32() - start_time < (uint32_t)timeout &&
!mp_hal_is_interrupted() &&
control_result == XFER_RESULT_STALLED) {
_xfer_result == 0xff) {
// The background tasks include TinyUSB which will call the function
// we provided above. In other words, the callback isn't in an interrupt.
RUN_BACKGROUND_TASKS;
}
if (control_result == XFER_RESULT_STALLED) {
xfer_result_t result = _xfer_result;
_xfer_result = 0xff;
if (result == XFER_RESULT_STALLED || result == 0xff) {
mp_raise_usb_core_USBTimeoutError();
}
if (control_result == XFER_RESULT_SUCCESS) {
if (result == XFER_RESULT_SUCCESS) {
return len;
}

Expand Down
1 change: 1 addition & 0 deletions supervisor/shared/usb/tusb_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ extern "C" {
#define CFG_TUH_CDC 0
#define CFG_TUH_MSC 0
#define CFG_TUH_VENDOR 0
#define CFG_TUH_API_EDPT_XFER 1

// max device support (excluding hub device)
#define CFG_TUH_DEVICE_MAX (CFG_TUH_HUB ? 4 : 1) // hub typically has 4 ports
Expand Down
0