cleanup a lot of os files

include/PR/controller.h

@@ -4,6 +4,7 @@
 #include "ultratypes.h"
 #include "os_cont.h"
 #include "os_pfs.h"
+#include "rcp.h"
 
 #define CHNL_ERR(format) (((format).rxsize & CHNL_ERR_MASK) >> 4)
 
@@ -152,7 +153,7 @@ typedef struct {
     /* 0x05 */ u8 typel;
     /* 0x06 */ u8 status;
     /* 0x07 */ u8 align1;
-} __OSContRequestHeader; // size = 0x8
+} __OSContRequesFormat; // size = 0x8
 
 typedef struct {
     /* 0x00 */ u8 txsize;

include/alignment.h

@@ -1,16 +1,16 @@
 #ifndef ALIGNMENT_H
 #define ALIGNMENT_H
 
+#include "attributes.h"
+
 #define ALIGN8(val) (((val) + 7) & ~7)
 #define ALIGN16(val) (((val) + 0xF) & ~0xF)
 #define ALIGN32(val) (((val) + 0x1F) & ~0x1F)
 #define ALIGN64(val) (((val) + 0x3F) & ~0x3F)
 #define ALIGN256(val) (((val) + 0xFF) & ~0xFF)
 
-#ifdef __GNUC__
-#define ALIGNED8 __attribute__ ((aligned (8)))
-#else
-#define ALIGNED8
+#ifndef ALIGNED
+#define ALIGNED(x) __attribute__ ((aligned (x)))
 #endif
 
 #ifdef __sgi /* IDO compiler */

include/attributes.h

@@ -0,0 +1,10 @@
+#ifndef ATTRIBUTES_H
+#define ATTRIBUTES_H
+
+#if (!defined(__GNUC__) && !defined(__clang__)) || defined(M2CTX) || defined(__sgi)
+    #ifndef __attribute__
+        #define __attribute__(x)
+    #endif
+#endif
+
+#endif