Rename macros.

This commit is contained in:
2020-03-01 05:48:20 +00:00
parent 06944ade67
commit c384986506
9 changed files with 39 additions and 39 deletions

View File

@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef DICREMOTE__AARUREMOTE_H_ #ifndef AARUREMOTE__AARUREMOTE_H_
#define DICREMOTE__AARUREMOTE_H_ #define AARUREMOTE__AARUREMOTE_H_
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

View File

@@ -10,8 +10,8 @@
* information regarding copyright ownership. * information regarding copyright ownership.
*/ */
#ifndef DICREMOTE__ENDIAN_H_ #ifndef AARUREMOTE__ENDIAN_H_
#define DICREMOTE__ENDIAN_H_ #define AARUREMOTE__ENDIAN_H_
#if HAVE_ENDIAN_H #if HAVE_ENDIAN_H
#include <endian.h> #include <endian.h>
@@ -100,4 +100,4 @@
#endif #endif
#endif // DICREMOTE__ENDIAN_H_ #endif // AARUREMOTE__ENDIAN_H_

View File

@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef DICREMOTE_LINUX_LINUX_H_ #ifndef AARUREMOTE_LINUX_LINUX_H_
#define DICREMOTE_LINUX_LINUX_H_ #define AARUREMOTE_LINUX_LINUX_H_
#include "../aaruremote.h" #include "../aaruremote.h"
@@ -125,4 +125,4 @@ typedef struct
char device_path[4096]; char device_path[4096];
} LinuxDeviceContext; } LinuxDeviceContext;
#endif // DICREMOTE_LINUX_LINUX_H_ #endif // AARUREMOTE_LINUX_LINUX_H_

View File

@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
#ifndef DICREMOTE_LINUX_MMC_IOCTL_H_ #ifndef AARUREMOTE_LINUX_MMC_IOCTL_H_
#define DICREMOTE_LINUX_MMC_IOCTL_H_ #define AARUREMOTE_LINUX_MMC_IOCTL_H_
#ifdef HAS_UAPI_MMC #ifdef HAS_UAPI_MMC
#include <linux/major.h> #include <linux/major.h>
@@ -88,4 +88,4 @@ struct mmc_ioc_multi_cmd
#define MMC_IOC_MAX_CMDS 255 #define MMC_IOC_MAX_CMDS 255
#endif #endif
#endif // DICREMOTE_LINUX_MMC_IOCTL_H_ #endif // AARUREMOTE_LINUX_MMC_IOCTL_H_

View File

@@ -15,12 +15,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef DICREMOTE_UNIX_UNIX_H_ #ifndef AARUREMOTE_UNIX_UNIX_H_
#define DICREMOTE_UNIX_UNIX_H_ #define AARUREMOTE_UNIX_UNIX_H_
typedef struct typedef struct
{ {
int fd; int fd;
} UnixNetworkContext; } UnixNetworkContext;
#endif // DICREMOTE_UNIX_UNIX_H_ #endif // AARUREMOTE_UNIX_UNIX_H_

View File

@@ -35,7 +35,7 @@ DeviceInfoList* WiiListDevices()
memset(list_next, 0, sizeof(DeviceInfoList)); memset(list_next, 0, sizeof(DeviceInfoList));
// All Wiis do have flash // 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.vendor, "Nintendo", 256);
strncpy(list_next->this.model, "Wii NAND", 256); strncpy(list_next->this.model, "Wii NAND", 256);
strncpy(list_next->this.bus, "NAND", 256); strncpy(list_next->this.bus, "NAND", 256);
@@ -46,14 +46,14 @@ DeviceInfoList* WiiListDevices()
list_start = list_next; list_start = list_next;
list_current = list_start; 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) if(sd_fd >= 0)
{ {
deviceId = 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.path, "/dev/flash", 1024);
strncpy(list_next->this.vendor, "Nintendo", 256); strncpy(list_next->this.vendor, "Nintendo", 256);

View File

@@ -15,25 +15,25 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef DICREMOTE_WII_WII_H_ #ifndef AARUREMOTE_WII_WII_H_
#define DICREMOTE_WII_WII_H_ #define AARUREMOTE_WII_WII_H_
#include "../aaruremote.h" #include "../aaruremote.h"
#define DICREMOTE_WII_DEVICE_FD_NAND 1 #define AARUREMOTE_WII_DEVICE_FD_NAND 1
#define DICREMOTE_WII_DEVICE_FD_DVD 2 #define AARUREMOTE_WII_DEVICE_FD_DVD 2
#define DICREMOTE_WII_DEVICE_FD_SD 3 #define AARUREMOTE_WII_DEVICE_FD_SD 3
#define DICREMOTE_WII_DEVICE_FD_GCMM_A 4 #define AARUREMOTE_WII_DEVICE_FD_GCMM_A 4
#define DICREMOTE_WII_DEVICE_FD_GCMM_B 5 #define AARUREMOTE_WII_DEVICE_FD_GCMM_B 5
#define DICREMOTE_WII_IOCTL_SD_GET_DEVICE_STATUS 0x0B #define AARUREMOTE_WII_IOCTL_SD_GET_DEVICE_STATUS 0x0B
#define DICREMOTE_WII_SD_INSERTED 1 #define AARUREMOTE_WII_SD_INSERTED 1
#define DICREMOTE_WII_DEVICE_PATH_NAND "/dev/flash" #define AARUREMOTE_WII_DEVICE_PATH_NAND "/dev/flash"
#define DICREMOTE_WII_DEVICE_PATH_DVD "/dev/di" #define AARUREMOTE_WII_DEVICE_PATH_DVD "/dev/di"
#define DICREMOTE_WII_DEVICE_PATH_SD "/dev/sdio/slot0" #define AARUREMOTE_WII_DEVICE_PATH_SD "/dev/sdio/slot0"
#define DICREMOTE_WII_DEVICE_PATH_GCMM_A "/dev/gcmm/slota" #define AARUREMOTE_WII_DEVICE_PATH_GCMM_A "/dev/gcmm/slota"
#define DICREMOTE_WII_DEVICE_PATH_GCMM_B "/dev/gcmm/slotb" #define AARUREMOTE_WII_DEVICE_PATH_GCMM_B "/dev/gcmm/slotb"
typedef struct typedef struct
{ {
@@ -48,4 +48,4 @@ typedef struct
DeviceInfoList* WiiListDevices(); DeviceInfoList* WiiListDevices();
#endif // DICREMOTE_WII_WII_H_ #endif // AARUREMOTE_WII_WII_H_

View File

@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef DICREMOTE_WIN32_NTIOCTL_H_ #ifndef AARUREMOTE_WIN32_NTIOCTL_H_
#define DICREMOTE_WIN32_NTIOCTL_H_ #define AARUREMOTE_WIN32_NTIOCTL_H_
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
@@ -213,4 +213,4 @@ typedef struct _SDCMD_DESCRIPTOR
} SDCMD_DESCRIPTOR, *PSDCMD_DESCRIPTOR; } SDCMD_DESCRIPTOR, *PSDCMD_DESCRIPTOR;
#endif #endif
#endif // DICREMOTE_WIN32_NTIOCTL_H_ #endif // AARUREMOTE_WIN32_NTIOCTL_H_

View File

@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef DICREMOTE_WIN32_WIN32_H_ #ifndef AARUREMOTE_WIN32_WIN32_H_
#define DICREMOTE_WIN32_WIN32_H_ #define AARUREMOTE_WIN32_WIN32_H_
#include "../aaruremote.h" #include "../aaruremote.h"
@@ -142,4 +142,4 @@ int32_t Win32SendSdhciCommand(void* device_ctx,
uint32_t* duration, uint32_t* duration,
uint32_t* sense); uint32_t* sense);
#endif // DICREMOTE_WIN32_WIN32_H_ #endif // AARUREMOTE_WIN32_WIN32_H_