1 files changed, 2 insertions, 57 deletions
diff --git a/include/PR/controller.h b/include/PR/controller.h
index c443a296..4295422b 100644
--- a/include/PR/controller.h
+++ b/include/PR/controller.h
@@ -2,21 +2,13 @@
 #define _CONTROLLER_H
 
 #include "macros.h"
-#include "PR/ultratypes.h"
-#include "PR/os_internal.h"
-#include "PR/os_version.h"
-#include "PR/rcp.h"
+#include <libultraship.h>
 
+#define EEPROM_BLOCK_SIZE	8
 #define CHNL_ERR(format) (((format).rxsize & CHNL_ERR_MASK) >> 4)
 
 typedef struct
 {
-    /* 0x0 */ u32 ramarray[15];
-    /* 0x3C */ u32 pifstatus;
-} OSPifRam;
-
-typedef struct
-{
     /* 0x0 */ u8 dummy;
     /* 0x1 */ u8 txsize;
     /* 0x2 */ u8 rxsize;
@@ -64,45 +56,6 @@ typedef struct
     /* 0x26 */ u8 datacrc;
 } __OSContRamReadFormat;
 
-typedef union {
-    /* 0x0 */ struct
-    {
-        /* 0x0 */ u8 bank;
-        /* 0x1 */ u8 page;
-    } inode_t;
-    /* 0x0 */ u16 ipage;
-} __OSInodeUnit;
-
-typedef struct
-{
-    /* 0x0 */ u32 game_code;
-    /* 0x4 */ u16 company_code;
-    /* 0x6 */ __OSInodeUnit start_page;
-    /* 0x8 */ u8 status;
-    /* 0x9 */ s8 reserved;
-    /* 0xA */ u16 data_sum;
-    /* 0xC */ u8 ext_name[PFS_FILE_EXT_LEN];
-    /* 0x10 */ u8 game_name[PFS_FILE_NAME_LEN];
-} __OSDir;
-
-typedef struct
-{
-    /* 0x0 */ __OSInodeUnit inode_page[128];
-} __OSInode;
-
-typedef struct
-{
-    /* 0x0 */ u32 repaired;
-    /* 0x4 */ u32 random;
-    /* 0x8 */ u64 serial_mid;
-    /* 0x10 */ u64 serial_low;
-    /* 0x18 */ u16 deviceid;
-    /* 0x1A */ u8 banks;
-    /* 0x1B */ u8 version;
-    /* 0x1C */ u16 checksum;
-    /* 0x1E */ u16 inverted_checksum;
-} __OSPackId;
-
 typedef struct
 {
     /* 0x0 */ u8 txsize;
@@ -193,14 +146,6 @@ typedef struct
 #define GB_POWER_ON  0x84
 #define GB_POWER_OFF 0xFE
 
-
-typedef struct
-{
-    /* 0x0 */ __OSInode inode;
-    /* 0x100 */ u8 bank;
-    /* 0x101 */ u8 map[PFS_INODE_DIST_MAP];
-} __OSInodeCache;
-
 extern s32 __osEepStatus(OSMesgQueue *, OSContStatus *);
 u16 __osSumcalc(u8 *ptr, int length);
 s32 __osIdCheckSum(u16 *ptr, u16 *csum, u16 *icsum);