X-Git-Url: http://git.rot13.org/?p=bcm963xx.git;a=blobdiff_plain;f=bcmdrivers%2Fopensource%2Finclude%2Fbcm963xx%2Fbcmtypes.h;h=2576e1d511bfcead582138b0efccb02c20d47416;hp=c446be87b5caafd42242c246da79c6e4fcc4662e;hb=6adeba4d92a546ebbadde2562283ee6b984b22c1;hpb=a69849c98808437716b821267cd97529c56f45b0

diff --git a/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h b/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h
index c446be87..2576e1d5 100755
--- a/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h
+++ b/bcmdrivers/opensource/include/bcm963xx/bcmtypes.h
@@ -48,7 +48,8 @@ typedef unsigned int    *PUINT;
 typedef signed int      INT;
 
 typedef unsigned short  *PUSHORT;
-typedef signed short    SHORT,*PSHORT,WORD,*PWORD;
+typedef signed short    SHORT,*PSHORT;
+typedef unsigned short  WORD,*PWORD;
 
 typedef unsigned char   *PUCHAR;
 typedef signed char     *PCHAR;
@@ -59,9 +60,6 @@ typedef unsigned char   BOOLEAN, *PBOOL, *PBOOLEAN;
 
 typedef unsigned char   BYTE,*PBYTE;
 
-//#ifndef __GNUC__
-//The following has been defined in Vxworks internally: vxTypesOld.h
-//redefine under vxworks will cause error
 typedef signed int      *PINT;
 
 typedef signed char     INT8;
@@ -80,9 +78,6 @@ typedef unsigned long   ULONG;
 typedef void            VOID;
 typedef unsigned char   BOOL;
 
-//#endif  /* __GNUC__ */
-
-
 // These are also defined in typedefs.h in the application area, so I need to
 // protect against re-definition.
 #ifndef TYPEDEFS_H
@@ -101,52 +96,6 @@ typedef enum
 
 #endif
 
-/* macros to protect against unaligned accesses */
-
-#if 0
-/* first arg is an address, second is a value */
-#define PUT16( a, d ) { 		\
-  *((byte *)a) = (byte)((d)>>8); 	\
-  *(((byte *)a)+1) = (byte)(d); 	\
-}
-
-#define PUT32( a, d ) { 		\
-  *((byte *)a) = (byte)((d)>>24); 	\
-  *(((byte *)a)+1) = (byte)((d)>>16); 	\
-  *(((byte *)a)+2) = (byte)((d)>>8); 	\
-  *(((byte *)a)+3) = (byte)(d); 	\
-}
-
-/* first arg is an address, returns a value */
-#define GET16( a ) ( 			\
-  (*((byte *)a) << 8) |			\
-  (*(((byte *)a)+1))	 		\
-)
-
-#define GET32( a ) ( 			\
-  (*((byte *)a) << 24)     |		\
-  (*(((byte *)a)+1) << 16) | 		\
-  (*(((byte *)a)+2) << 8)  | 		\
-  (*(((byte *)a)+3))	 		\
-)
-#endif
-
-#ifndef YES
-#define YES 1
-#endif
-
-#ifndef NO
-#define NO  0
-#endif
-
-#ifndef IN
-#define IN
-#endif
-
-#ifndef OUT
-#define OUT
-#endif
-
 #ifndef TRUE
 #define TRUE 1
 #endif