ezusb: decouple some nodes from ezusb-iidx-emu

This fixes a build failure in newer gcc for popnhook.
Since node-16seg has a dependency on iidxio

src/main/ezusb-emu/Module.mk

@@ -6,4 +6,12 @@ libs_ezusb-emu      := \
 src_ezusb-emu     := \
     desc.c \
     device.c \
-    util.c
+    util.c \
+    node-coin.c \
+    node-eeprom.c \
+    node-none.c \
+    node-security-mem.c \
+    node-security-plug.c \
+    node-sram.c \
+    node-wdt.c \
+    nodes.c

src/main/ezusb-emu/node-coin.c

@@ -1,6 +1,6 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-coin"
+#define LOG_MODULE "ezusb-emu-node-coin"
 
-#include "ezusb-iidx-emu/node-coin.h"
+#include "ezusb-emu/node-coin.h"
 
 #include "ezusb-iidx/coin-cmd.h"
 

src/main/ezusb-emu/node-coin.h

@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_COIN_H
 #define EZUSB_IIDX_EMU_NODE_COIN_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 uint8_t ezusb_iidx_emu_node_coin_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2);

src/main/ezusb-emu/node-eeprom.c

@@ -1,8 +1,8 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-eeprom"
+#define LOG_MODULE "ezusb-emu-node-eeprom"
 
 #include <string.h>
 
-#include "ezusb-iidx-emu/node-eeprom.h"
+#include "ezusb-emu/node-eeprom.h"
 
 #include "ezusb-iidx/eeprom-cmd.h"
 

src/main/ezusb-emu/node-eeprom.h

@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_EEPROM_H
 #define EZUSB_IIDX_EMU_NODE_EEPROM_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 void ezusb_iidx_emu_node_eeprom_init(void);
 /* Used on 9th to DistorteD */

src/main/ezusb-emu/node-none.c

@@ -1,4 +1,4 @@
-#include "ezusb-iidx-emu/node-none.h"
+#include "ezusb-emu/node-none.h"
 
 uint8_t ezusb_iidx_emu_node_none_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2)

src/main/ezusb-emu/node-none.h

@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_NONE_H
 #define EZUSB_IIDX_EMU_NODE_NONE_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 uint8_t ezusb_iidx_emu_node_none_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2);

src/main/ezusb-emu/node-security-mem.c

@@ -1,8 +1,8 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-sec-mem"
+#define LOG_MODULE "ezusb-emu-node-sec-mem"
 
 #include <string.h>
 
-#include "ezusb-iidx-emu/node-security-mem.h"
+#include "ezusb-emu/node-security-mem.h"
 #include "ezusb-iidx/secmem-cmd.h"
 
 #include "util/log.h"

src/main/ezusb-emu/node-security-mem.h

@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_SECURITY_MEM_H
 #define EZUSB_IIDX_EMU_NODE_SECURITY_MEM_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 void ezusb_iidx_emu_node_security_mem_init(void);
 

src/main/ezusb-emu/node-security-plug.c

@@ -1,10 +1,10 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-sec-plug"
+#define LOG_MODULE "ezusb-emu-node-sec-plug"
 
 #include <string.h>
 
-#include "ezusb-iidx-emu/node-eeprom.h"
-#include "ezusb-iidx-emu/node-security-mem.h"
-#include "ezusb-iidx-emu/node-security-plug.h"
+#include "ezusb-emu/node-eeprom.h"
+#include "ezusb-emu/node-security-mem.h"
+#include "ezusb-emu/node-security-plug.h"
 #include "ezusb-iidx/secplug-cmd.h"
 
 #include "security/rp.h"

src/main/ezusb-emu/node-security-plug.h

@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_SECURITY_PLUG_H
 #define EZUSB_IIDX_EMU_NODE_SECURITY_PLUG_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 #include "security/id.h"
 #include "security/mcode.h"

src/main/ezusb-emu/node-sram.c

@@ -1,9 +1,9 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-sram"
+#define LOG_MODULE "ezusb-emu-node-sram"
 
 #include <string.h>
 
-#include "ezusb-iidx-emu/conf.h"
-#include "ezusb-iidx-emu/node-sram.h"
+#include "ezusb-emu/conf.h"
+#include "ezusb-emu/node-sram.h"
 #include "ezusb-iidx/sram-cmd.h"
 
 #include "util/fs.h"

src/main/ezusb-emu/node-sram.h

@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_SRAM_H
 #define EZUSB_IIDX_EMU_NODE_SRAM_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 uint8_t ezusb_iidx_emu_node_sram_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2);

src/main/ezusb-emu/node-wdt.c

@@ -1,6 +1,6 @@
-#define LOG_MODULE "ezusb-iidx-emu-node-wdt"
+#define LOG_MODULE "ezusb-emu-node-wdt"
 
-#include "ezusb-iidx-emu/node-wdt.h"
+#include "ezusb-emu/node-wdt.h"
 #include "ezusb-iidx/wdt-cmd.h"
 
 #include "util/log.h"

src/main/ezusb-emu/node-wdt.h

@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_WDT_H
 #define EZUSB_IIDX_EMU_NODE_WDT_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 uint8_t ezusb_iidx_emu_node_wdt_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2);

src/main/ezusb-emu/nodes.c

@@ -0,0 +1,96 @@
+/*
+ * This file contains the ezusb nodes that appeared on
+ * all IIDX games so far.
+ */
+
+#include "ezusb-iidx/msg.h"
+
+#include "ezusb-emu/node-coin.h"
+#include "ezusb-emu/node-eeprom.h"
+#include "ezusb-emu/node-none.h"
+#include "ezusb-emu/node-security-mem.h"
+#include "ezusb-emu/node-security-plug.h"
+#include "ezusb-emu/node-sram.h"
+#include "ezusb-emu/node-wdt.h"
+#include "ezusb-emu/nodes.h"
+#include "ezusb-emu/node.h"
+
+/* All IIDX games */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_coin = {
+    .node_id = EZUSB_IIDX_MSG_NODE_COIN,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_coin_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_coin_read_packet,
+    .write_packet = ezusb_iidx_emu_node_coin_write_packet};
+
+/* Used on 9th to DistorteD */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v1 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_EEPROM,
+    .init_node = ezusb_iidx_emu_node_eeprom_init,
+    .process_cmd = ezusb_iidx_emu_node_eeprom_process_cmd_v1,
+    .read_packet = ezusb_iidx_emu_node_eeprom_read_packet,
+    .write_packet = ezusb_iidx_emu_node_eeprom_write_packet};
+
+/* Used on Gold to Sirius */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v2 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_EEPROM,
+    .init_node = ezusb_iidx_emu_node_eeprom_init,
+    .process_cmd = ezusb_iidx_emu_node_eeprom_process_cmd_v2,
+    .read_packet = ezusb_iidx_emu_node_eeprom_read_packet,
+    .write_packet = ezusb_iidx_emu_node_eeprom_write_packet};
+
+/* All IIDX games */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_none = {
+    .node_id = EZUSB_IIDX_MSG_NODE_NONE,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_none_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_none_read_packet,
+    .write_packet = ezusb_iidx_emu_node_none_write_packet};
+
+/* Used on 9th to DistorteD */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v1 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_MEM,
+    .init_node = ezusb_iidx_emu_node_security_mem_init,
+    .process_cmd = ezusb_iidx_emu_node_security_mem_v1_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_security_mem_read_packet,
+    .write_packet = ezusb_iidx_emu_node_security_mem_write_packet};
+
+/* Used on Gold to Sirius */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v2 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_MEM,
+    .init_node = ezusb_iidx_emu_node_security_mem_init,
+    .process_cmd = ezusb_iidx_emu_node_security_mem_v2_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_security_mem_read_packet,
+    .write_packet = ezusb_iidx_emu_node_security_mem_write_packet};
+
+/* Used on 9th to DistorteD */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v1 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_PLUG,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_security_plug_process_cmd_v1,
+    .read_packet = ezusb_iidx_emu_node_security_plug_read_packet_v1,
+    .write_packet = ezusb_iidx_emu_node_security_plug_write_packet};
+
+/* Used on Gold to Sirius */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v2 = {
+    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_PLUG,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_security_plug_process_cmd_v2,
+    .read_packet = ezusb_iidx_emu_node_security_plug_read_packet_v2,
+    .write_packet = ezusb_iidx_emu_node_security_plug_write_packet};
+
+/* All IIDX games */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_sram = {
+    .node_id = EZUSB_IIDX_MSG_NODE_SRAM,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_sram_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_sram_read_packet,
+    .write_packet = ezusb_iidx_emu_node_sram_write_packet};
+
+/* Used on 9th to Sirius */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_wdt = {
+    .node_id = EZUSB_IIDX_MSG_NODE_WDT,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_wdt_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_wdt_read_packet,
+    .write_packet = ezusb_iidx_emu_node_wdt_write_packet};

src/main/ezusb-emu/nodes.h

@@ -0,0 +1,17 @@
+#ifndef EZUSBEMU_NODES_H
+#define EZUSBEMU_NODES_H
+
+#include "ezusb-emu/node.h"
+
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_coin;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v1;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v2;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_none;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v1;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v2;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v1;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v2;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_sram;
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_wdt;
+
+#endif

src/main/ezusb-iidx-emu/Module.mk

@@ -1,19 +1,12 @@
 libs            += ezusb-iidx-emu
 
 libs_ezusb-iidx-emu      := \
-    ezusbemu \
+    ezusb-emu \
 
 src_ezusb-iidx-emu     := \
     card-mag.c \
     msg.c \
     node-16seg.c \
-    node-coin.c \
-    node-eeprom.c \
     node-fpga.c \
-    node-none.c \
-    node-security-mem.c \
-    node-security-plug.c \
     node-serial.c \
-    node-sram.c \
-    node-wdt.c \
     nodes.c \

src/main/ezusb-iidx-emu/msg.c

@@ -9,11 +9,12 @@
 #include "hook/iohook.h"
 
 #include "ezusb-emu/msg.h"
+#include "ezusb-emu/nodes.h"
+#include "ezusb-emu/node-coin.h"
 
 #include "ezusb-iidx/msg.h"
 
 #include "ezusb-iidx-emu/msg.h"
-#include "ezusb-iidx-emu/node-coin.h"
 #include "ezusb-iidx-emu/node-serial.h"
 #include "ezusb-iidx-emu/nodes.h"
 

src/main/ezusb-iidx-emu/node-16seg.h

@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_16SEG_H
 #define EZUSB_IIDX_EMU_NODE_16SEG_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 uint8_t ezusb_iidx_emu_node_16seg_process_cmd(
     uint8_t cmd_id, uint8_t cmd_data, uint8_t cmd_data2);

src/main/ezusb-iidx-emu/node-fpga.h

@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_FPGA_H
 #define EZUSB_IIDX_EMU_NODE_FPGA_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 /* Used on 9th to DistorteD */
 uint8_t ezusb_iidx_emu_node_fpga_v1_process_cmd(

src/main/ezusb-iidx-emu/node-serial.h

@@ -1,7 +1,7 @@
 #ifndef EZUSB_IIDX_EMU_NODE_SERIAL_H
 #define EZUSB_IIDX_EMU_NODE_SERIAL_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 void ezusb_iidx_emu_node_serial_init(void);
 

src/main/ezusb-iidx-emu/nodes.c

@@ -6,16 +6,8 @@
 #include "ezusb-iidx/msg.h"
 
 #include "ezusb-iidx-emu/node-16seg.h"
-#include "ezusb-iidx-emu/node-coin.h"
-#include "ezusb-iidx-emu/node-eeprom.h"
 #include "ezusb-iidx-emu/node-fpga.h"
-#include "ezusb-iidx-emu/node-none.h"
-#include "ezusb-iidx-emu/node-security-mem.h"
-#include "ezusb-iidx-emu/node-security-plug.h"
 #include "ezusb-iidx-emu/node-serial.h"
-#include "ezusb-iidx-emu/node-sram.h"
-#include "ezusb-iidx-emu/node-wdt.h"
-#include "ezusb-iidx-emu/node.h"
 #include "ezusb-iidx-emu/nodes.h"
 
 /* All IIDX games */
@@ -26,30 +18,6 @@ const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg = {
     .read_packet = ezusb_iidx_emu_node_16seg_read_packet,
     .write_packet = ezusb_iidx_emu_node_16seg_write_packet};
 
-/* All IIDX games */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_coin = {
-    .node_id = EZUSB_IIDX_MSG_NODE_COIN,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_coin_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_coin_read_packet,
-    .write_packet = ezusb_iidx_emu_node_coin_write_packet};
-
-/* Used on 9th to DistorteD */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v1 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_EEPROM,
-    .init_node = ezusb_iidx_emu_node_eeprom_init,
-    .process_cmd = ezusb_iidx_emu_node_eeprom_process_cmd_v1,
-    .read_packet = ezusb_iidx_emu_node_eeprom_read_packet,
-    .write_packet = ezusb_iidx_emu_node_eeprom_write_packet};
-
-/* Used on Gold to Sirius */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v2 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_EEPROM,
-    .init_node = ezusb_iidx_emu_node_eeprom_init,
-    .process_cmd = ezusb_iidx_emu_node_eeprom_process_cmd_v2,
-    .read_packet = ezusb_iidx_emu_node_eeprom_read_packet,
-    .write_packet = ezusb_iidx_emu_node_eeprom_write_packet};
-
 /* Used on 9th to DistorteD */
 const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v1 = {
     .node_id = EZUSB_IIDX_MSG_NODE_FPGA_V1,
@@ -66,46 +34,6 @@ const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v2 = {
     .read_packet = ezusb_iidx_emu_node_fpga_read_packet,
     .write_packet = ezusb_iidx_emu_node_fpga_write_packet};
 
-/* All IIDX games */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_none = {
-    .node_id = EZUSB_IIDX_MSG_NODE_NONE,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_none_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_none_read_packet,
-    .write_packet = ezusb_iidx_emu_node_none_write_packet};
-
-/* Used on 9th to DistorteD */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v1 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_MEM,
-    .init_node = ezusb_iidx_emu_node_security_mem_init,
-    .process_cmd = ezusb_iidx_emu_node_security_mem_v1_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_security_mem_read_packet,
-    .write_packet = ezusb_iidx_emu_node_security_mem_write_packet};
-
-/* Used on Gold to Sirius */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v2 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_MEM,
-    .init_node = ezusb_iidx_emu_node_security_mem_init,
-    .process_cmd = ezusb_iidx_emu_node_security_mem_v2_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_security_mem_read_packet,
-    .write_packet = ezusb_iidx_emu_node_security_mem_write_packet};
-
-/* Used on 9th to DistorteD */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v1 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_PLUG,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_security_plug_process_cmd_v1,
-    .read_packet = ezusb_iidx_emu_node_security_plug_read_packet_v1,
-    .write_packet = ezusb_iidx_emu_node_security_plug_write_packet};
-
-/* Used on Gold to Sirius */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v2 = {
-    .node_id = EZUSB_IIDX_MSG_NODE_SECURITY_PLUG,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_security_plug_process_cmd_v2,
-    .read_packet = ezusb_iidx_emu_node_security_plug_read_packet_v2,
-    .write_packet = ezusb_iidx_emu_node_security_plug_write_packet};
-
 /* Used on 9th to HappySky for magnetic readers */
 const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_serial = {
     .node_id = EZUSB_IIDX_MSG_NODE_SERIAL,
@@ -113,19 +41,3 @@ const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_serial = {
     .process_cmd = ezusb_iidx_emu_node_serial_process_cmd,
     .read_packet = ezusb_iidx_emu_node_serial_read_packet,
     .write_packet = ezusb_iidx_emu_node_serial_write_packet};
-
-/* All IIDX games */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_sram = {
-    .node_id = EZUSB_IIDX_MSG_NODE_SRAM,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_sram_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_sram_read_packet,
-    .write_packet = ezusb_iidx_emu_node_sram_write_packet};
-
-/* Used on 9th to Sirius */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_wdt = {
-    .node_id = EZUSB_IIDX_MSG_NODE_WDT,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_wdt_process_cmd,
-    .read_packet = ezusb_iidx_emu_node_wdt_read_packet,
-    .write_packet = ezusb_iidx_emu_node_wdt_write_packet};

src/main/ezusb-iidx-emu/nodes.h

@@ -1,21 +1,11 @@
 #ifndef EZUSBEMU_NODES_IIDX_H
 #define EZUSBEMU_NODES_IIDX_H
 
-#include "ezusb-iidx-emu/node.h"
+#include "ezusb-emu/node.h"
 
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_coin;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v1;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_eeprom_v2;
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v1;
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_fpga_v2;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_none;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v1;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_mem_v2;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v1;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_security_plug_v2;
 extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_serial;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_sram;
-extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_wdt;
 
 #endif

src/main/ezusb2-iidx-emu/msg.c

@@ -9,6 +9,7 @@
 #include "hook/iohook.h"
 
 #include "ezusb-emu/msg.h"
+#include "ezusb-emu/nodes.h"
 
 #include "ezusb-iidx-emu/msg.h"
 #include "ezusb-iidx-emu/nodes.h"

src/main/ezusb2-popn-emu/Module.mk

@@ -2,7 +2,6 @@ libs            += ezusb2-popn-emu
 
 libs_ezusb2-popn-emu      := \
     ezusb-emu \
-    ezusb-iidx-emu \
     ezusb-iidx \
     ezusb2-iidx-emu \
 

src/main/ezusb2-popn-emu/msg.c

@@ -10,12 +10,11 @@
 
 #include "ezusb-emu/msg.h"
 
-#include "ezusb-iidx-emu/msg.h"
-#include "ezusb-iidx-emu/nodes.h"
-#include "ezusb-iidx-emu/node-none.h"
-#include "ezusb-iidx-emu/node-coin.h"
-#include "ezusb-iidx-emu/node-security-mem.h"
-#include "ezusb-iidx-emu/node-security-plug.h"
+#include "ezusb-emu/nodes.h"
+#include "ezusb-emu/node-none.h"
+#include "ezusb-emu/node-coin.h"
+#include "ezusb-emu/node-security-mem.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "ezusb2-popn/msg.h"
 

src/main/iidxhook1/dllmain.c

@@ -11,9 +11,9 @@
 
 #include "ezusb-emu/desc.h"
 #include "ezusb-emu/device.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "ezusb-iidx-emu/msg.h"
-#include "ezusb-iidx-emu/node-security-plug.h"
 #include "ezusb-iidx-emu/node-serial.h"
 #include "ezusb-iidx-emu/nodes.h"
 

src/main/iidxhook2/dllmain.c

@@ -11,9 +11,9 @@
 
 #include "ezusb-emu/desc.h"
 #include "ezusb-emu/device.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "ezusb-iidx-emu/msg.h"
-#include "ezusb-iidx-emu/node-security-plug.h"
 #include "ezusb-iidx-emu/node-serial.h"
 #include "ezusb-iidx-emu/nodes.h"
 

src/main/iidxhook3/dllmain.c

@@ -9,7 +9,7 @@
 
 #include "cconfig/cconfig-hook.h"
 
-#include "ezusb-iidx-emu/node-security-plug.h"
+#include "ezusb-emu/node-security-plug.h"
 #include "ezusb-iidx-emu/node-serial.h"
 #include "ezusb-iidx-emu/nodes.h"
 

src/main/iidxhook4-cn/dllmain.c

@@ -9,7 +9,7 @@
 
 #include "cconfig/cconfig-hook.h"
 
-#include "ezusb-iidx-emu/node-security-plug.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "ezusb2-emu/desc.h"
 #include "ezusb2-emu/device.h"

src/main/iidxhook5-cn/dllmain.c

@@ -9,7 +9,7 @@
 
 #include "cconfig/cconfig-hook.h"
 
-#include "ezusb-iidx-emu/node-security-plug.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "ezusb2-emu/desc.h"
 #include "ezusb2-emu/device.h"

src/main/popnhook1/Module.mk

@@ -9,7 +9,7 @@ ldflags_popnhook1   := \
 
 libs_popnhook1		:= \
     iidxhook-util \
-    ezusb-iidx-emu \
+    ezusb-emu \
     ezusb2-popn-emu \
     ezusb2-emu \
     security \

src/main/popnhook1/dllmain.c

@@ -10,8 +10,7 @@
 
 #include "cconfig/cconfig-hook.h"
 
-#include "ezusb-iidx-emu/node-security-plug.h"
-#include "ezusb-iidx-emu/nodes.h"
+#include "ezusb-emu/node-security-plug.h"
 
 #include "hook/d3d9.h"
 #include "hook/table.h"