diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-12-11 15:23:15 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:23:15 -0500 |
commit | 51126deb201c59cc8cdc4873e3d130d6bc60513d (patch) | |
tree | aae5d37bda36d40b6486021e5f2e4d8c7721dfba /drivers/staging/rt2860/rtmp_type.h | |
parent | cc27706961cbe2de1b2b1d1b498efa7b6f04a822 (diff) |
Staging: rt28x0: remove typedefs (part one)
Remove typedefs from rtmp_type.h.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/rtmp_type.h')
-rw-r--r-- | drivers/staging/rt2860/rtmp_type.h | 85 |
1 files changed, 18 insertions, 67 deletions
diff --git a/drivers/staging/rt2860/rtmp_type.h b/drivers/staging/rt2860/rtmp_type.h index 11e3591cf76..8de142840d3 100644 --- a/drivers/staging/rt2860/rtmp_type.h +++ b/drivers/staging/rt2860/rtmp_type.h | |||
@@ -38,100 +38,51 @@ | |||
38 | #ifndef __RTMP_TYPE_H__ | 38 | #ifndef __RTMP_TYPE_H__ |
39 | #define __RTMP_TYPE_H__ | 39 | #define __RTMP_TYPE_H__ |
40 | 40 | ||
41 | #define PACKED __attribute__ ((packed)) | 41 | #include <linux/types.h> |
42 | |||
43 | #ifdef LINUX | ||
44 | /* Put platform dependent declaration here */ | ||
45 | /* For example, linux type definition */ | ||
46 | typedef unsigned char UINT8; | ||
47 | typedef unsigned short UINT16; | ||
48 | typedef unsigned int UINT32; | ||
49 | typedef unsigned long long UINT64; | ||
50 | typedef int INT32; | ||
51 | typedef long long INT64; | ||
52 | #endif /* LINUX // */ | ||
53 | |||
54 | typedef unsigned char *PUINT8; | ||
55 | typedef unsigned short *PUINT16; | ||
56 | typedef unsigned int *PUINT32; | ||
57 | typedef unsigned long long *PUINT64; | ||
58 | typedef int *PINT32; | ||
59 | typedef long long *PINT64; | ||
60 | |||
61 | /* modified for fixing compile warning on Sigma 8634 platform */ | ||
62 | typedef char STRING; | ||
63 | typedef signed char CHAR; | ||
64 | |||
65 | typedef signed short SHORT; | ||
66 | typedef signed int INT; | ||
67 | typedef signed long LONG; | ||
68 | typedef signed long long LONGLONG; | ||
69 | 42 | ||
70 | #ifdef LINUX | 43 | #define PACKED __attribute__ ((packed)) |
71 | typedef unsigned char UCHAR; | ||
72 | typedef unsigned short USHORT; | ||
73 | typedef unsigned int UINT; | ||
74 | typedef unsigned long ULONG; | ||
75 | #endif /* LINUX // */ | ||
76 | typedef unsigned long long ULONGLONG; | ||
77 | 44 | ||
78 | typedef unsigned char BOOLEAN; | 45 | typedef unsigned char BOOLEAN; |
79 | #ifdef LINUX | ||
80 | typedef void VOID; | ||
81 | #endif /* LINUX // */ | ||
82 | |||
83 | typedef char *PSTRING; | ||
84 | typedef VOID *PVOID; | ||
85 | typedef CHAR *PCHAR; | ||
86 | typedef UCHAR *PUCHAR; | ||
87 | typedef USHORT *PUSHORT; | ||
88 | typedef LONG *PLONG; | ||
89 | typedef ULONG *PULONG; | ||
90 | typedef UINT *PUINT; | ||
91 | |||
92 | typedef unsigned int NDIS_MEDIA_STATE; | ||
93 | 46 | ||
94 | typedef union _LARGE_INTEGER { | 47 | typedef union _LARGE_INTEGER { |
95 | struct { | 48 | struct { |
96 | UINT LowPart; | 49 | u32 LowPart; |
97 | INT32 HighPart; | 50 | int HighPart; |
98 | } u; | 51 | } u; |
99 | INT64 QuadPart; | 52 | long long QuadPart; |
100 | } LARGE_INTEGER; | 53 | } LARGE_INTEGER; |
101 | 54 | ||
102 | /* */ | 55 | /* */ |
103 | /* Register set pair for initialzation register set definition */ | 56 | /* Register set pair for initialzation register set definition */ |
104 | /* */ | 57 | /* */ |
105 | typedef struct _RTMP_REG_PAIR { | 58 | typedef struct _RTMP_REG_PAIR { |
106 | ULONG Register; | 59 | unsigned long Register; |
107 | ULONG Value; | 60 | unsigned long Value; |
108 | } RTMP_REG_PAIR, *PRTMP_REG_PAIR; | 61 | } RTMP_REG_PAIR, *PRTMP_REG_PAIR; |
109 | 62 | ||
110 | typedef struct _REG_PAIR { | 63 | typedef struct _REG_PAIR { |
111 | UCHAR Register; | 64 | u8 Register; |
112 | UCHAR Value; | 65 | u8 Value; |
113 | } REG_PAIR, *PREG_PAIR; | 66 | } REG_PAIR, *PREG_PAIR; |
114 | 67 | ||
115 | /* */ | 68 | /* */ |
116 | /* Register set pair for initialzation register set definition */ | 69 | /* Register set pair for initialzation register set definition */ |
117 | /* */ | 70 | /* */ |
118 | typedef struct _RTMP_RF_REGS { | 71 | typedef struct _RTMP_RF_REGS { |
119 | UCHAR Channel; | 72 | u8 Channel; |
120 | ULONG R1; | 73 | unsigned long R1; |
121 | ULONG R2; | 74 | unsigned long R2; |
122 | ULONG R3; | 75 | unsigned long R3; |
123 | ULONG R4; | 76 | unsigned long R4; |
124 | } RTMP_RF_REGS, *PRTMP_RF_REGS; | 77 | } RTMP_RF_REGS, *PRTMP_RF_REGS; |
125 | 78 | ||
126 | typedef struct _FREQUENCY_ITEM { | 79 | typedef struct _FREQUENCY_ITEM { |
127 | UCHAR Channel; | 80 | u8 Channel; |
128 | UCHAR N; | 81 | u8 N; |
129 | UCHAR R; | 82 | u8 R; |
130 | UCHAR K; | 83 | u8 K; |
131 | } FREQUENCY_ITEM, *PFREQUENCY_ITEM; | 84 | } FREQUENCY_ITEM, *PFREQUENCY_ITEM; |
132 | 85 | ||
133 | typedef int NTSTATUS; | ||
134 | |||
135 | #define STATUS_SUCCESS 0x00 | 86 | #define STATUS_SUCCESS 0x00 |
136 | #define STATUS_UNSUCCESSFUL 0x01 | 87 | #define STATUS_UNSUCCESSFUL 0x01 |
137 | 88 | ||