3 files changed, 17 insertions, 11 deletions
diff --git a/cmd/sbc_harness/config/config.h b/cmd/sbc_harness/config/config.h
index 5367dbe..ca23462 100644
--- a/cmd/sbc_harness/config/config.h
+++ b/cmd/sbc_harness/config/config.h
@@ -39,6 +39,18 @@
 
 #define CONFIG_9P_MAX_ERR_SIZE          128 /* 128 is what Plan 9 4e uses */
 
+#define CONFIG_9P_ENABLE_9P2000         1 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_u       1 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_e       0 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_L       0 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_p9p     0 /* bool */
+
+/* 9P_SRV *********************************************************************/
+
+#define CONFIG_9P_SRV_DEBUG             1 /* bool */
+
+#define CONFIG_9P_SRV_MAX_MSG_SIZE      ((4*1024)+24)
+
 /**
  * This max-msg-size is sized so that a Twrite message can return
  * 8KiB of data.
@@ -64,12 +76,6 @@
  */
 #define CONFIG_9P_SRV_MAX_HOSTMSG_SIZE  CONFIG_9P_SRV_MAX_MSG_SIZE+16
 
-#define CONFIG_9P_ENABLE_9P2000         1 /* bool */
-#define CONFIG_9P_ENABLE_9P2000_u       1 /* bool */
-#define CONFIG_9P_ENABLE_9P2000_e       0 /* bool */
-#define CONFIG_9P_ENABLE_9P2000_L       0 /* bool */
-#define CONFIG_9P_ENABLE_9P2000_p9p     0 /* bool */
-
 /* DHCP ***********************************************************************/
 
 #define CONFIG_DHCP_CAN_RECV_UNICAST_IP_WITHOUT_IP      0 /* bool */
diff --git a/cmd/sbc_harness/fs_harness_uptime_txt.c b/cmd/sbc_harness/fs_harness_uptime_txt.c
index 1425bf9..dd5c681 100644
--- a/cmd/sbc_harness/fs_harness_uptime_txt.c
+++ b/cmd/sbc_harness/fs_harness_uptime_txt.c
@@ -5,10 +5,10 @@
  */
 
 #include <stdio.h>  /* for snprintf() */
-#include <stdlib.h> /* for malloc(), free() */
 
 #include <libhw/generic/alarmclock.h>
 #include <util9p/static.h>
+#include <libmisc/alloc.h> /* for heap_alloc(), free() */
 
 #include "fs_harness_uptime_txt.h"
 
@@ -91,7 +91,7 @@ static lo_interface lib9p_srv_fio uptime_file_fopen(struct uptime_file *self, st
 	assert(self);
 	assert(ctx);
 
-	struct uptime_fio *ret = malloc(sizeof(struct uptime_fio));
+	struct uptime_fio *ret = heap_alloc(1, struct uptime_fio);
 	ret->parent = self;
 	ret->buf_len = 0;
 
diff --git a/cmd/sbc_harness/usb_keyboard.c b/cmd/sbc_harness/usb_keyboard.c
index f3cb42d..7dd8a24 100644
--- a/cmd/sbc_harness/usb_keyboard.c
+++ b/cmd/sbc_harness/usb_keyboard.c
@@ -54,8 +54,8 @@ COROUTINE usb_keyboard_cr(void *_chan) {
 		while (!tud_hid_n_ready(kbd_ifc))
 			cr_yield();
 
-		if (usb_keyboard_rpc_can_recv_req(chan)) {
-			usb_keyboard_rpc_req_t req = usb_keyboard_rpc_recv_req(chan);
+		if (cr_rpc_can_recv_req(chan)) {
+			usb_keyboard_rpc_req_t req = cr_rpc_recv_req(chan);
 			uint32_t rune = req.req;
 
 			modifier = ascii2keycode[rune][0] ? KEYBOARD_MODIFIER_LEFTSHIFT : 0;
@@ -69,7 +69,7 @@ COROUTINE usb_keyboard_cr(void *_chan) {
 			keycodes[0] = 0;
 			tud_hid_n_keyboard_report(kbd_ifc, report_id, modifier, keycodes);
 
-			usb_keyboard_rpc_send_resp(req, 1);
+			cr_rpc_send_resp(req, 1);
 		} else {
 			modifier = 0;
 			keycodes[0] = 0;