wip workflows

.github/workflows/build-master.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-
 jobs:
   build:
     runs-on: "ubuntu-22.04"
@@ -33,7 +32,7 @@ jobs:
         uses: "actions/upload-artifact@v2"
         with:
           name: bemanitools-${{ github.sha }}
-          retention-days: 90
+          retention-days: 30
           if-no-files-found: "error"
           path: |
             artifact/**

.github/workflows/build-tag.yaml

@@ -1,8 +1,4 @@
-name: "Build bemanitools and publish release"
+name: "Build bemanitools"
-
-permissions:
-  contents: write
-  packages: write
 
 on:
   push:
@@ -38,7 +34,7 @@ jobs:
         uses: "actions/upload-artifact@v2"
         with:
           name: bemanitools-${{ github.sha }}
-          retention-days: 90
+          retention-days: 30
           if-no-files-found: "error"
           path: |
             artifact/**

CHANGELOG.md

@@ -4,18 +4,8 @@ given in tags. The pipeline will pick this up and cuts out the relevant section
 
 ## 5.45
 ### Features
-* feat(iidx 30): Added support
-* feat(ddr): Add ddrio implementation with P3IO driver backend
-* feat(ddr): Add p3io-ddr-tool for testing/debugging real P3IO devices with EXTIO
-* feat(ddr): Add testing tool for real EXTIO devices
-* feat(ddr): Add extio driver
-* feat(ddr): Add p3io driver
-* feat(iidx 20-26): New/fixed gfx up-/downscaling feature, old one was broken
-* feat(ddr): Vigem driver for ddrio
-* feat(iidx 25-30): The user can now set a custom camera device override of "SKIP" to leave that camera unassigned
 
 ### Fixes
-* fix(iidx 09/10): Fix stretched BGAs on 1st and 3rd style videos
 
 ## 5.44
 ### Features

GNUmakefile

@@ -37,8 +37,6 @@ ldflags		          := -Wl,--gc-sections -static-libgcc
 
 all: build
 
-FORCE:
-
 .PHONY: \
 build-docker \
 clean \
@@ -46,8 +44,7 @@ code-format \
 print-building \
 print-release \
 run-tests \
-version \
+version
-FORCE
 
 release: \
 print-release \
@@ -196,8 +193,6 @@ $$(depdir_$1_$2_$3):
 $$(objdir_$1_$2_$3):
 	$(V)mkdir -p $$@
 
-$$(volatile_$3:%.c=$$(objdir_$1_$2_$3)/%.o): FORCE
-
 $$(objdir_$1_$2_$3)/%.o: $$(srcdir_$3)/%.c \
 		| $$(depdir_$1_$2_$3) $$(objdir_$1_$2_$3)
 	$(V)echo ... $$@

Module.mk

@@ -99,23 +99,17 @@ include src/main/bstio/Module.mk
 include src/main/camhook/Module.mk
 include src/main/cconfig/Module.mk
 include src/main/config/Module.mk
-include src/main/d3d9-util/Module.mk
 include src/main/d3d9exhook/Module.mk
 include src/main/ddrhook-util/Module.mk
 include src/main/ddrhook1/Module.mk
 include src/main/ddrhook2/Module.mk
-include src/main/ddrio-p3io/Module.mk
 include src/main/ddrio-mm/Module.mk
 include src/main/ddrio-smx/Module.mk
-include src/main/ddriotest/Module.mk
 include src/main/ddrio/Module.mk
 include src/main/dinput/Module.mk
 include src/main/eamio-icca/Module.mk
 include src/main/eamio/Module.mk
 include src/main/eamiotest/Module.mk
-include src/main/extio/Module.mk
-include src/main/extiodrv/Module.mk
-include src/main/extiotest/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
@@ -139,7 +133,6 @@ include src/main/iidx-bio2-exit-hook/Module.mk
 include src/main/iidx-ezusb-exit-hook/Module.mk
 include src/main/iidx-ezusb2-exit-hook/Module.mk
 include src/main/iidx-irbeat-patch/Module.mk
-include src/main/iidxhook-d3d9/Module.mk
 include src/main/iidxhook-util/Module.mk
 include src/main/iidxhook1/Module.mk
 include src/main/iidxhook2/Module.mk
@@ -171,9 +164,7 @@ include src/main/launcher/Module.mk
 include src/main/mempatch-hook/Module.mk
 include src/main/mm/Module.mk
 include src/main/p3io/Module.mk
-include src/main/p3iodrv/Module.mk
 include src/main/p3ioemu/Module.mk
-include src/main/p3io-ddr-tool/Module.mk
 include src/main/p4iodrv/Module.mk
 include src/main/p4ioemu/Module.mk
 include src/main/popnhook-util/Module.mk
@@ -192,7 +183,6 @@ include src/main/util/Module.mk
 include src/main/vefxio/Module.mk
 include src/main/vigem-iidxio/Module.mk
 include src/main/vigem-sdvxio/Module.mk
-include src/main/vigem-ddrio/Module.mk
 include src/main/vigemstub/Module.mk
 
 include src/test/cconfig/Module.mk
@@ -214,7 +204,6 @@ $(zipdir)/:
 
 $(zipdir)/tools.zip: \
 		build/bin/indep-32/aciotest.exe \
-		build/bin/indep-32/ddriotest.exe \
 		build/bin/indep-32/eamiotest.exe \
 		build/bin/indep-32/ezusb-iidx-fpga-flash.exe \
 		build/bin/indep-32/ezusb-iidx-sram-flash.exe \
@@ -236,7 +225,6 @@ $(zipdir)/tools.zip: \
 
 $(zipdir)/tools-x64.zip: \
 		build/bin/indep-64/aciotest.exe \
-		build/bin/indep-64/ddriotest.exe \
 		build/bin/indep-64/eamiotest.exe \
 		build/bin/indep-64/iidxiotest.exe \
 		build/bin/indep-64/iidx-bio2-exit-hook.dll \
@@ -429,7 +417,7 @@ $(zipdir)/iidx-25-to-26.zip: \
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
 
-$(zipdir)/iidx-27-to-30.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 \
@@ -441,11 +429,9 @@ $(zipdir)/iidx-27-to-30.zip: \
 		dist/iidx/gamestart-27.bat \
 		dist/iidx/gamestart-28.bat \
 		dist/iidx/gamestart-29.bat \
-		dist/iidx/gamestart-30.bat \
 		dist/iidx/iidxhook-27.conf \
 		dist/iidx/iidxhook-28.conf \
 		dist/iidx/iidxhook-29.conf \
-		dist/iidx/iidxhook-30.conf \
 		dist/iidx/vefx.txt \
 		| $(zipdir)/
 	$(V)echo ... $@
@@ -705,6 +691,8 @@ $(zipdir)/ddr-14-to-16.zip: \
 		build/bin/avs2_1508-32/unicorntail.dll \
 		build/bin/indep-32/config.exe \
 		build/bin/indep-32/ddrio.dll \
+		build/bin/indep-32/ddrio-mm.dll \
+		build/bin/indep-32/ddrio-smx.dll \
 		build/bin/indep-32/eamio.dll \
 		build/bin/indep-32/geninput.dll \
 		dist/ddr/config.bat \
@@ -721,6 +709,8 @@ $(zipdir)/ddr-16-x64.zip: \
 		build/bin/avs2_1603-64/unicorntail.dll \
 		build/bin/indep-64/config.exe \
 		build/bin/indep-64/ddrio.dll \
+		build/bin/indep-64/ddrio-mm.dll \
+		build/bin/indep-64/ddrio-smx.dll \
 		build/bin/indep-64/eamio.dll \
 		build/bin/indep-64/geninput.dll \
 		dist/ddr/config.bat \
@@ -729,28 +719,6 @@ $(zipdir)/ddr-16-x64.zip: \
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
 
-$(zipdir)/ddr-hwio-x86.zip: \
-		build/bin/indep-32/ddrio-p3io.dll \
-		build/bin/indep-32/ddrio-mm.dll \
-		build/bin/indep-32/ddrio-smx.dll \
-		build/bin/indep-32/extiotest.exe \
-		build/bin/indep-32/p3io-ddr-tool.exe \
-		build/bin/indep-32/vigem-ddrio.exe \
-		| $(zipdir)/
-	$(V)echo ... $@
-	$(V)zip -j $@ $^
-
-$(zipdir)/ddr-hwio-x64.zip: \
-		build/bin/indep-64/ddrio-p3io.dll \
-		build/bin/indep-64/ddrio-mm.dll \
-		build/bin/indep-64/ddrio-smx.dll \
-		build/bin/indep-64/extiotest.exe \
-		build/bin/indep-64/p3io-ddr-tool.exe \
-		build/bin/indep-64/vigem-ddrio.exe \
-		| $(zipdir)/
-	$(V)echo ... $@
-	$(V)zip -j $@ $^
-
 $(zipdir)/bst.zip: \
 		build/bin/avs2_1603-64/bsthook.dll \
 		build/bin/avs2_1603-64/launcher.exe \
@@ -826,8 +794,6 @@ $(BUILDDIR)/bemanitools.zip: \
 		$(zipdir)/ddr-13.zip \
 		$(zipdir)/ddr-14-to-16.zip \
 		$(zipdir)/ddr-16-x64.zip \
-		$(zipdir)/ddr-hwio-x86.zip \
-		$(zipdir)/ddr-hwio-x64.zip \
 		$(zipdir)/doc.zip \
 		$(zipdir)/iidx-09-to-12.zip \
 		$(zipdir)/iidx-13.zip \
@@ -839,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-30.zip \
+		$(zipdir)/iidx-27-to-29.zip \
 		$(zipdir)/iidx-hwio-x86.zip \
 		$(zipdir)/iidx-hwio-x64.zip \
 		$(zipdir)/jb-01.zip \

README.md

@@ -59,10 +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-30.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-30.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-30.zip`): [iidxhook9](doc/iidxhook/iidxhook9.md)
+    * Beatmania IIDX 29 CASTHOUR (`iidx-27-to-29.zip`): [iidxhook9](doc/iidxhook/iidxhook9.md)
-    * Beatmania IIDX 30 RESIDENT (`iidx-27-to-30.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)
@@ -101,13 +100,9 @@ The following games are supported with their corresponding hook-libraries.
   * [iidx-bio2-exit-hook](doc/tools/iidx-bio2-exit-hook.md): For IIDX with BIO2 IO
   * [iidx-ezusb2-exit-hook](doc/tools/iidx-ezusb-exit-hook.md): For IIDX with ezusb FX2 IO
 * Bemanitools API testing: Tools for testing bemanitools API implementations
-  * [ddriotest](doc/tools/ddriotest.md): For [ddrio API](doc/api.md#io-boards)
   * [eamiotest](doc/tools/eamiotest.md): For [eamio API](doc/api.md#eamuse-readers)
   * [iidxiotest](doc/tools/iidxiotest.md): For [iidxio API](doc/api.md#io-boards)
   * [jbiotest](doc/tools/jbiotest.md): For [jbio API](doc/api.md#io-boards)
-* DDR IO testing: Tools for testing hardware of a real DDR cabinet
-  * [p3io-ddr-tool](doc/tools/p3io-ddr-tool.md)
-  * [extiotest](doc/tools/extiotest.md)
 * [aciotest](doc/tools/aciotest.md): Command line tool to quickly test ACIO devices
 * config: UI input/output configuration tool when using the default bemanitools API (geninput)
 * ir-beat-patch-9/10: Patch the IR beat phase on IIDX 9 and 10
@@ -147,7 +142,7 @@ Depending on the game, you also need the following dependencies installed:
 * The [DirectX 9 End-User Runtimes (June 2010)](https://www.microsoft.com/en-us/download/details.aspx?id=8109)
 
 See also
-[bemanitools-supplement](https://www.github.com/djhackersdev/bemanitools-supplement/)
+[bemanitools-supplements](https://dev.s-ul.net/djhackers/bemanitools-supplement/-/blob/master/misc/win-runtime/README.md)
 for files.
 
 ## Development

dist/iidx/gamestart-30.bat

@@ -1,16 +0,0 @@
-@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
-)
-
-modules\launcher -H 134217728 -B iidxhook9.dll bm2dx.dll --config iidxhook-30.conf %*

dist/iidx/iidxhook-09.conf

@@ -10,7 +10,7 @@ eamuse.pcbid=0101020304050607086F
 # EAMID
 eamuse.eamid=0101020304050607086F
 
-# Fix stretched BG videos on newer GPUs. Might appear on SIRIUS and older. On 9th and 10th style this issue may only affect older BGAs (from 1st-3rd style)
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
 gfx.bgvideo_uv_fix=false
 
 # Run the game in a framed window (requires windowed option)

dist/iidx/iidxhook-10.conf

@@ -10,7 +10,7 @@ eamuse.pcbid=0101020304050607086F
 # EAMID
 eamuse.eamid=0101020304050607086F
 
-# Fix stretched BG videos on newer GPUs. Might appear on SIRIUS and older. On 9th and 10th style this issue may only affect older BGAs (from 1st-3rd style)
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
 gfx.bgvideo_uv_fix=false
 
 # Run the game in a framed window (requires windowed option)

dist/iidx/iidxhook-11.conf

@@ -10,7 +10,7 @@ eamuse.pcbid=0101020304050607086F
 # EAMID
 eamuse.eamid=0101020304050607086F
 
-# Fix stretched BG videos on newer GPUs. Might appear on SIRIUS and older. On 9th and 10th style this issue may only affect older BGAs (from 1st-3rd style)
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
 gfx.bgvideo_uv_fix=false
 
 # Run the game in a framed window (requires windowed option)

dist/iidx/iidxhook-12.conf

@@ -10,7 +10,7 @@ eamuse.pcbid=0101020304050607086F
 # EAMID
 eamuse.eamid=0101020304050607086F
 
-# Fix stretched BG videos on newer GPUs. Might appear on SIRIUS and older. On 9th and 10th style this issue may only affect older BGAs (from 1st-3rd style)
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
 gfx.bgvideo_uv_fix=false
 
 # Run the game in a framed window (requires windowed option)

dist/iidx/iidxhook-13.conf

@@ -10,7 +10,7 @@ eamuse.pcbid=0101020304050607086F
 # EAMID
 eamuse.eamid=0101020304050607086F
 
-# Fix stretched BG videos on newer GPUs. Might appear on SIRIUS and older. On 9th and 10th style this issue may only affect older BGAs (from 1st-3rd style)
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
 gfx.bgvideo_uv_fix=false
 
 # Run the game in a framed window (requires windowed option)

dist/iidx/iidxhook-14.conf

@@ -7,7 +7,7 @@ eamuse.pcbid=0101020304050607086F
 # EAMID
 eamuse.eamid=0101020304050607086F
 
-# Fix stretched BG videos on newer GPUs. Might appear on SIRIUS and older. On 9th and 10th style this issue may only affect older BGAs (from 1st-3rd style)
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
 gfx.bgvideo_uv_fix=false
 
 # Run the game in a framed window (requires windowed option)

dist/iidx/iidxhook-15.conf

@@ -7,7 +7,7 @@ eamuse.pcbid=0101020304050607086F
 # EAMID
 eamuse.eamid=0101020304050607086F
 
-# Fix stretched BG videos on newer GPUs. Might appear on SIRIUS and older. On 9th and 10th style this issue may only affect older BGAs (from 1st-3rd style)
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
 gfx.bgvideo_uv_fix=false
 
 # Run the game in a framed window (requires windowed option)

dist/iidx/iidxhook-16.conf

@@ -7,7 +7,7 @@ eamuse.pcbid=0101020304050607086F
 # EAMID
 eamuse.eamid=0101020304050607086F
 
-# Fix stretched BG videos on newer GPUs. Might appear on SIRIUS and older. On 9th and 10th style this issue may only affect older BGAs (from 1st-3rd style)
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
 gfx.bgvideo_uv_fix=false
 
 # Run the game in a framed window (requires windowed option)

dist/iidx/iidxhook-17.conf

@@ -7,7 +7,7 @@ eamuse.pcbid=0101020304050607086F
 # EAMID
 eamuse.eamid=0101020304050607086F
 
-# Fix stretched BG videos on newer GPUs. Might appear on SIRIUS and older. On 9th and 10th style this issue may only affect older BGAs (from 1st-3rd style)
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
 gfx.bgvideo_uv_fix=false
 
 # Run the game in a framed window (requires windowed option)

dist/iidx/iidxhook-18-cn.conf

@@ -1,6 +1,9 @@
 # PCBID
 eamuse.pcbid=0101020304050607086F
 
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 

dist/iidx/iidxhook-18.conf

@@ -1,3 +1,6 @@
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 

dist/iidx/iidxhook-19.conf

@@ -1,3 +1,6 @@
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 

dist/iidx/iidxhook-20-cn.conf

@@ -1,6 +1,9 @@
 # PCBID
 eamuse.pcbid=0101020304050607086F
 
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 

dist/iidx/iidxhook-20.conf

@@ -1,3 +1,6 @@
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 

dist/iidx/iidxhook-21.conf

@@ -1,3 +1,6 @@
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 

dist/iidx/iidxhook-22.conf

@@ -1,3 +1,6 @@
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 

dist/iidx/iidxhook-23.conf

@@ -1,3 +1,6 @@
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 

dist/iidx/iidxhook-24.conf

@@ -1,3 +1,6 @@
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 

dist/iidx/iidxhook-25.conf

@@ -1,3 +1,6 @@
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 
@@ -34,16 +37,10 @@ gfx.device_adapter=-1
 # Disables the camera emulation
 cam.disable_emu=false
 
-# Disable camera 1. Use, i.e., if you only have one camera and want it to be mapped to camera 2 ingame.
+# Override camera device ID 1 detection (copy from device manager, do not escape)
-cam.disable_camera1=false
-
-# Disable camera 2. Use, i.e., if you have more than one camera but only want to map camera 1 ingame.
-cam.disable_camera2=false
-
-# Override camera device ID 1 detection (copy from device manager, do not escape) Leave blank to automatically detect
 cam.device_id1=
 
-# Override camera device ID 2 detection (copy from device manager, do not escape) Leave blank to automatically detect
+# 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 COM1 (for games supporting slotted readers)
@@ -53,4 +50,4 @@ io.disable_card_reader_emu=false
 io.disable_bio2_emu=false
 
 # Disables the poll limiter, warning very high CPU usage may arise
-io.disable_poll_limiter=false
+io.disable_poll_limiter=false

dist/iidx/iidxhook-26.conf

@@ -1,3 +1,6 @@
+# Fix stretched BG videos on newer GPUs. Might appear on Red and newer
+gfx.bgvideo_uv_fix=false
+
 # Run the game in a framed window (requires windowed option)
 gfx.framed=false
 
@@ -34,16 +37,10 @@ gfx.device_adapter=-1
 # Disables the camera emulation
 cam.disable_emu=false
 
-# Disable camera 1. Use, i.e., if you only have one camera and want it to be mapped to camera 2 ingame.
+# Override camera device ID 1 detection (copy from device manager, do not escape)
-cam.disable_camera1=false
-
-# Disable camera 2. Use, i.e., if you have more than one camera but only want to map camera 1 ingame.
-cam.disable_camera2=false
-
-# Override camera device ID 1 detection (copy from device manager, do not escape) Leave blank to automatically detect
 cam.device_id1=
 
-# Override camera device ID 2 detection (copy from device manager, do not escape) Leave blank to automatically detect
+# 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 COM1 (for games supporting slotted readers)
@@ -53,4 +50,4 @@ io.disable_card_reader_emu=false
 io.disable_bio2_emu=false
 
 # Disables the poll limiter, warning very high CPU usage may arise
-io.disable_poll_limiter=false
+io.disable_poll_limiter=false

dist/iidx/iidxhook-27.conf

@@ -20,13 +20,7 @@ io.disable_file_hooks=false
 io.tt_multiplier=1.0
 
 # Disables the camera emulation
-cam.disable_emu=true
+cam.disable_emu=false
-
-# Disable camera 1. Use, i.e., if you only have one camera and want it to be mapped to camera 2 ingame.
-cam.disable_camera1=false
-
-# Disable camera 2. Use, i.e., if you have more than one camera but only want to map camera 1 ingame.
-cam.disable_camera2=false
 
 # Override camera device ID detection (copy from device manager, do not escape)
 cam.device_id1=

dist/iidx/iidxhook-28.conf

@@ -22,12 +22,6 @@ io.tt_multiplier=1.0
 # Disables the camera emulation
 cam.disable_emu=true
 
-# Disable camera 1. Use, i.e., if you only have one camera and want it to be mapped to camera 2 ingame.
-cam.disable_camera1=false
-
-# Disable camera 2. Use, i.e., if you have more than one camera but only want to map camera 1 ingame.
-cam.disable_camera2=false
-
 # Override camera device ID detection (copy from device manager, do not escape)
 cam.device_id1=
 

dist/iidx/iidxhook-29.conf

@@ -22,12 +22,6 @@ io.tt_multiplier=1.0
 # Disables the camera emulation
 cam.disable_emu=true
 
-# Disable camera 1. Use, i.e., if you only have one camera and want it to be mapped to camera 2 ingame.
-cam.disable_camera1=true
-
-# Disable camera 2. Use, i.e., if you have more than one camera but only want to map camera 1 ingame.
-cam.disable_camera2=false
-
 # Override camera device ID detection (copy from device manager, do not escape)
 cam.device_id1=
 

dist/iidx/iidxhook-30.conf

@@ -1,84 +0,0 @@
-# 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
-
-# Disable camera 1. Use, i.e., if you only have one camera and want it to be mapped to camera 2 ingame.
-cam.disable_camera1=true
-
-# Disable camera 2. Use, i.e., if you have more than one camera but only want to map camera 1 ingame.
-cam.disable_camera2=false
-
-# 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

@@ -22,9 +22,8 @@ The following implementations are already shipped with BT5.
     * bstio.dll (default): Keyboard, joystick and mouse input
 * Dance Dance Revolution
     * ddrio.dll (default): Keyboard, joystick and mouse input
-    * [ddrio-p3io.dll](ddrhook/ddrio-p3io.md): DDR P3IO (Dragon PCB) + EXTIO hardware
     * ddrio-mm.dll: Minimaid hardware
-    * [ddrio-smx.dll](ddrhook/ddrio-smx.md): StepManiaX platforms
+    * ddrio-smx.dll: StepManiaX platforms
 * Beatmania IIDX
     * iidxio.dll (default): Keyboard, joystick and mouse input
     * [iidxio-bio2.dll](iidxhook/iidxio-bio2.md): BIO2 driver

doc/ddrhook/ddrio-p3io.md

@@ -1,27 +0,0 @@
-# ddrio API implementation with DDR P3IO (Dragon) and EXTIO
-
-This implementation of BT5's ddrio API allows you to use the native DDR P3IO
-of a "Dragon PCB" plus the EXTIO with anything the ddrio API supports.
-
-This is not required to run the actual games supporting the hardware natively.
-However, there are various 3rd party applications using the ddrio API where you
-might benefit from using actual SD cabinet hardware, e.g.
-[vigem-ddrio](../vigem/README.md).
-
-## Setup
-
-For hooks, but likely applicable to 3rd party applications (consolidate their
-manuals).
-
-* Driver: You must have the P3IO driver intalled on your system
-  * Driver from [bemanitools-supplements](https://github.com/djhackersdev/bemanitools-supplement/blob/master/ddr/p3io/README.md)
-* Have `ddrio-p3io.dll` in the same folder as your `ddrhookX.dll`
-* Rename `ddrio-p3io.dll` to `ddrio.dll`
-* Ensure that your `gamestart.bat` actually injects the appropriate ddrhook dll, for example:
-```bat
-inject ddrhook1.dll ddr.exe ...*
-```
-or
-```bat
-launcher -K ddrhook2.dll arkmdxp3.dll ...*
-```

doc/ddrhook/unicorntail.md

@@ -17,11 +17,10 @@ A Chimera PCB however is different in many aspects to the Dragon PCB and require
 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. 
+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
-Unicorn Tail intercepts serial port IO commands being sent to the P3IO and redirects them to a 
+connects to a second ACIO bus which drives the extra lighting glitz like the light spikes and maybe
-COM4 in Windows instead, where two readers can be connected via the motherboard's RS232 port or 
+the LED strip).
-a usb RS232 adapter.
 
 ## Drivers
 
@@ -29,16 +28,6 @@ You need the P3IO driver installed on your target system. These can be acquired
 HDD or grabbed from
 [bemanitools-supplements](https://dev.s-ul.net/djhackers/bemanitools-supplement/-/blob/master/gfdm/p3io/README.md).
 
-## COM Port Setup
-
-Using Device Manager in Windows, ensure the following COM ports are connected and setup.
-
-COM1: EXTIO
-COM4: Two readers
-
-Windows is often poor about saving the COM port number, so ewf commit (if applicable) and 
-reboot after saving this setting to ensure it sticks.
-
 ## Setup and run
 
 Edit the `gamestart.bat` file that you are using and append `unicorntail.dll` to the list of hooks,

doc/dev/journal/2023-04-13-iidx-24-gfx-upscaling.md

@@ -1,57 +0,0 @@
-# IIDX 24 GFX upscaling notes
-
-Date: 2023-04-15
-Author: icex2
-
-Notes about my work on fixing the upscaling/downscaling feature of bemanitools for IIDX 20 to 26.
-I realized that the render backend changed significantly that the old method that worked fine
-doesn't work anymore.
-
-The tool used in the screenshots is [apitrace](https://github.com/apitrace/apitrace).
-
-## IIDX 24
-
-The GFX engine in IIDX from 20 to 26 has a changed render loop that includes built-in scaling to
-implement the SD and HD/HD* screen settings that are selectable in the operator menu
-
-### Frame 0 - GFX init part
-
-Setting up the context and device, as well as the frame buffer. This also creates the intermediate
-texture that is configured as the render target once it begins drawing the scene.
-
-![](2023-04-13-iidx-24-gfx-upscaling/init.png)
-
-### Frame 1 - A clean main render path
-
-Start the scene and set the render target to the intermediate texture.
-
-![](2023-04-13-iidx-24-gfx-upscaling/beginscene.png)
-
-After done drawing the scene, the intermediate texture is blended to the framebuffer. With a target
-2D plane having the size of the target resolution, the blending applies linear scaling to either
-up- or downscale the final image.
-
-![](2023-04-13-iidx-24-gfx-upscaling/scaling.png)
-
-## IIDX 10
-
-A recap of the old stuff, see also [my previous notes](2019-10-07-iidx-gfx-rendering-loops.md),
-as I had to look at everything again to properly understand the differences.
-
-### Frame 0 - GFX init part
-
-Setting up the context and device, as well as the frame buffer. Renders directly to the frame
-buffer.
-
-![](2023-04-13-iidx-24-gfx-upscaling/init10.png)
-
-### Frame 1 - A clean main render path
-
-Beginning the scene excerpt. The viewport needs to match the target resolution to display the
-final image correctly.
-
-![](2023-04-13-iidx-24-gfx-upscaling/beginscene10.png)
-
-Ending the scene excerpt, nothing fancy here, just swapping the back buffer.
-
-![](2023-04-13-iidx-24-gfx-upscaling/endscene10.png)

doc/dev/journal/2023-05-28-ddr-p3io-driver-work.md

@@ -1,194 +0,0 @@
-# DDR p3io driver work, various notes
-
-Date: 2023-05-28
-Author: icex2
-
-Notes about my work on writing a DDR P3io driver.
-
-## Python IO board hardware breakout interface
-
-PCB breakout interfaces/connectors on the side of the boards.
-
-### P2IO DDR
-
-Descriptions assume cabinet hardware of an upgraded DDR "black SD cabinet"
-
-* `LINE OUT 1`: Primary audio out to amplifier
-* `LINE OUT 2`: N.C.
-* `RGB`: Video out to monitor, supports 15khz/31khz based on hardware switch for video freq/mode selection
-* `COM1`: Virtual com port that connects to the EXTIO
-* `COM2`: Virtual com port that connects to a pair of ICCA card readers
-* `LAN`: Network connection
-* `PWR`: 100V power in
-* `ANALOG`: N.C.
-* `PORT 1`: Lights output for cabinet lights, e.g. menu button lights, top header lights
-* `PORT 2`: N.C.
-* `DIPSW`
-  * `1`: ???
-  * `2`: On = force all sensor polling mode and allow running the game without an EXTIO
-  * `3`: ???
-  * `4`: On = force 15 khz monitor output
-* `PLUG 1`: Black dongle
-* `PLUG 2`: White dongle
-
-### P3IO GF/DM
-
-Descriptions assume usage of a P3IO from a GF/DM in a "chimera style PCB build" on an upgraded
-DDR "black SD cabinet"
-
-* `PWR`: 100V power in
-* `12V-OUT`: +12V out for external devices
-* `PORT 1`: Lights output for cabinet lights, e.g. menu button lights, top header lights
-* `PORT 2`: N.C.
-* `COM1`: To EXTIO
-* `COM2`: To card readers
-* `RGB`: Video out to monitor, supports 15khz/31khz based on hardware switch for video freq/mode selection
-* `LINE OUT 1`: Primary audio out to amplifier
-* `LINE OUT 2`: N.C.
-* `DIPSW`
-  * `1`:
-  * `2`: 
-  * `3`: 
-  * `4`: On = force 15 khz monitor output
-* `PLUG 1`: Roundplug black dongle
-* `PLUG 2`: Roundplug white dongle
-
-### P3IO DDR(X)
-
-Descriptions assume cabinet hardware of an upgraded DDR "black SD cabinet"
-
-* `PWR`: 100V power in
-* `USB`: USB memory card readers on cabinet
-* `PORT 1`: Lights output for cabinet lights, e.g. menu button lights, top header lights
-* `COM3-4`: Virtual COM ports
-  * COM3 (VCOM1): Pins 1,3,5 on connector -> To card readers
-  * COM4 (VCOM0): Pins 2,4,6 on connector -> N.C.
-* `PLUG`: Breakout to security round plugs (black and white dongles)
-* `COM1`: To EXTIO
-  * Pinout (pins left to right)
-    * 1: TXD1
-    * 2: RXD1
-    * 3: N.C.
-    * 4: N.C.
-    * 5: GND
-* `COM2`: N/A (light spires on black HD cabinet)
-  * Pinout (pins left to right)
-    * 1: TXD2
-    * 2: RXD2
-    * 3: GND
-* `RGB`: Video out to monitor, supports 15khz/31khz based on hardware switch for video freq/mode selection
-* `LINE OUT1`: Primary audio out to amplifier
-* `LINE OUT2`: N.C.
-* `LAN`: Network
-* `DIP SW`
-  * `1`:
-  * `2`: 
-  * `3`: 
-  * `4`: On = force 15 khz monitor output
-
-## Python IO boards and differences
-
-### P3IO DDR(X)
-
-* Connects to USB and actually enumerates as a USB device and not a virtual COM port
-* COM ports 1-4 on breakout of the PCB are being passed through as actual COM ports to the operating system
-
-### P3IO GF/DM
-
-* Connects to USB and actually enumerates as a USB device and not a virtual COM port
-* COM ports 1-2 on breakout of the PCB are just virtual COM ports
-* These do not show up as COM ports on the operating system
-* The game drives the COM ports through the main P3IO protocol with additional P3IO commands
-  to open, read, write and close these virtual COM ports
-
-### P2IO DDR
-
-* Connects to USB and actually enumerates as a USB device and not a virtual COM port
-* COM ports 1-2 on breakout of the PCB are just virtual COM ports
-* These do not show up as COM ports on the operating system
-* The game drives the COM ports through the main P3IO protocol with additional P3IO commands
-  to open, read, write and close these virtual COM ports
-
-
-## Pinout card reader P1 -> P2 mini din8 male to mini din8 male
-
-Port 1 2 and 3: 
-
-* Pin 3: TX
-* Pin 4: GND
-* Pin 5 : RX
-
-Pin 3 and 5 need to be reversed inbetween readers 
-They are all the same, so your cable needs to bridge them over.
-A standard male to male mini din 8 cable does not do that.
-
-### Pinout card reader stock cable s-sub9 to round pin9
-
-```text
-dsub-9 female -> mini-din8 male
-2 (TXD) -> 3
-3 (RXD) -> 5
-5 (GND) -> 4
-```
-
-## ADE board and com port assignments
-
-Default or incorrectly configured?
-
-* `COM1` -> on mainboard
-* `COM2` -> COM2 on P3IO breakout
-* `COM3` -> ???
-* `COM4` -> COM1 on P3IO breakout
-
-## P3IO command init sequence on DDR 18
-
-From the ddrio-python23 library
-
-```text
-.data:1002D5D0 g_init_pakets   db 0AAh, 2, 0, 1, 29h dup(0); field_0.field_0
-.data:1002D5D0                                         ; DATA XREF: initialize_and_send_pakets+5↑o
-.data:1002D5D0                 db 0AAh, 2, 0, 2Fh, 29h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 3, 1, 27h, 1, 28h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2 dup(2), 31h, 29h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2, 3, 1, 29h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 3, 4, 27h, 29h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2Bh, 5, 25h, 10h, 28h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2Bh, 6, 25h, 10h, 28h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2Bh, 7, 25h, 10h, 28h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2Bh, 8, 25h, 10h, 28h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2Bh, 9, 25h, 10h, 28h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2Bh, 0Ah, 25h, 29h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2Bh, 0Bh, 25h, 29h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2Bh, 0Ch, 25h, 29h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2Bh, 0Dh, 25h, 29h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2Bh, 0Eh, 25h, 29h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 3, 0Fh, 5, 29h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 3, 0, 2Bh, 1, 28h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 3, 1, 29h, 5, 28h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 3, 2, 5, 30h, 28h dup(0); field_0.field_0
-.data:1002D5D0                 db 0AAh, 2 dup(3), 27h, 29h dup(0); field_0.field_0
-``
-
-```text
-// 01: get version <- this is part of a "flush" of old data?
-// 2F: set mode
-// 27: get cab type or dispsw
-// 31: get coinstock
-// 1: get version
-// 27: get cab type or dipsw
-// 25: read plug
-// 25: read plug
-// 25: read plug
-// 25: read plug
-// 25: read plug
-// 25: read plug
-// 25: read plug
-// 25: read plug
-// 25: read plug
-// 25: read plug
-// 5: set watchdog
-// 2b: unknown
-// 29: get video freq
-// 5: set watchdog
-// 27: get cab type or dipsw
-```

doc/iidxhook/iidxhook9.md

@@ -4,7 +4,6 @@ The following games are compatible with this version of iidxhook:
 * Heroic Verse
 * BISTROVER
 * CASTHOUR
-* RESIDENT
 
 The games must be bootstrapped using [launcher](../launcher.md).
 
@@ -23,19 +22,17 @@ Make sure to have the following dependencies installed:
 
 ## Data setup
 
-We assume that you are using a clean/vanilla data dump. Ensure your ("contents")
+We assume that you are using a clean/vanilla data dump. Ensure your ("concents")
 folder with your unpacked data looks like this:
 - data
 - modules
 - prop
 
-* For versions 27-29, only
+* Copy/Move all files from the *modules* directory to the root folder, so they
-  * Copy/Move all files from the *modules* directory to the root folder, so they
+are located next to the *data* and *prop* folders.
-    are located next to the *data* and *prop* folders.
 * Copy all files from *prop/defaults* to the *prop* folder.
 * Setup proper paths for *dev/nvram* and *dev/raw* in *prop/avs-config.xml* by
 replacing the *<fs>*-block in that file with the following block:
-
 ```
 <fs>
     <root>
@@ -49,17 +46,9 @@ replacing the *<fs>*-block in that file with the following block:
     <nr_filedesc __type="u16">256</nr_filedesc>
 </fs>
 ```
-
+* Unpack the package containing iidxhook9 into the root folder so iidxhook9.dll
-* For versions 27-29, only
+and all other files are located in the same folder as *data*, *prop*, 
-  * Unpack the package containing iidxhook9 into the root folder so iidxhook9.dll
+*bm2dx.dll*, etc.
-    and all other files are located in the same folder as *data*, *prop*, 
-    *bm2dx.dll*, etc.
-* For version 30
-  * Unpack the package containing iidxhook9 into the `modules` folder so iidxhook9.dll
-    and all other files are located in the same folder as the game's DLLs, e.g.
-    *bm2dx.dll*, etc.
-  * Move the `gamestart-30.bat` to the root folder so it is located next to the
-    `modules`, `data` and `prop` folders
 * Run the gamestart-XX.bat file as admin. Where XX matches the version you 
 want to run.
 

doc/tools/README.md

@@ -6,7 +6,6 @@ BT5's supported games, but provides additional features for users and developers
 Various command line tools for quick and easy testing of BT5 API implementations witohut having
 to run any target games.
 
-* [ddriotest](ddriotest.md): `ddrio` API
 * [eamiotest](eamiotest.md): `eamio` API
 * [iidxiotest](iidxiotest.md): `iidxio` API
 * [jbiotest](jbiotest.md): `jbio` API
@@ -16,10 +15,6 @@ to run any target games.
 * [aciotest](aciotest.md): Command line tool for quick and easy testing of ACIO devices without
 having to run a game.
 
-### P3IO DDR testing tool
-* [p3io-ddr-tool](p3io-ddr-tool.md): Extensive command line tool to test and debug a real P3IO DDR
-  (Dragon PCB) IO board + EXTIO
-
 ### Ezusb
 * [ezusb-iidx-fpga-flash](ezusb-iidx-fpga-flash.md): Tool for flashing the FPGA on ezusb 1 boards.
 Required if you want to run games without native ezusb support using BT5's iidxio API.

doc/tools/ddriotest.md

@@ -1,3 +0,0 @@
-Testing tool for development of ddrio libraries used for emulating the main io
-hardware on bemanitools for DanceDanceRevoluion. Just place ddriotest.exe and your 
-custom ddrio.dll in the same folder and run ddriotest.exe.

doc/tools/p3io-ddr-tool.md

@@ -1,2 +0,0 @@
-Test your real DDR P3IO (Dragon) + EXTIO hardware connected to your machine
-using this tool. Just execute it and follow the usage instructions.

src/main/acio/acio.h

@@ -44,8 +44,6 @@ enum ac_io_node_type {
     AC_IO_NODE_TYPE_PANB = 0x090E0000,
     AC_IO_NODE_TYPE_BMPU = 0x0B000000,
     AC_IO_NODE_TYPE_BI2A = 0x0D060000,
-    AC_IO_NODE_TYPE_BIOB = 0x0D050100,
-    AC_IO_NODE_TYPE_BI2B = 0x0D060100,
 };
 
 #pragma pack(push, 1)

src/main/bio2/bio2.h

@@ -11,7 +11,6 @@ enum bio2_bi2a_cmd {
     BIO2_BI2A_CMD_INIT = 0x0100,
     BIO2_BI2A_CMD_WATCHDOG = 0x0120,
     BIO2_BI2A_CMD_POLL = 0x0152, // For IIDX
-    BIO2_BI2A_CMD_POLL_WD = 0x0153, // For IIDX
     // For games using libacio for BIO2 communication
     BIO2_BI2A_CMD_ACIO_POLL_NOWD = 0x0112,
     BIO2_BI2A_CMD_ACIO_POLL_WD = 0x0113,
@@ -19,4 +18,4 @@ enum bio2_bi2a_cmd {
     BIO2_BI2A_CMD_TAPELED_SEND = 0x0141,
 };
 
-#endif
+#endif

src/main/bio2emu-iidx/bi2a.c

@@ -91,12 +91,11 @@ void bio2_emu_bi2a_dispatch_request(
             break;
 
         case BIO2_BI2A_CMD_WATCHDOG:
-            log_misc("BIO2_BI2A_CMD_WATCHDOG(%d)", req->addr);
+            log_misc("BIO2_BI2A_CMD_WATCHDOGX(%d)", req->addr);
             bio2_emu_bi2a_send_status(&bio2port->acio, req, 0x00);
             break;
 
         case BIO2_BI2A_CMD_POLL:
-        case BIO2_BI2A_CMD_POLL_WD:
             // log_misc("BIO2_BI2A_CMD_POLL");
             bio2_emu_bi2a_send_state(&bio2port->acio, req);
             break;

src/main/camhook/cam.c

@@ -550,8 +550,8 @@ char *grab_next_camera_id(char *buffer, size_t bsz)
         goto done;
     }
 
-    wcstombs(buffer, wSymLink, bsz);
     log_info("Detected webcam: %s\n", buffer);
+    wcstombs(buffer, wSymLink, bsz);
     ++gotten;
 
 done:
@@ -659,19 +659,16 @@ bool convert_path_to_fakesym(const char *path, wchar_t *sym, char *extra_o)
     strtolower(mistr);
     strtolower(extra);
 
-    char buffer[CAMERA_DATA_STRING_SIZE];
+    swprintf(
-    snprintf(
+        sym,
-        buffer,
         CAMERA_DATA_STRING_SIZE,
-        "\\\\?\\%s#%s&%s&%s#%s",
+        L"\\\\?\\%S#%S&%S&%S#%S",
         root,
         vidstr,
         pidstr,
         mistr,
         extra);
 
-    mbstowcs(sym, buffer, CAMERA_DATA_STRING_SIZE);
-
     return true;
 }
 
@@ -808,14 +805,6 @@ void camhook_init(struct camhook_config_cam *config_cam)
 
     // fill before applying hooks
     for (size_t i = 0; i < config_cam->num_devices; ++i) {
-        // Check if this camera is disabled first
-        if (config_cam->disable_camera[i]) {
-            // If so, pretend this camera is already assigned and move on
-            num_addressed_cams++;
-            num_located_cams++;
-            continue;
-        }
-        // If not, try to hook the camera
         fill_cam_struct(&camData[i], config_cam->device_id[i]);
     }
 
@@ -837,9 +826,7 @@ void camhook_init(struct camhook_config_cam *config_cam)
             NULL, "Mf.dll", camhook_mf_syms, lengthof(camhook_mf_syms));
 
         log_info("Inserted cam hooks for %d cams", (int) num_setup);
-        // If the user has manually disabled all cams, don't print this in the
+    } else {
-        // log
-    } else if (num_addressed_cams != config_cam->num_devices) {
         log_info("No cams detected, not hooking");
     }
 }

src/main/camhook/config-cam.c

@@ -7,19 +7,8 @@
 #define CAMHOOK_CONFIG_CAM_DISABLE_EMU_KEY "cam.disable_emu"
 #define CAMHOOK_CONFIG_CAM_DEFAULT_DISABLE_EMU_VALUE false
 
-// the following four arrays are based on CAMHOOK_CONFIG_CAM_MAX
+// the following two arrays are based on CAMHOOK_CONFIG_CAM_MAX
 // please insert more elements if more cams are added
-const char *camhook_config_disable_camera[CAMHOOK_CONFIG_CAM_MAX] = {
-    "cam.disable_camera1",
-    "cam.disable_camera2",
-};
-
-const int camhook_config_disable_camera_default_values[CAMHOOK_CONFIG_CAM_MAX] =
-    {
-        false,
-        false,
-};
-
 const char *camhook_config_device_id_keys[CAMHOOK_CONFIG_CAM_MAX] = {
     "cam.device_id1",
     "cam.device_id2",
@@ -39,11 +28,6 @@ void camhook_config_cam_init(struct cconfig *config, size_t num_cams)
         "Disables the camera emulation");
 
     for (size_t i = 0; i < num_cams; ++i) {
-        cconfig_util_set_bool(
-            config,
-            camhook_config_disable_camera[i],
-            camhook_config_disable_camera_default_values[i],
-            "Disable camera");
         cconfig_util_set_str(
             config,
             camhook_config_device_id_keys[i],
@@ -72,17 +56,6 @@ void camhook_config_cam_get(
             CAMHOOK_CONFIG_CAM_DEFAULT_DISABLE_EMU_VALUE);
     }
     for (size_t i = 0; i < num_cams; ++i) {
-        if (!cconfig_util_get_bool(
-                config,
-                camhook_config_disable_camera[i],
-                &config_cam->disable_camera[i],
-                camhook_config_disable_camera_default_values[i])) {
-            log_warning(
-                "Invalid value for key '%s' specified, fallback "
-                "to default '%d'",
-                camhook_config_disable_camera[i],
-                camhook_config_disable_camera_default_values[i]);
-        }
         if (!cconfig_util_get_str(
                 config,
                 camhook_config_device_id_keys[i],

src/main/camhook/config-cam.h

@@ -11,7 +11,6 @@ struct camhook_config_cam {
     bool disable_emu;
     size_t num_devices;
     char device_id[CAMHOOK_CONFIG_CAM_MAX][MAX_PATH];
-    bool disable_camera[CAMHOOK_CONFIG_CAM_MAX];
 };
 
 void camhook_config_cam_init(struct cconfig *config, size_t num_cams);

src/main/d3d9-util/Module.mk

@@ -1,6 +0,0 @@
-libs            += d3d9-util
-
-libs_d3d9-util     := \
-
-src_d3d9-util     := \
-    dxerr9.c \

src/main/d3d9-util/dxerr9.c

@@ -1,23 +0,0 @@
-// Source:
-// https://github.com/Alexpux/mingw-w64/blob/master/mingw-w64-crt/libsrc/dxerr9.c
-/*
-
-    dxerr9.c - DirectX 9 Error Functions
-
-    Written by Filip Navara <xnavara@volny.cz>
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-*/
-
-#define DXGetErrorString DXGetErrorString9A
-#define DXGetErrorDescription DXGetErrorDescription9A
-#define DXTrace DXTraceA
-#define DXERROR9(v, n, d) {v, n, d},
-#define DXERROR9LAST(v, n, d) \
-    {                         \
-        v, n, d               \
-    }
-#include "dxerr.c"

src/main/d3d9-util/dxerr9.h

@@ -1,67 +0,0 @@
-// Source:
-// https://github.com/Alexpux/mingw-w64/blob/master/mingw-w64-headers/direct-x/include/dxerr9.h
-/*
- * Copyright (C) 2004 Robert Reif
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_DXERR9_H
-#define __WINE_DXERR9_H
-
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* defined(__cplusplus) */
-
-const char *WINAPI DXGetErrorString9A(HRESULT hr);
-const WCHAR *WINAPI DXGetErrorString9W(HRESULT hr);
-#define DXGetErrorString9 __MINGW_NAME_AW(DXGetErrorString9)
-
-const char *WINAPI DXGetErrorDescription9A(HRESULT hr);
-const WCHAR *WINAPI DXGetErrorDescription9W(HRESULT hr);
-#define DXGetErrorDescription9 __MINGW_NAME_AW(DXGetErrorDescription9)
-
-HRESULT WINAPI DXTraceA(
-    const char *strFile,
-    DWORD dwLine,
-    HRESULT hr,
-    const char *strMsg,
-    WINBOOL bPopMsgBox);
-HRESULT WINAPI DXTraceW(
-    const char *strFile,
-    DWORD dwLine,
-    HRESULT hr,
-    const WCHAR *strMsg,
-    WINBOOL bPopMsgBox);
-#define DXTrace __MINGW_NAME_AW(DXTrace)
-
-#if defined(DEBUG) || defined(_DEBUG)
-#define DXTRACE_MSG(str) DXTrace(__FILE__, (DWORD) __LINE__, 0, str, FALSE)
-#define DXTRACE_ERR(str, hr) DXTrace(__FILE__, (DWORD) __LINE__, hr, str, TRUE)
-#define DXTRACE_ERR_NOMSGBOX(str, hr) \
-    DXTrace(__FILE__, (DWORD) __LINE__, hr, str, FALSE)
-#else
-#define DXTRACE_MSG(str) __MSABI_LONG(0)
-#define DXTRACE_ERR(str, hr) (hr)
-#define DXTRACE_ERR_NOMSGBOX(str, hr) (hr)
-#endif
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* defined(__cplusplus) */
-
-#endif /* __WINE_DXERR9_H */

src/main/d3d9-util/vertex.h

@@ -1,23 +0,0 @@
-#ifndef D3D9_UTIL_H
-#define D3D9_UTIL_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-struct d3d9_util_vertex {
-    float x;
-    float y;
-    float z;
-    uint32_t color;
-    uint32_t unknown;
-    float tu;
-    float tv;
-};
-
-inline bool
-d3d9_util_vertex_in_range(float v, float lower_bound_inc, float upper_bound_inc)
-{
-    return v >= lower_bound_inc && v <= upper_bound_inc;
-}
-
-#endif

src/main/ddrio-p3io/Module.mk

@@ -1,16 +0,0 @@
-dlls		+= ddrio-p3io
-
-ldflags_ddrio-p3io:= \
-	-lsetupapi \
-
-libs_ddrio-p3io	:= \
-	cconfig \
-	extio \
-	extiodrv \
-	p3io \
-	p3iodrv \
-	util \
-
-src_ddrio-p3io	:= \
-	config.c \
-	ddrio.c \

src/main/ddrio-p3io/config.c

@@ -1,35 +0,0 @@
-#include "cconfig/cconfig-util.h"
-
-#include "util/log.h"
-
-#include "config.h"
-
-#define DDRIO_P3IO_CONFIG_EXTIO_PORT_KEY "ddrio.p3io.extio_port"
-
-#define DDRIO_P3IO_CONFIG_EXTIO_PORT_VALUE "COM1"
-
-void ddrio_p3io_config_init(struct cconfig *config)
-{
-    cconfig_util_set_str(
-        config,
-        DDRIO_P3IO_CONFIG_EXTIO_PORT_KEY,
-        DDRIO_P3IO_CONFIG_EXTIO_PORT_VALUE,
-        "COM port the EXTIO is connected to, default COM1");
-}
-
-void ddrio_p3io_config_get(
-    struct ddrio_p3io_config *config_ddrio_p3io, struct cconfig *config)
-{
-    if (!cconfig_util_get_str(
-            config,
-            DDRIO_P3IO_CONFIG_EXTIO_PORT_KEY,
-            config_ddrio_p3io->extio_port,
-            sizeof(config_ddrio_p3io->extio_port) - 1,
-            DDRIO_P3IO_CONFIG_EXTIO_PORT_VALUE)) {
-        log_warning(
-            "Invalid value for key '%s' specified, fallback "
-            "to default '%s'",
-            DDRIO_P3IO_CONFIG_EXTIO_PORT_KEY,
-            DDRIO_P3IO_CONFIG_EXTIO_PORT_VALUE);
-    }
-}

src/main/ddrio-p3io/config.h

@@ -1,17 +0,0 @@
-#ifndef DDRIO_P3IO_CONFIG_H
-#define DDRIO_P3IO_CONFIG_H
-
-#include <windows.h>
-
-#include "cconfig/cconfig.h"
-
-struct ddrio_p3io_config {
-    char extio_port[12];
-};
-
-void ddrio_p3io_config_init(struct cconfig *config);
-
-void ddrio_p3io_config_get(
-    struct ddrio_p3io_config *config_ddrio_p3io, struct cconfig *config);
-
-#endif

src/main/ddrio-p3io/ddrio-p3io.def

@@ -1,11 +0,0 @@
-LIBRARY ddrio-p3io
-
-EXPORTS
-    ddr_io_set_loggers
-    ddr_io_fini
-    ddr_io_init
-    ddr_io_read_pad
-    ddr_io_set_lights_extio
-    ddr_io_set_lights_p3io
-    ddr_io_set_lights_hdxs_panel
-    ddr_io_set_lights_hdxs_rgb

src/main/ddrio-p3io/ddrio.c

@@ -1,427 +0,0 @@
-#define LOG_MODULE "ddrio-p3io"
-
-#include <windows.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "bemanitools/ddrio.h"
-
-#include "cconfig/cconfig-main.h"
-
-#include "extiodrv/device.h"
-#include "extiodrv/extio.h"
-
-#include "p3iodrv/ddr.h"
-#include "p3iodrv/device.h"
-
-#include "util/log.h"
-#include "util/thread.h"
-
-#include "config.h"
-
-static struct ddrio_p3io_config _ddr_io_p3io_config;
-static HANDLE _ddr_io_p3io_handle;
-static HANDLE _ddr_io_extio_handle;
-
-static HRESULT _ddr_io_p3io_scan_and_open(HANDLE *handle)
-{
-    HRESULT hr;
-    char path[MAX_PATH];
-
-    log_info("Scanning for p3io...");
-
-    hr = p3iodrv_device_scan(path);
-
-    if (FAILED(hr)) {
-        log_warning("Cannot find a connected p3io: %lX", hr);
-        return hr;
-    }
-
-    log_info("Opening p3io: %s", path);
-
-    hr = p3iodrv_device_open(path, handle);
-
-    if (FAILED(hr)) {
-        log_warning("Opening p3io failed: %lX", hr);
-        return hr;
-    }
-
-    return hr;
-}
-
-static HRESULT _ddr_io_p3io_print_version(HANDLE handle)
-{
-    HRESULT hr;
-    char version[P3IODRV_VERSION_MAX_LEN];
-
-    memset(version, 0, P3IODRV_VERSION_MAX_LEN);
-
-    hr = p3iodrv_device_read_version(handle, version);
-
-    if (FAILED(hr)) {
-        log_warning("Getting p3io version failed: %lX", hr);
-        return hr;
-    }
-
-    log_info("P3IO version: %s", version);
-
-    return hr;
-}
-
-static HRESULT _ddr_io_ddr_p3io_print_version(HANDLE handle)
-{
-    HRESULT hr;
-    char str[4];
-    uint32_t major;
-    uint32_t minor;
-    uint32_t patch;
-
-    hr = p3iodrv_ddr_get_version(handle, str, &major, &minor, &patch);
-
-    if (FAILED(hr)) {
-        log_warning("Getting version failed: %lX", hr);
-        return hr;
-    }
-
-    log_info("DDR version: %s %d.%d.%d", str, major, minor, patch);
-
-    return hr;
-}
-
-static HRESULT _ddr_io_ddr_p3io_print_cabinet_type(HANDLE handle)
-{
-    HRESULT hr;
-    enum p3io_cab_type type;
-
-    hr = p3iodrv_ddr_get_cab_type(handle, &type);
-
-    if (FAILED(hr)) {
-        log_warning("Getting cab type failed: %lX", hr);
-        return hr;
-    }
-
-    log_info("Cabinet type: %d", type);
-
-    return hr;
-}
-
-static HRESULT _ddr_io_ddr_p3io_print_dip_switches(HANDLE handle)
-{
-    HRESULT hr;
-    uint8_t dip_sw;
-
-    hr = p3iodrv_ddr_get_dipsw(handle, &dip_sw);
-
-    if (FAILED(hr)) {
-        log_warning("Getting dip switches failed");
-        return hr;
-    }
-
-    log_info("Dip switches: 0x%X", dip_sw);
-
-    return hr;
-}
-
-static HRESULT _ddr_io_ddr_p3io_print_video_freq(HANDLE handle)
-{
-    HRESULT hr;
-    enum p3io_video_freq video_freq;
-
-    hr = p3iodrv_ddr_get_video_freq(handle, &video_freq);
-
-    if (FAILED(hr)) {
-        log_warning("Getting video freq failed");
-        return hr;
-    }
-
-    log_info("Video freq: 0x%X", video_freq);
-
-    return hr;
-}
-
-static HRESULT _ddr_io_ddr_p3io_print_debug_info(HANDLE handle)
-{
-    return _ddr_io_p3io_print_version(handle) &&
-        _ddr_io_ddr_p3io_print_version(handle) &&
-        _ddr_io_ddr_p3io_print_cabinet_type(handle) &&
-        _ddr_io_ddr_p3io_print_dip_switches(handle) &&
-        _ddr_io_ddr_p3io_print_video_freq(handle);
-}
-
-static HRESULT _ddr_io_p3io_init(HANDLE *handle)
-{
-    HRESULT hr;
-
-    log_info("Initializing DDR P3IO...");
-
-    hr = _ddr_io_p3io_scan_and_open(handle);
-
-    if (FAILED(hr)) {
-        return hr;
-    }
-
-    hr = p3iodrv_ddr_init(*handle);
-
-    if (FAILED(hr)) {
-        return hr;
-    }
-
-    hr = _ddr_io_ddr_p3io_print_debug_info(*handle);
-
-    if (FAILED(hr)) {
-        return hr;
-    }
-
-    return hr;
-}
-
-static HRESULT _ddr_io_p3io_close(HANDLE *handle)
-{
-    HRESULT hr;
-
-    log_info("Closing p3io...");
-
-    hr = p3iodrv_device_close(handle);
-
-    if (FAILED(hr)) {
-        log_warning("Closing p3io failed: %lX", hr);
-        return hr;
-    }
-
-    return hr;
-}
-
-static HRESULT _ddr_io_extio_init(HANDLE *handle)
-{
-    log_info("Initializing EXTIO...");
-
-    return extiodrv_device_open(_ddr_io_p3io_config.extio_port, handle);
-}
-
-static HRESULT _ddr_io_extio_close(HANDLE *handle)
-{
-    log_info("Closing EXTIO...");
-
-    return extiodrv_device_close(handle);
-}
-
-static HRESULT _ddr_io_flush_and_reset(HANDLE p3io_handle, HANDLE extio_handle)
-{
-    HRESULT hr;
-    struct p3io_ddr_jamma jamma;
-    struct p3io_ddr_output output;
-    struct extiodrv_extio_pad_lights pad_lights[2];
-    bool neons;
-
-    log_assert(p3io_handle != INVALID_HANDLE_VALUE);
-    log_assert(extio_handle != INVALID_HANDLE_VALUE);
-
-    log_info("Flushing inputs and outputs");
-
-    memset(&output, 0, sizeof(output));
-    memset(&pad_lights, 0, sizeof(pad_lights));
-    neons = false;
-
-    hr = p3iodrv_ddr_get_jamma(p3io_handle, &jamma);
-
-    if (FAILED(hr)) {
-        log_warning("Reading jamma failed");
-        return hr;
-    }
-
-    hr = p3iodrv_ddr_set_outputs(p3io_handle, &output);
-
-    if (FAILED(hr)) {
-        log_warning("Settings outputs failed");
-        return hr;
-    }
-
-    hr = extiodrv_extio_transfer(
-        extio_handle, EXTIODRV_EXTIO_SENSOR_READ_MODE_ALL, pad_lights, neons);
-
-    if (FAILED(hr)) {
-        log_warning("EXTIO transfer failed");
-        return hr;
-    }
-
-    return hr;
-}
-
-void ddr_io_set_loggers(
-    log_formatter_t misc,
-    log_formatter_t info,
-    log_formatter_t warning,
-    log_formatter_t fatal)
-{
-    log_to_external(misc, info, warning, fatal);
-}
-
-static void _ddr_io_config_init(struct ddrio_p3io_config *config_ddrio_p3io)
-{
-    struct cconfig *config;
-
-    config = cconfig_init();
-
-    ddrio_p3io_config_init(config);
-
-    if (!cconfig_main_config_init(
-            config,
-            "--ddrio-p3io-config",
-            "ddrio-p3io.conf",
-            "--help",
-            "-h",
-            "ddrio-p3io",
-            CCONFIG_CMD_USAGE_OUT_STDOUT)) {
-        cconfig_finit(config);
-        exit(EXIT_FAILURE);
-    }
-
-    ddrio_p3io_config_get(config_ddrio_p3io, config);
-
-    cconfig_finit(config);
-}
-
-bool ddr_io_init(
-    thread_create_t thread_create,
-    thread_join_t thread_join,
-    thread_destroy_t thread_destroy)
-{
-    HRESULT hr;
-
-    _ddr_io_config_init(&_ddr_io_p3io_config);
-
-    hr = _ddr_io_p3io_init(&_ddr_io_p3io_handle);
-
-    if (FAILED(hr)) {
-        return false;
-    }
-
-    hr = _ddr_io_extio_init(&_ddr_io_extio_handle);
-
-    if (FAILED(hr)) {
-        return false;
-    }
-
-    hr = _ddr_io_flush_and_reset(_ddr_io_p3io_handle, _ddr_io_extio_handle);
-
-    if (FAILED(hr)) {
-        return false;
-    }
-
-    return true;
-}
-
-uint32_t ddr_io_read_pad(void)
-{
-    HRESULT hr;
-    struct p3io_ddr_jamma jamma;
-
-    hr = p3iodrv_ddr_get_jamma(_ddr_io_p3io_handle, &jamma);
-
-    if (FAILED(hr)) {
-        log_warning("Reading jamma failed");
-        return 0;
-    }
-
-    return _byteswap_ulong(*((uint32_t *) &jamma));
-}
-
-void ddr_io_set_lights_extio(uint32_t extio_lights)
-{
-    HRESULT hr;
-    struct extiodrv_extio_pad_lights pad_lights[EXTIO_PAD_LIGHT_MAX_PLAYERS];
-    bool neons;
-
-    pad_lights[0].up = (extio_lights & (1 << LIGHT_P1_UP)) > 0;
-    pad_lights[0].down = (extio_lights & (1 << LIGHT_P1_DOWN)) > 0;
-    pad_lights[0].left = (extio_lights & (1 << LIGHT_P1_LEFT)) > 0;
-    pad_lights[0].right = (extio_lights & (1 << LIGHT_P1_RIGHT)) > 0;
-
-    pad_lights[1].up = (extio_lights & (1 << LIGHT_P2_UP)) > 0;
-    pad_lights[1].down = (extio_lights & (1 << LIGHT_P2_DOWN)) > 0;
-    pad_lights[1].left = (extio_lights & (1 << LIGHT_P2_LEFT)) > 0;
-    pad_lights[1].right = (extio_lights & (1 << LIGHT_P2_RIGHT)) > 0;
-
-    neons = (extio_lights & (1 << LIGHT_NEONS)) > 0;
-
-    hr = extiodrv_extio_transfer(
-        _ddr_io_extio_handle,
-        EXTIODRV_EXTIO_SENSOR_READ_MODE_ALL,
-        pad_lights,
-        neons);
-
-    if (FAILED(hr)) {
-        log_warning("EXTIO transfer failed: %lX", hr);
-    }
-}
-
-void ddr_io_set_lights_p3io(uint32_t p3io_lights)
-{
-    HRESULT hr;
-    struct p3io_ddr_output output;
-
-    output.cabinet.top_p1_lower =
-        (p3io_lights & (1 << LIGHT_P1_LOWER_LAMP)) > 0 ? 1 : 0;
-    output.cabinet.top_p1_upper =
-        (p3io_lights & (1 << LIGHT_P1_UPPER_LAMP)) > 0 ? 1 : 0;
-    output.cabinet.top_p2_lower =
-        (p3io_lights & (1 << LIGHT_P2_LOWER_LAMP)) > 0 ? 1 : 0;
-    output.cabinet.top_p2_upper =
-        (p3io_lights & (1 << LIGHT_P2_UPPER_LAMP)) > 0 ? 1 : 0;
-
-    output.cabinet.p1_menu_buttons =
-        (p3io_lights & (1 << LIGHT_P1_MENU)) > 0 ? 1 : 0;
-    output.cabinet.p2_menu_buttons =
-        (p3io_lights & (1 << LIGHT_P2_MENU)) > 0 ? 1 : 0;
-
-    hr = p3iodrv_ddr_set_outputs(_ddr_io_p3io_handle, &output);
-
-    if (FAILED(hr)) {
-        log_warning("Settings outputs failed: %lX", hr);
-    }
-}
-
-void ddr_io_set_lights_hdxs_panel(uint32_t lights)
-{
-    // Unused
-
-    (void) lights;
-}
-
-void ddr_io_set_lights_hdxs_rgb(uint8_t idx, uint8_t r, uint8_t g, uint8_t b)
-{
-    // Unused
-
-    (void) idx;
-    (void) r;
-    (void) g;
-    (void) b;
-}
-
-void ddr_io_fini(void)
-{
-    HRESULT hr;
-
-    hr = _ddr_io_flush_and_reset(_ddr_io_p3io_handle, _ddr_io_extio_handle);
-
-    if (FAILED(hr)) {
-        log_warning("Flusing IO failed: %lX", hr);
-        return;
-    }
-
-    hr = _ddr_io_p3io_close(&_ddr_io_p3io_handle);
-
-    if (FAILED(hr)) {
-        log_warning("Closing P3IO failed: %lX", hr);
-        // continue
-    }
-
-    hr = _ddr_io_extio_close(&_ddr_io_extio_handle);
-
-    if (FAILED(hr)) {
-        log_warning("Closing EXTIO failed: %lX", hr);
-        // continue
-    }
-}

src/main/ddriotest/Module.mk

@@ -1,8 +0,0 @@
-exes            += ddriotest \
-
-libs_ddriotest     := \
-    ddrio \
-    util \
-
-src_ddriotest      := \
-    main.c \

src/main/ddriotest/main.c

@@ -1,303 +0,0 @@
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <windows.h>
-
-#include "bemanitools/ddrio.h"
-
-#include "util/log.h"
-#include "util/thread.h"
-
-int main(int argc, char **argv)
-{
-    enum log_level log_level;
-
-    log_level = LOG_LEVEL_FATAL;
-
-    for (int i = 0; i < argc; i++) {
-        if (!strcmp(argv[i], "-v")) {
-            log_level = LOG_LEVEL_WARNING;
-        } else if (!strcmp(argv[i], "-vv")) {
-            log_level = LOG_LEVEL_INFO;
-        } else if (!strcmp(argv[i], "-vvv")) {
-            log_level = LOG_LEVEL_MISC;
-        }
-    }
-
-    log_to_writer(log_writer_stderr, NULL);
-    log_set_level(log_level);
-
-    ddr_io_set_loggers(
-        log_impl_misc, log_impl_info, log_impl_warning, log_impl_fatal);
-
-    if (!ddr_io_init(crt_thread_create, crt_thread_join, crt_thread_destroy)) {
-        fprintf(stderr, "Initializing ddrio failed\n");
-        return -1;
-    }
-
-    fprintf(
-        stderr,
-        ">>> Initializing ddrio successful, press enter to continue <<<\n");
-
-    if (getchar() != '\n') {
-        return 0;
-    }
-
-    // inputs
-    uint32_t pad = 0;
-
-    // outputs
-    uint32_t extio_lights = 0;
-    uint32_t p3io_lights = 0;
-
-    bool loop = true;
-    uint8_t cnt = 0;
-
-    while (loop) {
-        ddr_io_set_lights_extio(extio_lights);
-        ddr_io_set_lights_p3io(p3io_lights);
-
-        pad = ddr_io_read_pad();
-
-        system("cls");
-
-        printf("Counter: %d\n", cnt);
-        printf("Player 1       Player 2\n");
-        printf("\n");
-        printf("Pad\n");
-
-        printf(
-            "Up:    %d       Up:    %d\n",
-            (pad & (1 << DDR_P1_UP)) > 0,
-            (pad & (1 << DDR_P2_UP)) > 0);
-        printf(
-            "Down:  %d       Down:  %d\n",
-            (pad & (1 << DDR_P1_DOWN)) > 0,
-            (pad & (1 << DDR_P2_DOWN)) > 0);
-        printf(
-            "Left:  %d       Left:  %d\n",
-            (pad & (1 << DDR_P1_LEFT)) > 0,
-            (pad & (1 << DDR_P2_LEFT)) > 0);
-        printf(
-            "Right: %d       Right: %d\n",
-            (pad & (1 << DDR_P1_RIGHT)) > 0,
-            (pad & (1 << DDR_P2_RIGHT)) > 0);
-        printf("\n");
-        printf("Menu\n");
-        printf(
-            "Start: %d       Start: %d\n",
-            (pad & (1 << DDR_P1_START)) > 0,
-            (pad & (1 << DDR_P2_START)) > 0);
-        printf(
-            "Up:    %d       Up:    %d\n",
-            (pad & (1 << DDR_P1_MENU_UP)) > 0,
-            (pad & (1 << DDR_P2_MENU_UP)) > 0);
-        printf(
-            "Down:  %d       Down:  %d\n",
-            (pad & (1 << DDR_P1_MENU_DOWN)) > 0,
-            (pad & (1 << DDR_P2_MENU_DOWN)) > 0);
-        printf(
-            "Left:  %d       Left:  %d\n",
-            (pad & (1 << DDR_P1_MENU_LEFT)) > 0,
-            (pad & (1 << DDR_P2_MENU_LEFT)) > 0);
-        printf(
-            "Right: %d       Right: %d\n",
-            (pad & (1 << DDR_P1_MENU_RIGHT)) > 0,
-            (pad & (1 << DDR_P2_MENU_RIGHT)) > 0);
-        printf("\n");
-        printf("Operator\n");
-        printf(
-            "Test: %d   Service: %d   Coin: %d\n",
-            (pad & (1 << DDR_TEST)) > 0,
-            (pad & (1 << DDR_SERVICE)) > 0,
-            (pad & (1 << DDR_COIN)) > 0);
-
-        if ((pad & (1 << DDR_P1_UP)) > 0) {
-            extio_lights |= (1 << LIGHT_P1_UP);
-        } else {
-            extio_lights &= ~(1 << LIGHT_P1_UP);
-        }
-
-        if ((pad & (1 << DDR_P1_DOWN)) > 0) {
-            extio_lights |= (1 << LIGHT_P1_DOWN);
-        } else {
-            extio_lights &= ~(1 << LIGHT_P1_DOWN);
-        }
-
-        if ((pad & (1 << DDR_P1_LEFT)) > 0) {
-            extio_lights |= (1 << LIGHT_P1_LEFT);
-        } else {
-            extio_lights &= ~(1 << LIGHT_P1_LEFT);
-        }
-
-        if ((pad & (1 << DDR_P1_RIGHT)) > 0) {
-            extio_lights |= (1 << LIGHT_P1_RIGHT);
-        } else {
-            extio_lights &= ~(1 << LIGHT_P1_RIGHT);
-        }
-
-        if ((pad & (1 << DDR_P2_UP)) > 0) {
-            extio_lights |= (1 << LIGHT_P2_UP);
-        } else {
-            extio_lights &= ~(1 << LIGHT_P2_UP);
-        }
-
-        if ((pad & (1 << DDR_P2_DOWN)) > 0) {
-            extio_lights |= (1 << LIGHT_P2_DOWN);
-        } else {
-            extio_lights &= ~(1 << LIGHT_P2_DOWN);
-        }
-
-        if ((pad & (1 << DDR_P2_LEFT)) > 0) {
-            extio_lights |= (1 << LIGHT_P2_LEFT);
-        } else {
-            extio_lights &= ~(1 << LIGHT_P2_LEFT);
-        }
-
-        if ((pad & (1 << DDR_P2_RIGHT)) > 0) {
-            extio_lights |= (1 << LIGHT_P2_RIGHT);
-        } else {
-            extio_lights &= ~(1 << LIGHT_P2_RIGHT);
-        }
-
-        if ((pad & (1 << DDR_P1_START)) > 0 ||
-            (pad & (1 << DDR_P1_MENU_UP)) > 0 ||
-            (pad & (1 << DDR_P1_MENU_DOWN)) > 0 ||
-            (pad & (1 << DDR_P1_MENU_LEFT)) > 0 ||
-            (pad & (1 << DDR_P1_MENU_RIGHT)) > 0) {
-            p3io_lights |= (1 << LIGHT_P1_MENU);
-        } else {
-            p3io_lights &= ~(1 << LIGHT_P1_MENU);
-        }
-
-        if ((pad & (1 << DDR_P2_START)) > 0 ||
-            (pad & (1 << DDR_P2_MENU_UP)) > 0 ||
-            (pad & (1 << DDR_P2_MENU_DOWN)) > 0 ||
-            (pad & (1 << DDR_P2_MENU_LEFT)) > 0 ||
-            (pad & (1 << DDR_P2_MENU_RIGHT)) > 0) {
-            p3io_lights |= (1 << LIGHT_P2_MENU);
-        } else {
-            p3io_lights &= ~(1 << LIGHT_P2_MENU);
-        }
-
-        /* avoid CPU banging */
-        Sleep(1);
-        ++cnt;
-
-        /* process menu */
-        if ((GetAsyncKeyState(VK_ESCAPE) & 0x8000) != 0) {
-            system("cls");
-            Sleep(5);
-            printf(
-                "Menu options:\n"
-                "  0: Exit menu and continue loop\n"
-                "  1: Exit\n"
-                "  2: Set neon state\n"
-                "  3: Top lamp state\n"
-                "  4: Set all lights on\n"
-                "  5: Set all lights off\n"
-                "Waiting for input: ");
-
-            char c = getchar();
-
-            switch (c) {
-                case '1': {
-                    loop = false;
-                    break;
-                }
-
-                case '2': {
-                    int state;
-                    int n;
-
-                    printf("Enter neon state (0/1): ");
-
-                    n = scanf("%d", &state);
-
-                    if (n > 0) {
-                        extio_lights |= (1 << LIGHT_NEONS);
-                    } else {
-                        extio_lights &= ~(1 << LIGHT_NEONS);
-                    }
-
-                    break;
-                }
-
-                case '3': {
-                    char buf[4];
-                    int n;
-
-                    printf("Enter top lamp state, chain of 0/1s: ");
-
-                    n = scanf("%8s", buf);
-
-                    if (n > 0) {
-                        if (buf[0] == '1') {
-                            p3io_lights |= (1 << LIGHT_P1_UPPER_LAMP);
-                        } else {
-                            p3io_lights &= ~(1 << LIGHT_P1_UPPER_LAMP);
-                        }
-
-                        if (buf[1] == '1') {
-                            p3io_lights |= (1 << LIGHT_P1_LOWER_LAMP);
-                        } else {
-                            p3io_lights &= ~(1 << LIGHT_P1_LOWER_LAMP);
-                        }
-
-                        if (buf[2] == '1') {
-                            p3io_lights |= (1 << LIGHT_P2_UPPER_LAMP);
-                        } else {
-                            p3io_lights &= ~(1 << LIGHT_P2_UPPER_LAMP);
-                        }
-
-                        if (buf[3] == '1') {
-                            p3io_lights |= (1 << LIGHT_P2_LOWER_LAMP);
-                        } else {
-                            p3io_lights &= ~(1 << LIGHT_P2_LOWER_LAMP);
-                        }
-                    }
-
-                    break;
-                }
-
-                case '4': {
-                    extio_lights |= (1 << LIGHT_NEONS);
-
-                    p3io_lights |= (1 << LIGHT_P1_MENU);
-                    p3io_lights |= (1 << LIGHT_P2_MENU);
-                    p3io_lights |= (1 << LIGHT_P1_UPPER_LAMP);
-                    p3io_lights |= (1 << LIGHT_P1_LOWER_LAMP);
-                    p3io_lights |= (1 << LIGHT_P2_UPPER_LAMP);
-                    p3io_lights |= (1 << LIGHT_P2_LOWER_LAMP);
-
-                    break;
-                }
-
-                case '5': {
-                    extio_lights &= ~(1 << LIGHT_NEONS);
-
-                    p3io_lights &= ~(1 << LIGHT_P1_MENU);
-                    p3io_lights &= ~(1 << LIGHT_P2_MENU);
-                    p3io_lights &= ~(1 << LIGHT_P1_UPPER_LAMP);
-                    p3io_lights &= ~(1 << LIGHT_P1_LOWER_LAMP);
-                    p3io_lights &= ~(1 << LIGHT_P2_UPPER_LAMP);
-                    p3io_lights &= ~(1 << LIGHT_P2_LOWER_LAMP);
-
-                    break;
-                }
-
-                case '0':
-                default:
-                    break;
-            }
-        }
-    }
-
-    system("cls");
-
-    ddr_io_fini();
-
-    return 0;
-}

src/main/extio/Module.mk

@@ -1,4 +0,0 @@
-libs		+= extio
-
-src_extio	:= \
-	cmd.c \

src/main/extio/cmd.c

@@ -1,16 +0,0 @@
-#include "cmd.h"
-
-uint8_t extio_cmd_checksum(const struct extio_cmd_write *write)
-{
-    const uint8_t *data;
-    uint32_t checksum;
-
-    data = (const uint8_t *) write;
-
-    checksum = 0;
-    checksum += data[0];
-    checksum += data[1];
-    checksum += data[2];
-
-    return (uint8_t) (checksum & 0x7F);
-}

src/main/extio/cmd.h

@@ -1,49 +0,0 @@
-#ifndef EXTIO_CMD_H
-#define EXTIO_CMD_H
-
-#include <stdint.h>
-
-#define EXTIO_PAD_LIGHT_MAX_PLAYERS 2
-
-enum extio_status {
-    EXTIO_STATUS_OK = 0x11,
-};
-
-#pragma pack(push, 1)
-
-struct extio_cmd_pad_light {
-    uint8_t unknown : 3;
-    uint8_t right : 1;
-    uint8_t left : 1;
-    uint8_t down : 1;
-    uint8_t up : 1;
-    uint8_t unknown_80 : 1;
-};
-
-struct extio_cmd_write {
-    struct extio_cmd_pad_light pad_lights[EXTIO_PAD_LIGHT_MAX_PLAYERS];
-
-    uint8_t unknown3 : 3;
-    uint8_t sensor_read_mode : 3;
-    uint8_t neons : 1;
-    uint8_t unknown4 : 1;
-
-    uint8_t checksum;
-};
-
-struct extio_cmd_read {
-    uint8_t status;
-};
-
-_Static_assert(
-    sizeof(struct extio_cmd_write) == 4,
-    "struct extio_cmd_write is the wrong size");
-_Static_assert(
-    sizeof(struct extio_cmd_read) == 1,
-    "struct extio_cmd_read is the wrong size");
-
-#pragma pack(pop)
-
-uint8_t extio_cmd_checksum(const struct extio_cmd_write *write);
-
-#endif

src/main/extiodrv/Module.mk

@@ -1,5 +0,0 @@
-libs		+= extiodrv
-
-src_extiodrv	:= \
-	device.c \
-	extio.c \

src/main/extiodrv/device.c

@@ -1,182 +0,0 @@
-#define LOG_MODULE "extiodrv-device"
-
-#include "device.h"
-
-#include "util/log.h"
-
-HRESULT extiodrv_device_open(const char *port, HANDLE *handle)
-{
-    HRESULT hr;
-    COMMTIMEOUTS ct;
-    DCB dcb;
-
-    log_assert(port);
-    log_assert(handle);
-
-    log_info("Opening extio on %s", port);
-
-    *handle = CreateFile(
-        port,
-        GENERIC_READ | GENERIC_WRITE,
-        0,
-        NULL,
-        OPEN_EXISTING,
-        FILE_FLAG_WRITE_THROUGH | FILE_ATTRIBUTE_NORMAL,
-        NULL);
-
-    if (*handle == INVALID_HANDLE_VALUE) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        log_warning("Failed to open %s: %lX", port, hr);
-
-        goto early_fail;
-    }
-
-    if (!SetCommMask(*handle, EV_RXCHAR)) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        log_warning("SetCommMask failed: %lX", hr);
-
-        goto fail;
-    }
-
-    if (!SetupComm(*handle, 0x4000u, 0x4000u)) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        log_warning("SetupComm failed: %lX", hr);
-
-        goto fail;
-    }
-
-    if (!PurgeComm(
-            *handle,
-            PURGE_TXABORT | PURGE_RXABORT | PURGE_TXCLEAR | PURGE_RXCLEAR)) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        log_warning("PurgeComm failed: %lX", hr);
-
-        goto fail;
-    }
-
-    ct.ReadTotalTimeoutConstant = 0;
-    ct.WriteTotalTimeoutConstant = 0;
-    ct.ReadIntervalTimeout = -1;
-    ct.ReadTotalTimeoutMultiplier = 10;
-    ct.WriteTotalTimeoutMultiplier = 100;
-
-    if (!SetCommTimeouts(*handle, &ct)) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        log_warning("SetCommTimeouts failed: %lX", hr);
-
-        goto fail;
-    }
-
-    dcb.DCBlength = sizeof(dcb);
-
-    if (!GetCommState(*handle, &dcb)) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        log_warning("GetCommState failed: %lX", hr);
-
-        goto fail;
-    }
-
-    dcb.BaudRate = 38400;
-    dcb.fBinary = TRUE;
-    dcb.fParity = FALSE;
-    dcb.fDtrControl = DTR_CONTROL_ENABLE;
-    dcb.fDsrSensitivity = FALSE;
-    dcb.fOutX = FALSE;
-    dcb.fInX = FALSE;
-    dcb.fErrorChar = FALSE;
-    dcb.fNull = FALSE;
-    dcb.fRtsControl = RTS_CONTROL_ENABLE;
-    dcb.fAbortOnError = FALSE;
-    dcb.ByteSize = 8;
-    dcb.Parity = NOPARITY;
-    dcb.StopBits = ONESTOPBIT;
-    dcb.XonChar = 17;
-    dcb.XoffChar = 19;
-    dcb.XonLim = 100;
-    dcb.XoffLim = 100;
-
-    if (!SetCommState(*handle, &dcb)) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        log_warning("SetCommState failed: %lX", hr);
-
-        goto fail;
-    }
-
-    log_info("[%p] Opened extio device on %s", *handle, port);
-
-    return S_OK;
-
-fail:
-    CloseHandle(*handle);
-    *handle = INVALID_HANDLE_VALUE;
-
-early_fail:
-    return hr;
-}
-
-HRESULT extiodrv_device_close(HANDLE *handle)
-{
-    HRESULT hr;
-
-    log_assert(handle);
-
-    if (CloseHandle(*handle) == FALSE) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        return hr;
-    }
-
-    *handle = INVALID_HANDLE_VALUE;
-
-    return S_OK;
-}
-
-HRESULT extiodrv_device_read(
-    HANDLE handle, void *bytes, size_t nbytes, size_t *read_bytes)
-{
-    HRESULT hr;
-    DWORD dw_read_bytes;
-
-    log_assert(handle != INVALID_HANDLE_VALUE);
-    log_assert(bytes);
-    log_assert(read_bytes);
-
-    if (!ClearCommError(handle, NULL, NULL)) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        log_warning("[%p] ClearCommError failed: %lX", handle, hr);
-
-        return hr;
-    }
-
-    if (!ReadFile(handle, bytes, nbytes, &dw_read_bytes, NULL)) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        log_warning("[%p] ReadFile failed: %lX", handle, hr);
-
-        return hr;
-    }
-
-    *read_bytes = dw_read_bytes;
-
-    return S_OK;
-}
-
-HRESULT extiodrv_device_write(
-    HANDLE handle, const void *bytes, size_t nbytes, size_t *written_bytes)
-{
-    HRESULT hr;
-    DWORD dw_written_bytes;
-
-    log_assert(handle != INVALID_HANDLE_VALUE);
-    log_assert(bytes);
-    log_assert(written_bytes);
-
-    if (!WriteFile(handle, bytes, nbytes, &dw_written_bytes, NULL)) {
-        hr = HRESULT_FROM_WIN32(GetLastError());
-        log_warning("[%p] WriteFile failed: %lX", handle, hr);
-
-        return hr;
-    }
-
-    *written_bytes = dw_written_bytes;
-
-    return S_OK;
-}

src/main/extiodrv/device.h

@@ -1,57 +0,0 @@
-#ifndef EXTIODRV_DEVICE_H
-#define EXTIODRV_DEVICE_H
-
-#include <windows.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/**
- * Open an EXTIO device connected to a com port.
- *
- * @param port Com port the device is connected to, e.g. "COM1"
- * @param handle Pointer to a HANDLE variable to return the handle to when
- *               succesfully opened
- * @return S_OK on success with the handle returned in handle, other HRESULT
- *         value on error.
- */
-HRESULT extiodrv_device_open(const char *port, HANDLE *handle);
-
-/**
- * Close an opened EXTIO device
- *
- * @param handle Pointer to a handle variable that stores a valid and opened
- *        EXTIO handle.
- * @return S_OK on success and the handle value is set to INVALID_HANDLE_VALUE,
- *         other HRESULT value on error.
- */
-HRESULT extiodrv_device_close(HANDLE *handle);
-
-/**
- * Read data from the EXTIO device. This call blocks until data is available.
- *
- * @param handle A valid handle to an opened EXTIO device.
- * @param bytes Pointer to a buffer to read the data into
- * @param nbytes (Maximum) number of bytes to read
- * @param read_bytes Pointer to a variable to store the resulting read size to
- * @return S_OK on success with read_bytes populated with the number of bytes
- *         read, other HRESULT value on error.
- */
-HRESULT extiodrv_device_read(
-    HANDLE handle, void *bytes, size_t nbytes, size_t *read_bytes);
-
-/**
- * WRite data to the EXTIO device. This call blocks until the data is written.
- *
- * @param handle A valid handle to an opened EXTIO device.
- * @param bytes Pointer to a buffer with data to write to the device
- * @param nbytes (Maximum) number of bytes to write
- * @param written_bytes Pointer to a variable to store the resulting write size
- *        to
- * @return S_OK on success with written_bytes populated with the number of bytes
- *         written, other HRESULT value on error.
- */
-HRESULT extiodrv_device_write(
-    HANDLE handle, const void *bytes, size_t nbytes, size_t *written_bytes);
-
-#endif

src/main/extiodrv/extio.c

@@ -1,110 +0,0 @@
-#define LOG_MODULE "extiodrv-extio"
-
-#include "extio.h"
-
-#include "util/log.h"
-
-// static uint8_t _extiodrv_extio_sensor_read_mode_map[5] = {
-//     1, // all
-//     2, // up
-//     3, // down
-//     4, // left
-//     5, // right
-// };
-
-HRESULT extiodrv_extio_transfer(
-    HANDLE handle,
-    enum extiodrv_extio_sensor_read_mode sensor_read_mode,
-    const struct extiodrv_extio_pad_lights
-        pad_lights[EXTIO_PAD_LIGHT_MAX_PLAYERS],
-    bool neons)
-{
-    HRESULT hr;
-    struct extio_cmd_write write;
-    struct extio_cmd_read read;
-    size_t bytes_written;
-    size_t bytes_read;
-    const uint8_t *raw;
-
-    log_assert(handle != INVALID_HANDLE_VALUE);
-
-    memset(&write, 0, sizeof(write));
-
-    // TODO this doesn't seem to work, yet
-    // write.sensor_read_mode =
-    // 0;//_extiodrv_extio_sensor_read_mode_map[sensor_read_mode]; 0 = all 1 =
-    // mess? 2 = mess? 3 = mess? 4 = mess? 5 = mess? 6 = right sensor only 7 =
-    // right sensor only 8 = right sensor only
-    write.sensor_read_mode = 0;
-
-    for (uint8_t i = 0; i < EXTIO_PAD_LIGHT_MAX_PLAYERS; i++) {
-        write.pad_lights[i].up = pad_lights[i].up ? 1 : 0;
-        write.pad_lights[i].down = pad_lights[i].down ? 1 : 0;
-        write.pad_lights[i].left = pad_lights[i].left ? 1 : 0;
-        write.pad_lights[i].right = pad_lights[i].right ? 1 : 0;
-    }
-
-    write.neons = neons ? 1 : 0;
-
-    // This MUST be set but only on the p1 packet
-    // Not setting it or also setting it on the p2 packet results in the EXTIO
-    // not responding at all
-    write.pad_lights[0].unknown_80 = 1;
-
-    write.checksum = extio_cmd_checksum(&write);
-
-    raw = (uint8_t *) &write;
-
-    log_misc("Raw write paket: %X %X %X %X", raw[0], raw[1], raw[2], raw[3]);
-
-    hr = extiodrv_device_write(handle, &write, sizeof(write), &bytes_written);
-
-    if (FAILED(hr)) {
-        log_warning("Writing extio device failed");
-        return hr;
-    }
-
-    if (bytes_written != sizeof(write)) {
-        log_warning(
-            "Writing extio device failed, expected bytes %d != actual bytes %d",
-            (uint32_t) sizeof(write),
-            (uint32_t) bytes_written);
-        return HRESULT_FROM_WIN32(ERROR_BAD_LENGTH);
-    }
-
-    // Read loop to keep reading until a full message is read
-    // There are various occasions, especially if polling from the host side is
-    // faster than the device can put the response to the wire. this can result
-    // in empty reads
-    while (true) {
-        hr = extiodrv_device_read(handle, &read, sizeof(read), &bytes_read);
-
-        if (FAILED(hr)) {
-            log_warning("Reading extio device failed");
-            return hr;
-        }
-
-        if (bytes_read < sizeof(read)) {
-            log_misc("Empty read, retry read");
-            continue;
-        }
-
-        if (bytes_read != sizeof(read)) {
-            log_warning(
-                "Reading extio device failed, expected bytes %d != actual "
-                "bytes %d",
-                (uint32_t) sizeof(read),
-                (uint32_t) bytes_read);
-            return HRESULT_FROM_WIN32(ERROR_BAD_LENGTH);
-        }
-
-        break;
-    }
-
-    if (read.status != EXTIO_STATUS_OK) {
-        log_warning("Status not ok: 0x%X", read.status);
-        return HRESULT_FROM_WIN32(ERROR_GEN_FAILURE);
-    }
-
-    return S_OK;
-}

src/main/extiodrv/extio.h

@@ -1,45 +0,0 @@
-#ifndef EXTIODRV_EXTIO_H
-#define EXTIODRV_EXTIO_H
-
-#include <windows.h>
-
-#include <stdbool.h>
-
-#include "extio/cmd.h"
-
-#include "device.h"
-
-enum extiodrv_extio_sensor_read_mode {
-    EXTIODRV_EXTIO_SENSOR_READ_MODE_ALL = 0,
-    EXTIODRV_EXTIO_SENSOR_READ_MODE_UP = 1,
-    EXTIODRV_EXTIO_SENSOR_READ_MODE_DOWN = 2,
-    EXTIODRV_EXTIO_SENSOR_READ_MODE_LEFT = 3,
-    EXTIODRV_EXTIO_SENSOR_READ_MODE_RIGHT = 4
-};
-
-struct extiodrv_extio_pad_lights {
-    bool up;
-    bool down;
-    bool left;
-    bool right;
-};
-
-/**
- * Execute a data transfer (write + read) to the EXTIO device
- *
- * @param handle A valid and opened handle to an EXTIO device
- * @param sensor_read_mode The sensor read mode to set on the EXTIO device.
- *        This only needs to be set once that input reads return the configured
- *        sensor read setting.
- * @param pad_lights Pad light ouptut state to set
- * @param neons Neon output state to set
- * @return S_OK on success, other HRESULT value on error
- */
-HRESULT extiodrv_extio_transfer(
-    HANDLE handle,
-    enum extiodrv_extio_sensor_read_mode sensor_read_mode,
-    const struct extiodrv_extio_pad_lights
-        pad_lights[EXTIO_PAD_LIGHT_MAX_PLAYERS],
-    bool neons);
-
-#endif

src/main/extiotest/Module.mk

@@ -1,9 +0,0 @@
-exes            += extiotest \
-
-libs_extiotest     := \
-    extiodrv \
-    extio \
-    util \
-
-src_extiotest      := \
-    main.c \

src/main/extiotest/main.c

@@ -1,55 +0,0 @@
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <windows.h>
-
-#include "extiodrv/extio.h"
-
-#include "util/log.h"
-
-int main(int argc, char **argv)
-{
-    HRESULT hr;
-    const char *port;
-    HANDLE handle;
-    struct extiodrv_extio_pad_lights pad_lights[EXTIO_PAD_LIGHT_MAX_PLAYERS];
-
-    if (argc < 2) {
-        fprintf(stderr, "Basic functional test of EXTIO\n");
-        fprintf(stderr, "Usage: %s COM_PORT\n", argv[0]);
-        fprintf(stderr, "  COM_PORT: For example COM1\n");
-    }
-
-    log_to_writer(log_writer_stderr, NULL);
-    log_set_level(LOG_LEVEL_MISC);
-
-    port = argv[1];
-
-    hr = extiodrv_device_open(port, &handle);
-
-    if (FAILED(hr)) {
-        fprintf(stderr, "Opening extio at port '%s' failed: %lX\n", port, hr);
-        return -1;
-    }
-
-    memset(&pad_lights, 0, sizeof(pad_lights));
-
-    hr = extiodrv_extio_transfer(
-        handle, EXTIODRV_EXTIO_SENSOR_READ_MODE_ALL, pad_lights, false);
-
-    if (FAILED(hr)) {
-        fprintf(stderr, "Extio transfer failed: %lX\n", hr);
-        return -1;
-    }
-
-    hr = extiodrv_device_close(&handle);
-
-    if (FAILED(hr)) {
-        fprintf(stderr, "Closing extio failed: %lX", hr);
-        return -1;
-    }
-
-    return 0;
-}

src/main/hook/d3d9.c

@@ -80,9 +80,6 @@ static HRESULT(STDCALL *real_SetViewport)(
 static HRESULT(STDCALL *real_SetVertexShader)(
     IDirect3DDevice9 *self, IDirect3DVertexShader9 *pShader);
 
-static HRESULT(STDCALL *real_SetScissorRect)(
-    IDirect3DDevice9 *self, const RECT *pRect);
-
 /* ------------------------------------------------------------------------------------------------------------------
  */
 
@@ -157,9 +154,6 @@ my_SetViewport(IDirect3DDevice9 *self, const D3DVIEWPORT9 *pViewport);
 static HRESULT STDCALL
 my_SetVertexShader(IDirect3DDevice9 *self, IDirect3DVertexShader9 *pShader);
 
-static HRESULT STDCALL
-my_SetScissorRect(IDirect3DDevice9 *self, const RECT *pRect);
-
 /* ------------------------------------------------------------------------------------------------------------------
  */
 
@@ -226,9 +220,6 @@ hook_d3d9_irp_handler_real_dev_set_viewport(struct hook_d3d9_irp *irp);
 static HRESULT
 hook_d3d9_irp_handler_real_dev_set_vertex_shader(struct hook_d3d9_irp *irp);
 
-static HRESULT
-hook_d3d9_irp_handler_real_dev_set_scissor_rect(struct hook_d3d9_irp *irp);
-
 /* ------------------------------------------------------------------------------------------------------------------
  */
 
@@ -258,8 +249,6 @@ static const hook_d3d9_irp_handler_t hook_d3d9_irp_real_handlers[] = {
         hook_d3d9_irp_handler_real_dev_set_viewport,
     [HOOK_D3D9_IRP_OP_DEV_SET_VERTEX_SHADER] =
         hook_d3d9_irp_handler_real_dev_set_vertex_shader,
-    [HOOK_D3D9_IRP_OP_DEV_SET_SCISSOR_RECT] =
-        hook_d3d9_irp_handler_real_dev_set_scissor_rect,
 };
 
 static const hook_d3d9_irp_handler_t *hook_d3d9_handlers;
@@ -581,23 +570,6 @@ my_Reset(IDirect3DDevice9 *self, D3DPRESENT_PARAMETERS *pp)
     return hr;
 }
 
-static HRESULT STDCALL
-my_SetScissorRect(IDirect3DDevice9 *self, const RECT *pRect)
-{
-    struct hook_d3d9_irp irp;
-    HRESULT hr;
-
-    memset(&irp, 0, sizeof(irp));
-
-    irp.op = HOOK_D3D9_IRP_OP_DEV_SET_SCISSOR_RECT;
-    irp.args.dev_set_scissor_rect.self = self;
-    irp.args.dev_set_scissor_rect.pRect = pRect;
-
-    hr = hook_d3d9_irp_invoke_next(&irp);
-
-    return hr;
-}
-
 /* ------------------------------------------------------------------------------------------------------------------
  */
 
@@ -776,9 +748,6 @@ hook_d3d9_irp_handler_real_dev_create_device(struct hook_d3d9_irp *irp)
     real_SetVertexShader = api_vtbl->SetVertexShader;
     api_vtbl->SetVertexShader = my_SetVertexShader;
 
-    real_SetScissorRect = api_vtbl->SetScissorRect;
-    api_vtbl->SetScissorRect = my_SetScissorRect;
-
     *irp->args.ctx_create_device.pdev = (IDirect3DDevice9 *) api_proxy;
 
     return hr;
@@ -879,16 +848,6 @@ hook_d3d9_irp_handler_real_dev_set_vertex_shader(struct hook_d3d9_irp *irp)
         irp->args.dev_set_vertex_shader.pShader);
 }
 
-static HRESULT
-hook_d3d9_irp_handler_real_dev_set_scissor_rect(struct hook_d3d9_irp *irp)
-{
-    log_assert(irp);
-
-    return real_SetScissorRect(
-        irp->args.dev_set_scissor_rect.self,
-        irp->args.dev_set_scissor_rect.pRect);
-}
-
 /* ------------------------------------------------------------------------------------------------------------------
  */
 

src/main/hook/d3d9.h

@@ -36,7 +36,6 @@ enum hook_d3d9_irp_op {
     HOOK_D3D9_IRP_OP_DEV_RESET = 12,
     HOOK_D3D9_IRP_OP_DEV_SET_VIEWPORT = 13,
     HOOK_D3D9_IRP_OP_DEV_SET_VERTEX_SHADER = 14,
-    HOOK_D3D9_IRP_OP_DEV_SET_SCISSOR_RECT = 15,
 };
 
 /**
@@ -189,14 +188,6 @@ struct hook_d3d9_irp {
             IDirect3DDevice9 *self;
             IDirect3DVertexShader9 *pShader;
         } dev_set_vertex_shader;
-
-        /**
-         * Params of IDIrect3DDevice9_SetScissorRect
-         */
-        struct {
-            IDirect3DDevice9 *self;
-            const RECT *pRect;
-        } dev_set_scissor_rect;
     } args;
 
     size_t next_handler;

src/main/iidxhook-d3d9/Module.mk

@@ -1,8 +0,0 @@
-libs            += iidxhook-d3d9
-
-libs_iidxhook-d3d9     := \
-    util \
-    d3d9-util \
-
-src_iidxhook-d3d9     := \
-    bb-scale-hd.c \

src/main/iidxhook-d3d9/bb-scale-hd.c

@@ -1,163 +0,0 @@
-#define LOG_MODULE "iidxhook-d3d9-bb-scale-hd"
-
-#include <windows.h>
-
-#include "d3d9-util/vertex.h"
-
-#include "bb-scale-hd.h"
-#include "util.h"
-
-#include "util/log.h"
-
-static bool iidxhook_d3d9_bb_scale_initialized;
-static uint16_t iidxhook_d3d9_bb_scale_hd_width;
-static uint16_t iidxhook_d3d9_bb_scale_hd_height;
-
-void iidxhook_d3d9_bb_scale_hd_init(uint16_t width, uint16_t height)
-{
-    iidxhook_d3d9_bb_scale_hd_width = width;
-    iidxhook_d3d9_bb_scale_hd_height = height;
-
-    iidxhook_d3d9_bb_scale_initialized = true;
-
-    log_info("Initialized, width %d, height %d", width, height);
-}
-
-static bool iidxhook_d3d9_bb_scale_hd_in_range_of_2d_coords(
-    struct d3d9_util_vertex *vertex, float x, float y, float error_margin)
-{
-    return vertex->x >= x - error_margin && vertex->x <= x + error_margin &&
-        vertex->y >= y - error_margin && vertex->y <= y + error_margin;
-}
-
-static bool iidxhook_d3d9_bb_scale_hd_match_2d_plane(
-    struct d3d9_util_vertex *vertices,
-    float origin_x,
-    float origin_y,
-    float size_x,
-    float size_y,
-    float error_margin)
-{
-    return
-        // top left
-        iidxhook_d3d9_bb_scale_hd_in_range_of_2d_coords(
-            &vertices[0], origin_x, origin_y, error_margin) &&
-        // top right
-        iidxhook_d3d9_bb_scale_hd_in_range_of_2d_coords(
-            &vertices[1], origin_x + size_x, origin_y, error_margin) &&
-        // bottom right
-        iidxhook_d3d9_bb_scale_hd_in_range_of_2d_coords(
-            &vertices[2], origin_x + size_x, origin_y + size_y, error_margin) &&
-        // bottom left
-        iidxhook_d3d9_bb_scale_hd_in_range_of_2d_coords(
-            &vertices[3], origin_x, origin_y + size_y, error_margin);
-}
-
-static void iidxhook_d3d9_bb_scale_hd_set_plane(
-    struct d3d9_util_vertex *vertices,
-    float origin_x,
-    float origin_y,
-    float size_x,
-    float size_y)
-{
-    // top left
-    vertices[0].x = origin_x;
-    vertices[0].y = origin_y;
-    // top right
-    vertices[1].x = origin_x + size_x;
-    vertices[1].y = origin_y;
-    // bottom right
-    vertices[2].x = origin_x + size_x;
-    vertices[2].y = origin_y + size_y;
-    // bottom left
-    vertices[3].x = origin_x;
-    vertices[3].y = origin_y + size_y;
-}
-
-HRESULT iidxhook_d3d9_bb_scale_hd_d3d9_irp_handler(struct hook_d3d9_irp *irp)
-{
-    log_assert(irp);
-
-    if (!iidxhook_d3d9_bb_scale_initialized) {
-        return hook_d3d9_irp_invoke_next(irp);
-    }
-
-    if (irp->op == HOOK_D3D9_IRP_OP_CTX_CREATE_DEVICE) {
-        // Scale the backbuffer accordingly
-        // The game renders to an intermediate texture by default to provide the
-        // SD vs. HD feature already
-        irp->args.ctx_create_device.pp->BackBufferWidth =
-            iidxhook_d3d9_bb_scale_hd_width;
-        irp->args.ctx_create_device.pp->BackBufferHeight =
-            iidxhook_d3d9_bb_scale_hd_height;
-
-        return hook_d3d9_irp_invoke_next(irp);
-    } else if (irp->op == HOOK_D3D9_IRP_OP_DEV_DRAW_PRIMITIVE_UP) {
-        if (irp->args.dev_draw_primitive_up.primitive_type ==
-                D3DPT_TRIANGLEFAN &&
-            irp->args.dev_draw_primitive_up.primitive_count == 2 &&
-            irp->args.dev_draw_primitive_up.stride == 28) {
-
-            struct d3d9_util_vertex *vertices =
-                (struct d3d9_util_vertex *)
-                    irp->args.dev_draw_primitive_up.data;
-
-            // The engine draws everything to a separate texture as the primary
-            // render target Depending on the game mode selected, SD vs. HD/HD*,
-            // the texture's size is either 640x480 or 1280x720 After drawing
-            // the scene is finished (after EndScene), the game blends the
-            // texture with the game's rendered output to the actual frame
-            // buffer
-            if (iidxhook_d3d9_bb_scale_hd_match_2d_plane(
-                    vertices, 0, 0, 640, 480, 1.0) ||
-                iidxhook_d3d9_bb_scale_hd_match_2d_plane(
-                    vertices, 0, 0, 1280, 720, 1.0)) {
-                // Note: Original plane is not at origin 0.0/0.0?
-                // Example for SD plane:
-                // -0.500000/-0.500000 639.500000/-0.500000
-                // 639.500000/479.500000 -0.500000/479.500000 Patch to set it to
-                // 0.0/0.0
-
-                // Scale the 2D output plane primitive to the right resolution
-                // (upscale or downscale) The render parameter for the blending
-                // operation will automatically scale the selected source
-                // texture, the intermediate render buffer with the game's final
-                // frame, to the actual frame buffer once the DrawPrimitiveUP
-                // call completed
-                iidxhook_d3d9_bb_scale_hd_set_plane(
-                    vertices,
-                    0.0,
-                    0.0,
-                    iidxhook_d3d9_bb_scale_hd_width,
-                    iidxhook_d3d9_bb_scale_hd_height);
-            }
-        }
-
-        return hook_d3d9_irp_invoke_next(irp);
-    } else if (irp->op == HOOK_D3D9_IRP_OP_DEV_RESET) {
-        // Gets called when changing the "definition type" in the operator
-        // menu. needs to be patched to keep the right back buffer size
-        irp->args.dev_reset.pp->BackBufferWidth =
-            iidxhook_d3d9_bb_scale_hd_width;
-        irp->args.dev_reset.pp->BackBufferHeight =
-            iidxhook_d3d9_bb_scale_hd_height;
-
-        return hook_d3d9_irp_invoke_next(irp);
-    } else if (irp->op == HOOK_D3D9_IRP_OP_DEV_SET_SCISSOR_RECT) {
-        // Blending to the frame buffer applies scissors which needs to be
-        // patched to match the final frame buffer's size
-        RECT *rect = (RECT *) irp->args.dev_set_scissor_rect.pRect;
-
-        // Only adjust scissoring when applied to full frame
-        // Otherwise, this also scissors various UI elements
-        if (rect->left == 0 && rect->left == 0 && rect->right == 1280 &&
-            rect->bottom == 720) {
-            rect->right = iidxhook_d3d9_bb_scale_hd_width;
-            rect->bottom = iidxhook_d3d9_bb_scale_hd_height;
-        }
-
-        return hook_d3d9_irp_invoke_next(irp);
-    } else {
-        return hook_d3d9_irp_invoke_next(irp);
-    }
-}

src/main/iidxhook-d3d9/bb-scale-hd.h

@@ -1,13 +0,0 @@
-#ifndef IIDXHOOK_D3D9_HD_H
-#define IIDXHOOK_D3D9_HD_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "hook/d3d9.h"
-
-void iidxhook_d3d9_bb_scale_hd_init(uint16_t width, uint16_t height);
-
-HRESULT iidxhook_d3d9_bb_scale_hd_d3d9_irp_handler(struct hook_d3d9_irp *irp);
-
-#endif

src/main/iidxhook-d3d9/util.h

@@ -1,22 +0,0 @@
-#ifndef IIDXHOOK_D3D9_UTIL_H
-#define IIDXHOOK_D3D9_UTIL_H
-
-#include <windows.h>
-
-#include "d3d9-util/dxerr9.h"
-
-#include "util/log.h"
-
-inline void
-iidxhook_d3d9_util_check_and_handle_failure(HRESULT hr, const char *msg)
-{
-    if (FAILED(hr)) {
-        log_fatal(
-            "%s\nDX error: %s, DX error description: %s",
-            msg,
-            DXGetErrorString9(hr),
-            DXGetErrorDescription9(hr));
-    }
-}
-
-#endif

src/main/iidxhook-util/config-gfx.c

@@ -45,9 +45,8 @@ void iidxhook_config_gfx_init(struct cconfig *config)
         config,
         IIDXHOOK_CONFIG_GFX_BGVIDEO_UV_FIX_KEY,
         IIDXHOOK_CONFIG_GFX_DEFAULT_BGVIDEO_UV_FIX_VALUE,
-        "Fix stretched BG videos on newer GPUs. Might appear on SIRIUS "
+        "Fix stretched BG videos on newer GPUs. Might appear on Red and "
-        "and older.  On 9th and 10th style this issue may only affect "
+        "newer");
-        "older BGAs (from 1st-3rd style)");
 
     cconfig_util_set_bool(
         config,

src/main/iidxhook-util/d3d9.c

@@ -580,14 +580,14 @@ iidxhook_util_d3d9_iidx13_fix_song_select_bg(struct hook_d3d9_irp *irp)
 }
 
 static void
-iidxhook_util_d3d9_iidx09_to_17_fix_uvs_bg_videos(struct hook_d3d9_irp *irp)
+iidxhook_util_d3d9_iidx11_to_17_fix_uvs_bg_videos(struct hook_d3d9_irp *irp)
 {
     log_assert(irp);
     log_assert(irp->op == HOOK_D3D9_IRP_OP_DEV_DRAW_PRIMITIVE_UP);
 
     /* same code taken from the d3d8 module. but, this just fixes the quad
        seam issue as there are no reports of streched bg videos */
-    if (iidxhook_util_d3d9_config.iidx09_to_17_fix_uvs_bg_videos &&
+    if (iidxhook_util_d3d9_config.iidx11_to_17_fix_uvs_bg_videos &&
         irp->args.dev_draw_primitive_up.primitive_type == D3DPT_TRIANGLEFAN &&
         irp->args.dev_draw_primitive_up.primitive_count == 2 &&
         irp->args.dev_draw_primitive_up.stride == 28) {
@@ -632,100 +632,52 @@ iidxhook_util_d3d9_iidx09_to_17_fix_uvs_bg_videos(struct hook_d3d9_irp *irp)
             /* different versions have different themes and position the bg
                video on slightly different positions (good job...) */
             if (/* single */
-                (vertices[0].x >= 164.0f && vertices[0].x <= 168.0f &&
+                ((vertices[0].x >= 164.0f && vertices[0].x <= 168.0f &&
-                 iidxhook_util_d3d9_float_equal(vertices[0].y, 0.0f, 0.1f) &&
+                  iidxhook_util_d3d9_float_equal(vertices[0].y, 0.0f, 0.1f)) &&
-                 vertices[1].x >= 472.0f && vertices[1].x <= 476.1f &&
+                 (vertices[1].x >= 472.0f && vertices[1].x <= 476.0f &&
-                 iidxhook_util_d3d9_float_equal(vertices[1].y, 0.0f, 0.1f) &&
+                  iidxhook_util_d3d9_float_equal(vertices[1].y, 0.0f, 0.1f)) &&
-                 vertices[2].x >= 472.0f && vertices[2].x <= 476.1f &&
+                 (vertices[2].x >= 472.0f && vertices[2].x <= 476.0f &&
-                 ((iidxhook_util_d3d9_float_equal(
-                      vertices[2].y, 415.0f, 0.1f)) ||
                   iidxhook_util_d3d9_float_equal(
                       vertices[2].y, 416.0f, 0.1f)) &&
-                 vertices[3].x >= 164.0f && vertices[3].x <= 168.0f &&
+                 (vertices[3].x >= 164.0f && vertices[3].x <= 168.0f &&
-                 ((iidxhook_util_d3d9_float_equal(
+                  iidxhook_util_d3d9_float_equal(
-                      vertices[3].y, 415.0f, 0.1f)) ||
+                      vertices[3].y, 416.0f, 0.1f))) ||
-                  (iidxhook_util_d3d9_float_equal(
-                      vertices[3].y, 416.0f, 0.1f)))) ||
                 /* double top left */
-                ((iidxhook_util_d3d9_float_equal(vertices[0].x, 6.0f, 0.1f) ||
+                ((iidxhook_util_d3d9_float_equal(vertices[0].x, 6.0f, 0.1f) &&
-                  iidxhook_util_d3d9_float_equal(vertices[0].x, 11.0f, 0.1f)) &&
+                  vertices[0].y >= 24.0f && vertices[0].y <= 28.0f) &&
-                 vertices[0].y >= 23.9f && vertices[0].y <= 28.0f &&
+                 (iidxhook_util_d3d9_float_equal(vertices[1].x, 147.0f, 0.1f) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[1].x, 137.0f, 0.1f) ||
+                  vertices[1].y >= 24.0f && vertices[1].y <= 28.0f) &&
-                  iidxhook_util_d3d9_float_equal(
+                 (iidxhook_util_d3d9_float_equal(vertices[2].x, 147.0f, 0.1f) &&
-                      vertices[1].x, 147.0f, 0.1f)) &&
+                  vertices[2].y >= 212.0f && vertices[2].y <= 216.0f) &&
-                 vertices[1].y >= 23.9f && vertices[1].y <= 28.0f &&
+                 (iidxhook_util_d3d9_float_equal(vertices[3].x, 6.0f, 0.1f) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[2].x, 137.0f, 0.1f) ||
+                  vertices[3].y >= 212.0f && vertices[3].y <= 216.0f)) ||
-                  iidxhook_util_d3d9_float_equal(
-                      vertices[2].x, 147.0f, 0.1f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[2].y, 192.0f, 0.1f) ||
-                  (vertices[2].y >= 212.0f && vertices[2].y <= 216.0f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[3].x, 6.0f, 0.1f) ||
-                  iidxhook_util_d3d9_float_equal(vertices[3].x, 11.0f, 0.1f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[3].y, 192.0f, 0.1f) ||
-                  (vertices[3].y >= 212.0f && vertices[3].y <= 216.0f))) ||
                 /* double bottom left */
-                ((iidxhook_util_d3d9_float_equal(vertices[0].x, 6.0f, 0.1f) ||
+                ((iidxhook_util_d3d9_float_equal(vertices[0].x, 6.0f, 0.1f) &&
-                  iidxhook_util_d3d9_float_equal(vertices[0].x, 11.0f, 0.1f)) &&
+                  vertices[0].y >= 216.0f && vertices[0].y <= 220.0f) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[0].y, 200.0f, 0.1f) ||
+                 (iidxhook_util_d3d9_float_equal(vertices[1].x, 147.0f, 0.1f) &&
-                  iidxhook_util_d3d9_float_equal(vertices[0].y, 206.0f, 0.1f) ||
+                  vertices[1].y >= 216.0f && vertices[1].y <= 220.0f) &&
-                  (vertices[0].y >= 216.0f && vertices[0].y <= 220.0f)) &&
+                 (iidxhook_util_d3d9_float_equal(vertices[2].x, 147.0f, 0.1) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[1].x, 137.0f, 0.1f) ||
+                  vertices[2].y >= 404.0f && vertices[2].y <= 408.0f) &&
-                  iidxhook_util_d3d9_float_equal(
+                 (iidxhook_util_d3d9_float_equal(vertices[3].x, 6.0f, 0.1f) &&
-                      vertices[1].x, 147.0f, 0.1f)) &&
+                  vertices[3].y >= 404.0f && vertices[3].y <= 408.0f)) ||
-                 (iidxhook_util_d3d9_float_equal(vertices[1].y, 200.0f, 0.1f) ||
-                  iidxhook_util_d3d9_float_equal(vertices[1].y, 206.0f, 0.1f) ||
-                  (vertices[1].y >= 216.0f && vertices[1].y <= 220.0f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[2].x, 137.0f, 0.1f) ||
-                  iidxhook_util_d3d9_float_equal(
-                      vertices[2].x, 147.0f, 0.1f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[2].y, 368.0f, 0.1f) ||
-                  iidxhook_util_d3d9_float_equal(vertices[2].y, 394.0f, 0.1f) ||
-                  (vertices[2].y >= 404.0f && vertices[2].y <= 408.0f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[3].x, 6.0f, 0.1f) ||
-                  iidxhook_util_d3d9_float_equal(vertices[3].x, 11.0f, 0.1f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[3].y, 368.0f, 0.1f) ||
-                  iidxhook_util_d3d9_float_equal(vertices[3].y, 394.0f, 0.1f) ||
-                  (vertices[3].y >= 404.0f && vertices[3].y <= 408.0f))) ||
                 /* double top right */
-                (((vertices[0].x >= 493.0f && vertices[0].x <= 494.0f) ||
+                ((vertices[0].x >= 493.0f && vertices[0].x <= 494.0f &&
-                  iidxhook_util_d3d9_float_equal(
+                  vertices[0].y >= 24.0f && vertices[0].y <= 28.0f) &&
-                      vertices[0].x, 500.0f, 0.1f)) &&
+                 (vertices[1].x >= 634.0f && vertices[1].x <= 635.0f &&
-                 vertices[0].y >= 23.9f && vertices[0].y <= 28.0f &&
+                  vertices[1].y >= 24.0f && vertices[1].y <= 28.0f) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[1].x, 626.0f, 0.1f) ||
+                 (vertices[2].x >= 634.0f && vertices[2].x <= 635.0f &&
-                  (vertices[1].x >= 634.0f && vertices[1].x <= 635.0f)) &&
+                  vertices[2].y >= 212.0f && vertices[2].y <= 216.0f) &&
-                 vertices[1].y >= 23.9f && vertices[1].y <= 28.0f &&
+                 (vertices[3].x >= 493.0f && vertices[3].x <= 494.0f &&
-                 (iidxhook_util_d3d9_float_equal(vertices[2].x, 626.0f, 0.1f) ||
+                  vertices[3].y >= 212.0f && vertices[3].y <= 216.0f)) ||
-                  (vertices[2].x >= 634.0f && vertices[2].x <= 635.0f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[2].y, 192.0f, 0.1f) ||
-                  (vertices[2].y >= 212.0f && vertices[2].y <= 216.0f)) &&
-                 ((vertices[3].x >= 493.0f && vertices[3].x <= 494.0f) ||
-                  iidxhook_util_d3d9_float_equal(
-                      vertices[3].x, 500.0f, 0.1f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[3].y, 192.0f, 0.1f) ||
-                  (vertices[3].y >= 212.0f && vertices[3].y <= 216.0f))) ||
                 /* double bottom right */
-                (((vertices[0].x >= 493.0f && vertices[0].x <= 494.0f) ||
+                ((vertices[0].x >= 493.0f && vertices[0].x <= 494.0f &&
-                  iidxhook_util_d3d9_float_equal(
+                  vertices[0].y >= 216.0f && vertices[0].y <= 220.0f) &&
-                      vertices[0].x, 500.0f, 0.1f)) &&
+                 (vertices[1].x >= 634.0f && vertices[1].x <= 635.0f &&
-                 (iidxhook_util_d3d9_float_equal(vertices[0].y, 200.0f, 0.1f) ||
+                  vertices[1].y >= 216.0f && vertices[1].y <= 220.0f) &&
-                  iidxhook_util_d3d9_float_equal(vertices[0].y, 206.0f, 0.1f) ||
+                 (vertices[2].x >= 634.0f && vertices[2].x <= 635.0f &&
-                  (vertices[0].y >= 216.0f && vertices[0].y <= 220.0f)) &&
+                  vertices[2].y >= 404.0f && vertices[2].y <= 408.0f) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[1].x, 626.0f, 0.1f) ||
+                 (vertices[3].x >= 493.0f && vertices[3].x <= 494.0f &&
-                  (vertices[1].x >= 634.0f && vertices[1].x <= 635.0f)) &&
+                  vertices[3].y >= 404.0f && vertices[3].y <= 408.0f))) {
-                 (iidxhook_util_d3d9_float_equal(vertices[1].y, 200.0f, 0.1f) ||
-                  iidxhook_util_d3d9_float_equal(vertices[1].y, 206.0f, 0.1f) ||
-                  (vertices[1].y >= 216.0f && vertices[1].y <= 220.0f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[2].x, 626.0f, 0.1f) ||
-                  (vertices[2].x >= 634.0f && vertices[2].x <= 635.0f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[2].y, 368.0f, 0.1f) ||
-                  iidxhook_util_d3d9_float_equal(vertices[2].y, 394.0f, 0.1f) ||
-                  (vertices[2].y >= 404.0f && vertices[2].y <= 408.0f)) &&
-                 ((vertices[3].x >= 493.0f && vertices[3].x <= 494.0f) ||
-                  iidxhook_util_d3d9_float_equal(
-                      vertices[3].x, 500.0f, 0.1f)) &&
-                 (iidxhook_util_d3d9_float_equal(vertices[3].y, 368.0f, 0.1f) ||
-                  iidxhook_util_d3d9_float_equal(vertices[3].y, 394.0f, 0.1f) ||
-                  (vertices[3].y >= 404.0f && vertices[3].y <= 408.0f)))) {
                 /* fix UVs
                    1.0f / 512 fixes the diagonal seam connecting the two
                    triangles which is visible on some GPUs (why? idk)
@@ -743,7 +695,7 @@ iidxhook_util_d3d9_iidx09_to_17_fix_uvs_bg_videos(struct hook_d3d9_irp *irp)
 }
 
 static void
-iidxhook_uti_d3d9_fix_iidx09_to_13_viewport_size(struct hook_d3d9_irp *irp)
+iidxhook_uti_d3d9_fix_iidx9_to_13_viewport_size(struct hook_d3d9_irp *irp)
 {
     log_assert(irp);
     log_assert(irp->op == HOOK_D3D9_IRP_OP_GET_CLIENT_RECT);
@@ -1015,7 +967,7 @@ iidxhook_util_d3d9_log_config(const struct iidxhook_util_d3d9_config *config)
         "pci_vid: %X\n"
         "pci_pid: %X\n"
         "iidx09_to_19_monitor_check_cb: %p\n"
-        "iidx09_to_17_fix_uvs_bg_videos: %d\n"
+        "iidx11_to_17_fix_uvs_bg_videos: %d\n"
         "iidx12_fix_song_select_bg: %d\n"
         "iidx13_fix_song_select_bg: %d\n"
         "iidx14_to_19_nvidia_fix: %d\n"
@@ -1033,7 +985,7 @@ iidxhook_util_d3d9_log_config(const struct iidxhook_util_d3d9_config *config)
         config->pci_vid,
         config->pci_pid,
         config->iidx09_to_19_monitor_check_cb,
-        config->iidx09_to_17_fix_uvs_bg_videos,
+        config->iidx11_to_17_fix_uvs_bg_videos,
         config->iidx12_fix_song_select_bg,
         config->iidx13_fix_song_select_bg,
         config->iidx14_to_19_nvidia_fix,
@@ -1098,7 +1050,7 @@ void iidxhook_util_d3d9_init_config(struct iidxhook_util_d3d9_config *config)
     config->pci_vid = 0;
     config->pci_pid = 0;
     config->iidx09_to_19_monitor_check_cb = NULL;
-    config->iidx09_to_17_fix_uvs_bg_videos = false;
+    config->iidx11_to_17_fix_uvs_bg_videos = false;
     config->iidx12_fix_song_select_bg = false;
     config->iidx13_fix_song_select_bg = false;
     config->iidx14_to_19_nvidia_fix = false;
@@ -1157,7 +1109,7 @@ iidxhook_util_d3d9_irp_handler(struct hook_d3d9_irp *irp)
             hr = hook_d3d9_irp_invoke_next(irp);
 
             if (hr == S_OK) {
-                iidxhook_uti_d3d9_fix_iidx09_to_13_viewport_size(irp);
+                iidxhook_uti_d3d9_fix_iidx9_to_13_viewport_size(irp);
             }
 
             return hr;
@@ -1209,7 +1161,7 @@ iidxhook_util_d3d9_irp_handler(struct hook_d3d9_irp *irp)
             return hook_d3d9_irp_invoke_next(irp);
 
         case HOOK_D3D9_IRP_OP_DEV_DRAW_PRIMITIVE_UP:
-            iidxhook_util_d3d9_iidx09_to_17_fix_uvs_bg_videos(irp);
+            iidxhook_util_d3d9_iidx11_to_17_fix_uvs_bg_videos(irp);
 
             return hook_d3d9_irp_invoke_next(irp);
 

src/main/iidxhook-util/d3d9.h

@@ -102,7 +102,7 @@ struct iidxhook_util_d3d9_config {
      * the background videos or seeing a quad seam (see implementation for
      * further details).
      */
-    bool iidx09_to_17_fix_uvs_bg_videos;
+    bool iidx11_to_17_fix_uvs_bg_videos;
 
     /**
      * Ported from d3d8 module to enable this when using d3d8to9.

src/main/iidxhook1/dllmain.c

@@ -87,7 +87,7 @@ static void iidxhook1_setup_d3d9_hooks(
     d3d9_config.framerate_limit = config_gfx->frame_rate_limit;
     d3d9_config.iidx12_fix_song_select_bg =
         config_iidxhook1->happy_sky_ms_bg_fix;
-    d3d9_config.iidx09_to_17_fix_uvs_bg_videos = config_gfx->bgvideo_uv_fix;
+    d3d9_config.iidx11_to_17_fix_uvs_bg_videos = config_gfx->bgvideo_uv_fix;
     d3d9_config.scale_back_buffer_width = config_gfx->scale_back_buffer_width;
     d3d9_config.scale_back_buffer_height = config_gfx->scale_back_buffer_height;
     d3d9_config.scale_back_buffer_filter = config_gfx->scale_back_buffer_filter;

src/main/iidxhook2/dllmain.c

@@ -84,7 +84,7 @@ static void iidxhook2_setup_d3d9_hooks(
     d3d9_config.framerate_limit = config_gfx->frame_rate_limit;
     d3d9_config.iidx13_fix_song_select_bg =
         config_iidxhook2->distorted_ms_bg_fix;
-    d3d9_config.iidx09_to_17_fix_uvs_bg_videos = config_gfx->bgvideo_uv_fix;
+    d3d9_config.iidx11_to_17_fix_uvs_bg_videos = config_gfx->bgvideo_uv_fix;
     d3d9_config.scale_back_buffer_width = config_gfx->scale_back_buffer_width;
     d3d9_config.scale_back_buffer_height = config_gfx->scale_back_buffer_height;
     d3d9_config.scale_back_buffer_filter = config_gfx->scale_back_buffer_filter;

src/main/iidxhook3/dllmain.c

@@ -80,7 +80,7 @@ iidxhook3_setup_d3d9_hooks(const struct iidxhook_config_gfx *config_gfx)
     d3d9_config.pci_pid = config_gfx->pci_id_pid;
 
     /* Required for GOLD (and newer?) to not crash with NVIDIA cards */
-    d3d9_config.iidx09_to_17_fix_uvs_bg_videos = true;
+    d3d9_config.iidx11_to_17_fix_uvs_bg_videos = true;
     d3d9_config.iidx14_to_19_nvidia_fix = true;
 
     d3d9_config.scale_back_buffer_width = config_gfx->scale_back_buffer_width;

src/main/iidxhook6/Module.mk

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

src/main/iidxhook6/dllmain.c

@@ -25,8 +25,6 @@
 #include "hooklib/rs232.h"
 #include "hooklib/setupapi.h"
 
-#include "iidxhook-d3d9/bb-scale-hd.h"
-
 #include "iidxhook-util/acio.h"
 #include "iidxhook-util/config-gfx.h"
 #include "iidxhook-util/config-io.h"
@@ -46,7 +44,6 @@
     "Usage: launcher.exe -K iidxhook6.dll <bm2dx.dll> [options...]"
 
 static const hook_d3d9_irp_handler_t iidxhook_d3d9_handlers[] = {
-    iidxhook_d3d9_bb_scale_hd_d3d9_irp_handler,
     iidxhook_util_d3d9_irp_handler,
 };
 
@@ -66,20 +63,14 @@ iidxhook6_setup_d3d9_hooks(const struct iidxhook_config_gfx *config_gfx)
     d3d9_config.framerate_limit = config_gfx->frame_rate_limit;
     d3d9_config.pci_vid = config_gfx->pci_id_vid;
     d3d9_config.pci_pid = config_gfx->pci_id_pid;
+    d3d9_config.scale_back_buffer_width = config_gfx->scale_back_buffer_width;
+    d3d9_config.scale_back_buffer_height = config_gfx->scale_back_buffer_height;
+    d3d9_config.scale_back_buffer_filter = config_gfx->scale_back_buffer_filter;
     d3d9_config.forced_refresh_rate = config_gfx->forced_refresh_rate;
     d3d9_config.device_adapter = config_gfx->device_adapter;
 
     iidxhook_util_d3d9_configure(&d3d9_config);
 
-    // The "old"/current scaling feature does not work with 20-26 because
-    // the render engine changed and provides its own built-in scaling feature
-    if (config_gfx->scale_back_buffer_width > 0 &&
-        config_gfx->scale_back_buffer_height > 0) {
-        iidxhook_d3d9_bb_scale_hd_init(
-            config_gfx->scale_back_buffer_width,
-            config_gfx->scale_back_buffer_height);
-    }
-
     hook_d3d9_init(iidxhook_d3d9_handlers, lengthof(iidxhook_d3d9_handlers));
 }
 

src/main/iidxhook7/Module.mk

@@ -2,13 +2,11 @@ avsdlls         += iidxhook7
 
 ldflags_iidxhook7   := \
     -liphlpapi \
-    -ld3d9 \
 
 deplibs_iidxhook7   := \
     avs \
 
 libs_iidxhook7      := \
-    iidxhook-d3d9 \
     iidxhook-util \
     cconfig \
     ezusb-emu \

src/main/iidxhook7/dllmain.c

@@ -25,8 +25,6 @@
 #include "hooklib/rs232.h"
 #include "hooklib/setupapi.h"
 
-#include "iidxhook-d3d9/bb-scale-hd.h"
-
 #include "iidxhook-util/acio.h"
 #include "iidxhook-util/config-gfx.h"
 #include "iidxhook-util/config-io.h"
@@ -46,7 +44,6 @@
     "Usage: launcher.exe -K iidxhook7.dll <bm2dx.dll> [options...]"
 
 static const hook_d3d9_irp_handler_t iidxhook_d3d9_handlers[] = {
-    iidxhook_d3d9_bb_scale_hd_d3d9_irp_handler,
     iidxhook_util_d3d9_irp_handler,
 };
 
@@ -66,20 +63,14 @@ iidxhook7_setup_d3d9_hooks(const struct iidxhook_config_gfx *config_gfx)
     d3d9_config.framerate_limit = config_gfx->frame_rate_limit;
     d3d9_config.pci_vid = config_gfx->pci_id_vid;
     d3d9_config.pci_pid = config_gfx->pci_id_pid;
+    d3d9_config.scale_back_buffer_width = config_gfx->scale_back_buffer_width;
+    d3d9_config.scale_back_buffer_height = config_gfx->scale_back_buffer_height;
+    d3d9_config.scale_back_buffer_filter = config_gfx->scale_back_buffer_filter;
     d3d9_config.forced_refresh_rate = config_gfx->forced_refresh_rate;
     d3d9_config.device_adapter = config_gfx->device_adapter;
 
     iidxhook_util_d3d9_configure(&d3d9_config);
 
-    // The "old"/current scaling feature does not work with 20-26 because
-    // the render engine changed and provides its own built-in scaling feature
-    if (config_gfx->scale_back_buffer_width > 0 &&
-        config_gfx->scale_back_buffer_height > 0) {
-        iidxhook_d3d9_bb_scale_hd_init(
-            config_gfx->scale_back_buffer_width,
-            config_gfx->scale_back_buffer_height);
-    }
-
     hook_d3d9_init(iidxhook_d3d9_handlers, lengthof(iidxhook_d3d9_handlers));
 }
 

src/main/iidxhook8/Module.mk

@@ -12,7 +12,6 @@ deplibs_iidxhook8   := \
     avs \
 
 libs_iidxhook8      := \
-    iidxhook-d3d9 \
     iidxhook-util \
     acioemu \
     bio2emu \

src/main/iidxhook8/dllmain.c

@@ -18,8 +18,6 @@
 #include "hooklib/rs232.h"
 #include "hooklib/setupapi.h"
 
-#include "iidxhook-d3d9/bb-scale-hd.h"
-
 #include "iidxhook-util/acio.h"
 #include "iidxhook-util/config-gfx.h"
 #include "iidxhook-util/d3d9.h"
@@ -45,7 +43,6 @@
     "Usage: launcher.exe -K iidxhook8.dll <bm2dx.dll> [options...]"
 
 static const hook_d3d9_irp_handler_t iidxhook_d3d9_handlers[] = {
-    iidxhook_d3d9_bb_scale_hd_d3d9_irp_handler,
     iidxhook_util_d3d9_irp_handler,
 };
 
@@ -63,20 +60,14 @@ iidxhook8_setup_d3d9_hooks(const struct iidxhook_config_gfx *config_gfx)
     d3d9_config.framerate_limit = config_gfx->frame_rate_limit;
     d3d9_config.pci_vid = config_gfx->pci_id_vid;
     d3d9_config.pci_pid = config_gfx->pci_id_pid;
+    d3d9_config.scale_back_buffer_width = config_gfx->scale_back_buffer_width;
+    d3d9_config.scale_back_buffer_height = config_gfx->scale_back_buffer_height;
+    d3d9_config.scale_back_buffer_filter = config_gfx->scale_back_buffer_filter;
     d3d9_config.forced_refresh_rate = config_gfx->forced_refresh_rate;
     d3d9_config.device_adapter = config_gfx->device_adapter;
 
     iidxhook_util_d3d9_configure(&d3d9_config);
 
-    // The "old"/current scaling feature does not work with 20-26 because
-    // the render engine changed and provides its own built-in scaling feature
-    if (config_gfx->scale_back_buffer_width > 0 &&
-        config_gfx->scale_back_buffer_height > 0) {
-        iidxhook_d3d9_bb_scale_hd_init(
-            config_gfx->scale_back_buffer_width,
-            config_gfx->scale_back_buffer_height);
-    }
-
     hook_d3d9_init(iidxhook_d3d9_handlers, lengthof(iidxhook_d3d9_handlers));
 }
 

src/main/inject/Module.mk

@@ -13,7 +13,3 @@ src_inject      := \
     logger.c \
     options.c \
     version.c \
-
-volatile_inject := \
-    version.c \
-

src/main/launcher/Module.mk

@@ -20,8 +20,4 @@ src_launcher    := \
     options.c \
     property.c \
     stubs.c \
-    version.c \
-
-volatile_launcher := \
-    version.c \
 

src/main/launcher/main.c

@@ -14,7 +14,6 @@
 #include "launcher/options.h"
 #include "launcher/property.h"
 #include "launcher/stubs.h"
-#include "launcher/version.h"
 
 #include "util/codepage.h"
 #include "util/defs.h"
@@ -140,10 +139,6 @@ int main(int argc, const char **argv)
     struct property_node *ea3_config_root;
 
     log_to_writer(log_writer_file, stdout);
-    log_info(
-        "launcher build date %s, gitrev %s",
-        launcher_build_date,
-        launcher_gitrev);
 
     /* Read command line */
 

src/main/launcher/version.c

@@ -1,4 +0,0 @@
-#include "util/defs.h"
-
-const char *launcher_build_date = __DATE__ " " __TIME__;
-const char *launcher_gitrev = STRINGIFY(GITREV);

src/main/launcher/version.h

@@ -1,4 +0,0 @@
-#pragma once
-
-extern const char *launcher_build_date;
-extern const char *launcher_gitrev;

src/main/p3io-ddr-tool/Module.mk

@@ -1,16 +0,0 @@
-exes            += p3io-ddr-tool \
-
-ldflags_p3io-ddr-tool   := \
-    -lsetupapi \
-
-libs_p3io-ddr-tool     := \
-    extiodrv \
-    extio \
-    p3iodrv \
-    p3io \
-    hook \
-    util \
-
-src_p3io-ddr-tool      := \
-    main.c \
-    mode-test.c \

src/main/p3io-ddr-tool/main.c

@@ -1,774 +0,0 @@
-#define LOG_MODULE "p3io-ddr-tool"
-
-#include <windows.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "extiodrv/extio.h"
-
-#include "p3io/ddr.h"
-#include "p3iodrv/ddr.h"
-#include "p3iodrv/device.h"
-
-#include "util/log.h"
-#include "util/thread.h"
-
-#include "mode-test.h"
-
-enum mode {
-    MODE_INVALID = 0,
-    MODE_SCAN = 1,
-    MODE_VERP3IO = 2,
-    MODE_INIT = 3,
-    MODE_VERDDR = 4,
-    MODE_WATCHDOGON = 5,
-    MODE_WATCHDOGOFF = 6,
-    MODE_CABTYPE = 7,
-    MODE_DIPSW = 8,
-    MODE_VIDEOFREQ = 9,
-    MODE_TEST = 10,
-    MODE_LIGHTOFF = 11,
-    MODE_POLL = 12,
-    MODE_SENSORES = 13,
-    MODE_TOTAL_COUNT = 14,
-};
-
-typedef bool (*mode_proc)(HANDLE handle);
-
-static bool _mode_invalid(HANDLE handle);
-static bool _mode_scan(HANDLE handle);
-static bool _mode_verp3io(HANDLE handle);
-static bool _mode_init(HANDLE handle);
-static bool _mode_verddr(HANDLE handle);
-static bool _mode_watchdogon(HANDLE handle);
-static bool _mode_watchdogoff(HANDLE handle);
-static bool _mode_cabtype(HANDLE handle);
-static bool _mode_dipsw(HANDLE handle);
-static bool _mode_videofreq(HANDLE handle);
-static bool _mode_test(HANDLE handle);
-static bool _mode_lightoff(HANDLE handle);
-static bool _mode_poll(HANDLE handle);
-static bool _mode_sensores(HANDLE handle);
-
-static mode_proc _mode_procs[MODE_TOTAL_COUNT] = {
-    _mode_invalid,
-    _mode_scan,
-    _mode_verp3io,
-    _mode_init,
-    _mode_verddr,
-    _mode_watchdogon,
-    _mode_watchdogoff,
-    _mode_cabtype,
-    _mode_dipsw,
-    _mode_videofreq,
-    _mode_test,
-    _mode_lightoff,
-    _mode_poll,
-    _mode_sensores,
-};
-
-static enum log_level _log_level = LOG_LEVEL_FATAL;
-static bool _extio_enabled = true;
-static const char *_p3io_device_path = "";
-static const char *_extio_com_port = "COM1";
-static enum mode _mode = MODE_INVALID;
-
-static bool _scan_and_open(HANDLE *handle)
-{
-    HRESULT hr;
-    char path[MAX_PATH];
-
-    log_info("Scanning for p3io...");
-
-    hr = p3iodrv_device_scan(path);
-
-    if (FAILED(hr)) {
-        log_warning("Cannot find a connected p3io: %lX", hr);
-        return false;
-    }
-
-    log_info("Opening p3io: %s", path);
-
-    hr = p3iodrv_device_open(path, handle);
-
-    if (FAILED(hr)) {
-        log_warning("Opening p3io failed: %lX", hr);
-        return false;
-    }
-
-    return true;
-}
-
-static bool _close(HANDLE handle)
-{
-    HRESULT hr;
-
-    log_info("Closing p3io...");
-
-    hr = p3iodrv_device_close(handle);
-
-    if (FAILED(hr)) {
-        log_warning("Closing p3io failed: %lX", hr);
-        return false;
-    }
-
-    return true;
-}
-
-static bool _process_cmd_args(int argc, char **argv)
-{
-    char *mode;
-
-    if (argc < 2) {
-        fprintf(stderr, "DDR P3IO and EXTIO CLI testing tool\n");
-        fprintf(stderr, "\n");
-        fprintf(stderr, "Usage: [ARG ...] MODE\n");
-        fprintf(stderr, "Arguments:\n");
-        fprintf(
-            stderr,
-            "  -v        Enable additional logging, log level 'warning'\n");
-        fprintf(
-            stderr,
-            "  -vv       Enable additional logging, log level 'info'\n");
-        fprintf(
-            stderr,
-            "  -vvv      Enable additional logging, log level 'misc' (very "
-            "verbose)\n");
-        fprintf(
-            stderr,
-            "  -noextio  Run the tool without an EXTIO. This also impacts "
-            "various functionality, e.g. sensor polling, light outputs\n");
-        fprintf(
-            stderr,
-            "  -p3io     Explicit device path pointing to a P3IO device to "
-            "open. If not provided, the device will be automatically scanned "
-            "for.\n");
-        fprintf(
-            stderr,
-            "  -extio    Explicitly set the COM port the EXTIO is connected "
-            "to, e.g. COM4. If not provided COM1 is used.\n");
-        fprintf(stderr, "\n");
-        fprintf(stderr, "Modes:\n");
-        fprintf(
-            stderr,
-            "  scan: Scan for a connected P3IO device. Outputs the full device "
-            "path to stdout if found.\n");
-        fprintf(
-            stderr,
-            "  verp3io: Get and print the P3IO version information to "
-            "stdout.\n");
-        fprintf(stderr, "  init: Initialize the P3IO (\"DDR mode\").\n");
-        fprintf(
-            stderr,
-            "  verddr: Get and print the DDR P3IO specific information to "
-            "stdout.\n");
-        fprintf(stderr, "  watchdogon: Turn the watchdog on.\n");
-        fprintf(stderr, "  watchdogoff: Turn the watchdog off.\n");
-        fprintf(
-            stderr,
-            "  cabtype: Get and print the cabinet type information to "
-            "stdout.\n");
-        fprintf(
-            stderr, "  dipsw: Get and print the DIP switch state to stdout.\n");
-        fprintf(
-            stderr,
-            "  videofreq: Get and print the detected video frequency to "
-            "stdout.\n");
-        fprintf(
-            stderr,
-            "  test: Run interactive test mode, executes a polling read/write "
-            "loop to drive the IO and displays the current input states.\n");
-        fprintf(stderr, "  lightoff: Turn all the lights off\n");
-        fprintf(
-            stderr,
-            "  poll: Run a simple polling loop that polls data from the JAMMA "
-            "endpoint with input state output.\n");
-        fprintf(
-            stderr,
-            "  sensores: Run cycling individual sensores in a simple polling "
-            "loop with input state ouptut.\n");
-
-        return false;
-    }
-
-    for (int i = 0; i < argc; i++) {
-        if (!strcmp(argv[i], "-v")) {
-            _log_level = LOG_LEVEL_WARNING;
-        } else if (!strcmp(argv[i], "-vv")) {
-            _log_level = LOG_LEVEL_INFO;
-        } else if (!strcmp(argv[i], "-vvv")) {
-            _log_level = LOG_LEVEL_MISC;
-        } else if (!strcmp(argv[i], "-noextio")) {
-            _extio_enabled = false;
-        } else if (!strcmp(argv[i], "-p3io")) {
-            if (i + 1 < argc) {
-                _p3io_device_path = argv[++i];
-            } else {
-                fprintf(stderr, "Missing value for -p3io argument\n");
-            }
-        } else if (!strcmp(argv[i], "-extio")) {
-            if (i + 1 < argc) {
-                _extio_com_port = argv[++i];
-            } else {
-                fprintf(stderr, "Missing value for -extio argument\n");
-            }
-        }
-    }
-
-    mode = argv[argc - 1];
-
-    if (!strcmp(mode, "scan")) {
-        _mode = MODE_SCAN;
-    } else if (!strcmp(mode, "verp3io")) {
-        _mode = MODE_VERP3IO;
-    } else if (!strcmp(mode, "init")) {
-        _mode = MODE_INIT;
-    } else if (!strcmp(mode, "verddr")) {
-        _mode = MODE_VERDDR;
-    } else if (!strcmp(mode, "watchdogon")) {
-        _mode = MODE_WATCHDOGON;
-    } else if (!strcmp(mode, "watchdogoff")) {
-        _mode = MODE_WATCHDOGOFF;
-    } else if (!strcmp(mode, "cabtype")) {
-        _mode = MODE_CABTYPE;
-    } else if (!strcmp(mode, "dipsw")) {
-        _mode = MODE_DIPSW;
-    } else if (!strcmp(mode, "videofreq")) {
-        _mode = MODE_VIDEOFREQ;
-    } else if (!strcmp(mode, "test")) {
-        _mode = MODE_TEST;
-    } else if (!strcmp(mode, "lightoff")) {
-        _mode = MODE_LIGHTOFF;
-    } else if (!strcmp(mode, "poll")) {
-        _mode = MODE_POLL;
-    } else if (!strcmp(mode, "sensores")) {
-        _mode = MODE_SENSORES;
-    } else {
-        fprintf(stderr, "Invalid mode '%s'", mode);
-        return false;
-    }
-
-    return true;
-}
-
-static void _init_logging()
-{
-    log_to_writer(log_writer_stderr, NULL);
-    log_set_level(_log_level);
-}
-
-static bool _mode_invalid(HANDLE handle)
-{
-    fprintf(stderr, "Invalid mode");
-    return false;
-}
-
-static bool _mode_scan(HANDLE handle)
-{
-    HRESULT hr;
-    char path[MAX_PATH];
-
-    log_info("Scanning for p3io...");
-
-    hr = p3iodrv_device_scan(path);
-
-    if (FAILED(hr)) {
-        log_warning("Cannot find a connected p3io: %lX", hr);
-        return false;
-    }
-
-    log_info("Found p3io: %s", path);
-
-    printf("%s\n", path);
-
-    return true;
-}
-
-static bool _mode_verp3io(HANDLE handle)
-{
-    HRESULT hr;
-    char version[P3IODRV_VERSION_MAX_LEN];
-
-    memset(version, 0, P3IODRV_VERSION_MAX_LEN);
-
-    hr = p3iodrv_device_read_version(handle, version);
-
-    if (FAILED(hr)) {
-        log_warning("Getting version failed: %lX", hr);
-        return _close(handle);
-    }
-
-    log_info("Version (P3IO): %s", version);
-
-    printf("%s\n", version);
-
-    return true;
-}
-
-static bool _mode_init(HANDLE handle)
-{
-    HRESULT hr;
-
-    hr = p3iodrv_ddr_init(handle);
-
-    if (FAILED(hr)) {
-        log_warning("Init failed: %lX", hr);
-        return false;
-    }
-
-    log_info("Initialized");
-
-    return true;
-}
-
-static bool _mode_verddr(HANDLE handle)
-{
-    HRESULT hr;
-    char str[4];
-    uint32_t major;
-    uint32_t minor;
-    uint32_t patch;
-
-    hr = p3iodrv_ddr_get_version(handle, str, &major, &minor, &patch);
-
-    if (FAILED(hr)) {
-        log_warning("Getting DDR version failed: %lX", hr);
-        return false;
-    }
-
-    log_info("Version (DDR): %s %d.%d.%d", str, major, minor, patch);
-
-    printf("%s %d.%d.%d\n", str, major, minor, patch);
-
-    return true;
-}
-
-static bool _mode_watchdogon(HANDLE handle)
-{
-    HRESULT hr;
-
-    hr = p3iodrv_ddr_set_watchdog(handle, true);
-
-    if (FAILED(hr)) {
-        log_warning("Enabling watchdog failed: %lX", hr);
-        return false;
-    }
-
-    log_info("Watchdog on");
-
-    return true;
-}
-
-static bool _mode_watchdogoff(HANDLE handle)
-{
-    HRESULT hr;
-
-    hr = p3iodrv_ddr_set_watchdog(handle, false);
-
-    if (FAILED(hr)) {
-        log_warning("Disabling watchdog failed: %lX", hr);
-        return false;
-    }
-
-    log_info("Watchdog off");
-
-    return true;
-}
-
-static bool _mode_cabtype(HANDLE handle)
-{
-    HRESULT hr;
-    enum p3io_cab_type type;
-    const char *type_str;
-
-    hr = p3iodrv_ddr_get_cab_type(handle, &type);
-
-    if (FAILED(hr)) {
-        log_warning("Getting cab type failed: %lX", hr);
-        return false;
-    }
-
-    log_info("Cabinet type: %d", type);
-
-    switch (type) {
-        case P3IO_CAB_TYPE_SD:
-            type_str = "sd";
-            break;
-
-        case P3IO_CAB_TYPE_HD:
-            type_str = "hd";
-            break;
-
-        default:
-            type_str = "unknown";
-            break;
-    }
-
-    printf("%s\n", type_str);
-
-    return true;
-}
-
-static bool _mode_dipsw(HANDLE handle)
-{
-    HRESULT hr;
-    uint8_t dip_sw;
-
-    hr = p3iodrv_ddr_get_dipsw(handle, &dip_sw);
-
-    if (FAILED(hr)) {
-        log_warning("Getting dip switches failed: %lX", hr);
-        return false;
-    }
-
-    log_info("Dip switches: 0x%X", dip_sw);
-
-    printf("0x%X\n", dip_sw);
-
-    return true;
-}
-
-static bool _mode_videofreq(HANDLE handle)
-{
-    HRESULT hr;
-    enum p3io_video_freq video_freq;
-    const char *video_freq_str;
-
-    hr = p3iodrv_ddr_get_video_freq(handle, &video_freq);
-
-    if (FAILED(hr)) {
-        log_warning("Getting video freq failed: %lX", hr);
-        return false;
-    }
-
-    log_info("Video freq: 0x%X", video_freq);
-
-    switch (video_freq) {
-        case P3IO_VIDEO_FREQ_15KHZ:
-            video_freq_str = "15khz";
-            break;
-
-        case P3IO_VIDEO_FREQ_31KHZ:
-            video_freq_str = "31khz";
-            break;
-
-        default:
-            video_freq_str = "unknown";
-            break;
-    }
-
-    printf("%s\n", video_freq_str);
-
-    return true;
-}
-
-static bool _mode_test(HANDLE handle_p3io)
-{
-    HRESULT hr;
-    HANDLE handle_extio;
-    bool result;
-
-    if (_extio_enabled) {
-        hr = extiodrv_device_open(_extio_com_port, &handle_extio);
-
-        if (FAILED(hr)) {
-            log_warning(
-                "Failed opening EXTIO on com port '%s': %lX",
-                _extio_com_port,
-                hr);
-            return false;
-        }
-    } else {
-        handle_extio = INVALID_HANDLE_VALUE;
-    }
-
-    result = mode_test_proc(handle_p3io, handle_extio);
-
-    if (_extio_enabled) {
-        hr = extiodrv_device_close(&handle_extio);
-
-        if (FAILED(hr)) {
-            log_warning("Failed closing EXTIO: %lX", hr);
-            result = false;
-        }
-    }
-
-    return result;
-}
-
-static bool _mode_lightoff(HANDLE handle_p3io)
-{
-    HRESULT hr;
-    HANDLE handle_extio;
-
-    struct p3io_ddr_output output;
-    struct extiodrv_extio_pad_lights pad_lights[EXTIO_PAD_LIGHT_MAX_PLAYERS];
-    bool neons;
-
-    memset(&output, 0, sizeof(output));
-    memset(&pad_lights, 0, sizeof(pad_lights));
-    neons = false;
-
-    if (_extio_enabled) {
-        hr = extiodrv_device_open(_extio_com_port, &handle_extio);
-
-        if (FAILED(hr)) {
-            log_warning(
-                "Failed opening EXTIO on com port '%s': %lX",
-                _extio_com_port,
-                hr);
-            return false;
-        }
-    } else {
-        handle_extio = INVALID_HANDLE_VALUE;
-    }
-
-    hr = p3iodrv_ddr_set_outputs(handle_p3io, &output);
-
-    if (FAILED(hr)) {
-        log_warning("Setting outputs failed: %lX", hr);
-        return false;
-    }
-
-    if (_extio_enabled) {
-        hr = extiodrv_extio_transfer(
-            handle_extio,
-            EXTIODRV_EXTIO_SENSOR_READ_MODE_ALL,
-            pad_lights,
-            neons);
-
-        if (FAILED(hr)) {
-            log_warning("extio transfer failed: %lX", hr);
-            return false;
-        }
-    }
-
-    if (_extio_enabled) {
-        hr = extiodrv_device_close(&handle_extio);
-
-        if (FAILED(hr)) {
-            log_warning("Failed closing EXTIO: %lX", hr);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-static bool _mode_poll(HANDLE handle_p3io)
-{
-    HRESULT hr;
-    HANDLE handle_extio;
-
-    struct p3io_ddr_jamma jamma;
-    struct p3io_ddr_output output;
-    struct extiodrv_extio_pad_lights pad_lights[EXTIO_PAD_LIGHT_MAX_PLAYERS];
-    bool neons;
-
-    uint32_t cnt;
-
-    memset(&output, 0, sizeof(output));
-    memset(&pad_lights, 0, sizeof(pad_lights));
-    neons = false;
-
-    if (_extio_enabled) {
-        hr = extiodrv_device_open(_extio_com_port, &handle_extio);
-
-        if (FAILED(hr)) {
-            log_warning(
-                "Failed opening EXTIO on com port '%s': %lX",
-                _extio_com_port,
-                hr);
-            return false;
-        }
-    } else {
-        handle_extio = INVALID_HANDLE_VALUE;
-    }
-
-    fprintf(
-        stderr,
-        ">>> Press enter to start endless polling loop. Press Escape to exit "
-        "to exit polling loop <<<\n");
-
-    if (getchar() != '\n') {
-        return true;
-    }
-
-    cnt = 0;
-
-    while ((GetAsyncKeyState(VK_ESCAPE) & 0x8000) == 0) {
-        hr = p3iodrv_ddr_set_outputs(handle_p3io, &output);
-
-        if (FAILED(hr)) {
-            log_warning("Setting outputs failed: %lX", hr);
-            return false;
-        }
-
-        if (_extio_enabled) {
-            hr = extiodrv_extio_transfer(
-                handle_extio,
-                EXTIODRV_EXTIO_SENSOR_READ_MODE_ALL,
-                pad_lights,
-                neons);
-
-            if (FAILED(hr)) {
-                log_warning("extio transfer failed: %lX", hr);
-                return false;
-            }
-        }
-
-        hr = p3iodrv_ddr_get_jamma(handle_p3io, &jamma);
-
-        if (FAILED(hr)) {
-            log_warning("Reading jamma failed: %lX", hr);
-            return false;
-        }
-
-        printf(
-            "%d: %08X %08X %08X\n",
-            cnt,
-            *((uint32_t *) &jamma) & 0xFFFFFF00,
-            jamma.unused,
-            jamma.unused2);
-
-        cnt++;
-    }
-
-    if (_extio_enabled) {
-        hr = extiodrv_device_close(&handle_extio);
-
-        if (FAILED(hr)) {
-            log_warning("Failed closing EXTIO: %lX", hr);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-static bool _mode_sensores(HANDLE handle_p3io)
-{
-    HRESULT hr;
-    HANDLE handle_extio;
-
-    struct p3io_ddr_jamma jamma;
-    struct p3io_ddr_output output;
-    struct extiodrv_extio_pad_lights pad_lights[EXTIO_PAD_LIGHT_MAX_PLAYERS];
-    bool neons;
-
-    uint32_t cnt;
-    uint8_t sensor_read;
-
-    memset(&output, 0, sizeof(output));
-    memset(&pad_lights, 0, sizeof(pad_lights));
-    neons = false;
-
-    if (_extio_enabled) {
-        hr = extiodrv_device_open(_extio_com_port, &handle_extio);
-
-        if (FAILED(hr)) {
-            log_warning(
-                "Failed opening EXTIO on com port '%s': %lX",
-                _extio_com_port,
-                hr);
-            return false;
-        }
-    } else {
-        handle_extio = INVALID_HANDLE_VALUE;
-    }
-
-    fprintf(
-        stderr,
-        ">>> Press enter to start endless sensor cycling loop. Press Escape to "
-        "exit to exit sensor cycling loop <<<\n");
-
-    if (getchar() != '\n') {
-        return true;
-    }
-
-    cnt = 0;
-    sensor_read = 0;
-
-    while ((GetAsyncKeyState(VK_ESCAPE) & 0x8000) == 0) {
-        hr = p3iodrv_ddr_set_outputs(handle_p3io, &output);
-
-        if (FAILED(hr)) {
-            log_warning("Setting outputs failed: %lX", hr);
-            return false;
-        }
-
-        if (_extio_enabled) {
-            hr = extiodrv_extio_transfer(
-                handle_extio, sensor_read + 1, pad_lights, neons);
-
-            if (FAILED(hr)) {
-                log_warning("extio transfer failed: %lX", hr);
-                return false;
-            }
-        }
-
-        hr = p3iodrv_ddr_get_jamma(handle_p3io, &jamma);
-
-        if (FAILED(hr)) {
-            log_warning("Reading jamma failed: %lX", hr);
-            return false;
-        }
-
-        printf(
-            "%d (%d): %08X %08X %08X\n",
-            cnt,
-            sensor_read,
-            *((uint32_t *) &jamma) & 0xFFFFFF00,
-            jamma.unused,
-            jamma.unused2);
-
-        cnt++;
-        sensor_read++;
-
-        if (sensor_read > 3) {
-            sensor_read = 0;
-        }
-    }
-
-    if (_extio_enabled) {
-        hr = extiodrv_device_close(&handle_extio);
-
-        if (FAILED(hr)) {
-            log_warning("Failed closing EXTIO: %lX", hr);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-int main(int argc, char **argv)
-{
-    HANDLE handle;
-    bool result;
-
-    if (!_process_cmd_args(argc, argv)) {
-        return -1;
-    }
-
-    _init_logging();
-
-    if (_mode != MODE_SCAN) {
-        if (!_scan_and_open(&handle)) {
-            result = false;
-        } else {
-            result = _mode_procs[_mode](handle);
-
-            if (!_close(&handle)) {
-                result = false;
-            }
-        }
-    } else {
-        result = _mode_procs[_mode](INVALID_HANDLE_VALUE);
-    }
-
-    return result ? 0 : -1;
-}

src/main/p3io-ddr-tool/mode-test.c

@@ -1,406 +0,0 @@
-#define LOG_MODULE "mode-test"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "extiodrv/extio.h"
-
-#include "p3io/ddr.h"
-#include "p3iodrv/ddr.h"
-#include "p3iodrv/device.h"
-
-#include "util/log.h"
-
-#include "mode-test.h"
-
-struct mode_test_output_state {
-    struct p3io_ddr_output output;
-    struct extiodrv_extio_pad_lights pad_lights[EXTIO_PAD_LIGHT_MAX_PLAYERS];
-    bool neons;
-};
-
-struct mode_test_input_state {
-    struct p3io_ddr_jamma jamma[4];
-};
-
-static bool _check_input_state_change(
-    const struct mode_test_input_state *cur_state,
-    const struct mode_test_input_state *prev_state)
-{
-    return !memcmp(cur_state, prev_state, sizeof(struct mode_test_input_state));
-}
-
-static void _input_state_swap(
-    struct mode_test_input_state **cur_state,
-    struct mode_test_input_state **prev_state)
-{
-    struct mode_test_input_state *tmp;
-
-    tmp = *cur_state;
-    *cur_state = *prev_state;
-    *prev_state = tmp;
-}
-
-static bool _update_io_frame(
-    HANDLE handle_p3io,
-    HANDLE handle_extio,
-    bool polling_mode,
-    struct mode_test_input_state *input,
-    const struct mode_test_output_state *output)
-{
-    HRESULT hr;
-
-    hr = p3iodrv_ddr_set_outputs(handle_p3io, &output->output);
-
-    if (FAILED(hr)) {
-        log_warning("Setting outputs failed: %lX", hr);
-        return false;
-    }
-
-    if (polling_mode) {
-        hr = extiodrv_extio_transfer(
-            handle_extio,
-            EXTIODRV_EXTIO_SENSOR_READ_MODE_ALL,
-            output->pad_lights,
-            output->neons);
-
-        if (FAILED(hr)) {
-            log_warning("extio transfer failed: %lX", hr);
-            return false;
-        }
-
-        hr = p3iodrv_ddr_get_jamma(handle_p3io, &input->jamma[0]);
-
-        if (FAILED(hr)) {
-            log_warning("Reading jamma failed: %lX", hr);
-            return false;
-        }
-    } else {
-        for (uint8_t i = 0; i < 4; i++) {
-            hr = extiodrv_extio_transfer(
-                handle_extio, i + 1, output->pad_lights, output->neons);
-
-            if (FAILED(hr)) {
-                log_warning("extio transfer failed: %lX", hr);
-                return false;
-            }
-
-            hr = p3iodrv_ddr_get_jamma(handle_p3io, &input->jamma[i]);
-
-            if (FAILED(hr)) {
-                log_warning("Reading jamma failed: %lX", hr);
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-static void _set_outputs_on_inputs(
-    const struct mode_test_input_state *input,
-    struct mode_test_output_state *output)
-{
-    memset(&output->pad_lights, 0, sizeof(output->pad_lights));
-
-    output->output.cabinet.p1_menu_buttons = 0;
-    output->output.cabinet.p2_menu_buttons = 0;
-
-    for (uint8_t i = 0; i < 4; i++) {
-        output->pad_lights[0].up |= input->jamma[i].p1.pad_up ? 1 : 0;
-        output->pad_lights[0].down |= input->jamma[i].p1.pad_down ? 1 : 0;
-        output->pad_lights[0].left |= input->jamma[i].p1.pad_left ? 1 : 0;
-        output->pad_lights[0].right |= input->jamma[i].p1.pad_right ? 1 : 0;
-
-        output->pad_lights[1].up |= input->jamma[i].p2.pad_up ? 1 : 0;
-        output->pad_lights[1].down |= input->jamma[i].p2.pad_down ? 1 : 0;
-        output->pad_lights[1].left |= input->jamma[i].p2.pad_left ? 1 : 0;
-        output->pad_lights[1].right |= input->jamma[i].p2.pad_right ? 1 : 0;
-
-        output->output.cabinet.p1_menu_buttons |=
-            (input->jamma[i].p1.menu_left || input->jamma[i].p1.menu_right ||
-             input->jamma[i].p1.menu_start) ?
-            1 :
-            0;
-        output->output.cabinet.p2_menu_buttons |=
-            (input->jamma[i].p2.menu_left || input->jamma[i].p2.menu_right ||
-             input->jamma[i].p2.menu_start) ?
-            1 :
-            0;
-    }
-}
-
-static void _render_main(
-    uint8_t cnt, bool polling_mode, const struct mode_test_input_state *state)
-{
-    printf("Counter: %d\n", cnt);
-    printf("Polling mode: %d\n", polling_mode);
-    printf("Player 1       Player 2\n");
-    printf("\n");
-    printf("Pad\n");
-
-    if (polling_mode) {
-        printf(
-            "Up:    %d       Up:    %d\n",
-            state->jamma[0].p1.pad_up,
-            state->jamma[0].p2.pad_up);
-        printf(
-            "Down:  %d       Down:  %d\n",
-            state->jamma[0].p1.pad_down,
-            state->jamma[0].p2.pad_down);
-        printf(
-            "Left:  %d       Left:  %d\n",
-            state->jamma[0].p1.pad_left,
-            state->jamma[0].p2.pad_left);
-        printf(
-            "Right: %d       Right: %d\n",
-            state->jamma[0].p1.pad_right,
-            state->jamma[0].p2.pad_right);
-    } else {
-        printf(
-            "Up:    %c%c%c%c   Up:    %c%c%c%c\n",
-            state->jamma[0].p1.pad_up ? 'U' : '_',
-            state->jamma[1].p1.pad_up ? 'D' : '_',
-            state->jamma[2].p1.pad_up ? 'L' : '_',
-            state->jamma[3].p1.pad_up ? 'R' : '_',
-            state->jamma[0].p2.pad_up ? 'U' : '_',
-            state->jamma[1].p2.pad_up ? 'D' : '_',
-            state->jamma[2].p2.pad_up ? 'L' : '_',
-            state->jamma[3].p2.pad_up) ?
-            'R' :
-            '_';
-        printf(
-            "Down:  %c%c%c%c   Down:  %c%c%c%c\n",
-            state->jamma[0].p1.pad_down ? 'U' : '_',
-            state->jamma[1].p1.pad_down ? 'D' : '_',
-            state->jamma[2].p1.pad_down ? 'L' : '_',
-            state->jamma[3].p1.pad_down ? 'R' : '_',
-            state->jamma[0].p2.pad_down ? 'U' : '_',
-            state->jamma[1].p2.pad_down ? 'D' : '_',
-            state->jamma[2].p2.pad_down ? 'L' : '_',
-            state->jamma[3].p2.pad_down ? 'R' : '_');
-        printf(
-            "Left:  %c%c%c%c   Left:  %c%c%c%c\n",
-            state->jamma[0].p1.pad_left ? 'U' : '_',
-            state->jamma[1].p1.pad_left ? 'D' : '_',
-            state->jamma[2].p1.pad_left ? 'L' : '_',
-            state->jamma[3].p1.pad_left ? 'R' : '_',
-            state->jamma[0].p2.pad_left ? 'U' : '_',
-            state->jamma[1].p2.pad_left ? 'D' : '_',
-            state->jamma[2].p2.pad_left ? 'L' : '_',
-            state->jamma[3].p2.pad_left ? 'R' : '_');
-        printf(
-            "Right: %c%c%c%c   Right: %c%c%c%c\n",
-            state->jamma[0].p1.pad_right ? 'U' : '_',
-            state->jamma[1].p1.pad_right ? 'D' : '_',
-            state->jamma[2].p1.pad_right ? 'L' : '_',
-            state->jamma[3].p1.pad_right ? 'R' : '_',
-            state->jamma[0].p2.pad_right ? 'U' : '_',
-            state->jamma[1].p2.pad_right ? 'D' : '_',
-            state->jamma[2].p2.pad_right ? 'L' : '_',
-            state->jamma[3].p2.pad_right ? 'R' : '_');
-    }
-
-    printf("\n");
-    printf("Menu\n");
-    printf(
-        "Start: %d       Start: %d\n",
-        state->jamma[0].p1.menu_start,
-        state->jamma[0].p2.menu_start);
-    printf(
-        "Up:    %d       Up:    %d\n",
-        state->jamma[0].operator.p1_menu_up,
-        state->jamma[0].operator.p2_menu_up);
-    printf(
-        "Down:  %d       Down:  %d\n",
-        state->jamma[0].operator.p1_menu_down,
-        state->jamma[0].operator.p2_menu_down);
-    printf(
-        "Left:  %d       Left:  %d\n",
-        state->jamma[0].p1.menu_left,
-        state->jamma[0].p2.menu_left);
-    printf(
-        "Right: %d       Right: %d\n",
-        state->jamma[0].p1.menu_right,
-        state->jamma[0].p2.menu_right);
-    printf("\n");
-    printf("Operator\n");
-    printf(
-        "Test: %d   Service: %d   Coin: %d\n",
-        state->jamma[0].operator.test,
-        state->jamma[0].operator.service,
-        state->jamma[0].operator.coin);
-}
-
-static void
-_render_menu(bool *continue_loop, struct mode_test_output_state *output)
-{
-    printf(
-        "Menu options:\n"
-        "  0: Exit menu and continue loop\n"
-        "  1: Exit\n"
-        "  2: Set neon state\n"
-        "  3: Top lamp state\n"
-        "  4: Set all lights on\n"
-        "  5: Set all lights off\n"
-        "Waiting for input: ");
-
-    char c = getchar();
-
-    // Keyboard input debounce
-    Sleep(10);
-
-    switch (c) {
-        case '1': {
-            *continue_loop = false;
-            break;
-        }
-
-        case '2': {
-            int state;
-            int n;
-
-            printf("Enter neon state (0/1): ");
-
-            n = scanf("%d", &state);
-
-            if (n > 0) {
-                output->neons = state > 0;
-            }
-
-            break;
-        }
-
-        case '3': {
-            char buf[4];
-            int n;
-
-            printf("Enter top lamp state, chain of 0/1s: ");
-
-            n = scanf("%8s", buf);
-
-            if (n > 0) {
-                output->output.cabinet.top_p1_upper = buf[0] == '1';
-                output->output.cabinet.top_p1_lower = buf[1] == '1';
-                output->output.cabinet.top_p2_upper = buf[2] == '1';
-                output->output.cabinet.top_p2_lower = buf[3] == '1';
-            }
-
-            break;
-        }
-
-        case '4': {
-            output->output.cabinet.top_p1_upper = 1;
-            output->output.cabinet.top_p1_lower = 1;
-            output->output.cabinet.top_p2_upper = 1;
-            output->output.cabinet.top_p2_lower = 1;
-
-            output->output.cabinet.p1_menu_buttons = 1;
-            output->output.cabinet.p2_menu_buttons = 1;
-
-            output->neons = true;
-
-            output->pad_lights[0].up = true;
-            output->pad_lights[0].down = true;
-            output->pad_lights[0].left = true;
-            output->pad_lights[0].right = true;
-
-            output->pad_lights[1].up = true;
-            output->pad_lights[1].down = true;
-            output->pad_lights[1].left = true;
-            output->pad_lights[1].right = true;
-
-            break;
-        }
-
-        case '5': {
-            output->output.cabinet.top_p1_upper = 0;
-            output->output.cabinet.top_p1_lower = 0;
-            output->output.cabinet.top_p2_upper = 0;
-            output->output.cabinet.top_p2_lower = 0;
-
-            output->output.cabinet.p1_menu_buttons = 0;
-            output->output.cabinet.p2_menu_buttons = 0;
-
-            output->neons = false;
-
-            output->pad_lights[0].up = false;
-            output->pad_lights[0].down = false;
-            output->pad_lights[0].left = false;
-            output->pad_lights[0].right = false;
-
-            output->pad_lights[1].up = false;
-            output->pad_lights[1].down = false;
-            output->pad_lights[1].left = false;
-            output->pad_lights[1].right = false;
-
-            break;
-        }
-
-        case '0':
-        default:
-            break;
-    }
-}
-
-bool mode_test_proc(HANDLE handle_p3io, HANDLE handle_extio)
-{
-    struct mode_test_input_state state[2];
-    struct mode_test_input_state *cur_input_state;
-    struct mode_test_input_state *prev_input_state;
-    struct mode_test_output_state output_state;
-
-    bool polling_mode;
-    bool loop;
-    uint8_t cnt;
-
-    memset(&state, 0, sizeof(state));
-    cur_input_state = &state[0];
-    prev_input_state = &state[1];
-    memset(&output_state, 0, sizeof(output_state));
-
-    polling_mode = true;
-    loop = true;
-    cnt = 0;
-
-    fprintf(stderr, ">>> Press enter to start running test mode <<<\n");
-
-    if (getchar() != '\n') {
-        return true;
-    }
-
-    while (loop) {
-        if ((GetAsyncKeyState(VK_ESCAPE) & 0x8000) != 0) {
-            system("cls");
-
-            _render_menu(&loop, &output_state);
-        } else {
-            _input_state_swap(&cur_input_state, &prev_input_state);
-
-            memset(cur_input_state, 0, sizeof(struct mode_test_input_state));
-
-            if (!_update_io_frame(
-                    handle_p3io,
-                    handle_extio,
-                    polling_mode,
-                    cur_input_state,
-                    &output_state)) {
-                return false;
-            }
-
-            _set_outputs_on_inputs(cur_input_state, &output_state);
-
-            if (_check_input_state_change(cur_input_state, prev_input_state)) {
-                system("cls");
-
-                _render_main(cnt, polling_mode, cur_input_state);
-            }
-        }
-
-        /* avoid CPU banging */
-        Sleep(1);
-        ++cnt;
-    }
-
-    return true;
-}