From c3849865060d32164853b4e00c77cdf57f3cccdc Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 1 Mar 2020 05:48:20 +0000 Subject: [PATCH] Rename macros. --- aaruremote.h | 4 ++-- endian.h | 6 +++--- linux/linux.h | 6 +++--- linux/mmc/ioctl.h | 6 +++--- unix/unix.h | 6 +++--- wii/list_devices.c | 8 ++++---- wii/wii.h | 30 +++++++++++++++--------------- win32/ntioctl.h | 6 +++--- win32/win32.h | 6 +++--- 9 files changed, 39 insertions(+), 39 deletions(-) diff --git a/aaruremote.h b/aaruremote.h index 0ce2a70..b6ef031 100644 --- a/aaruremote.h +++ b/aaruremote.h @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#ifndef DICREMOTE__AARUREMOTE_H_ -#define DICREMOTE__AARUREMOTE_H_ +#ifndef AARUREMOTE__AARUREMOTE_H_ +#define AARUREMOTE__AARUREMOTE_H_ #include #include diff --git a/endian.h b/endian.h index 1635658..3b0b0de 100644 --- a/endian.h +++ b/endian.h @@ -10,8 +10,8 @@ * information regarding copyright ownership. */ -#ifndef DICREMOTE__ENDIAN_H_ -#define DICREMOTE__ENDIAN_H_ +#ifndef AARUREMOTE__ENDIAN_H_ +#define AARUREMOTE__ENDIAN_H_ #if HAVE_ENDIAN_H #include @@ -100,4 +100,4 @@ #endif -#endif // DICREMOTE__ENDIAN_H_ +#endif // AARUREMOTE__ENDIAN_H_ diff --git a/linux/linux.h b/linux/linux.h index 955dedb..9047b14 100644 --- a/linux/linux.h +++ b/linux/linux.h @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#ifndef DICREMOTE_LINUX_LINUX_H_ -#define DICREMOTE_LINUX_LINUX_H_ +#ifndef AARUREMOTE_LINUX_LINUX_H_ +#define AARUREMOTE_LINUX_LINUX_H_ #include "../aaruremote.h" @@ -125,4 +125,4 @@ typedef struct char device_path[4096]; } LinuxDeviceContext; -#endif // DICREMOTE_LINUX_LINUX_H_ +#endif // AARUREMOTE_LINUX_LINUX_H_ diff --git a/linux/mmc/ioctl.h b/linux/mmc/ioctl.h index c8e37b5..e55b496 100644 --- a/linux/mmc/ioctl.h +++ b/linux/mmc/ioctl.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef DICREMOTE_LINUX_MMC_IOCTL_H_ -#define DICREMOTE_LINUX_MMC_IOCTL_H_ +#ifndef AARUREMOTE_LINUX_MMC_IOCTL_H_ +#define AARUREMOTE_LINUX_MMC_IOCTL_H_ #ifdef HAS_UAPI_MMC #include @@ -88,4 +88,4 @@ struct mmc_ioc_multi_cmd #define MMC_IOC_MAX_CMDS 255 #endif -#endif // DICREMOTE_LINUX_MMC_IOCTL_H_ +#endif // AARUREMOTE_LINUX_MMC_IOCTL_H_ diff --git a/unix/unix.h b/unix/unix.h index 3da3222..780d4d3 100644 --- a/unix/unix.h +++ b/unix/unix.h @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -#ifndef DICREMOTE_UNIX_UNIX_H_ -#define DICREMOTE_UNIX_UNIX_H_ +#ifndef AARUREMOTE_UNIX_UNIX_H_ +#define AARUREMOTE_UNIX_UNIX_H_ typedef struct { int fd; } UnixNetworkContext; -#endif // DICREMOTE_UNIX_UNIX_H_ +#endif // AARUREMOTE_UNIX_UNIX_H_ diff --git a/wii/list_devices.c b/wii/list_devices.c index 8980469..497b874 100644 --- a/wii/list_devices.c +++ b/wii/list_devices.c @@ -35,7 +35,7 @@ DeviceInfoList* WiiListDevices() memset(list_next, 0, sizeof(DeviceInfoList)); // All Wiis do have flash - strncpy(list_next->this.path, DICREMOTE_WII_DEVICE_PATH_NAND, 1024); + strncpy(list_next->this.path, AARUREMOTE_WII_DEVICE_PATH_NAND, 1024); strncpy(list_next->this.vendor, "Nintendo", 256); strncpy(list_next->this.model, "Wii NAND", 256); strncpy(list_next->this.bus, "NAND", 256); @@ -46,14 +46,14 @@ DeviceInfoList* WiiListDevices() list_start = list_next; list_current = list_start; - sd_fd = IOS_Open(DICREMOTE_WII_DEVICE_PATH_SD, IPC_OPEN_READ); + sd_fd = IOS_Open(AARUREMOTE_WII_DEVICE_PATH_SD, IPC_OPEN_READ); if(sd_fd >= 0) { deviceId = 0; - IOS_Ioctl(sd_fd, DICREMOTE_WII_IOCTL_SD_GET_DEVICE_STATUS, 0, 0, &deviceId, sizeof(deviceId)); + IOS_Ioctl(sd_fd, AARUREMOTE_WII_IOCTL_SD_GET_DEVICE_STATUS, 0, 0, &deviceId, sizeof(deviceId)); - if(deviceId == DICREMOTE_WII_SD_INSERTED) + if(deviceId == AARUREMOTE_WII_SD_INSERTED) { strncpy(list_next->this.path, "/dev/flash", 1024); strncpy(list_next->this.vendor, "Nintendo", 256); diff --git a/wii/wii.h b/wii/wii.h index 5140d4f..0d35f54 100644 --- a/wii/wii.h +++ b/wii/wii.h @@ -15,25 +15,25 @@ * along with this program. If not, see . */ -#ifndef DICREMOTE_WII_WII_H_ -#define DICREMOTE_WII_WII_H_ +#ifndef AARUREMOTE_WII_WII_H_ +#define AARUREMOTE_WII_WII_H_ #include "../aaruremote.h" -#define DICREMOTE_WII_DEVICE_FD_NAND 1 -#define DICREMOTE_WII_DEVICE_FD_DVD 2 -#define DICREMOTE_WII_DEVICE_FD_SD 3 -#define DICREMOTE_WII_DEVICE_FD_GCMM_A 4 -#define DICREMOTE_WII_DEVICE_FD_GCMM_B 5 +#define AARUREMOTE_WII_DEVICE_FD_NAND 1 +#define AARUREMOTE_WII_DEVICE_FD_DVD 2 +#define AARUREMOTE_WII_DEVICE_FD_SD 3 +#define AARUREMOTE_WII_DEVICE_FD_GCMM_A 4 +#define AARUREMOTE_WII_DEVICE_FD_GCMM_B 5 -#define DICREMOTE_WII_IOCTL_SD_GET_DEVICE_STATUS 0x0B -#define DICREMOTE_WII_SD_INSERTED 1 +#define AARUREMOTE_WII_IOCTL_SD_GET_DEVICE_STATUS 0x0B +#define AARUREMOTE_WII_SD_INSERTED 1 -#define DICREMOTE_WII_DEVICE_PATH_NAND "/dev/flash" -#define DICREMOTE_WII_DEVICE_PATH_DVD "/dev/di" -#define DICREMOTE_WII_DEVICE_PATH_SD "/dev/sdio/slot0" -#define DICREMOTE_WII_DEVICE_PATH_GCMM_A "/dev/gcmm/slota" -#define DICREMOTE_WII_DEVICE_PATH_GCMM_B "/dev/gcmm/slotb" +#define AARUREMOTE_WII_DEVICE_PATH_NAND "/dev/flash" +#define AARUREMOTE_WII_DEVICE_PATH_DVD "/dev/di" +#define AARUREMOTE_WII_DEVICE_PATH_SD "/dev/sdio/slot0" +#define AARUREMOTE_WII_DEVICE_PATH_GCMM_A "/dev/gcmm/slota" +#define AARUREMOTE_WII_DEVICE_PATH_GCMM_B "/dev/gcmm/slotb" typedef struct { @@ -48,4 +48,4 @@ typedef struct DeviceInfoList* WiiListDevices(); -#endif // DICREMOTE_WII_WII_H_ +#endif // AARUREMOTE_WII_WII_H_ diff --git a/win32/ntioctl.h b/win32/ntioctl.h index e66f0e5..82b77c2 100644 --- a/win32/ntioctl.h +++ b/win32/ntioctl.h @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#ifndef DICREMOTE_WIN32_NTIOCTL_H_ -#define DICREMOTE_WIN32_NTIOCTL_H_ +#ifndef AARUREMOTE_WIN32_NTIOCTL_H_ +#define AARUREMOTE_WIN32_NTIOCTL_H_ #include #include @@ -213,4 +213,4 @@ typedef struct _SDCMD_DESCRIPTOR } SDCMD_DESCRIPTOR, *PSDCMD_DESCRIPTOR; #endif -#endif // DICREMOTE_WIN32_NTIOCTL_H_ +#endif // AARUREMOTE_WIN32_NTIOCTL_H_ diff --git a/win32/win32.h b/win32/win32.h index dc053b9..cd92cb9 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#ifndef DICREMOTE_WIN32_WIN32_H_ -#define DICREMOTE_WIN32_WIN32_H_ +#ifndef AARUREMOTE_WIN32_WIN32_H_ +#define AARUREMOTE_WIN32_WIN32_H_ #include "../aaruremote.h" @@ -142,4 +142,4 @@ int32_t Win32SendSdhciCommand(void* device_ctx, uint32_t* duration, uint32_t* sense); -#endif // DICREMOTE_WIN32_WIN32_H_ +#endif // AARUREMOTE_WIN32_WIN32_H_