Merge branch 'master' of github.com:sonicdcer/sf64

include/PR/controller.h

@@ -0,0 +1,51 @@
+#ifndef PR_CONTROLLER_H
+#define PR_CONTROLLER_H
+
+#include "global.h"
+#include "PR/os.h"
+
+typedef struct {
+    /* 0x00 */ u8 align;
+    /* 0x01 */ u8 txsize;
+    /* 0x02 */ u8 rxsize;
+    /* 0x03 */ u8 poll;
+    /* 0x04 */ u8 typeh;
+    /* 0x05 */ u8 typel;
+    /* 0x06 */ u8 status;
+    /* 0x07 */ u8 align1;
+} __OSContRequestHeader; // size = 0x8
+
+// Joybus commands
+#define CONT_CMD_REQUEST_STATUS 0
+#define CONT_CMD_READ_BUTTON    1
+#define CONT_CMD_READ_PAK       2
+#define CONT_CMD_WRITE_PAK      3
+#define CONT_CMD_READ_EEPROM    4
+#define CONT_CMD_WRITE_EEPROM   5
+#define CONT_CMD_READ36_VOICE   9
+#define CONT_CMD_WRITE20_VOICE  10
+#define CONT_CMD_READ2_VOICE    11
+#define CONT_CMD_WRITE4_VOICE   12
+#define CONT_CMD_SWRITE_VOICE   13
+#define CONT_CMD_CHANNEL_RESET  0xFD
+#define CONT_CMD_RESET          0xFF
+
+#define UNK(n) 500000 * (u64)(n) / 1000000
+
+typedef struct
+{
+              u32 ramarray[15];
+               u32 pifstatus;
+} OSPifRam;
+
+extern u32 __osContinitialized;
+extern u8 __osMaxControllers;
+extern u8 __osContLastCmd;
+extern OSPifRam __osContPifRam;
+extern OSMesgQueue __osEepromTimerQ;
+extern OSMesg __osEepromTimerMsg;
+
+void __osPackRequestData(u8 poll);
+void __osContGetInitData(u8* pattern, OSContStatus* data);
+
+#endif

include/PR/os.h

@@ -877,7 +877,7 @@ extern int		osStopTimer(OSTimer *);
 
 /* Controller interface */
 
-extern s32		osContInit(OSMesgQueue *, u8 *, OSContStatus *);
+extern s32		osContInit(OSMesgQueue * mq, u8 * bitpattern, OSContStatus * data);
 extern s32		osContReset(OSMesgQueue *, OSContStatus *);
 extern s32		osContStartQuery(OSMesgQueue *);
 extern s32		osContStartReadData(OSMesgQueue *);

include/PR/ultratypes.h

@@ -57,6 +57,8 @@ typedef volatile long long		vs64;	/* signed 64-bit */
 typedef float				f32;	/* single prec floating point */
 typedef double				f64;	/* double prec floating point */
 
+typedef u32 size_t;
+
 #endif  /* _LANGUAGE_C */
 
 

include/libc/stddef.h

@@ -0,0 +1,14 @@
+#ifndef LIBC_STDDEF_H
+#define LIBC_STDDEF_H
+
+#include "PR/ultratypes.h"
+
+typedef s32 ptrdiff_t;
+
+#ifdef __GNUC__
+#define offsetof(structure, member) __builtin_offsetof (structure, member)
+#else
+#define offsetof(structure, member) ((size_t)&(((structure*)0)->member))
+#endif
+
+#endif /* STDDEF_H */

include/libc/stdlib.h

@@ -0,0 +1,28 @@
+#ifndef LIBC_STDLIB_H
+#define LIBC_STDLIB_H
+
+#include "libc/stddef.h"
+
+typedef struct {
+    /* 0x0 */ int quot;
+    /* 0x4 */ int rem;
+} div_t;
+
+typedef struct {
+    /* 0x0 */ long quot;
+    /* 0x4 */ long rem;
+} ldiv_t;
+
+typedef struct {
+    /* 0x0 */ long long quot;
+    /* 0x8 */ long long rem;
+} lldiv_t;
+
+typedef int ssize_t;
+
+typedef long wchar_t;
+
+ldiv_t ldiv(long numer, long denom);
+lldiv_t lldiv(long long numer, long long denom);
+
+#endif /* STDLIB_H */

include/macros.h

@@ -1,6 +1,6 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-
+#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
 
 #endif // MACROS_H