Merge branch 'lukeshu/misc'

5 files changed, 23 insertions, 18 deletions

diff --git a/cmd/sbc_harness/CMakeLists.txt b/cmd/sbc_harness/CMakeLists.txt
index 6e722d7..878e151 100644
--- a/cmd/sbc_harness/CMakeLists.txt
+++ b/cmd/sbc_harness/CMakeLists.txt
@@ -72,10 +72,11 @@ pico_set_program_url(sbc_harness "https://git.lukeshu.com/sbc-harness")
 target_embed_sources(sbc_harness_objs sbc_harness static.h
 	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS.md
 	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/agpl-3.0.txt
+	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/dhcp.bsd3-mit.txt
+	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/newlib.txt
 	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/pico-sdk.bsd3.txt
 	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/printf.mit.txt
 	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/tinyusb.mit.txt
-	static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/newlib.txt
 	static/Documentation/harness_rom_bin.txt
 	static/Documentation/harness_flash_bin.txt
 	static/Documentation/harness_uptime_txt.txt
diff --git a/cmd/sbc_harness/fs_harness_flash_bin.c b/cmd/sbc_harness/fs_harness_flash_bin.c
index 5920b85..f353ddd 100644
--- a/cmd/sbc_harness/fs_harness_flash_bin.c
+++ b/cmd/sbc_harness/fs_harness_flash_bin.c
@@ -41,7 +41,7 @@ static_assert(DATA_HSIZE % FLASH_SECTOR_SIZE == 0);
 [[noreturn]] static void __no_inline_not_in_flash_func(ab_flash_finalize)(uint8_t *buf) {
 	assert(buf);
 
-	infof("copying upper flash to lower flash...");
+	log_infof("copying upper flash to lower flash...");
 
 	cr_save_and_disable_interrupts();
 
@@ -53,7 +53,7 @@ static_assert(DATA_HSIZE % FLASH_SECTOR_SIZE == 0);
 		flash_range_program(off, buf, FLASH_SECTOR_SIZE);
 	}
 
-	infof("rebooting...");
+	log_infof("rebooting...");
 
 	watchdog_reboot(0, 0, 300);
 
@@ -71,7 +71,7 @@ static void ab_flash_initialize_zero(uint8_t *buf) {
 
 	memset(buf, 0, FLASH_SECTOR_SIZE);
 
-	infof("zeroing upper flash...");
+	log_infof("zeroing upper flash...");
 	for (size_t off = DATA_HSIZE; off < DATA_SIZE; off += FLASH_SECTOR_SIZE) {
 		if (memcmp(buf, DATA_START+off, FLASH_SECTOR_SIZE) == 0)
 			continue;
@@ -84,7 +84,7 @@ static void ab_flash_initialize_zero(uint8_t *buf) {
 		flash_range_program(off, buf, FLASH_SECTOR_SIZE);
 		cr_restore_interrupts(saved);
 	}
-	debugf("... zeroed");
+	log_debugf("... zeroed");
 }
 
 /**
@@ -95,7 +95,7 @@ static void ab_flash_initialize_zero(uint8_t *buf) {
 static void ab_flash_initialize(uint8_t *buf) {
 	assert(buf);
 
-	infof("initializing upper flash...");
+	log_infof("initializing upper flash...");
 	for (size_t off = 0; off < DATA_HSIZE; off += FLASH_SECTOR_SIZE) {
 		memcpy(buf, DATA_START+off, FLASH_SECTOR_SIZE);
 		if (memcmp(buf, DATA_START+DATA_HSIZE+off, FLASH_SECTOR_SIZE) == 0)
@@ -105,7 +105,7 @@ static void ab_flash_initialize(uint8_t *buf) {
 		flash_range_program(DATA_HSIZE+off, buf, FLASH_SECTOR_SIZE);
 		cr_restore_interrupts(saved);
 	}
-	debugf("... initialized");
+	log_debugf("... initialized");
 }
 
 /**
@@ -123,14 +123,14 @@ static void ab_flash_write_sector(size_t pos, uint8_t *dat) {
 
 	pos += DATA_HSIZE;
 
-	infof("write flash sector @ %zu...", pos);
+	log_infof("write flash sector @ %zu...", pos);
 	if (memcmp(dat, DATA_START+pos, FLASH_SECTOR_SIZE) != 0) {
 		bool saved = cr_save_and_disable_interrupts();
 		flash_range_erase(pos, FLASH_SECTOR_SIZE);
 		flash_range_program(pos, dat, FLASH_SECTOR_SIZE);
 		cr_restore_interrupts(saved);
 	}
-	debugf("... written");
+	log_debugf("... written");
 }
 
 /* srv_file *******************************************************************/
diff --git a/cmd/sbc_harness/main.c b/cmd/sbc_harness/main.c
index 5630e83..b6f485f 100644
--- a/cmd/sbc_harness/main.c
+++ b/cmd/sbc_harness/main.c
@@ -71,6 +71,12 @@ struct lib9p_srv_file root =
 		                                 STATIC_FILE("agpl-3.0.txt",
 		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_agpl_3_0_txt_start,
 		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_agpl_3_0_txt_end),
+		                                 STATIC_FILE("dhcp.bsd3-mit.txt",
+		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_dhcp_bsd3_mit_txt_start,
+		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_dhcp_bsd3_mit_txt_end),
+		                                 STATIC_FILE("newlib.txt",
+		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_newlib_txt_start,
+		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_newlib_txt_end),
 		                                 STATIC_FILE("pico-sdk.bsd3.txt",
 		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_pico_sdk_bsd3_txt_start,
 		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_pico_sdk_bsd3_txt_end),
@@ -80,9 +86,6 @@ struct lib9p_srv_file root =
 		                                 STATIC_FILE("tinyusb.mit.txt",
 		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_tinyusb_mit_txt_start,
 		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_tinyusb_mit_txt_end),
-		                                 STATIC_FILE("newlib.txt",
-		                                             .data_start = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_newlib_txt_start,
-		                                             .data_end   = _binary_static_Documentation_YOUR_RIGHTS_AND_OBLIGATIONS_newlib_txt_end),
 		                                 ),
 		                      STATIC_FILE("harness_rom_bin.txt",
 		                                  .data_start = _binary_static_Documentation_harness_rom_bin_txt_start,
@@ -129,7 +132,7 @@ static COROUTINE hello_world_cr(void *_chan) {
 	for (size_t i = 0;; i = (i+1) % strlen(msg)) {
 		int result = usb_keyboard_rpc_send_req(chan, (uint32_t)msg[i]);
 		if (result < 1) {
-			errorf("error sending rune U+%d", (uint32_t)msg[i]);
+			log_errorf("error sending rune U+%d", (uint32_t)msg[i]);
 			break;
 		}
 	}
@@ -246,7 +249,7 @@ int main() {
 	bootclock = rp2040_hwtimer(0);
 	stdio_uart_init();
 	/* char *hdr = "=" * (80-strlen("info : MAIN: ")); */
-	infof("===================================================================");
+	log_infof("===================================================================");
 	coroutine_add("init", init_cr, NULL);
 	coroutine_main();
 	assert_notreached("all coroutines exited");
diff --git a/cmd/sbc_harness/static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/dhcp.bsd3-mit.txt b/cmd/sbc_harness/static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/dhcp.bsd3-mit.txt
new file mode 120000
index 0000000..0277bc8
--- /dev/null
+++ b/cmd/sbc_harness/static/Documentation/YOUR_RIGHTS_AND_OBLIGATIONS/dhcp.bsd3-mit.txt
@@ -0,0 +1 @@
+../../../../../3rd-party/COPYING.wiznet-dhcp.txt
\ No newline at end of file
diff --git a/cmd/sbc_harness/tusb_log.c b/cmd/sbc_harness/tusb_log.c
index 4c6b7df..fe2c688 100644
--- a/cmd/sbc_harness/tusb_log.c
+++ b/cmd/sbc_harness/tusb_log.c
@@ -1,6 +1,6 @@
 /* sbc_harness/tusb_log.c - Logger for tusb_config.h
  *
- * Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
+ * Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
@@ -9,7 +9,7 @@
 
 void _libmisc_tu_mess_failed(const char *expr,
                              const char *file, unsigned int line, const char *func) {
-	errorf("%s:%u:%s(): assertion \"%s\" failed",
-	       file, line, func,
-	       expr);
+	log_errorf("%s:%u:%s(): assertion \"%s\" failed",
+	           file, line, func,
+	           expr);
 }