Update changelog for 5.43 release

No significant changes on the game's side. Tooling that works for
27 and 28 also works fine for 29

CHANGELOG.md

@@ -2,6 +2,11 @@
 Note for CI/CD: Ensure the version formatting in the sections is kept identical to the versions
 given in tags. The pipeline will pick this up and cuts out the relevant section for release notes.
 
+## 5.43
+* iidx29: (Officially) support IIDX CASTHOUR
+* Code structure maintenance
+* Various documentation improvements
+
 ## 5.42
 * Bugfix: Fix diagonal texture tearing on IIDX 18 and 19 based games
 * Feature: Add support for IIDX Resort Anthem CN using iidxhook4-cn 

Module.mk

@@ -57,6 +57,7 @@
 #                   beatmania IIDX 22 PENDUAL
 #					beatmania IIDX 23 copula
 #                   beatmania IIDX 24 SINOBUZ
+#       Patch 3:    DanceDanceRevoluion A20+ (64-bit)
 #     "Patch" 3:    Silent Scope Bone Eater (compatible with p7)
 #	  "Patch" 7:    Steel Chronicle VicTroopers (not a Bemani, w/e)
 #
@@ -110,6 +111,7 @@ include src/main/eamio-icca/Module.mk
 include src/main/eamio/Module.mk
 include src/main/eamiotest/Module.mk
 include src/main/ezusb-emu/Module.mk
+include src/main/ezusb-iidx-16seg-emu/Module.mk
 include src/main/ezusb-iidx-emu/Module.mk
 include src/main/ezusb-iidx-fpga-flash/Module.mk
 include src/main/ezusb-iidx-sram-flash/Module.mk
@@ -415,7 +417,7 @@ $(zipdir)/iidx-25-to-26.zip: \
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
 
-$(zipdir)/iidx-27-to-28.zip: \
+$(zipdir)/iidx-27-to-29.zip: \
 		build/bin/avs2_1700-64/iidxhook9.dll \
 		build/bin/avs2_1700-64/launcher.exe \
 		build/bin/indep-64/config.exe \
@@ -426,8 +428,10 @@ $(zipdir)/iidx-27-to-28.zip: \
 		dist/iidx/config.bat \
 		dist/iidx/gamestart-27.bat \
 		dist/iidx/gamestart-28.bat \
+		dist/iidx/gamestart-29.bat \
 		dist/iidx/iidxhook-27.conf \
 		dist/iidx/iidxhook-28.conf \
+		dist/iidx/iidxhook-29.conf \
 		dist/iidx/vefx.txt \
 		| $(zipdir)/
 	$(V)echo ... $@
@@ -801,7 +805,7 @@ $(BUILDDIR)/bemanitools.zip: \
 		$(zipdir)/iidx-20-cn.zip \
 		$(zipdir)/iidx-21-to-24.zip \
 		$(zipdir)/iidx-25-to-26.zip \
-		$(zipdir)/iidx-27-to-28.zip \
+		$(zipdir)/iidx-27-to-29.zip \
 		$(zipdir)/iidx-hwio-x86.zip \
 		$(zipdir)/iidx-hwio-x64.zip \
 		$(zipdir)/jb-01.zip \

README.md

@@ -1,7 +1,7 @@
 # Bemanitools 5
 [![pipeline status](https://dev.s-ul.net/djhackers/bemanitools/badges/master/pipeline.svg)](https://dev.s-ul.net/djhackers/bemanitools/commits/master)
 
-Version: 5.42
+Version: 5.43
 
 [Release history](CHANGELOG.md)
 
@@ -59,8 +59,9 @@ The following games are supported with their corresponding hook-libraries.
     * Beatmania IIDX 24 SINOBUZ (`iidx-21-to-24.zip`): [iidxhook7](doc/iidxhook/iidxhook7.md)
     * Beatmania IIDX 25 CANNON BALLERS (`iidx-25-to-26.zip`): [iidxhook8](doc/iidxhook/iidxhook8.md)
     * Beatmania IIDX 26 Rootage (`iidx-25-to-26.zip`): [iidxhook8](doc/iidxhook/iidxhook8.md)
-    * Beatmania IIDX 27 Heroic Verse (`iidx-27-to-28.zip`): [iidxhook9](doc/iidxhook/iidxhook9.md)
-    * Beatmania IIDX 28 BISTROVER (`iidx-27-to-28.zip`): [iidxhook9](doc/iidxhook/iidxhook9.md)
+    * Beatmania IIDX 27 Heroic Verse (`iidx-27-to-29.zip`): [iidxhook9](doc/iidxhook/iidxhook9.md)
+    * Beatmania IIDX 28 BISTROVER (`iidx-27-to-29.zip`): [iidxhook9](doc/iidxhook/iidxhook9.md)
+    * Beatmania IIDX 29 CASTHOUR (`iidx-27-to-29.zip`): [iidxhook9](doc/iidxhook/iidxhook9.md)
 * [jubeat](doc/jbhook/README.md)
     * jubeat (`jb-01.zip`): [jbhook1](doc/jbhook/jbhook1.md)
     * jubeat ripples (`jb-02.zip`): [jbhook1](doc/jbhook/jbhook1.md)
@@ -110,9 +111,16 @@ consumer version of Windows XP. Newer versions of Windows, e.g. Windows 7, 8 and
 as well. Some hooks also include fixes required to run the games on a more recent version.
 
 Depending on the game, you also need the following dependencies installed:
-* DirectX 9 runtime
-* Microsoft Visual C++ Redistributables 2010 **and** 2013: Depends on the game and age but both
-should cover most if not all of the games so far
+
+* The 32-bit (x86) version of
+  [Microsoft Visual C++ 2010 Service Pack 1 Redistributable Package MFC Security Update](https://www.microsoft.com/en-sg/download/details.aspx?id=26999)
+* The 32-bit (x86) and 64-bit (x64) versions of
+  [Microsoft Visual C++ Redistributable Packages for Visual Studio 2013](https://www.microsoft.com/en-sg/download/details.aspx?id=40784)
+* The [DirectX 9 End-User Runtimes (June 2010)](https://www.microsoft.com/en-us/download/details.aspx?id=8109)
+
+See also
+[bemanitools-supplements](https://dev.s-ul.net/djhackers/bemanitools-supplement/-/blob/master/misc/win-runtime/README.md)
+for files.
 
 ## Development
 ### Building

dist/iidx/gamestart-29.bat

@@ -0,0 +1,16 @@
+@echo off
+cd /d %~dp0
+
+if not exist dev mkdir dev
+if not exist dev\e mkdir dev\e
+if not exist dev\g mkdir dev\g
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\raw mkdir dev\raw
+if not exist dev\raw\log mkdir dev\raw\log
+if not exist dev\raw\fscache mkdir dev\raw\fscache
+
+for /R prop\defaults %%D in (*.*) do (
+    if not exist dev\nvram\%%~nxD copy /y prop\defaults\%%~nxD dev\nvram
+)
+
+launcher -H 134217728 -B iidxhook9.dll bm2dx.dll --config iidxhook-29.conf %*

dist/iidx/iidxhook-25.conf

@@ -43,7 +43,7 @@ cam.device_id1=
 # Override camera device ID 2 detection (copy from device manager, do not escape)
 cam.device_id2=
 
-# Disable card reader emulation and enable usage of real card reader hardware on COM0 (for games supporting slotted readers)
+# Disable card reader emulation and enable usage of real card reader hardware on COM1 (for games supporting slotted readers)
 io.disable_card_reader_emu=false
 
 # Disable BIO2 emulation and enable usage of real BIO2 hardware

dist/iidx/iidxhook-26.conf

@@ -43,7 +43,7 @@ cam.device_id1=
 # Override camera device ID 2 detection (copy from device manager, do not escape)
 cam.device_id2=
 
-# Disable card reader emulation and enable usage of real card reader hardware on COM0 (for games supporting slotted readers)
+# Disable card reader emulation and enable usage of real card reader hardware on COM1 (for games supporting slotted readers)
 io.disable_card_reader_emu=false
 
 # Disable BIO2 emulation and enable usage of real BIO2 hardware

dist/iidx/iidxhook-27.conf

@@ -1,4 +1,4 @@
-# Disable card reader emulation and enable usage of real card reader hardware on COM0 (for games supporting slotted readers)
+# Disable card reader emulation and enable usage of real card reader hardware on COM1 (for games supporting slotted readers)
 io.disable_card_reader_emu=false
 
 # Disable BIO2 emulation and enable usage of real BIO2 hardware

dist/iidx/iidxhook-28.conf

@@ -1,4 +1,4 @@
-# Disable card reader emulation and enable usage of real card reader hardware on COM0 (for games supporting slotted readers)
+# Disable card reader emulation and enable usage of real card reader hardware on COM1 (for games supporting slotted readers)
 io.disable_card_reader_emu=false
 
 # Disable BIO2 emulation and enable usage of real BIO2 hardware

dist/iidx/iidxhook-29.conf

@@ -0,0 +1,78 @@
+# Disable card reader emulation and enable usage of real card reader hardware on COM1 (for games supporting slotted readers)
+io.disable_card_reader_emu=false
+
+# Disable BIO2 emulation and enable usage of real BIO2 hardware
+io.disable_bio2_emu=false
+
+# Disables the poll limiter, warning very high CPU usage may arise
+io.disable_poll_limiter=false
+
+# Lightning cab mode (requires additional IO emulation)
+io.lightning_mode=false
+
+# Disable camera connection
+io.disable_cams=true
+
+# Disables the built in file hooks, requiring manual file creation
+io.disable_file_hooks=false
+
+# Turntable sensitivity multiplier (1.0 is default)
+io.tt_multiplier=1.0
+
+# Disables the camera emulation
+cam.disable_emu=true
+
+# Override camera device ID detection (copy from device manager, do not escape)
+cam.device_id1=
+
+# Override camera device ID detection (copy from device manager, do not escape)
+cam.device_id2=
+
+# Run the game in a framed window (requires windowed option)
+gfx.framed=true
+
+# Run the game windowed
+gfx.windowed=false
+
+# Confine mouse cursor to window
+gfx.confined=false
+
+# Windowed width, -1 for default size
+gfx.window_width=-1
+
+# Windowed height, -1 for default size
+gfx.window_height=-1
+
+# Windowed X, -1 for default X position
+gfx.window_x=-1
+
+# Windowed Y, -1 for default Y position
+gfx.window_y=-1
+
+# Forced refresh rate, -1 to not force any (try 59 or 60 if monitor check fails to lock on high refresh rate monitors)
+gfx.forced_refresh_rate=-1
+
+# D3D9ex device adapter (monitor), -1 to use default, 0, 1, 2 etc. to use specified adapter
+gfx.device_adapter=-1
+
+# Orientation to force monitor into, -1 to use default, 0, 1, 2, 3 to do 0, 90, 180, 270 degrees
+gfx.force_orientation=-1
+
+# Force a screen resolution (width), -1 to disable. Use this if the game does not auto detect your monitor's resolution properly, e.g. 1368x768 instead of 1280x720.
+gfx.force_screen_res.width=-1
+
+# Force a screen resolution (height), -1 to disable. Use this if the game does not auto detect your monitor's resolution properly, e.g. 1368x768 instead of 1280x720.
+gfx.force_screen_res.height=-1
+
+# IP of adapter to force override with
+adapter.override_ip=
+
+# Force ASIO audio mode/device (if applicable / TDJ default)
+asio.force_asio=false
+
+# Force WASAPI audio mode (if applicable / LDJ default)
+asio.force_wasapi=true
+
+# The ASIO device name to use
+asio.device_name=XONAR SOUND CARD(64)
+

doc/api.md

@@ -1,4 +1,5 @@
 # Bemanitools API
+
 Bemanitools introduces interfaces abstracting the IO hardware of many games. This is used to implement support for
 non-intended IO devices from simple keyboard support, standard gamecontrollers to custom IO boards or using real
 hardware with the games (e.g. support for real legacy hardware).
@@ -12,6 +13,9 @@ If you want to write an implementation for your own custom piece of hardware, ch
 sub-folder) in the source code (src.zip).
 
 ## Implementations
+
+### IO boards
+
 The following implementations are already shipped with BT5.
 
 * BeatStream
@@ -34,10 +38,33 @@ The following implementations are already shipped with BT5.
     * [sdvxio-bio2.dll](sdvxhook/sdvxio-bio2.md): BIO2 driver
     * [sdvxio-kfca.dll](sdvxhook/sdvxio-kfca.md): KFCA IO board driver
 
+### Eamuse readers
+
 Eamuse hardware support is implemented separately:
+
 * eamio.dll (default): Keyboard and joystick input
+* eamio-icca.dll: Slotted/wave pass readers, required for old games with magnetic stripe cards
+
+#### ICCA readers for IIDX and port config in device manager
+
+The COM port for the card readers needs to be configured correctly in device manager. Otherwise,
+communication with the readers will fail if the settings do not align with how the game or
+bemanitools wants to operate them.
+
+Use built-in ports on your mainboard if available but an external USB to serial port dongle also
+works. 
+
+* Assign `COM1` to the COM port the card readers are connected to.
+* Ensure that the following settings for the COM port you are going to use are 
+set
+  * BAUD rate 57600
+  * Data bits 8
+  * Parity None
+  * Stop bits 1
+  * Flow control None.
 
 ## Development notes
+
 A DEF file for geninput.dll is included. To convert the DEF into an import library suitable for use with Visual C++, run
 ```
 lib /machine:i386 /def:geninput.def

doc/ddrhook/README.md

@@ -47,3 +47,7 @@ IO hardware you want to use:
 game controllers
 * ddrio-mm: Support Minimaid custom interface
 * [ddrio-smx](ddrhook/ddrio-smx.md): Support for StepManiaX dance platforms
+
+## Unicorntail
+
+[Instructions how to run on Chimera PCBs](unicorntail.md).

doc/ddrhook/ddrhook2.md

@@ -17,6 +17,73 @@ different versions. See different distribution packages, e.g. `ddr-12.zip`,
 Depending on the game version, earlier versions are bootstrapped using
 [inject](../inject.md) while later versions require [launcher](../launcher.md).
 
+## Setup A20+
+
+### Data and folder structure
+
+The following assumes you are using vanilla and unpacked/decrypted data. Copy/unpack the data
+to a destination of your choice. Expect to have the following root folder structure:
+
+```
+arkdata
+com
+data
+dev
+modules
+prop
+```
+
+* Copy the contents of `modules` to the root folder that the dll-files are next to the folders
+  `arkdata`, `com`, etc.
+* Unpack the contents of `ddr-14-to-16.zip` to the root folder. `luncher.exe` should be located
+  next to `arkdata`, `com` and all the dll-files
+
+#### Configuring eamuse settings
+
+You need to create a `prop/ea3-config.xml` configuration file which provides properties for
+connecting to a network of your choice (and allows the game to boot).
+
+Take the `prop/eamuse.xml` as a base and make a copy of it called `prop/ea3-config.xml`.
+
+Add the software identifier as a child to the `<ea3>` parent node:
+
+```xml
+<soft>
+  <model __type="str">MDX</model>
+  <dest __type="str">J</dest>
+  <spec __type="str">A</spec>
+  <rev __type="str">A</rev>
+  <ext __type="str">2022020200</ext>
+</soft>
+```
+
+Replace the identifiers according to the version you are using.
+
+Add your PCBID as a child to the `<ea3>` parent node:
+
+```xml
+<id>
+  <pcbid __type="str">00010203040506070809</pcbid>
+  <hardid __type="str">00010203040506070809</hardid>
+</id>
+```
+
+Replace the values accordingly with your actual PCBID registered with your target network.
+
+Add network settings (note this might already exist, replace existing or delete old one) as a child
+to the `<ea3>` parent node:
+
+```xml
+<network>
+  <sz_xrpc_buf __type="u32">102400</sz_xrpc_buf>
+  <ssl __type="bool">0</ssl>
+  <services>http://eamuse.konami.fun/service/services/services/</services>
+</network>
+```
+
+Replace the properties accordingly with the settings provided by your network provider, e.g. the
+URL, further settings like ssl etc.
+
 ## Running
 
 Run `gamestart-XX.bat`, where `XX` corresponds to the version of the game you
@@ -70,6 +137,9 @@ Run the following commands either from a command line (`cmd.exe`) or from
 * Register `regsvr32 D:\MDX\contents\k-clvsd.dll`
 * Register `regsvr32 D:\MDX\contents\xactengine2_10.dll`
 
+The `gamestart-XX.bat` scripts should already take care of this by executing the listed commands
+when launched.
+
 Note: The one that comes with IIDX will hang DDR at startup. The opposite is not true:
 IIDX works just fine with this CLVSD.
 

doc/ddrhook/unicorntail.md

@@ -0,0 +1,45 @@
+# Unicorntail
+
+Unicorntail is a hook library to run the DDR games on a hybrid type of hardware referred to as a
+"Chimera" or "Unicorn". Compared to a "Dragon", which refers to the official stock hardware by
+Konami, a Chimera mixes the P3IO board from a PCB used with GF&DM V4-V8, Jubeat, Jubeat Ripples or
+Jubeat Knit with the motherboard from a GF&DM XG, XG2 or XG3 PCB, or a Reflec Beat PCB.
+
+Actual build instructions for such hardware are out of scope here.
+
+## Context
+
+Dragon PCBs are hard to come by compared to finding the parts for a Chimera PCB.
+
+A Chimera PCB however is different in many aspects to the Dragon PCB and requires the use of the
+`unicorntail.dll` hook library.
+
+The Dragon's P3IO has two serial ports that the regular P3IOs do not, and one of these serial ports
+is used to communicate with the card readers. Note that these are actual serial ports driven
+directly by the P3IO microcontroller, these are NOT just passed through to the motherboard like the
+proprietary COM1 and COM2 connectors. Unicorn Tail intercepts serial port IO commands being sent to
+the P3IO and redirects them to COM2 instead, since COM2 is unused on SD cabinets (on HD cabinets it
+connects to a second ACIO bus which drives the extra lighting glitz like the light spikes and maybe
+the LED strip).
+
+## Drivers
+
+You need the P3IO driver installed on your target system. These can be acquired from an actual stock
+HDD or grabbed from
+[bemanitools-supplements](https://dev.s-ul.net/djhackers/bemanitools-supplement/-/blob/master/gfdm/p3io/README.md).
+
+## Setup and run
+
+Edit the `gamestart.bat` file that you are using and append `unicorntail.dll` to the list of hooks,
+e.g.:
+
+```shell
+launcher.exe -H 33554432 -K unicorntail.dll arkmdxp3.dll %*
+```
+
+If you want to use any ddrhook library in addition, you have to have the hooks in the right order
+to make everything work correctly, e.g.:
+
+```shell
+launcher.exe -H 33554432 -K unicorntail.dll -K ddrhook2.dll arkmdxp3.dll %*
+```

doc/iidxhook/iidxhook9.md

@@ -3,6 +3,7 @@
 The following games are compatible with this version of iidxhook:
 * Heroic Verse
 * BISTROVER
+* CASTHOUR
 
 The games must be bootstrapped using [launcher](../launcher.md).
 

doc/popnhook/README.md

@@ -1,6 +1,6 @@
 # popnhook
 
-popnhook is a collection of hook libraries for jubeat providing
+popnhook is a collection of hook libraries for pop'n music providing
 emulation and various patches to run these games on non BemaniPC hardware and
 newer Windows versions.
 

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-16seg-emu/Module.mk

@@ -0,0 +1,5 @@
+libs            += ezusb-iidx-16seg-emu
+
+src_ezusb-iidx-16seg-emu     := \
+    node-16seg.c \
+    nodes.c \

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

@@ -1,6 +1,6 @@
 #define LOG_MODULE "ezusb-iidx-emu-node-16seg"
 
-#include "ezusb-iidx-emu/node-16seg.h"
+#include "ezusb-iidx-16seg-emu/node-16seg.h"
 
 #include <string.h>
 

src/main/ezusb-iidx-16seg-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-16seg-emu/nodes.c

@@ -0,0 +1,16 @@
+/*
+ * This file contains the ezusb nodes that appeared on
+ * all IIDX games so far.
+ */
+
+#include "ezusb-iidx/msg.h"
+
+#include "ezusb-iidx-16seg-emu/node-16seg.h"
+
+/* All IIDX games */
+const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg = {
+    .node_id = EZUSB_IIDX_MSG_NODE_16SEG,
+    .init_node = NULL,
+    .process_cmd = ezusb_iidx_emu_node_16seg_process_cmd,
+    .read_packet = ezusb_iidx_emu_node_16seg_read_packet,
+    .write_packet = ezusb_iidx_emu_node_16seg_write_packet};

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

@@ -0,0 +1,8 @@
+#ifndef EZUSBEMU_NODES_16SEG_IIDX_H
+#define EZUSBEMU_NODES_16SEG_IIDX_H
+
+#include "ezusb-emu/node.h"
+
+extern const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg;
+
+#endif

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

@@ -1,19 +1,12 @@
 libs            += ezusb-iidx-emu
 
 libs_ezusb-iidx-emu      := \
-    ezusbemu \
+    ezusb-emu \
+    ezusb-iidx-16seg-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,14 +9,17 @@
 #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"
 
+#include "ezusb-iidx-16seg-emu/nodes.h"
+
 #include "util/hex.h"
 #include "util/log.h"
 

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

@@ -5,51 +5,10 @@
 
 #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 */
-const struct ezusb_iidx_emu_node ezusb_iidx_emu_node_16seg = {
-    .node_id = EZUSB_IIDX_MSG_NODE_16SEG,
-    .init_node = NULL,
-    .process_cmd = ezusb_iidx_emu_node_16seg_process_cmd,
-    .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 +25,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 +32,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,10 @@
 #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/Module.mk

@@ -2,6 +2,7 @@ libs            += ezusb2-iidx-emu
 
 libs_ezusb2-iidx-emu      := \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
 
 src_ezusb2-iidx-emu     := \
     msg.c \

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

@@ -9,9 +9,8 @@
 #include "hook/iohook.h"
 
 #include "ezusb-emu/msg.h"
-
-#include "ezusb-iidx-emu/msg.h"
-#include "ezusb-iidx-emu/nodes.h"
+#include "ezusb-emu/nodes.h"
+#include "ezusb-iidx-16seg-emu/nodes.h"
 
 #include "ezusb2-iidx/msg.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/Module.mk

@@ -7,6 +7,7 @@ ldflags_iidxhook1   := \
 libs_iidxhook1      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb-iidx-emu \
     security \
     eamio \

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/Module.mk

@@ -7,6 +7,7 @@ ldflags_iidxhook2   := \
 libs_iidxhook2      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb-iidx-emu \
     security \
     eamio \

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/Module.mk

@@ -7,6 +7,7 @@ ldflags_iidxhook3   := \
 libs_iidxhook3      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
     ezusb-iidx-emu \

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/Module.mk

@@ -2,6 +2,7 @@ avsdlls         += iidxhook4-cn
 
 ldflags_iidxhook4-cn   := \
     -liphlpapi \
+    -lws2_32 \
 
 deplibs_iidxhook4-cn   := \
     avs \
@@ -9,9 +10,9 @@ deplibs_iidxhook4-cn   := \
 libs_iidxhook4-cn      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
-    ezusb-iidx-emu \
     security \
     hook \
     hooklib \

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/iidxhook4/Module.mk

@@ -9,6 +9,7 @@ deplibs_iidxhook4   := \
 libs_iidxhook4      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
     ezusb-iidx-emu \

src/main/iidxhook5-cn/Module.mk

@@ -2,6 +2,7 @@ avsdlls         += iidxhook5-cn
 
 ldflags_iidxhook5-cn   := \
     -liphlpapi \
+    -lws2_32 \
 
 deplibs_iidxhook5-cn   := \
     avs \
@@ -9,9 +10,9 @@ deplibs_iidxhook5-cn   := \
 libs_iidxhook5-cn      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
-    ezusb-iidx-emu \
     security \
     hook \
     hooklib \

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/iidxhook5/Module.mk

@@ -9,6 +9,7 @@ deplibs_iidxhook5   := \
 libs_iidxhook5      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
     ezusb-iidx-emu \

src/main/iidxhook6/Module.mk

@@ -9,6 +9,7 @@ deplibs_iidxhook6   := \
 libs_iidxhook6      := \
     iidxhook-util \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
     ezusb-iidx-emu \

src/main/iidxhook7/Module.mk

@@ -10,6 +10,7 @@ libs_iidxhook7      := \
     iidxhook-util \
     cconfig \
     ezusb-emu \
+    ezusb-iidx-16seg-emu \
     ezusb2-emu \
     ezusb2-iidx-emu \
     ezusb-iidx-emu \

src/main/iidxhook8/config-io.c

@@ -21,7 +21,7 @@ void iidxhook8_config_io_init(struct cconfig *config)
         IIDXHOOK8_CONFIG_IO_DEFAULT_DISABLE_CARD_READER_EMU_VALUE,
         "Disable card reader emulation and enable usage of real card "
         "reader "
-        "hardware on COM0 (for games supporting slotted readers)");
+        "hardware on COM1 (for games supporting slotted readers)");
 
     cconfig_util_set_bool(
         config,

src/main/iidxhook9/config-io.c

@@ -28,7 +28,7 @@ void iidxhook9_config_io_init(struct cconfig *config)
         IIDXHOOK9_CONFIG_IO_DISABLE_CARD_READER_EMU_KEY,
         IIDXHOOK9_CONFIG_IO_DEFAULT_DISABLE_CARD_READER_EMU_VALUE,
         "Disable card reader emulation and enable usage of real card reader "
-        "hardware on COM0 (for games supporting slotted readers)");
+        "hardware on COM1 (for games supporting slotted readers)");
 
     cconfig_util_set_bool(
         config,

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"