Rename publically accessible functions

Author: will-v-pi

src/common/pico_usb_reset_interface_headers/include/pico/usb_reset_interface.h

@@ -21,7 +21,7 @@
  * 2. Define PICO_STDIO_USB_ENABLE_RESET_VIA_VENDOR_INTERFACE=1
  * 3. Add `TUD_RPI_RESET_DESCRIPTOR(<ITF_NUM>, <STR_IDX>)` to your USB descriptors (length is `TUD_RPI_RESET_DESC_LEN`)
  * 4. Check if your project has an existing `usbd_app_driver_get_cb` function:
- *    - If it does, you need to add the `_resetd_driver` to the drivers returned
+ *    - If it does, you need to add the `pico_usb_reset_interface_driver` to the drivers returned
  *    - If it does not, and you aren't using the `pico_stdio_usb` library, you need to define `PICO_STDIO_USB_RESET_INCLUDE_APP_DRIVER_CB=1`
  * 5. Check if your project has an existing Microsoft OS 2.0 Descriptor:
  *    - If it does, you need to add the Function Subset header `RPI_RESET_MS_OS_20_DESCRIPTOR(<ITF_NUM>)` to your Microsoft OS 2.0 Descriptor (length is `RPI_RESET_MS_OS_20_DESC_LEN`)
@@ -144,22 +144,22 @@
 #include "stdint.h"
 #include "device/usbd_pvt.h"
 
-void resetd_init(void);
-void resetd_reset(uint8_t __unused rhport);
-uint16_t resetd_open(uint8_t __unused rhport, tusb_desc_interface_t const *itf_desc, uint16_t max_len);
-bool resetd_control_xfer_cb(uint8_t __unused rhport, uint8_t stage, tusb_control_request_t const * request);
-bool resetd_xfer_cb(uint8_t __unused rhport, uint8_t __unused ep_addr, xfer_result_t __unused result, uint32_t __unused xferred_bytes);
+void pico_usb_reset_interface_init(void);
+void pico_usb_reset_interface_reset(uint8_t __unused rhport);
+uint16_t pico_usb_reset_interface_open(uint8_t __unused rhport, tusb_desc_interface_t const *itf_desc, uint16_t max_len);
+bool pico_usb_reset_interface_control_xfer_cb(uint8_t __unused rhport, uint8_t stage, tusb_control_request_t const * request);
+bool pico_usb_reset_interface_xfer_cb(uint8_t __unused rhport, uint8_t __unused ep_addr, xfer_result_t __unused result, uint32_t __unused xferred_bytes);
 
-static usbd_class_driver_t const _resetd_driver =
+static usbd_class_driver_t const pico_usb_reset_interface_driver =
 {
 #if CFG_TUSB_DEBUG >= 2
     .name = "RESET",
 #endif
-    .init             = resetd_init,
-    .reset            = resetd_reset,
-    .open             = resetd_open,
-    .control_xfer_cb  = resetd_control_xfer_cb,
-    .xfer_cb          = resetd_xfer_cb,
+    .init             = pico_usb_reset_interface_init,
+    .reset            = pico_usb_reset_interface_reset,
+    .open             = pico_usb_reset_interface_open,
+    .control_xfer_cb  = pico_usb_reset_interface_control_xfer_cb,
+    .xfer_cb          = pico_usb_reset_interface_xfer_cb,
     .sof              = NULL
 };
 

src/rp2_common/pico_usb_reset_interface/usb_reset_interface.c

@@ -68,14 +68,14 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_requ
 }
 #endif
 
-void resetd_init(void) {
+void pico_usb_reset_interface_init(void) {
 }
 
-void resetd_reset(uint8_t __unused rhport) {
+void pico_usb_reset_interface_reset(uint8_t __unused rhport) {
     itf_num = 0;
 }
 
-uint16_t resetd_open(uint8_t __unused rhport, tusb_desc_interface_t const *itf_desc, uint16_t max_len) {
+uint16_t pico_usb_reset_interface_open(uint8_t __unused rhport, tusb_desc_interface_t const *itf_desc, uint16_t max_len) {
     TU_VERIFY(TUSB_CLASS_VENDOR_SPECIFIC == itf_desc->bInterfaceClass &&
               RESET_INTERFACE_SUBCLASS == itf_desc->bInterfaceSubClass &&
               RESET_INTERFACE_PROTOCOL == itf_desc->bInterfaceProtocol, 0);
@@ -88,7 +88,7 @@ uint16_t resetd_open(uint8_t __unused rhport, tusb_desc_interface_t const *itf_d
 }
 
 // Support for parameterized reset via vendor interface control request
-bool resetd_control_xfer_cb(uint8_t __unused rhport, uint8_t stage, tusb_control_request_t const * request) {
+bool pico_usb_reset_interface_control_xfer_cb(uint8_t __unused rhport, uint8_t stage, tusb_control_request_t const * request) {
     // nothing to do with DATA & ACK stage
     if (stage != CONTROL_STAGE_SETUP) return true;
 
@@ -125,15 +125,15 @@ bool resetd_control_xfer_cb(uint8_t __unused rhport, uint8_t stage, tusb_control
     return false;
 }
 
-bool resetd_xfer_cb(uint8_t __unused rhport, uint8_t __unused ep_addr, xfer_result_t __unused result, uint32_t __unused xferred_bytes) {
+bool pico_usb_reset_interface_xfer_cb(uint8_t __unused rhport, uint8_t __unused ep_addr, xfer_result_t __unused result, uint32_t __unused xferred_bytes) {
     return true;
 }
 
 #if PICO_STDIO_USB_RESET_INCLUDE_APP_DRIVER_CB
 // Implement callback to add our custom driver
 usbd_class_driver_t const *usbd_app_driver_get_cb(uint8_t *driver_count) {
     *driver_count = 1;
-    return &_resetd_driver;
+    return &pico_usb_reset_interface_driver;
 }
 #endif
 #endif