diff --git a/amex/guid.c b/amex/guid.c deleted file mode 100644 index de51804..0000000 --- a/amex/guid.c +++ /dev/null @@ -1,8 +0,0 @@ -#include -#include - -#include "amex/ds.h" -#include "amex/eeprom.h" -#include "amex/gpio.h" -#include "amex/jvs.h" -#include "amex/sram.h" diff --git a/amex/config.c b/idmac/config.c similarity index 90% rename from amex/config.c rename to idmac/config.c index e138447..75423ed 100644 --- a/amex/config.c +++ b/idmac/config.c @@ -6,13 +6,13 @@ #include #include -#include "amex/amex.h" -#include "amex/config.h" -#include "amex/ds.h" -#include "amex/eeprom.h" -#include "amex/gpio.h" -#include "amex/jvs.h" -#include "amex/sram.h" +#include "idmac/idmac.h" +#include "idmac/config.h" +#include "idmac/ds.h" +#include "idmac/eeprom.h" +#include "idmac/gpio.h" +#include "idmac/jvs.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); diff --git a/amex/config.h b/idmac/config.h similarity index 67% rename from amex/config.h rename to idmac/config.h index d088bf0..3c2fdfd 100644 --- a/amex/config.h +++ b/idmac/config.h @@ -6,16 +6,16 @@ #include #include -#include "amex/amex.h" -#include "amex/ds.h" -#include "amex/eeprom.h" -#include "amex/gpio.h" -#include "amex/jvs.h" -#include "amex/sram.h" +#include "idmac/idmac.h" +#include "idmac/ds.h" +#include "idmac/eeprom.h" +#include "idmac/gpio.h" +#include "idmac/jvs.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); diff --git a/amex/ds.c b/idmac/ds.c similarity index 98% rename from amex/ds.c rename to idmac/ds.c index c0f357f..ead06a8 100644 --- a/amex/ds.c +++ b/idmac/ds.c @@ -7,8 +7,8 @@ #include #include -#include "amex/ds.h" -#include "amex/nvram.h" +#include "idmac/ds.h" +#include "idmac/nvram.h" #include "hook/iobuf.h" #include "hook/iohook.h" diff --git a/amex/ds.h b/idmac/ds.h similarity index 100% rename from amex/ds.h rename to idmac/ds.h diff --git a/amex/eeprom.c b/idmac/eeprom.c similarity index 98% rename from amex/eeprom.c rename to idmac/eeprom.c index 84e4701..f9da8b8 100644 --- a/amex/eeprom.c +++ b/idmac/eeprom.c @@ -10,8 +10,8 @@ #include -#include "amex/eeprom.h" -#include "amex/nvram.h" +#include "idmac/eeprom.h" +#include "idmac/nvram.h" #include "hook/iohook.h" diff --git a/amex/eeprom.h b/idmac/eeprom.h similarity index 100% rename from amex/eeprom.h rename to idmac/eeprom.h diff --git a/amex/gpio.c b/idmac/gpio.c similarity index 99% rename from amex/gpio.c rename to idmac/gpio.c index 4e18630..c711aa8 100644 --- a/amex/gpio.c +++ b/idmac/gpio.c @@ -4,7 +4,7 @@ #include #include -#include "amex/gpio.h" +#include "idmac/gpio.h" #include "hook/iohook.h" diff --git a/amex/gpio.h b/idmac/gpio.h similarity index 100% rename from amex/gpio.h rename to idmac/gpio.h diff --git a/idmac/guid.c b/idmac/guid.c new file mode 100644 index 0000000..559e557 --- /dev/null +++ b/idmac/guid.c @@ -0,0 +1,8 @@ +#include +#include + +#include "idmac/ds.h" +#include "idmac/eeprom.h" +#include "idmac/gpio.h" +#include "idmac/jvs.h" +#include "idmac/sram.h" diff --git a/amex/amex.c b/idmac/idmac.c similarity index 71% rename from amex/amex.c rename to idmac/idmac.c index 903665f..dad3529 100644 --- a/amex/amex.c +++ b/idmac/idmac.c @@ -1,15 +1,15 @@ #include -#include "amex/amex.h" -#include "amex/ds.h" -#include "amex/eeprom.h" -#include "amex/gpio.h" -#include "amex/jvs.h" -#include "amex/sram.h" +#include "idmac/idmac.h" +#include "idmac/ds.h" +#include "idmac/eeprom.h" +#include "idmac/gpio.h" +#include "idmac/jvs.h" +#include "idmac/sram.h" #include -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; diff --git a/amex/amex.h b/idmac/idmac.h similarity index 50% rename from amex/amex.h rename to idmac/idmac.h index f1a0368..262745a 100644 --- a/amex/amex.h +++ b/idmac/idmac.h @@ -2,13 +2,13 @@ #include -#include "amex/ds.h" -#include "amex/eeprom.h" -#include "amex/gpio.h" -#include "amex/jvs.h" -#include "amex/sram.h" +#include "idmac/ds.h" +#include "idmac/eeprom.h" +#include "idmac/gpio.h" +#include "idmac/jvs.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( - const struct amex_config *cfg, +HRESULT idmac_hook_init( + const struct idmac_config *cfg, jvs_provider_t jvs); diff --git a/amex/jvs.c b/idmac/jvs.c similarity index 99% rename from amex/jvs.c rename to idmac/jvs.c index 40d9673..01b2b04 100644 --- a/amex/jvs.c +++ b/idmac/jvs.c @@ -8,7 +8,7 @@ #include #include -#include "amex/jvs.h" +#include "idmac/jvs.h" #include "hook/iobuf.h" #include "hook/iohook.h" diff --git a/amex/jvs.h b/idmac/jvs.h similarity index 100% rename from amex/jvs.h rename to idmac/jvs.h diff --git a/amex/meson.build b/idmac/meson.build similarity index 85% rename from amex/meson.build rename to idmac/meson.build index 0f4d61e..afea1fb 100644 --- a/amex/meson.build +++ b/idmac/meson.build @@ -1,5 +1,5 @@ -amex_lib = static_library( - 'amex', +idmac_lib = static_library( + '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', - 'amex.h', + 'idmac.c', + 'idmac.h', 'config.c', 'config.h', 'ds.c', diff --git a/amex/nvram.c b/idmac/nvram.c similarity index 98% rename from amex/nvram.c rename to idmac/nvram.c index bbade62..48e0c56 100644 --- a/amex/nvram.c +++ b/idmac/nvram.c @@ -4,7 +4,7 @@ #include #include -#include "amex/nvram.h" +#include "idmac/nvram.h" #include "util/dprintf.h" diff --git a/amex/nvram.h b/idmac/nvram.h similarity index 100% rename from amex/nvram.h rename to idmac/nvram.h diff --git a/amex/sram.c b/idmac/sram.c similarity index 98% rename from amex/sram.c rename to idmac/sram.c index c5a195a..5b0c83f 100644 --- a/amex/sram.c +++ b/idmac/sram.c @@ -10,8 +10,8 @@ #include -#include "amex/sram.h" -#include "amex/nvram.h" +#include "idmac/sram.h" +#include "idmac/nvram.h" #include "hook/iohook.h" diff --git a/amex/sram.h b/idmac/sram.h similarity index 100% rename from amex/sram.h rename to idmac/sram.h diff --git a/meson.build b/meson.build index daeef33..c28fe54 100644 --- a/meson.build +++ b/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') diff --git a/minihook/dllmain.c b/minihook/dllmain.c index cc4b402..6f042eb 100644 --- a/minihook/dllmain.c +++ b/minihook/dllmain.c @@ -2,8 +2,8 @@ #include -#include "amex/config.h" -#include "amex/ds.h" +#include "idmac/config.h" +#include "idmac/ds.h" #include "hook/process.h" diff --git a/minihook/meson.build b/minihook/meson.build index 8acbf1e..21acfd1 100644 --- a/minihook/meson.build +++ b/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,