move shift & mask macros to gcutil.h

Author: WinterMute

gc/gcutil.h

@@ -8,5 +8,13 @@
 # define ATTRIBUTE_PACKED					__attribute__((packed))
 #endif
 
+#define _SHIFTL(v, s, w)	\
+    ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s))) //mask the first w bits of v before lshifting
+#define _SHIFTR(v, s, w)	\
+    ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))  //rshift v and mask the first w bits afterwards
+
+#define _ROTL(v,s)			\
+	(((u32)v<<s)|((u32)v>>(0x20-s)))
+
 #endif /* _GCUTIL_H */
 

libdb/geckousb.c

@@ -7,11 +7,6 @@
 
 #include "geckousb.h"
 
-#define _SHIFTL(v, s, w)	\
-	((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s)))
-#define _SHIFTR(v, s, w)	\
-	((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))
-
 static struct dbginterface usb_device;
 
 static __inline__ int __send_command(s32 chn,u16 *cmd)

libdb/uIP/bba.c

@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include "gcutil.h"
 #include "asm.h"
 #include "processor.h"
 #include "exi.h"
@@ -187,10 +188,6 @@ struct bba_descr {
 	u32 X(X(next_packet_ptr:12, packet_len:12), status:8);
 };
 
-#define _SHIFTL(v, s, w)	\
-    ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s)))
-#define _SHIFTR(v, s, w)	\
-    ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))
 
 /* new functions */
 #define bba_select()		EXI_Select(EXI_CHANNEL_0,EXI_DEVICE_2,EXI_SPEED32MHZ)

libogc/aram.c

@@ -31,6 +31,7 @@ distribution.
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include "gcutil.h"
 #include "asm.h"
 #include "processor.h"
 #include "aram.h"
@@ -54,11 +55,6 @@ distribution.
 
 #define AR_ARAMEXPANSION	2
 
-#define _SHIFTL(v, s, w)	\
-    ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s)))
-#define _SHIFTR(v, s, w)	\
-    ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))
-
 static vu16* const _dspReg = (u16*)0xCC005000;
 
 static ARCallback __ARDmaCallback = NULL;

libogc/audio.c

@@ -30,6 +30,7 @@ distribution.
 
 
 #include <stdlib.h>
+#include "gcutil.h"
 #include "asm.h"
 #include "processor.h"
 #include "irq.h"
@@ -65,12 +66,6 @@ distribution.
 #define AI_SCRESET			0x20
 #define AI_DMAFR			0x40
 
-
-#define _SHIFTL(v, s, w)	\
-    ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s))) //mask the first w bits of v before lshifting
-#define _SHIFTR(v, s, w)	\
-    ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))  //rshift v and mask the first w bits afterwards
-
 #if defined(HW_DOL)
 	static vu32* const _aiReg = (u32*)0xCC006C00;
 #elif defined(HW_RVL)

libogc/cache.c

@@ -28,15 +28,11 @@ distribution.
 -------------------------------------------------------------*/
 
 
-#include <asm.h>
-#include <processor.h>
+#include "gcutil.h"
+#include "asm.h"
+#include "processor.h"
 #include "cache.h"
 
-#define _SHIFTL(v, s, w)	\
-    ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s)))
-#define _SHIFTR(v, s, w)	\
-    ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))
-
 extern void __LCEnable(void);
 extern void L2GlobalInvalidate(void);
 extern void L2Enable(void);

libogc/card.c

@@ -52,13 +52,6 @@ distribution.
 #define CARD_SYSBAT					0x6000
 #define CARD_SYSBAT_BACK			0x8000
 
-#define _SHIFTL(v, s, w)	\
-    ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s)))
-#define _SHIFTR(v, s, w)	\
-    ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))
-#define _ROTL(v,s)			\
-	(((u32)v<<s)|((u32)v>>(0x20-s)))
-
 #define CARD_STATUS_UNLOCKED			0x40
 
 struct card_header {

libogc/dsp.c

@@ -31,6 +31,7 @@ distribution.
 
 #include <stdlib.h>
 #include <stdio.h>
+#include "gcutil.h"
 #include "asm.h"
 #include "processor.h"
 #include "irq.h"
@@ -51,10 +52,6 @@ distribution.
 #define DSPCR_PIINT         0x0002        // assert DSP PI interrupt
 #define DSPCR_RES           0x0001        // reset DSP
 
-#define _SHIFTL(v, s, w)	\
-    ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s)))
-#define _SHIFTR(v, s, w)	\
-    ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))
 
 static u32 __dsp_inited = FALSE;
 static u32 __dsp_rudetask_pend = FALSE;

libogc/dvd.c

@@ -131,11 +131,6 @@ distribution.
 #define cpu_to_le32(x)					(((x>>24)&0x000000ff) | ((x>>8)&0x0000ff00) | ((x<<8)&0x00ff0000) | ((x<<24)&0xff000000))
 #define dvd_may_retry(s)				(DVD_STATUS(s) == DVD_STATUS_READY || DVD_STATUS(s) == DVD_STATUS_DISK_ID_NOT_READ)
 
-#define _SHIFTL(v, s, w)	\
-    ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s)))
-#define _SHIFTR(v, s, w)	\
-    ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))
-
 typedef void (*dvdcallbacklow)(s32);
 typedef void (*dvdstatecb)(dvdcmdblk *);
 

libogc/exi.c

@@ -36,6 +36,7 @@ distribution.
 #include "processor.h"
 #include "spinlock.h"
 #include "exi.h"
+#include "gcutil.h"
 
 //#define _EXI_DEBUG
 
@@ -53,11 +54,6 @@ distribution.
 #define EXI_EXT_IRQ					0x0800
 #define EXI_EXT_BIT					0x1000
 
-#define _SHIFTL(v, s, w)	\
-    ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s)))
-#define _SHIFTR(v, s, w)	\
-    ((u32)(((u32)(v) >> (s)) & ((0x01 << (w)) - 1)))
-
 
 struct _lck_dev {
 	lwp_node node;