Skip to content

Commit

Permalink
tabs to spaces in lib/include
Browse files Browse the repository at this point in the history
  • Loading branch information
PikalaxALT committed Jun 26, 2024
1 parent 8b5b46b commit 8d277f5
Show file tree
Hide file tree
Showing 10 changed files with 97 additions and 97 deletions.
28 changes: 14 additions & 14 deletions lib/include/nitro/card/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
#define CARD_PXI_COMMAND_PULLED_OUT 0x0011
#define CARD_PXI_COMMAND_TERMINATE 0x0001

#define CARD_THREAD_PRIORITY_DEFAULT 4

#define CARD_BACKUP_TYPE_DEVICE_SHIFT 0
#define CARD_BACKUP_TYPE_DEVICE_MASK 0xFF
#define CARD_BACKUP_TYPE_DEVICE_EEPROM 1
#define CARD_BACKUP_TYPE_DEVICE_FLASH 2
#define CARD_BACKUP_TYPE_DEVICE_FRAM 3
#define CARD_BACKUP_TYPE_SIZEBIT_SHIFT 8
#define CARD_BACKUP_TYPE_SIZEBIT_MASK 0xFF
#define CARD_BACKUP_TYPE_VENDER_SHIFT 16
#define CARD_BACKUP_TYPE_DEFINE(type, size, vender) \
(((CARD_BACKUP_TYPE_DEVICE_ ## type) << CARD_BACKUP_TYPE_DEVICE_SHIFT) | \
((size) << CARD_BACKUP_TYPE_SIZEBIT_SHIFT) | \
((vender) << CARD_BACKUP_TYPE_VENDER_SHIFT))
#define CARD_THREAD_PRIORITY_DEFAULT 4

#define CARD_BACKUP_TYPE_DEVICE_SHIFT 0
#define CARD_BACKUP_TYPE_DEVICE_MASK 0xFF
#define CARD_BACKUP_TYPE_DEVICE_EEPROM 1
#define CARD_BACKUP_TYPE_DEVICE_FLASH 2
#define CARD_BACKUP_TYPE_DEVICE_FRAM 3
#define CARD_BACKUP_TYPE_SIZEBIT_SHIFT 8
#define CARD_BACKUP_TYPE_SIZEBIT_MASK 0xFF
#define CARD_BACKUP_TYPE_VENDER_SHIFT 16
#define CARD_BACKUP_TYPE_DEFINE(type, size, vender) \
(((CARD_BACKUP_TYPE_DEVICE_ ## type) << CARD_BACKUP_TYPE_DEVICE_SHIFT) | \
((size) << CARD_BACKUP_TYPE_SIZEBIT_SHIFT) | \
((vender) << CARD_BACKUP_TYPE_VENDER_SHIFT))

#define ALIGN_MASK(a) ((a) - 1)
#define CARD_ALIGN_HI_BIT(n) (((u32)(n)) & ~ALIGN_MASK(CARD_ROM_PAGE_SIZE))
Expand Down
2 changes: 1 addition & 1 deletion lib/include/nitro/card/rom.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <nitro/card/common.h>
#include <nitro/os/tcm.h>

#define CARD_ROM_PAGE_SIZE 512
#define CARD_ROM_PAGE_SIZE 512

#define CARDMST_SEL_ROM 0x00
#define CARDMST_IF_ENABLE 0x40
Expand Down
2 changes: 1 addition & 1 deletion lib/include/nitro/dgt/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#define DGT_HASH1_DIGEST_SIZE (128/8)
#define DGT_HASH2_DIGEST_SIZE (160/8)
#define DGT_HASH_DIGEST_SIZE_MAX DGT_HASH2_DIGEST_SIZE
#define DGT_HASH_BLOCK_SIZE (512/8)
#define DGT_HASH_BLOCK_SIZE (512/8)



Expand Down
66 changes: 33 additions & 33 deletions lib/include/nitro/fs/archive.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ struct FSArchive;

#define FS_ARCHIVE_NAME_LEN_MAX 3

#define FS_ARCHIVE_FLAG_REGISTER 0x00000001
#define FS_ARCHIVE_FLAG_LOADED 0x00000002
#define FS_ARCHIVE_FLAG_TABLE_LOAD 0x00000004
#define FS_ARCHIVE_FLAG_SUSPEND 0x00000008
#define FS_ARCHIVE_FLAG_RUNNING 0x00000010
#define FS_ARCHIVE_FLAG_CANCELING 0x00000020
#define FS_ARCHIVE_FLAG_SUSPENDING 0x00000040
#define FS_ARCHIVE_FLAG_UNLOADING 0x00000080
#define FS_ARCHIVE_FLAG_IS_ASYNC 0x00000100
#define FS_ARCHIVE_FLAG_IS_SYNC 0x00000200
#define FS_ARCHIVE_FLAG_REGISTER 0x00000001
#define FS_ARCHIVE_FLAG_LOADED 0x00000002
#define FS_ARCHIVE_FLAG_TABLE_LOAD 0x00000004
#define FS_ARCHIVE_FLAG_SUSPEND 0x00000008
#define FS_ARCHIVE_FLAG_RUNNING 0x00000010
#define FS_ARCHIVE_FLAG_CANCELING 0x00000020
#define FS_ARCHIVE_FLAG_SUSPENDING 0x00000040
#define FS_ARCHIVE_FLAG_UNLOADING 0x00000080
#define FS_ARCHIVE_FLAG_IS_ASYNC 0x00000100
#define FS_ARCHIVE_FLAG_IS_SYNC 0x00000200

typedef enum {
FS_COMMAND_ASYNC_BEGIN = 0,
Expand Down Expand Up @@ -46,37 +46,37 @@ typedef enum {
} FSCommandType;

/* Asynchronous commands*/
#define FS_ARCHIVE_PROC_READFILE (1 << FS_COMMAND_READFILE)
#define FS_ARCHIVE_PROC_WRITEFILE (1 << FS_COMMAND_WRITEFILE)
#define FS_ARCHIVE_PROC_READFILE (1 << FS_COMMAND_READFILE)
#define FS_ARCHIVE_PROC_WRITEFILE (1 << FS_COMMAND_WRITEFILE)
/* All asynchronous commands*/
#define FS_ARCHIVE_PROC_ASYNC \
(FS_ARCHIVE_PROC_READFILE | FS_ARCHIVE_PROC_WRITEFILE)
#define FS_ARCHIVE_PROC_ASYNC \
(FS_ARCHIVE_PROC_READFILE | FS_ARCHIVE_PROC_WRITEFILE)

/* Synchronous commands*/
#define FS_ARCHIVE_PROC_SEEKDIR (1 << FS_COMMAND_SEEKDIR)
#define FS_ARCHIVE_PROC_READDIR (1 << FS_COMMAND_READDIR)
#define FS_ARCHIVE_PROC_FINDPATH (1 << FS_COMMAND_FINDPATH)
#define FS_ARCHIVE_PROC_GETPATH (1 << FS_COMMAND_GETPATH)
#define FS_ARCHIVE_PROC_OPENFILEFAST (1 << FS_COMMAND_OPENFILEFAST)
#define FS_ARCHIVE_PROC_OPENFILEDIRECT (1 << FS_COMMAND_OPENFILEDIRECT)
#define FS_ARCHIVE_PROC_CLOSEFILE (1 << FS_COMMAND_CLOSEFILE)
#define FS_ARCHIVE_PROC_SEEKDIR (1 << FS_COMMAND_SEEKDIR)
#define FS_ARCHIVE_PROC_READDIR (1 << FS_COMMAND_READDIR)
#define FS_ARCHIVE_PROC_FINDPATH (1 << FS_COMMAND_FINDPATH)
#define FS_ARCHIVE_PROC_GETPATH (1 << FS_COMMAND_GETPATH)
#define FS_ARCHIVE_PROC_OPENFILEFAST (1 << FS_COMMAND_OPENFILEFAST)
#define FS_ARCHIVE_PROC_OPENFILEDIRECT (1 << FS_COMMAND_OPENFILEDIRECT)
#define FS_ARCHIVE_PROC_CLOSEFILE (1 << FS_COMMAND_CLOSEFILE)
/* All synchronous commands*/
#define FS_ARCHIVE_PROC_SYNC \
(FS_ARCHIVE_PROC_SEEKDIR | FS_ARCHIVE_PROC_READDIR | \
FS_ARCHIVE_PROC_FINDPATH | FS_ARCHIVE_PROC_GETPATH | \
FS_ARCHIVE_PROC_OPENFILEFAST | FS_ARCHIVE_PROC_OPENFILEDIRECT | FS_ARCHIVE_PROC_CLOSEFILE)
#define FS_ARCHIVE_PROC_SYNC \
(FS_ARCHIVE_PROC_SEEKDIR | FS_ARCHIVE_PROC_READDIR | \
FS_ARCHIVE_PROC_FINDPATH | FS_ARCHIVE_PROC_GETPATH | \
FS_ARCHIVE_PROC_OPENFILEFAST | FS_ARCHIVE_PROC_OPENFILEDIRECT | FS_ARCHIVE_PROC_CLOSEFILE)

/* Messages when status changes*/
#define FS_ARCHIVE_PROC_ACTIVATE (1 << FS_COMMAND_ACTIVATE)
#define FS_ARCHIVE_PROC_IDLE (1 << FS_COMMAND_IDLE)
#define FS_ARCHIVE_PROC_SUSPENDING (1 << FS_COMMAND_SUSPEND)
#define FS_ARCHIVE_PROC_RESUME (1 << FS_COMMAND_RESUME)
#define FS_ARCHIVE_PROC_ACTIVATE (1 << FS_COMMAND_ACTIVATE)
#define FS_ARCHIVE_PROC_IDLE (1 << FS_COMMAND_IDLE)
#define FS_ARCHIVE_PROC_SUSPENDING (1 << FS_COMMAND_SUSPEND)
#define FS_ARCHIVE_PROC_RESUME (1 << FS_COMMAND_RESUME)
/* All messages when status changes*/
#define FS_ARCHIVE_PROC_STATUS \
(FS_ARCHIVE_PROC_ACTIVATE | FS_ARCHIVE_PROC_IDLE | \
FS_ARCHIVE_PROC_SUSPENDING | FS_ARCHIVE_PROC_RESUME)
#define FS_ARCHIVE_PROC_STATUS \
(FS_ARCHIVE_PROC_ACTIVATE | FS_ARCHIVE_PROC_IDLE | \
FS_ARCHIVE_PROC_SUSPENDING | FS_ARCHIVE_PROC_RESUME)

#define FS_ARCHIVE_PROC_ALL (~0)
#define FS_ARCHIVE_PROC_ALL (~0)

typedef enum {
FS_RESULT_SUCCESS = 0,
Expand Down
4 changes: 2 additions & 2 deletions lib/include/nitro/fs/overlay.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ extern "C" {

typedef u32 FSOverlayID;

#define FS_EXTERN_OVERLAY(name) extern u32 SDK_OVERLAY_ ## name ## _ID[1]
#define FS_OVERLAY_ID(name) ((u32)&(SDK_OVERLAY_ ## name ## _ID))
#define FS_EXTERN_OVERLAY(name) extern u32 SDK_OVERLAY_ ## name ## _ID[1]
#define FS_OVERLAY_ID(name) ((u32)&(SDK_OVERLAY_ ## name ## _ID))

typedef void (*FSOverlayInitFunc)(void);

Expand Down
14 changes: 7 additions & 7 deletions lib/include/nitro/fx/fx_mtx44.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ static inline void MTX_Identity44 (MtxFx44 * pDst) {
}

static inline void MTX_Copy44 (const MtxFx44 * pSrc, MtxFx44 * pDst) {
MI_Copy64B(pSrc, pDst);
MI_Copy64B(pSrc, pDst);
}

static inline void MTX_Copy44To33 (const MtxFx44 * pSrc, MtxFx33 * pDst) {
MTX_Copy44To33_(pSrc, pDst);
MTX_Copy44To33_(pSrc, pDst);
}

static inline void MTX_Copy44To43 (const MtxFx44 * pSrc, MtxFx43 * pDst) {
MTX_Copy44To43_(pSrc, pDst);
MTX_Copy44To43_(pSrc, pDst);
}

static inline void MTX_Transpose44 (const MtxFx44 * pSrc, MtxFx44 * pDst) {
MTX_Transpose44_(pSrc, pDst);
MTX_Transpose44_(pSrc, pDst);
}

static inline void MTX_Scale44 (MtxFx44 * pDst, fx32 x, fx32 y, fx32 z) {
Expand All @@ -67,16 +67,16 @@ static inline void MTX_RotZ44 (MtxFx44 * pDst, fx32 sinVal, fx32 cosVal) {
}

static inline void MTX_Frustum (fx32 t, fx32 b, fx32 l, fx32 r, fx32 n, fx32 f, MtxFx44 * mtx) {
MTX_FrustumW(t, b, l, r, n, f, FX32_ONE, mtx);
MTX_FrustumW(t, b, l, r, n, f, FX32_ONE, mtx);
}

static inline
void MTX_Perspective (fx32 fovySin, fx32 fovyCos, fx32 aspect, fx32 n, fx32 f, MtxFx44 * mtx) {
MTX_PerspectiveW(fovySin, fovyCos, aspect, n, f, FX32_ONE, mtx);
MTX_PerspectiveW(fovySin, fovyCos, aspect, n, f, FX32_ONE, mtx);
}

static inline void MTX_Ortho (fx32 t, fx32 b, fx32 l, fx32 r, fx32 n, fx32 f, MtxFx44 * mtx) {
MTX_OrthoW(t, b, l, r, n, f, FX32_ONE, mtx);
MTX_OrthoW(t, b, l, r, n, f, FX32_ONE, mtx);
}

#endif //NITRO_FX_FX_MTX44_H_
48 changes: 24 additions & 24 deletions lib/include/nitro/gx/g3.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,45 +151,45 @@ typedef enum {
} GXMtxMode;

typedef enum {
GX_TEXGEN_NONE = 0,
GX_TEXGEN_TEXCOORD = 1,
GX_TEXGEN_NORMAL = 2,
GX_TEXGEN_VERTEX = 3
GX_TEXGEN_NONE = 0,
GX_TEXGEN_TEXCOORD = 1,
GX_TEXGEN_NORMAL = 2,
GX_TEXGEN_VERTEX = 3
} GXTexGen;

typedef enum {
GX_TEXREPEAT_NONE = 0,
GX_TEXREPEAT_S = 1,
GX_TEXREPEAT_T = 2,
GX_TEXREPEAT_ST = 3
GX_TEXREPEAT_NONE = 0,
GX_TEXREPEAT_S = 1,
GX_TEXREPEAT_T = 2,
GX_TEXREPEAT_ST = 3
} GXTexRepeat;

typedef enum {
GX_TEXFLIP_NONE = 0,
GX_TEXFLIP_S = 1,
GX_TEXFLIP_T = 2,
GX_TEXFLIP_ST = 3
GX_TEXFLIP_NONE = 0,
GX_TEXFLIP_S = 1,
GX_TEXFLIP_T = 2,
GX_TEXFLIP_ST = 3
} GXTexFlip;

typedef enum {
GX_BEGIN_TRIANGLES = 0,
GX_BEGIN_QUADS = 1,
GX_BEGIN_TRIANGLE_STRIP = 2,
GX_BEGIN_QUAD_STRIP = 3
GX_BEGIN_TRIANGLES = 0,
GX_BEGIN_QUADS = 1,
GX_BEGIN_TRIANGLE_STRIP = 2,
GX_BEGIN_QUAD_STRIP = 3
} GXBegin;

typedef enum {
GX_POLYGONMODE_MODULATE = 0,
GX_POLYGONMODE_DECAL = 1,
GX_POLYGONMODE_TOON = 2,
GX_POLYGONMODE_SHADOW = 3
GX_POLYGONMODE_MODULATE = 0,
GX_POLYGONMODE_DECAL = 1,
GX_POLYGONMODE_TOON = 2,
GX_POLYGONMODE_SHADOW = 3
} GXPolygonMode;

typedef enum {
GX_CULL_ALL = 0,
GX_CULL_FRONT = 1,
GX_CULL_BACK = 2,
GX_CULL_NONE = 3
GX_CULL_ALL = 0,
GX_CULL_FRONT = 1,
GX_CULL_BACK = 2,
GX_CULL_NONE = 3
} GXCull;

#ifdef SDK_ADS
Expand Down
6 changes: 3 additions & 3 deletions lib/include/nitro/gx/g3imm.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ static inline void G3_ViewPort(int x1, int y1, int x2, int y2) {
}

static inline void G3_MtxMode(GXMtxMode mode) {
reg_G3_MTX_MODE = GX_PACK_MTXMODE_PARAM(mode);
reg_G3_MTX_MODE = GX_PACK_MTXMODE_PARAM(mode);
}

static inline void G3_PushMtx() {
reg_G3_MTX_PUSH = 0;
reg_G3_MTX_PUSH = 0;
}

static inline void G3_PopMtx(int num) {
reg_G3_MTX_POP = GX_PACK_POPMTX_PARAM(num);
reg_G3_MTX_POP = GX_PACK_POPMTX_PARAM(num);
}

#endif //NITRO_GX_G3IMM_H_
2 changes: 1 addition & 1 deletion lib/include/nitro/gx/g3x.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void G3X_SetEdgeColorTable(const GXRgb *rgb_8);

static inline s32 G3X_IsGeometryBusy (void)
{
return (s32)(reg_G3X_GXSTAT & REG_G3X_GXSTAT_B_MASK);
return (s32)(reg_G3X_GXSTAT & REG_G3X_GXSTAT_B_MASK);
}

#endif //NITRO_GX_G3X_H_
22 changes: 11 additions & 11 deletions lib/include/nitro/os/ARM9/vramExclusive.h
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#ifndef NITRO_OS_VRAMEXCLUSIVE_H_
#define NITRO_OS_VRAMEXCLUSIVE_H_

#define OS_VRAM_BANK_ID_A 0x0001
#define OS_VRAM_BANK_ID_B 0x0002
#define OS_VRAM_BANK_ID_C 0x0004
#define OS_VRAM_BANK_ID_D 0x0008
#define OS_VRAM_BANK_ID_E 0x0010
#define OS_VRAM_BANK_ID_F 0x0020
#define OS_VRAM_BANK_ID_G 0x0040
#define OS_VRAM_BANK_ID_H 0x0080
#define OS_VRAM_BANK_ID_I 0x0100
#define OS_VRAM_BANK_ID_ALL 0x01ff
#define OS_VRAM_BANK_ID_A 0x0001
#define OS_VRAM_BANK_ID_B 0x0002
#define OS_VRAM_BANK_ID_C 0x0004
#define OS_VRAM_BANK_ID_D 0x0008
#define OS_VRAM_BANK_ID_E 0x0010
#define OS_VRAM_BANK_ID_F 0x0020
#define OS_VRAM_BANK_ID_G 0x0040
#define OS_VRAM_BANK_ID_H 0x0080
#define OS_VRAM_BANK_ID_I 0x0100
#define OS_VRAM_BANK_ID_ALL 0x01ff

#define OS_VRAM_BANK_KINDS 9
#define OS_VRAM_BANK_KINDS 9

u32 OsCountZeroBits(u32 bitmap);
void OSi_InitVramExclusive(void);
Expand Down

0 comments on commit 8d277f5

Please sign in to comment.