diff options
| author | Egor Ananyin <ananinegor@gmail.com> | 2020-05-23 09:22:31 +0300 |
|---|---|---|
| committer | Egor Ananyin <ananinegor@gmail.com> | 2020-05-23 09:22:31 +0300 |
| commit | 936ea8a0134ed8095f9496ebe1571866509530d7 (patch) | |
| tree | 2f30c7bd3c7300bba75a1738b08faa16de57cea2 | |
| parent | a43d02ff7a3f9ed0da04d12ca2973a3372d14344 (diff) | |
Rename header files to avoid confusion
| -rw-r--r-- | arm9/arm9.lcf | 2 | ||||
| -rw-r--r-- | arm9/lib/include/MATH_pop.h (renamed from arm9/lib/include/MATH.h) | 4 | ||||
| -rw-r--r-- | arm9/lib/include/dgt.h | 7 | ||||
| -rw-r--r-- | arm9/lib/include/math.h | 7 | ||||
| -rw-r--r-- | arm9/lib/src/MATH_pop.c (renamed from arm9/lib/src/MATH.c) | 2 |
5 files changed, 15 insertions, 7 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index 4bdb86db..66800b7a 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -539,7 +539,7 @@ SECTIONS { CTRDG_flash_MX29L010.o (.text) CTRDG_flash_MX29L512.o (.text) CTRDG_task.o (.text) - MATH.o (.text) + MATH_pop.o (.text) MATH_dgt.o (.text) MATH_crc.o (.text) STD_string.o (.text) diff --git a/arm9/lib/include/MATH.h b/arm9/lib/include/MATH_pop.h index 037492f5..89dab0c0 100644 --- a/arm9/lib/include/MATH.h +++ b/arm9/lib/include/MATH_pop.h @@ -1,5 +1,5 @@ -#ifndef GUARD_MATH_H -#define GUARD_MATH_H +#ifndef GUARD_MATH_POP_H +#define GUARD_MATH_POP_H #include "types.h" diff --git a/arm9/lib/include/dgt.h b/arm9/lib/include/dgt.h index 5e63f3f7..a764e85a 100644 --- a/arm9/lib/include/dgt.h +++ b/arm9/lib/include/dgt.h @@ -27,4 +27,11 @@ struct DGTHash2Context { int Corrupted; }; +void DGT_Hash1Reset(struct DGTHash1Context *context); +void DGT_Hash1SetSource(struct DGTHash1Context *context, u8 *input, u32 length); +void DGT_Hash1GetDigest_R(u8 *digest, struct DGTHash1Context *context); +void DGT_Hash2Reset(struct DGTHash2Context *context); +void DGT_Hash2SetSource(struct DGTHash2Context *context, u8 *input, u32 length); +void DGT_Hash2GetDigest(struct DGTHash2Context *context, u8 *digest); + #endif diff --git a/arm9/lib/include/math.h b/arm9/lib/include/math.h index 80d7cc26..085aa24f 100644 --- a/arm9/lib/include/math.h +++ b/arm9/lib/include/math.h @@ -1,7 +1,8 @@ -#ifndef GUARD_LIBMATH_H -#define GUARD_LIBMATH_H +#ifndef GUARD_MATH_H +#define GUARD_MATH_H -#include "MATH.h" +#include "dgt.h" +#include "MATH_pop.h" #include "MATH_crc.h" #include "MATH_dgt.h" diff --git a/arm9/lib/src/MATH.c b/arm9/lib/src/MATH_pop.c index a14779ac..18582494 100644 --- a/arm9/lib/src/MATH.c +++ b/arm9/lib/src/MATH_pop.c @@ -1,5 +1,5 @@ #include "global.h" -#include "MATH.h" +#include "MATH_pop.h" ARM_FUNC u8 MATH_CountPopulation(u32 x) { x -= (x >> 1) & 0x55555555; |