Move reboot functionality to a separate library

This will be required for including into apps, so break it out.

CMakeLists.txt

@@ -20,6 +20,8 @@ set_target_properties(picowota PROPERTIES COMPILE_FLAGS "-Wall -Os")
 
 target_include_directories(picowota PRIVATE ${CMAKE_CURRENT_LIST_DIR})
 
+add_subdirectory(picowota_reboot)
+
 target_link_libraries(picowota
 	cmsis_core
 	hardware_dma
@@ -30,4 +32,5 @@ target_link_libraries(picowota
 	pico_stdlib
 	pico_sync
 	pico_util
+	picowota_reboot
 )

main.c

@@ -28,6 +28,8 @@
 
 #include "tcp_comm.h"
 
+#include "picowota/reboot.h"
+
 #ifdef DEBUG
 #include <stdio.h>
 #include "pico/stdio_usb.h"
@@ -64,7 +66,6 @@ struct event {
 };
 
 #define BOOTLOADER_ENTRY_PIN 15
-#define BOOTLOADER_ENTRY_MAGIC 0xb105f00d
 
 #define TCP_PORT 4242
 
@@ -501,23 +502,6 @@ const struct comm_command info_cmd = {
 	.handle = &handle_info,
 };
 
-static void do_reboot(bool to_bootloader)
-{
-	hw_clear_bits(&watchdog_hw->ctrl, WATCHDOG_CTRL_ENABLE_BITS);
-	if (to_bootloader) {
-		watchdog_hw->scratch[5] = BOOTLOADER_ENTRY_MAGIC;
-		watchdog_hw->scratch[6] = ~BOOTLOADER_ENTRY_MAGIC;
-	} else {
-		watchdog_hw->scratch[5] = 0;
-		watchdog_hw->scratch[6] = 0;
-	}
-	watchdog_reboot(0, 0, 0);
-	while (1) {
-		tight_loop_contents();
-		asm("");
-	}
-}
-
 static uint32_t size_reboot(uint32_t *args_in, uint32_t *data_len_out, uint32_t *resp_data_len_out)
 {
 	*data_len_out = 0;
@@ -554,8 +538,8 @@ struct comm_command reboot_cmd = {
 
 static bool should_stay_in_bootloader()
 {
-	bool wd_says_so = (watchdog_hw->scratch[5] == BOOTLOADER_ENTRY_MAGIC) &&
-		(watchdog_hw->scratch[6] == ~BOOTLOADER_ENTRY_MAGIC);
+	bool wd_says_so = (watchdog_hw->scratch[5] == PICOWOTA_BOOTLOADER_ENTRY_MAGIC) &&
+		(watchdog_hw->scratch[6] == ~PICOWOTA_BOOTLOADER_ENTRY_MAGIC);
 
 	return !gpio_get(BOOTLOADER_ENTRY_PIN) || wd_says_so;
 }
@@ -633,7 +617,7 @@ int main()
 			case EVENT_TYPE_REBOOT:
 				tcp_comm_server_close(tcp);
 				cyw43_arch_deinit();
-				do_reboot(ev.reboot.to_bootloader);
+				picowota_reboot(ev.reboot.to_bootloader);
 				/* Should never get here */
 				break;
 			case EVENT_TYPE_GO:

picowota_reboot/CMakeLists.txt

@@ -0,0 +1,13 @@
+add_library(picowota_reboot INTERFACE)
+
+target_include_directories(picowota_reboot INTERFACE
+	${CMAKE_CURRENT_LIST_DIR}/include
+)
+
+target_sources(picowota_reboot INTERFACE
+	${CMAKE_CURRENT_LIST_DIR}/reboot.c
+)
+
+target_link_libraries(picowota_reboot INTERFACE
+	hardware_structs
+)

picowota_reboot/include/picowota/reboot.h

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2022 Brian Starkey <stark3y@gmail.com>
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __PICOWOTA_REBOOT_H__
+#define __PICOWOTA_REBOOT_H__
+
+#include <stdbool.h>
+
+#define PICOWOTA_BOOTLOADER_ENTRY_MAGIC 0xb105f00d
+
+void picowota_reboot(bool to_bootloader);
+
+#endif /* __PICOWOTA_REBOOT_H__ */

picowota_reboot/reboot.c

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2022 Brian Starkey <stark3y@gmail.com>
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "RP2040.h"
+#include "hardware/structs/watchdog.h"
+#include "hardware/watchdog.h"
+
+#include "picowota/reboot.h"
+
+void picowota_reboot(bool to_bootloader)
+{
+	hw_clear_bits(&watchdog_hw->ctrl, WATCHDOG_CTRL_ENABLE_BITS);
+	if (to_bootloader) {
+		watchdog_hw->scratch[5] = PICOWOTA_BOOTLOADER_ENTRY_MAGIC;
+		watchdog_hw->scratch[6] = ~PICOWOTA_BOOTLOADER_ENTRY_MAGIC;
+	} else {
+		watchdog_hw->scratch[5] = 0;
+		watchdog_hw->scratch[6] = 0;
+	}
+	watchdog_reboot(0, 0, 0);
+	while (1) {
+		tight_loop_contents();
+		asm("");
+	}
+}