Split libnu into libplatform, libamex

Going to add some ALLS stuff to libplatform and the ALLS hardware
does not contain an AMEX board.

amex/ds.c

@@ -18,12 +18,12 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "amex/ds.h"
+#include "amex/nvram.h"
+
 #include "hook/iobuf.h"
 #include "hook/iohook.h"
 
-#include "nu/ds.h"
-#include "nu/nvram.h"
-
 #include "util/crc.h"
 #include "util/dprintf.h"
 #include "util/setupapi.h"

amex/eeprom.c

@@ -10,10 +10,10 @@
 
 #include <assert.h>
 
-#include "hook/iohook.h"
+#include "amex/eeprom.h"
+#include "amex/nvram.h"
 
-#include "nu/eeprom.h"
+#include "hook/iohook.h"
-#include "nu/nvram.h"
 
 #include "util/dprintf.h"
 #include "util/setupapi.h"

amex/gpio.c

@@ -4,9 +4,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include "hook/iohook.h"
+#include "amex/gpio.h"
 
-#include "nu/gpio.h"
+#include "hook/iohook.h"
 
 #include "util/dprintf.h"
 #include "util/setupapi.h"

amex/guid.c

@@ -0,0 +1,8 @@
+#include <windows.h>
+#include <initguid.h>
+
+#include "amex/ds.h"
+#include "amex/eeprom.h"
+#include "amex/gpio.h"
+#include "amex/jvs.h"
+#include "amex/sram.h"

amex/jvs.c

@@ -8,13 +8,13 @@
 #include <assert.h>
 #include <stddef.h>
 
+#include "amex/jvs.h"
+
 #include "hook/iobuf.h"
 #include "hook/iohook.h"
 
 #include "jvs/jvs-bus.h"
 
-#include "nu/jvs.h"
-
 #include "util/dprintf.h"
 #include "util/dump.h"
 #include "util/setupapi.h"

amex/meson.build

@@ -1,5 +1,5 @@
-nu_lib = static_library(
+amex_lib = static_library(
-    'nu',
+    'amex',
     include_directories : inc,
     implicit_include_directories : false,
     c_pch : [
@@ -8,7 +8,6 @@ nu_lib = static_library(
     ],
     dependencies : [
         capnhook.get_variable('hook_dep'),
-        capnhook.get_variable('hooklib_dep'),
     ],
     sources : [
         'ds.c',
@@ -20,10 +19,6 @@ nu_lib = static_library(
         'guid.c',
         'jvs.c',
         'jvs.h',
-        'hwmon.c',
-        'hwmon.h',
-        'nusec.c',
-        'nusec.h',
         'nvram.c',
         'nvram.h',
         'sram.c',

amex/nvram.c

@@ -4,9 +4,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "util/dprintf.h"
+#include "amex/nvram.h"
 
-#include "nu/nvram.h"
+#include "util/dprintf.h"
 
 HRESULT nvram_open_file(HANDLE *out, wchar_t *path, size_t size)
 {

amex/sram.c

@@ -10,10 +10,10 @@
 
 #include <assert.h>
 
-#include "hook/iohook.h"
+#include "amex/sram.h"
+#include "amex/nvram.h"
 
-#include "nu/sram.h"
+#include "hook/iohook.h"
-#include "nu/nvram.h"
 
 #include "util/dprintf.h"
 #include "util/setupapi.h"

chunihook/dllmain.c

@@ -3,6 +3,12 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+#include "amex/ds.h"
+#include "amex/eeprom.h"
+#include "amex/gpio.h"
+#include "amex/jvs.h"
+#include "amex/sram.h"
+
 #include "chunihook/jvs.h"
 #include "chunihook/slider-hook.h"
 
@@ -10,13 +16,8 @@
 
 #include "hooklib/serial.h"
 
-#include "nu/ds.h"
+#include "platform/hwmon.h"
-#include "nu/eeprom.h"
+#include "platform/nusec.h"
-#include "nu/gpio.h"
-#include "nu/jvs.h"
-#include "nu/hwmon.h"
-#include "nu/nusec.h"
-#include "nu/sram.h"
 
 #include "util/clock.h"
 #include "util/dprintf.h"
@@ -47,16 +48,19 @@ static DWORD CALLBACK chuni_pre_startup(void)
     gfx_hook_init();
     serial_hook_init();
 
-    /* Initialize Nu emulation */
+    /* Initialize platform API emulation */
 
-    eeprom_hook_init();
-    sram_hook_init();
-    ds_hook_init();
-    gpio_hook_init();
-    jvs_hook_init();
     hwmon_hook_init();
     nusec_hook_init();
 
+    /* Initialize AMEX emulation */
+
+    ds_hook_init();
+    gpio_hook_init();
+    eeprom_hook_init();
+    jvs_hook_init();
+    sram_hook_init();
+
     /* Initialize Chunithm board emulation */
 
     slider_hook_init();

chunihook/jvs.c

@@ -5,12 +5,12 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "amex/jvs.h"
+
 #include "board/io3.h"
 
 #include "jvs/jvs-bus.h"
 
-#include "nu/jvs.h"
-
 #include "util/dprintf.h"
 
 static void chunithm_jvs_read_switches(void *ctx, struct io3_switch_state *out);

chunihook/meson.build

@@ -12,9 +12,10 @@ shared_library(
         capnhook.get_variable('hooklib_dep'),
     ],
     link_with : [
+        amex_lib,
         board_lib,
         jvs_lib,
-        nu_lib,
+        platform_lib,
         util_lib,
     ],
     sources : [

meson.build

@@ -30,9 +30,10 @@ xinput_lib = cc.find_library('xinput')
 inc = include_directories('.')
 capnhook = subproject('capnhook')
 
+subdir('amex')
 subdir('board')
 subdir('jvs')
-subdir('nu')
+subdir('platform')
 subdir('util')
 
 subdir('aimeio')

minihook/dllmain.c

@@ -1,9 +1,10 @@
 #include <windows.h>
 
+#include "amex/ds.h"
+
 #include "hook/process.h"
 
-#include "nu/ds.h"
+#include "platform/nusec.h"
-#include "nu/nusec.h"
 
 #include "util/clock.h"
 #include "util/dprintf.h"
@@ -15,10 +16,10 @@ static DWORD CALLBACK app_pre_startup(void)
 {
     dprintf("--- Begin %s ---\n", __func__);
 
+    spike_hook_init("minispike.txt");
+    clock_hook_init();
     ds_hook_init();
     nusec_hook_init();
-    clock_hook_init();
-    spike_hook_init("minispike.txt");
 
     dprintf("---  End  %s ---\n", __func__);
 

minihook/meson.build

@@ -11,7 +11,8 @@ shared_library(
         capnhook.get_variable('hook_dep'),
     ],
     link_with : [
-        nu_lib,
+        amex_lib,
+        platform_lib,
         util_lib,
     ],
     sources : [

nu/guid.c

@@ -1,8 +0,0 @@
-#include <windows.h>
-#include <initguid.h>
-
-#include "nu/ds.h"
-#include "nu/eeprom.h"
-#include "nu/gpio.h"
-#include "nu/jvs.h"
-#include "nu/sram.h"

platform/hwmon.c

@@ -7,7 +7,7 @@
 
 #include "hook/iohook.h"
 
-#include "nu/hwmon.h"
+#include "platform/hwmon.h"
 
 enum {
     HWMON_IOCTL_READ_CPU_TEMP = 0x80006000,

platform/meson.build

@@ -0,0 +1,18 @@
+platform_lib = static_library(
+    'platform',
+    include_directories : inc,
+    implicit_include_directories : false,
+    c_pch : [
+        '../precompiled.c',
+        '../precompiled.h',
+    ],
+    dependencies : [
+        capnhook.get_variable('hook_dep'),
+    ],
+    sources : [
+        'hwmon.c',
+        'hwmon.h',
+        'nusec.c',
+        'nusec.h',
+    ],
+)

platform/nusec.c

@@ -7,6 +7,8 @@
 
 #include "hook/iohook.h"
 
+#include "platform/nusec.h"
+
 enum {
     NUSEC_IOCTL_PING                    = 0x22A114,
     NUSEC_IOCTL_ERASE_TRACE_LOG         = 0x22E188,