From 18ff84aa04c3dbf39166d4bad210e91a9381960f Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Mon, 25 Jul 2022 13:17:23 -0400
Subject: usb_cdc: Rename usb_request_bootloader() to bootloader_request()

Rename this board API function to a more generic name.  This is in
preparation for calling the function from the canbus code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
 src/rp2040/main.c      | 14 ++++++++++++++
 src/rp2040/usbserial.c |  7 -------
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'src/rp2040')

diff --git a/src/rp2040/main.c b/src/rp2040/main.c
index fbbe3b56..462e69c6 100644
--- a/src/rp2040/main.c
+++ b/src/rp2040/main.c
@@ -5,11 +5,13 @@
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
 #include <stdint.h> // uint32_t
+#include "board/misc.h" // bootloader_request
 #include "hardware/structs/clocks.h" // clock_hw_t
 #include "hardware/structs/pll.h" // pll_hw_t
 #include "hardware/structs/resets.h" // sio_hw
 #include "hardware/structs/watchdog.h" // watchdog_hw
 #include "hardware/structs/xosc.h" // xosc_hw
+#include "internal.h" // enable_pclock
 #include "sched.h" // sched_main
 
 
@@ -36,6 +38,18 @@ watchdog_init(void)
 DECL_INIT(watchdog_init);
 
 
+/****************************************************************
+ * Bootloader
+ ****************************************************************/
+
+void
+bootloader_request(void)
+{
+    // Use the bootrom-provided code to reset into BOOTSEL mode
+    reset_to_usb_boot(0, 0);
+}
+
+
 /****************************************************************
  * Clock setup
  ****************************************************************/
diff --git a/src/rp2040/usbserial.c b/src/rp2040/usbserial.c
index 83838d2d..aafe53ef 100644
--- a/src/rp2040/usbserial.c
+++ b/src/rp2040/usbserial.c
@@ -160,13 +160,6 @@ usb_set_configure(void)
         USB_BUF_CTRL_AVAIL | USB_BUF_CTRL_LAST | DPBUF_SIZE);
 }
 
-void
-usb_request_bootloader(void)
-{
-    // Use the bootrom-provided code to reset into BOOTSEL mode
-    reset_to_usb_boot(0, 0);
-}
-
 
 /****************************************************************
  * USB Errata workaround
-- 
cgit v1.2.3-70-g09d2