Finish matching ique-cn (#2451)

* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin

subrepo:
  subdir:   "tools/com-plugin"
  merged:   "e8543312d"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "e8543312d"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* ique-cn OK

* Review suggestions

* Most suggestions

* git subrepo pull tools/com-plugin

subrepo:
  subdir:   "tools/com-plugin"
  merged:   "81595ed1c"
upstream:
  origin:   "git@github.com:Thar0/com-plugin.git"
  branch:   "main"
  commit:   "81595ed1c"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Fix other versions

6 files changed, 18 insertions, 14 deletions

diff --git a/src/libultra/io/controller.c b/src/libultra/io/controller.c
index c6c8d83ca..3a2dc9a17 100644
--- a/src/libultra/io/controller.c
+++ b/src/libultra/io/controller.c
@@ -4,7 +4,9 @@ OSPifRam __osContPifRam;
 u8 __osContLastCmd;
 u8 __osMaxControllers; // always 4
 
+#ifndef BBPLAYER
 OSTimer __osEepromTimer;
+#endif
 OSMesgQueue __osEepromTimerMsgQueue;
 OSMesg __osEepromTimerMsg;
 
diff --git a/src/libultra/io/piacs.c b/src/libultra/io/piacs.c
index 0ffa3448c..cff131f69 100644
--- a/src/libultra/io/piacs.c
+++ b/src/libultra/io/piacs.c
@@ -1,7 +1,7 @@
 #include "global.h"
 
 u32 __osPiAccessQueueEnabled = false;
-OSMesg piAccessBuf[1];
+static OSMesg piAccessBuf[1];
 OSMesgQueue __osPiAccessQueue;
 
 void __osPiCreateAccessQueue(void) {
diff --git a/src/libultra/io/pimgr.c b/src/libultra/io/pimgr.c
index 7a0b68f8d..6b006d7aa 100644
--- a/src/libultra/io/pimgr.c
+++ b/src/libultra/io/pimgr.c
@@ -6,11 +6,10 @@ OSDevMgr __osPiDevMgr = { 0 };
 
 OSPiHandle __Dom1SpeedParam;
 OSPiHandle __Dom2SpeedParam;
-OSThread piThread;
-STACK(piStackThread, 0x1000);
-OSMesgQueue piEventQueue;
-OSMesg piEventBuf[2];
-OSThread __osThreadSave;
+static OSThread piThread;
+static STACK(piThreadStack, 0x1000);
+static OSMesgQueue piEventQueue;
+static OSMesg piEventBuf[2];
 
 OSPiHandle* __osPiTable = NULL;
 OSPiHandle* __osCurrentHandle[] = {
@@ -47,7 +46,7 @@ void osCreatePiManager(OSPri pri, OSMesgQueue* cmdQueue, OSMesg* cmdBuf, s32 cmd
         __osPiDevMgr.dma = __osPiRawStartDma;
         __osPiDevMgr.edma = __osEPiRawStartDma;
 
-        osCreateThread(&piThread, 0, __osDevMgrMain, (void*)&__osPiDevMgr, STACK_TOP(piStackThread), pri);
+        osCreateThread(&piThread, 0, __osDevMgrMain, (void*)&__osPiDevMgr, STACK_TOP(piThreadStack), pri);
         osStartThread(&piThread);
 
         __osRestoreInt(prevInt);
diff --git a/src/libultra/io/siacs.c b/src/libultra/io/siacs.c
index c814867bd..9f528feef 100644
--- a/src/libultra/io/siacs.c
+++ b/src/libultra/io/siacs.c
@@ -1,6 +1,6 @@
 #include "global.h"
 
-OSMesg siAccessBuf[1];
+static OSMesg siAccessBuf[1];
 OSMesgQueue __osSiAccessQueue;
 u32 __osSiAccessQueueEnabled = false;
 
diff --git a/src/libultra/io/vimgr.c b/src/libultra/io/vimgr.c
index d9b3fc435..a075ebf4f 100644
--- a/src/libultra/io/vimgr.c
+++ b/src/libultra/io/vimgr.c
@@ -2,12 +2,12 @@
 #include "stack.h"
 #include "ultra64/internal.h"
 
-OSThread viThread;
-STACK(viThreadStack, 0x1000);
-OSMesgQueue viEventQueue;
-OSMesg viEventBuf[5];
-OSIoMesg viRetraceMsg;
-OSIoMesg viCounterMsg;
+static OSThread viThread;
+static STACK(viThreadStack, 0x1000);
+static OSMesgQueue viEventQueue;
+static OSMesg viEventBuf[5];
+static OSIoMesg viRetraceMsg;
+static OSIoMesg viCounterMsg;
 OSDevMgr __osViDevMgr = { 0 };
 u32 __additional_scanline = 0;
 
diff --git a/src/libultra/os/kdebugserver.c b/src/libultra/os/kdebugserver.c
new file mode 100644
index 000000000..2f7abe20d
--- /dev/null
+++ b/src/libultra/os/kdebugserver.c
@@ -0,0 +1,3 @@
+#include "ultra64.h"
+
+OSThread __osThreadSave;