platform: Shift config structs around

platform/amvideo.h

@@ -2,6 +2,10 @@
 
 #include <windows.h>
 
-#include "platform/config.h"
+#include <stdbool.h>
+
+struct amvideo_config {
+    bool enable;
+};
 
 HRESULT amvideo_hook_init(const struct amvideo_config *cfg, HMODULE redir_mod);

platform/clock.c

@@ -6,7 +6,6 @@
 #include "hook/table.h"
 
 #include "platform/clock.h"
-#include "platform/config.h"
 
 #include "util/dprintf.h"
 

platform/clock.h

@@ -2,6 +2,12 @@
 
 #include <windows.h>
 
-#include "platform/config.h"
+#include <stdbool.h>
+
+struct clock_config {
+    bool timezone;
+    bool timewarp;
+    bool writeable;
+};
 
 HRESULT clock_hook_init(const struct clock_config *cfg);

platform/config.c

@@ -9,7 +9,17 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "platform/amvideo.h"
+#include "platform/clock.h"
 #include "platform/config.h"
+#include "platform/dns.h"
+#include "platform/hwmon.h"
+#include "platform/misc.h"
+#include "platform/netenv.h"
+#include "platform/nusec.h"
+#include "platform/pcbid.h"
+#include "platform/platform.h"
+#include "platform/vfs.h"
 
 void platform_config_load(struct platform_config *cfg, const wchar_t *filename)
 {

platform/config.h

@@ -6,73 +6,16 @@
 #include <stddef.h>
 #include <stdint.h>
 
-struct amvideo_config {
+#include "platform/amvideo.h"
-    bool enable;
+#include "platform/clock.h"
-};
+#include "platform/dns.h"
-
+#include "platform/hwmon.h"
-struct clock_config {
+#include "platform/misc.h"
-    bool timezone;
+#include "platform/netenv.h"
-    bool timewarp;
+#include "platform/nusec.h"
-    bool writeable;
+#include "platform/pcbid.h"
-};
+#include "platform/platform.h"
-
+#include "platform/vfs.h"
-struct dns_config {
-    bool enable;
-    wchar_t router[128];
-    wchar_t startup[128];
-    wchar_t billing[128];
-    wchar_t aimedb[128];
-};
-
-struct hwmon_config {
-    bool enable;
-};
-
-struct misc_config {
-    bool enable;
-};
-
-struct netenv_config {
-    bool enable;
-    uint8_t addr_suffix;
-    uint8_t router_suffix;
-    uint8_t mac_addr[6];
-};
-
-struct nusec_config {
-    bool enable;
-    char keychip_id[16];
-    char game_id[4];
-    char platform_id[4];
-    uint8_t region;
-    uint8_t system_flag;
-    uint32_t subnet;
-    wchar_t billing_ca[MAX_PATH];
-    wchar_t billing_pub[MAX_PATH];
-};
-
-struct pcbid_config {
-    bool enable;
-    wchar_t serial_no[17];
-};
-
-struct vfs_config {
-    bool enable;
-    wchar_t amfs[MAX_PATH];
-    wchar_t appdata[MAX_PATH];
-};
-
-struct platform_config {
-    struct amvideo_config amvideo;
-    struct clock_config clock;
-    struct dns_config dns;
-    struct hwmon_config hwmon;
-    struct misc_config misc;
-    struct pcbid_config pcbid;
-    struct netenv_config netenv;
-    struct nusec_config nusec;
-    struct vfs_config vfs;
-};
 
 void platform_config_load(
         struct platform_config *cfg,

platform/dns.c

@@ -4,7 +4,6 @@
 
 #include "hooklib/dns.h"
 
-#include "platform/config.h"
 #include "platform/dns.h"
 
 HRESULT dns_platform_hook_init(const struct dns_config *cfg)

platform/dns.h

@@ -2,7 +2,15 @@
 
 #include <windows.h>
 
-#include "platform/config.h"
+#include <stdbool.h>
+#include <stddef.h>
+
+struct dns_config {
+    bool enable;
+    wchar_t router[128];
+    wchar_t startup[128];
+    wchar_t billing[128];
+    wchar_t aimedb[128];
+};
 
 HRESULT dns_platform_hook_init(const struct dns_config *cfg);
-

platform/hwmon.c

@@ -5,7 +5,6 @@
 
 #include "hook/iohook.h"
 
-#include "platform/config.h"
 #include "platform/hwmon.h"
 
 #include "util/dprintf.h"

platform/hwmon.h

@@ -2,6 +2,10 @@
 
 #include <windows.h>
 
-#include "platform/config.h"
+#include <stdbool.h>
+
+struct hwmon_config {
+    bool enable;
+};
 
 HRESULT hwmon_hook_init(const struct hwmon_config *cfg);

platform/misc.h

@@ -1,5 +1,9 @@
 #pragma once
 
-#include "platform/config.h"
+#include <windows.h>
+
+struct misc_config {
+    bool enable;
+};
 
 HRESULT misc_hook_init(const struct misc_config *cfg, const char *platform_id);

platform/netenv.c

@@ -9,8 +9,8 @@
 
 #include "hook/table.h"
 
-#include "platform/config.h"
 #include "platform/netenv.h"
+#include "platform/nusec.h"
 
 #include "util/dprintf.h"
 

platform/netenv.h

@@ -5,7 +5,14 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "platform/config.h"
+#include "platform/nusec.h"
+
+struct netenv_config {
+    bool enable;
+    uint8_t addr_suffix;
+    uint8_t router_suffix;
+    uint8_t mac_addr[6];
+};
 
 HRESULT netenv_hook_init(
         const struct netenv_config *cfg,

platform/nusec.c

@@ -7,7 +7,6 @@
 
 #include "hooklib/reg.h"
 
-#include "platform/config.h"
 #include "platform/nusec.h"
 
 #include "util/dprintf.h"

platform/nusec.h

@@ -2,7 +2,21 @@
 
 #include <windows.h>
 
-#include "platform/config.h"
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+struct nusec_config {
+    bool enable;
+    char keychip_id[16];
+    char game_id[4];
+    char platform_id[4];
+    uint8_t region;
+    uint8_t system_flag;
+    uint32_t subnet;
+    wchar_t billing_ca[MAX_PATH];
+    wchar_t billing_pub[MAX_PATH];
+};
 
 HRESULT nusec_hook_init(
         const struct nusec_config *cfg,

platform/pcbid.h

@@ -1,5 +1,13 @@
 #pragma once
 
-#include "platform/config.h"
+#include <windows.h>
+
+#include <stdbool.h>
+#include <stddef.h>
+
+struct pcbid_config {
+    bool enable;
+    wchar_t serial_no[17];
+};
 
 HRESULT pcbid_hook_init(const struct pcbid_config *cfg);

platform/platform.c

@@ -4,7 +4,6 @@
 
 #include "platform/amvideo.h"
 #include "platform/clock.h"
-#include "platform/config.h"
 #include "platform/dns.h"
 #include "platform/hwmon.h"
 #include "platform/misc.h"

platform/platform.h

@@ -2,7 +2,27 @@
 
 #include <windows.h>
 
-#include "platform/config.h"
+#include "platform/amvideo.h"
+#include "platform/clock.h"
+#include "platform/dns.h"
+#include "platform/hwmon.h"
+#include "platform/misc.h"
+#include "platform/netenv.h"
+#include "platform/nusec.h"
+#include "platform/pcbid.h"
+#include "platform/vfs.h"
+
+struct platform_config {
+    struct amvideo_config amvideo;
+    struct clock_config clock;
+    struct dns_config dns;
+    struct hwmon_config hwmon;
+    struct misc_config misc;
+    struct pcbid_config pcbid;
+    struct netenv_config netenv;
+    struct nusec_config nusec;
+    struct vfs_config vfs;
+};
 
 HRESULT platform_hook_init(
         const struct platform_config *cfg,

platform/vfs.c

@@ -8,7 +8,6 @@
 #include "hooklib/path.h"
 #include "hooklib/reg.h"
 
-#include "platform/config.h"
 #include "platform/vfs.h"
 
 #include "util/dprintf.h"

platform/vfs.h

@@ -2,6 +2,13 @@
 
 #include <windows.h>
 
-#include "platform/config.h"
+#include <stdbool.h>
+#include <stddef.h>
+
+struct vfs_config {
+    bool enable;
+    wchar_t amfs[MAX_PATH];
+    wchar_t appdata[MAX_PATH];
+};
 
 HRESULT vfs_hook_init(const struct vfs_config *config);