diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-08 19:39:43 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-08 19:39:43 -0400 |
| commit | b398a161f324f88a4d4c8682eb15c63a62753a43 (patch) | |
| tree | cb537afb44e15ac1c901d881ce9ab43934b2d713 /arm9/lib/include | |
| parent | 782eca721768b17d51d79e36b519e95d8d9e5b9b (diff) | |
Fix style inconsistencies
Diffstat (limited to 'arm9/lib/include')
| -rw-r--r-- | arm9/lib/include/FS_file.h | 16 | ||||
| -rw-r--r-- | arm9/lib/include/OS_printf.h | 2 | ||||
| -rw-r--r-- | arm9/lib/include/OS_system.h | 4 | ||||
| -rw-r--r-- | arm9/lib/include/mmap_global.h | 4 |
4 files changed, 10 insertions, 16 deletions
diff --git a/arm9/lib/include/FS_file.h b/arm9/lib/include/FS_file.h index 9857a40c..3a7d8730 100644 --- a/arm9/lib/include/FS_file.h +++ b/arm9/lib/include/FS_file.h @@ -5,13 +5,13 @@ #include "FS_archive.h" -#define FS_FILE_STATUS_BUSY 0x00000001 -#define FS_FILE_STATUS_CANCEL 0x00000002 -#define FS_FILE_STATUS_SYNC 0x00000004 -#define FS_FILE_STATUS_ASYNC 0x00000008 -#define FS_FILE_STATUS_IS_FILE 0x00000010 -#define FS_FILE_STATUS_IS_DIR 0x00000020 -#define FS_FILE_STATUS_OPERATING 0x00000040 +#define FS_FILE_STATUS_BUSY 0x00000001 +#define FS_FILE_STATUS_CANCEL 0x00000002 +#define FS_FILE_STATUS_SYNC 0x00000004 +#define FS_FILE_STATUS_ASYNC 0x00000008 +#define FS_FILE_STATUS_IS_FILE 0x00000010 +#define FS_FILE_STATUS_IS_DIR 0x00000020 +#define FS_FILE_STATUS_OPERATING 0x00000040 #define FS_FILE_NAME_MAX 127 @@ -81,7 +81,7 @@ typedef struct FSFileID *file; FSDirPos *dir; } - result; + result; } FSFindPathInfo; diff --git a/arm9/lib/include/OS_printf.h b/arm9/lib/include/OS_printf.h index 0fda0f51..7c02252b 100644 --- a/arm9/lib/include/OS_printf.h +++ b/arm9/lib/include/OS_printf.h @@ -2,5 +2,7 @@ #define NITRO_OS_PRINTF_H_ #define OS_Warning( ... ) ((void)0) +#define OS_TPanic(...) OS_Terminate() +#define OS_TWarning(...) ((void)0) #endif //NITRO_OS_PRINTF_H_ diff --git a/arm9/lib/include/OS_system.h b/arm9/lib/include/OS_system.h index 88137c3b..794e16d2 100644 --- a/arm9/lib/include/OS_system.h +++ b/arm9/lib/include/OS_system.h @@ -7,7 +7,6 @@ #include "function_target.h" #include "consts.h" -#include "function_target.h" typedef enum { OS_PROCMODE_USER=16, @@ -36,8 +35,5 @@ OSIntrMode OS_GetCpsrIrq(); OSProcMode OS_GetProcMode(); void OS_SpinWait(); void OS_WaitVBlankIntr(); -void OS_Terminate(void); -#define OS_TPanic(...) OS_Terminate() -#define OS_TWarning(...) ((void)0) #endif //POKEDIAMOND_OS_SYSTEM_H diff --git a/arm9/lib/include/mmap_global.h b/arm9/lib/include/mmap_global.h deleted file mode 100644 index e657e46f..00000000 --- a/arm9/lib/include/mmap_global.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef NITRO_MMAP_GLOBAL_H_ -#define NITRO_MMAP_GLOBAL_H_ - -#endif //NITRO_MMAP_GLOBAL_H_ |