From a3120181be304f9b2a7d0a5bf721545d12b810f5 Mon Sep 17 00:00:00 2001 From: Dniel97 Date: Mon, 23 Dec 2024 21:48:30 +0100 Subject: [PATCH] replace hardcoded enums with #define CTL_CODEs --- amex/ds.c | 12 +++++------- amex/eeprom.c | 6 ++---- amex/gpio.c | 11 +++++------ amex/jvs.c | 9 ++++----- amex/sram.c | 6 ++---- platform/hwmon.c | 5 ++--- platform/hwreset.c | 5 ++--- platform/nusec.c | 34 ++++++++++++++++------------------ 8 files changed, 38 insertions(+), 50 deletions(-) diff --git a/amex/ds.c b/amex/ds.c index 74d1c85..0989ac4 100644 --- a/amex/ds.c +++ b/amex/ds.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include @@ -20,13 +20,11 @@ #include "util/dprintf.h" #include "util/str.h" -#pragma pack(push, 1) +#define DS_IOCTL_GET_ABI_VERSION CTL_CODE(0x8000, 0x800, METHOD_BUFFERED, FILE_READ_ACCESS) +#define DS_IOCTL_SETUP CTL_CODE(0x8000, 0x801, METHOD_BUFFERED, FILE_READ_ACCESS) +#define DS_IOCTL_READ_SECTOR CTL_CODE(0x8000, 0x804, METHOD_BUFFERED, FILE_READ_ACCESS) -enum { - DS_IOCTL_GET_ABI_VERSION = 0x80006000, - DS_IOCTL_SETUP = 0x80006004, - DS_IOCTL_READ_SECTOR = 0x80006010, -}; +#pragma pack(push, 1) struct ds_eeprom { uint32_t crc32; diff --git a/amex/eeprom.c b/amex/eeprom.c index 84e4701..b06c4bd 100644 --- a/amex/eeprom.c +++ b/amex/eeprom.c @@ -6,7 +6,7 @@ #include #endif #include -#include +#include #include @@ -20,9 +20,7 @@ #include "util/dprintf.h" #include "util/str.h" -enum { - EEPROM_IOCTL_GET_ABI_VERSION = 0x80006000, -}; +#define EEPROM_IOCTL_GET_ABI_VERSION CTL_CODE(0x8000, 0x800, METHOD_BUFFERED, FILE_READ_ACCESS) static HRESULT eeprom_handle_irp(struct irp *irp); static HRESULT eeprom_handle_open(struct irp *irp); diff --git a/amex/gpio.c b/amex/gpio.c index 4e18630..86eadad 100644 --- a/amex/gpio.c +++ b/amex/gpio.c @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -13,12 +14,10 @@ #include "util/dprintf.h" #include "util/str.h" -enum { - GPIO_IOCTL_SET_LEDS = 0x8000A004, - GPIO_IOCTL_GET_PSW = 0x80006008, - GPIO_IOCTL_GET_DIPSW = 0x8000600C, - GPIO_IOCTL_DESCRIBE = 0x80006014, -}; +#define GPIO_IOCTL_SET_LEDS CTL_CODE(0x8000, 0x801, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define GPIO_IOCTL_GET_PSW CTL_CODE(0x8000, 0x802, METHOD_BUFFERED, FILE_READ_ACCESS) +#define GPIO_IOCTL_GET_DIPSW CTL_CODE(0x8000, 0x803, METHOD_BUFFERED, FILE_READ_ACCESS) +#define GPIO_IOCTL_DESCRIBE CTL_CODE(0x8000, 0x805, METHOD_BUFFERED, FILE_READ_ACCESS) enum { GPIO_TYPE_NONE = 0, diff --git a/amex/jvs.c b/amex/jvs.c index dc55137..0c2dfc7 100644 --- a/amex/jvs.c +++ b/amex/jvs.c @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -21,11 +22,9 @@ #include "util/dump.h" #include "util/str.h" -enum { - JVS_IOCTL_HELLO = 0x80006004, - JVS_IOCTL_SENSE = 0x8000600C, - JVS_IOCTL_TRANSACT = 0x8000E008, -}; +#define JVS_IOCTL_HELLO CTL_CODE(0x8000, 0x801, METHOD_BUFFERED, FILE_READ_ACCESS) +#define JVS_IOCTL_TRANSACT CTL_CODE(0x8000, 0x802, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define JVS_IOCTL_SENSE CTL_CODE(0x8000, 0x803, METHOD_BUFFERED, FILE_READ_ACCESS) static HRESULT jvs_handle_irp(struct irp *irp); static HRESULT jvs_handle_open(struct irp *irp); diff --git a/amex/sram.c b/amex/sram.c index c5a195a..fa4f005 100644 --- a/amex/sram.c +++ b/amex/sram.c @@ -6,7 +6,7 @@ #include #endif #include -#include +#include #include @@ -20,9 +20,7 @@ #include "util/dprintf.h" #include "util/str.h" -enum { - SRAM_IOCTL_GET_ABI_VERSION = 0x80006000, -}; +#define SRAM_IOCTL_GET_ABI_VERSION CTL_CODE(0x8000, 0x800, METHOD_BUFFERED, FILE_READ_ACCESS) static HRESULT sram_handle_irp(struct irp *irp); static HRESULT sram_handle_open(struct irp *irp); diff --git a/platform/hwmon.c b/platform/hwmon.c index ac125d3..cc13c7a 100644 --- a/platform/hwmon.c +++ b/platform/hwmon.c @@ -1,6 +1,7 @@ #include #include +#include #include #include "hook/iohook.h" @@ -10,9 +11,7 @@ #include "util/dprintf.h" #include "util/str.h" -enum { - HWMON_IOCTL_READ_CPU_TEMP = 0x80006000, -}; +#define HWMON_IOCTL_READ_CPU_TEMP CTL_CODE(0x8000, 0x800, METHOD_BUFFERED, FILE_READ_ACCESS) static HRESULT hwmon_handle_irp(struct irp *irp); static HRESULT hwmon_handle_open(struct irp *irp); diff --git a/platform/hwreset.c b/platform/hwreset.c index 51ec337..7b37f1f 100644 --- a/platform/hwreset.c +++ b/platform/hwreset.c @@ -1,6 +1,7 @@ #include #include +#include #include #include "hook/iohook.h" @@ -10,9 +11,7 @@ #include "util/dprintf.h" #include "util/str.h" -enum { - HWRESET_IOCTL_RESTART = 0x80002000, -}; +#define HWRESET_IOCTL_RESTART CTL_CODE(0x8000, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) static HRESULT hwreset_handle_irp(struct irp *irp); static HRESULT hwreset_handle_open(struct irp *irp); diff --git a/platform/nusec.c b/platform/nusec.c index f455ca7..db275c4 100644 --- a/platform/nusec.c +++ b/platform/nusec.c @@ -14,24 +14,22 @@ #include "util/dump.h" #include "util/str.h" -enum { - NUSEC_IOCTL_PING = CTL_CODE(0x22, 0x845, METHOD_BUFFERED, FILE_WRITE_ACCESS), - NUSEC_IOCTL_GET_PLAY_COUNT = CTL_CODE(0x22, 0x854, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_ADD_PLAY_COUNT = CTL_CODE(0x22, 0x855, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_ERASE_TRACE_LOG = CTL_CODE(0x22, 0x862, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_TD_ERASE_USED = CTL_CODE(0x22, 0x863, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_PUT_TRACE_LOG_DATA = CTL_CODE(0x22, 0x864, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_GET_TRACE_LOG_DATA = CTL_CODE(0x22, 0x865, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_GET_TRACE_LOG_STATE = CTL_CODE(0x22, 0x866, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_GET_NVRAM_AVAILABLE = CTL_CODE(0x22, 0x867, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_GET_BILLING_CA_CERT = CTL_CODE(0x22, 0x871, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_GET_BILLING_PUBKEY = CTL_CODE(0x22, 0x872, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_GET_PLAY_LIMIT = CTL_CODE(0x22, 0x881, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_PUT_PLAY_LIMIT = CTL_CODE(0x22, 0x882, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_GET_NEARFULL = CTL_CODE(0x22, 0x883, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_PUT_NEARFULL = CTL_CODE(0x22, 0x884, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), - NUSEC_IOCTL_GET_NVRAM_GEOMETRY = CTL_CODE(0x22, 0x893, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS), -}; +#define NUSEC_IOCTL_PING CTL_CODE(0x22, 0x845, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_GET_PLAY_COUNT CTL_CODE(0x22, 0x854, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_ADD_PLAY_COUNT CTL_CODE(0x22, 0x855, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_ERASE_TRACE_LOG CTL_CODE(0x22, 0x862, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_TD_ERASE_USED CTL_CODE(0x22, 0x863, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_PUT_TRACE_LOG_DATA CTL_CODE(0x22, 0x864, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_GET_TRACE_LOG_DATA CTL_CODE(0x22, 0x865, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_GET_TRACE_LOG_STATE CTL_CODE(0x22, 0x866, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_GET_NVRAM_AVAILABLE CTL_CODE(0x22, 0x867, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_GET_BILLING_CA_CERT CTL_CODE(0x22, 0x871, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_GET_BILLING_PUBKEY CTL_CODE(0x22, 0x872, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_GET_PLAY_LIMIT CTL_CODE(0x22, 0x881, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_PUT_PLAY_LIMIT CTL_CODE(0x22, 0x882, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_GET_NEARFULL CTL_CODE(0x22, 0x883, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_PUT_NEARFULL CTL_CODE(0x22, 0x884, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define NUSEC_IOCTL_GET_NVRAM_GEOMETRY CTL_CODE(0x22, 0x893, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) struct nusec_log_record { uint8_t unknown[60];