diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2020-01-16 07:28:23 +0800 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-01-16 08:14:27 -0600 |
| commit | aa631825fcf8661f7ef57afe0cb652a4147ca77a (patch) | |
| tree | 892a129f2889fab2c72d6d4b889d1bd4d2464807 /src | |
| parent | 46b00b11d4f62d866f55247f291678c8366498bd (diff) | |
resolve data sections
Diffstat (limited to 'src')
| -rw-r--r-- | src/librfu.c | 9 | ||||
| -rw-r--r-- | src/librfu_rfu.c | 20 | ||||
| -rw-r--r-- | src/librfu_sio32id.c | 9 |
3 files changed, 10 insertions, 28 deletions
diff --git a/src/librfu.c b/src/librfu.c deleted file mode 100644 index 1a295fd48..000000000 --- a/src/librfu.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "global.h" -#include "librfu.h" - -struct RfuSlotStatusUNI* gRfuSlotStatusUNI[4]; -struct RfuSlotStatusNI* gRfuSlotStatusNI[4]; -struct RfuLinkStatus *gRfuLinkStatus; -struct RfuStatic *gRfuStatic; -struct RfuFixed* gRfuFixed; -struct RfuSIO32Id gRfuSIO32Id; diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c index f5f13cc5d..732cc532d 100644 --- a/src/librfu_rfu.c +++ b/src/librfu_rfu.c @@ -67,13 +67,13 @@ static void rfu_STC_NI_receive_Sender(u8, u8, const struct RfuLocalStruct *, __a static void rfu_STC_NI_initSlot_asRecvDataEntity(u8, struct NIComm *); static void rfu_STC_NI_initSlot_asRecvControllData(u8, struct NIComm *); -//struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX]; -//struct RfuSlotStatusNI *gRfuSlotStatusNI[RFU_CHILD_MAX]; -//struct RfuLinkStatus *gRfuLinkStatus; -//struct RfuStatic *gRfuStatic; -//struct RfuFixed *gRfuFixed; +struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX]; +struct RfuSlotStatusNI *gRfuSlotStatusNI[RFU_CHILD_MAX]; +struct RfuLinkStatus *gRfuLinkStatus; +struct RfuStatic *gRfuStatic; +struct RfuFixed *gRfuFixed; -/*static const struct LLSFStruct llsf_struct[2] = { +static const struct LLSFStruct llsf_struct[2] = { { 2, 14, 0, 10, 9, 5, 7, 2, 0, 15, 1, 3, 3, 0x1f @@ -83,16 +83,9 @@ static void rfu_STC_NI_initSlot_asRecvControllData(u8, struct NIComm *); } }; -#ifdef EMERALD static const char lib_ver[] = "RFU_V1026"; -#else -static const char lib_ver[] = "RFU_V1024"; -#endif static const char str_checkMbootLL[] = "RFU-MBOOT"; -*/ -extern const struct LLSFStruct llsf_struct[2]; -extern const char str_checkMbootLL[];// = "RFU-MBOOT"; u16 rfu_initializeAPI(struct RfuAPIBuffer *APIBuffer, u16 buffByteSize, IntrFunc *sioIntrTable_p, bool8 copyInterruptToRam) { @@ -2031,6 +2024,7 @@ static void rfu_STC_NI_receive_Sender(u8 r0, u8 r10, const struct RfuLocalStruct } } _081E30AE: + ; } else if (r12->state == SLOT_STATE_SEND_LAST) { diff --git a/src/librfu_sio32id.c b/src/librfu_sio32id.c index f5d652348..fc5701986 100644 --- a/src/librfu_sio32id.c +++ b/src/librfu_sio32id.c @@ -4,13 +4,10 @@ static void Sio32IDIntr(void); static void Sio32IDInit(void); static s32 Sio32IDMain(void); -//struct RfuSIO32Id gRfuSIO32Id; +struct RfuSIO32Id gRfuSIO32Id; -//static const u16 Sio32ConnectionData[] = { 0x494e, 0x544e, 0x4e45, 0x4f44 }; // NINTENDO -//static const char Sio32IDLib_Var[] = "Sio32ID_030820"; - -extern const u16 Sio32ConnectionData[]; -extern const char Sio32IDLib_Var[]; +static const u16 Sio32ConnectionData[] = { 0x494e, 0x544e, 0x4e45, 0x4f44 }; // NINTENDO +static const char Sio32IDLib_Var[] = "Sio32ID_030820"; s32 AgbRFU_checkID(u8 r5) { |