Skip to content

Commit f13d218

Browse files
dhalbertdhalbert
authored
Merge pull request #6125 from tannewt/usb_host
Start of USB host API
2 parents 862210b + a719fab commit f13d218

File tree

63 files changed

+1979
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1979
-114
lines changed

‎lib/tinyusb

Submodule tinyusb updated 195 files

‎ports/atmel-samd/supervisor/usb.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,25 @@ void init_usb_hardware(void) {
6363

6464
#ifdef SAMD21
6565
void USB_Handler(void) {
66-
usb_irq_handler();
66+
usb_irq_handler(0);
6767
}
6868
#endif
6969

7070
#ifdef SAM_D5X_E5X
71+
// These are different subsets of USB interrupts, *NOT* different USB peripherals.
7172
void USB_0_Handler(void) {
72-
usb_irq_handler();
73+
usb_irq_handler(0);
7374
}
7475

7576
void USB_1_Handler(void) {
76-
usb_irq_handler();
77+
usb_irq_handler(0);
7778
}
7879

7980
void USB_2_Handler(void) {
80-
usb_irq_handler();
81+
usb_irq_handler(0);
8182
}
8283

8384
void USB_3_Handler(void) {
84-
usb_irq_handler();
85+
usb_irq_handler(0);
8586
}
8687
#endif

‎ports/broadcom/mpconfigport.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
#define MICROPY_PORT_ROOT_POINTERS \
6161
CIRCUITPY_COMMON_ROOT_POINTERS
6262

63-
#define DEBUG_UART_TX (&pin_GPIO14)
64-
#define DEBUG_UART_RX (&pin_GPIO15)
63+
#define CIRCUITPY_DEBUG_UART_TX (&pin_GPIO14)
64+
#define CIRCUITPY_DEBUG_UART_RX (&pin_GPIO15)
6565

6666
#endif // __INCLUDED_MPCONFIGPORT_H

‎ports/broadcom/supervisor/usb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
uint32_t SystemCoreClock = 700 * 1000 * 1000;
3636

3737
void USB_IRQHandler(void) {
38-
usb_irq_handler();
38+
usb_irq_handler(0);
3939
}
4040

4141
void init_usb_hardware(void) {

‎ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,3 @@
4949
#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO5, .rx = &pin_GPIO16}}
5050

5151
#define DOUBLE_TAP_PIN (&pin_GPIO10)
52-
53-
#ifdef DEBUG
54-
#define DEBUG_UART_RX (&pin_GPIO16)
55-
#define DEBUG_UART_TX (&pin_GPIO5)
56-
#endif

‎ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#define DEFAULT_UART_BUS_TX (&pin_GPIO21)
3838

3939
// Serial over UART
40-
#define DEBUG_UART_RX DEFAULT_UART_BUS_RX
41-
#define DEBUG_UART_TX DEFAULT_UART_BUS_TX
40+
#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX
41+
#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX
4242

4343
// For entering safe mode
4444
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9)

‎ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#define DEFAULT_UART_BUS_TX (&pin_GPIO21)
3838

3939
// Serial over UART
40-
#define DEBUG_UART_RX DEFAULT_UART_BUS_RX
41-
#define DEBUG_UART_TX DEFAULT_UART_BUS_TX
40+
#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX
41+
#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX
4242

4343
// For entering safe mode
4444
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9)

‎ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#define DEFAULT_UART_BUS_TX (&pin_GPIO21)
3838

3939
// Serial over UART
40-
#define DEBUG_UART_RX DEFAULT_UART_BUS_RX
41-
#define DEBUG_UART_TX DEFAULT_UART_BUS_TX
40+
#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX
41+
#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX
4242

4343
// For entering safe mode
4444
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO2)

‎ports/espressif/boards/microdev_micro_c3/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
#define DEFAULT_UART_BUS_TX (&pin_GPIO21)
4545

4646
// Serial over UART
47-
#define DEBUG_UART_RX DEFAULT_UART_BUS_RX
48-
#define DEBUG_UART_TX DEFAULT_UART_BUS_TX
47+
#define CIRCUITPY_DEBUG_UART_RX DEFAULT_UART_BUS_RX
48+
#define CIRCUITPY_DEBUG_UART_TX DEFAULT_UART_BUS_TX
4949

5050
// For entering safe mode
5151
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9)

‎ports/litex/mphalport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void isr(void) {
6464
nesting_count += 1;
6565
#ifdef CFG_TUSB_MCU
6666
if (irqs & (1 << USB_INTERRUPT)) {
67-
usb_irq_handler();
67+
usb_irq_handler(0);
6868
}
6969
#endif
7070
if (irqs & (1 << TIMER0_INTERRUPT)) {

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy