amex -> idmac

amex/guid.c

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

idmac/config.c

@@ -6,13 +6,13 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "amex/amex.h"
+#include "idmac/idmac.h"
-#include "amex/config.h"
+#include "idmac/config.h"
-#include "amex/ds.h"
+#include "idmac/ds.h"
-#include "amex/eeprom.h"
+#include "idmac/eeprom.h"
-#include "amex/gpio.h"
+#include "idmac/gpio.h"
-#include "amex/jvs.h"
+#include "idmac/jvs.h"
-#include "amex/sram.h"
+#include "idmac/sram.h"
 
 void ds_config_load(struct ds_config *cfg, const wchar_t *filename)
 {
@@ -91,7 +91,7 @@ void sram_config_load(struct sram_config *cfg, const wchar_t *filename)
             filename);
 }
 
-void amex_config_load(struct amex_config *cfg, const wchar_t *filename)
+void idmac_config_load(struct idmac_config *cfg, const wchar_t *filename)
 {
     assert(cfg != NULL);
     assert(filename != NULL);

idmac/config.h

@@ -6,16 +6,16 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "amex/amex.h"
+#include "idmac/idmac.h"
-#include "amex/ds.h"
+#include "idmac/ds.h"
-#include "amex/eeprom.h"
+#include "idmac/eeprom.h"
-#include "amex/gpio.h"
+#include "idmac/gpio.h"
-#include "amex/jvs.h"
+#include "idmac/jvs.h"
-#include "amex/sram.h"
+#include "idmac/sram.h"
 
 void ds_config_load(struct ds_config *cfg, const wchar_t *filename);
 void eeprom_config_load(struct eeprom_config *cfg, const wchar_t *filename);
 void gpio_config_load(struct gpio_config *cfg, const wchar_t *filename);
 void jvs_config_load(struct jvs_config *cfg, const wchar_t *filename);
 void sram_config_load(struct sram_config *cfg, const wchar_t *filename);
-void amex_config_load(struct amex_config *cfg, const wchar_t *filename);
+void idmac_config_load(struct idmac_config *cfg, const wchar_t *filename);

idmac/ds.c

@@ -7,8 +7,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "amex/ds.h"
+#include "idmac/ds.h"
-#include "amex/nvram.h"
+#include "idmac/nvram.h"
 
 #include "hook/iobuf.h"
 #include "hook/iohook.h"

idmac/eeprom.c

@@ -10,8 +10,8 @@
 
 #include <assert.h>
 
-#include "amex/eeprom.h"
+#include "idmac/eeprom.h"
-#include "amex/nvram.h"
+#include "idmac/nvram.h"
 
 #include "hook/iohook.h"
 

idmac/gpio.c

@@ -4,7 +4,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "amex/gpio.h"
+#include "idmac/gpio.h"
 
 #include "hook/iohook.h"
 

idmac/guid.c

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

idmac/idmac.c

@@ -1,15 +1,15 @@
 #include <windows.h>
 
-#include "amex/amex.h"
+#include "idmac/idmac.h"
-#include "amex/ds.h"
+#include "idmac/ds.h"
-#include "amex/eeprom.h"
+#include "idmac/eeprom.h"
-#include "amex/gpio.h"
+#include "idmac/gpio.h"
-#include "amex/jvs.h"
+#include "idmac/jvs.h"
-#include "amex/sram.h"
+#include "idmac/sram.h"
 
 #include <assert.h>
 
-HRESULT amex_hook_init(const struct amex_config *cfg, jvs_provider_t jvs)
+HRESULT idmac_hook_init(const struct idmac_config *cfg, jvs_provider_t jvs)
 {
     HRESULT hr;
 

idmac/idmac.h

@@ -2,13 +2,13 @@
 
 #include <windows.h>
 
-#include "amex/ds.h"
+#include "idmac/ds.h"
-#include "amex/eeprom.h"
+#include "idmac/eeprom.h"
-#include "amex/gpio.h"
+#include "idmac/gpio.h"
-#include "amex/jvs.h"
+#include "idmac/jvs.h"
-#include "amex/sram.h"
+#include "idmac/sram.h"
 
-struct amex_config {
+struct idmac_config {
     struct ds_config ds;
     struct eeprom_config eeprom;
     struct gpio_config gpio;
@@ -16,6 +16,6 @@ struct amex_config {
     struct sram_config sram;
 };
 
-HRESULT amex_hook_init(
+HRESULT idmac_hook_init(
-        const struct amex_config *cfg,
+        const struct idmac_config *cfg,
         jvs_provider_t jvs);

idmac/jvs.c

@@ -8,7 +8,7 @@
 #include <assert.h>
 #include <stddef.h>
 
-#include "amex/jvs.h"
+#include "idmac/jvs.h"
 
 #include "hook/iobuf.h"
 #include "hook/iohook.h"

idmac/meson.build

@@ -1,5 +1,5 @@
-amex_lib = static_library(
+idmac_lib = static_library(
-    'amex',
+    'idmac',
     include_directories : inc,
     implicit_include_directories : false,
     c_pch : '../precompiled.h',
@@ -7,8 +7,8 @@ amex_lib = static_library(
         capnhook.get_variable('hook_dep'),
     ],
     sources : [
-        'amex.c',
+        'idmac.c',
-        'amex.h',
+        'idmac.h',
         'config.c',
         'config.h',
         'ds.c',

idmac/nvram.c

@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "amex/nvram.h"
+#include "idmac/nvram.h"
 
 #include "util/dprintf.h"
 

idmac/sram.c

@@ -10,8 +10,8 @@
 
 #include <assert.h>
 
-#include "amex/sram.h"
+#include "idmac/sram.h"
-#include "amex/nvram.h"
+#include "idmac/nvram.h"
 
 #include "hook/iohook.h"
 

meson.build

@@ -43,7 +43,7 @@ xinput_lib = cc.find_library('xinput')
 inc = include_directories('.')
 capnhook = subproject('capnhook')
 
-subdir('amex')
+subdir('idmac')
 subdir('iccard')
 subdir('board')
 subdir('hooklib')

minihook/dllmain.c

@@ -2,8 +2,8 @@
 
 #include <stdlib.h>
 
-#include "amex/config.h"
+#include "idmac/config.h"
-#include "amex/ds.h"
+#include "idmac/ds.h"
 
 #include "hook/process.h"
 

minihook/meson.build

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