refactor all common parts and games

Makefile

@@ -5,6 +5,8 @@ V               ?= @
 BUILD_DIR := build
 BUILD_DIR_32 := $(BUILD_DIR)/build32
 BUILD_DIR_64 := $(BUILD_DIR)/build64
+BUILD_DIR_GAMES_32 := $(BUILD_DIR_32)/games
+BUILD_DIR_GAMES_64 := $(BUILD_DIR_64)/games
 BUILD_DIR_ZIP := $(BUILD_DIR)/zip
 
 DOC_DIR := doc

Package.mk

@@ -3,7 +3,7 @@ $(BUILD_DIR_ZIP)/chuni.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/chuni
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/chuni/DEVICE
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_32)/chunihook/chunihook.dll \
+		$(BUILD_DIR_GAMES_32)/chunihook/chunihook.dll \
 		$(DIST_DIR)/chuni/segatools.ini \
 		$(DIST_DIR)/chuni/launch.bat \
 		$(BUILD_DIR_ZIP)/chuni
@@ -18,7 +18,7 @@ $(BUILD_DIR_ZIP)/cxb.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/cxb
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/cxb/DEVICE
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_32)/cxbhook/cxbhook.dll \
+		$(BUILD_DIR_GAMES_32)/cxbhook/cxbhook.dll \
 		$(DIST_DIR)/cxb/segatools.ini \
 		$(DIST_DIR)/cxb/launch.bat \
 		$(BUILD_DIR_ZIP)/cxb
@@ -33,7 +33,7 @@ $(BUILD_DIR_ZIP)/diva.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/diva
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/diva/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/divahook/divahook.dll \
+		$(BUILD_DIR_GAMES_64)/divahook/divahook.dll \
 		$(DIST_DIR)/diva/segatools.ini \
 		$(DIST_DIR)/diva/launch.bat \
 		$(BUILD_DIR_ZIP)/diva
@@ -48,7 +48,7 @@ $(BUILD_DIR_ZIP)/carol.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/carol
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/carol/DEVICE
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_32)/carolhook/carolhook.dll \
+		$(BUILD_DIR_GAMES_32)/carolhook/carolhook.dll \
 		$(DIST_DIR)/carol/segatools.ini \
 		$(DIST_DIR)/carol/launch.bat \
 		$(BUILD_DIR_ZIP)/carol
@@ -63,7 +63,7 @@ $(BUILD_DIR_ZIP)/idz.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/idz
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/idz/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/idzhook/idzhook.dll \
+		$(BUILD_DIR_GAMES_64)/idzhook/idzhook.dll \
 		$(DIST_DIR)/idz/segatools.ini \
 		$(DIST_DIR)/idz/launch.bat \
     	$(BUILD_DIR_ZIP)/idz
@@ -78,7 +78,7 @@ $(BUILD_DIR_ZIP)/fgo.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/fgo
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/fgo/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/fgohook/fgohook.dll \
+		$(BUILD_DIR_GAMES_64)/fgohook/fgohook.dll \
 		$(DIST_DIR)/fgo/segatools.ini \
 		$(DIST_DIR)/fgo/launch.bat \
     	$(BUILD_DIR_ZIP)/fgo
@@ -93,7 +93,7 @@ $(BUILD_DIR_ZIP)/idac.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/idac
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/idac/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/idachook/idachook.dll \
+		$(BUILD_DIR_GAMES_64)/idachook/idachook.dll \
 		$(DIST_DIR)/idac/segatools.ini \
 		$(DIST_DIR)/idac/config_hook.json \
 		$(DIST_DIR)/idac/launch.bat \
@@ -109,7 +109,7 @@ $(BUILD_DIR_ZIP)/swdc.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/swdc
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/swdc/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/swdchook/swdchook.dll \
+		$(BUILD_DIR_GAMES_64)/swdchook/swdchook.dll \
 		$(DIST_DIR)/swdc/segatools.ini \
 		$(DIST_DIR)/swdc/config_hook.json \
 		$(DIST_DIR)/swdc/launch.bat \
@@ -125,7 +125,7 @@ $(BUILD_DIR_ZIP)/mercury.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mercury
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mercury/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/mercuryhook/mercuryhook.dll \
+		$(BUILD_DIR_GAMES_64)/mercuryhook/mercuryhook.dll \
 		$(DIST_DIR)/mercury/segatools.ini \
 		$(DIST_DIR)/mercury/launch.bat \
     	$(BUILD_DIR_ZIP)/mercury
@@ -143,9 +143,9 @@ $(BUILD_DIR_ZIP)/chusan.zip:
 		$(DIST_DIR)/chusan/config_hook.json \
 		$(DIST_DIR)/chusan/launch.bat \
 		$(BUILD_DIR_ZIP)/chusan
-	$(V)cp $(BUILD_DIR_32)/chusanhook/chusanhook.dll \
+	$(V)cp $(BUILD_DIR_GAMES_32)/chusanhook/chusanhook.dll \
 		$(BUILD_DIR_ZIP)/chusan/chusanhook_x86.dll
-	$(V)cp $(BUILD_DIR_64)/chusanhook/chusanhook.dll \
+	$(V)cp $(BUILD_DIR_GAMES_64)/chusanhook/chusanhook.dll \
 		$(BUILD_DIR_ZIP)/chusan/chusanhook_x64.dll
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
 		$(BUILD_DIR_ZIP)/chusan/inject_x86.exe
@@ -162,7 +162,7 @@ $(BUILD_DIR_ZIP)/mu3.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mu3
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mu3/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/mu3hook/mu3hook.dll \
+		$(BUILD_DIR_GAMES_64)/mu3hook/mu3hook.dll \
 		$(DIST_DIR)/mu3/segatools.ini \
 		$(DIST_DIR)/mu3/launch.bat \
     	$(BUILD_DIR_ZIP)/mu3
@@ -177,7 +177,7 @@ $(BUILD_DIR_ZIP)/mai2.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mai2
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/mai2/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/mai2hook/mai2hook.dll \
+		$(BUILD_DIR_GAMES_64)/mai2hook/mai2hook.dll \
 		$(DIST_DIR)/mai2/segatools.ini \
 		$(DIST_DIR)/mai2/launch.bat \
     	$(BUILD_DIR_ZIP)/mai2
@@ -192,7 +192,7 @@ $(BUILD_DIR_ZIP)/cm.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/cm
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/cm/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/cmhook/cmhook.dll \
+		$(BUILD_DIR_GAMES_64)/cmhook/cmhook.dll \
 		$(DIST_DIR)/cm/config_hook.json \
 		$(DIST_DIR)/cm/segatools.ini \
 		$(DIST_DIR)/cm/launch.bat \
@@ -208,7 +208,7 @@ $(BUILD_DIR_ZIP)/tokyo.zip:
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/tokyo
 	$(V)mkdir -p $(BUILD_DIR_ZIP)/tokyo/DEVICE
 	$(V)cp $(BUILD_DIR_64)/subprojects/capnhook/inject/inject.exe \
-		$(BUILD_DIR_64)/tokyohook/tokyohook.dll \
+		$(BUILD_DIR_GAMES_64)/tokyohook/tokyohook.dll \
 		$(DIST_DIR)/tokyo/config_hook.json \
 		$(DIST_DIR)/tokyo/segatools.ini \
 		$(DIST_DIR)/tokyo/launch.bat \
@@ -226,9 +226,9 @@ $(BUILD_DIR_ZIP)/kemono.zip:
 	$(V)cp $(DIST_DIR)/kemono/segatools.ini \
 		$(DIST_DIR)/kemono/launch.bat \
 		$(BUILD_DIR_ZIP)/kemono
-	$(V)cp $(BUILD_DIR_32)/kemonohook/kemonohook.dll \
+	$(V)cp $(BUILD_DIR_GAMES_32)/kemonohook/kemonohook.dll \
 		$(BUILD_DIR_ZIP)/kemono/kemonohook_x86.dll
-	$(V)cp $(BUILD_DIR_64)/kemonohook/kemonohook.dll \
+	$(V)cp $(BUILD_DIR_GAMES_64)/kemonohook/kemonohook.dll \
 		$(BUILD_DIR_ZIP)/kemono/kemonohook_x64.dll
 	$(V)cp $(BUILD_DIR_32)/subprojects/capnhook/inject/inject.exe \
 		$(BUILD_DIR_ZIP)/kemono/inject_x86.exe

common/board/meson.build

@@ -9,6 +9,9 @@ board_lib = static_library(
         iccard_lib,
     ],
     sources : [
+        '3mpxsc-cmd.h',
+        '3mpxsc-frame.c',
+        '3mpxsc-frame.h',
         'aime-dll.c',
         'aime-dll.h',
         'config.c',

common/board/sg-nfc.c

@@ -321,6 +321,7 @@ static HRESULT sg_nfc_poll_aime(
 
     mifare->type = 0x10;
     mifare->id_len = sizeof(mifare->uid);
+    // mifare->uid = _byteswap_ulong(0x8FBECBFF);
     mifare->uid = _byteswap_ulong(0x01020304);
 
     /* Initialize MIFARE IC emulator */