Merge pull request #2130 from hathach/hcd-frame-pio-usb

hathach · web-flow · commit 6e1eec908a05 · 2023-06-29T22:46:24.000+07:00
add hcd_frame_number() for pio-usb host
diff --git a/.gitmodules b/.gitmodules
diff --git a/hw/bsp/rp2040/board.h b/hw/bsp/rp2040/board.h
@@ -49,15 +49,17 @@
 #define UART_RX_PIN           PICO_DEFAULT_UART_RX_PIN
 #endif
 
+//--------------------------------------------------------------------+
 // PIO_USB
+// default to pin on Adafruit Feather rp2040 USB Host or Tester if defined
+//--------------------------------------------------------------------+
 
 // #define USE_ADAFRUIT_RP2040_TESTER
 #ifdef USE_ADAFRUIT_RP2040_TESTER
 #define PICO_DEFAULT_PIO_USB_DP_PIN       20
 #define PICO_DEFAULT_PIO_USB_VBUSEN_PIN   22
 #endif
 
-// following default to pin on Adafruit Feather rp2040 USB Host
 #ifndef PICO_DEFAULT_PIO_USB_DP_PIN
 #define PICO_DEFAULT_PIO_USB_DP_PIN       16
 #endif
diff --git a/src/portable/raspberrypi/pio_usb/hcd_pio_usb.c b/src/portable/raspberrypi/pio_usb/hcd_pio_usb.c
@@ -105,7 +105,7 @@ void hcd_device_close(uint8_t rhport, uint8_t dev_addr)
 uint32_t hcd_frame_number(uint8_t rhport)
 {
   (void) rhport;
-  return 0;
+  return pio_usb_host_get_frame_number();
 }
 
 void hcd_int_enable(uint8_t rhport)
diff --git a/tools/get_deps.py b/tools/get_deps.py
@@ -54,7 +54,7 @@
                             '950819b7de9b32f92c3edf396bc5ffb8d66e7009',
                             'kinetis_k32l2 kinetis_kl lpc51 lpc54 lpc55 mcx imxrt'],
     'hw/mcu/raspberry_pi/Pico-PIO-USB': ['https://github.com/sekigon-gonnoc/Pico-PIO-USB.git',
-                                         'c3715ce94b6f6391856de56081d4d9b3e98fa93d',
+                                         '58879cfa0eca5725d8db6443ec17f8896a321042',
                                          'rp2040'],
     'hw/mcu/renesas/fsp': ['https://github.com/renesas/fsp.git',
                            '8dc14709f2a6518b43f71efad70d900b7718d9f1',

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ void hcd_device_close(uint8_t rhport, uint8_t dev_addr)`
`105`	`105`	`uint32_t hcd_frame_number(uint8_t rhport)`
`106`	`106`	`{`
`107`	`107`	`(void) rhport;`
`108`		`- return 0;`
	`108`	`+ return pio_usb_host_get_frame_number();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`void hcd_int_enable(uint8_t rhport)`