aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-03-23 14:44:31 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 17:54:21 -0400
commitf15a88fae1b75bfcf19d25e557d7ef5301562ec6 (patch)
tree2b2419d9930f23bb04008f8a106f757d5b0748f5 /drivers
parent44b71174dfe579690c8f91d51763e05ca72169e2 (diff)
Staging: epl: remove FAR
It's not used and is not needed. Cc: Daniel Krueger <daniel.krueger@systec-electronic.com> Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/epl/EplAmi.h72
-rw-r--r--drivers/staging/epl/amix86.c220
-rw-r--r--drivers/staging/epl/global.h4
3 files changed, 145 insertions, 151 deletions
diff --git a/drivers/staging/epl/EplAmi.h b/drivers/staging/epl/EplAmi.h
index f5754d14997..d3e47cbd3c9 100644
--- a/drivers/staging/epl/EplAmi.h
+++ b/drivers/staging/epl/EplAmi.h
@@ -105,15 +105,15 @@ extern "C" {
105// 105//
106// To save code space the function AmiSetByte is replaced by 106// To save code space the function AmiSetByte is replaced by
107// an macro. 107// an macro.
108// void AmiSetByte (void FAR* pAddr_p, BYTE bByteVal_p); 108// void AmiSetByte (void * pAddr_p, BYTE bByteVal_p);
109 109
110#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} 110#define AmiSetByteToBe(pAddr_p, bByteVal_p) {*(BYTE *)(pAddr_p) = (bByteVal_p);}
111#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE FAR*)(pAddr_p) = (bByteVal_p);} 111#define AmiSetByteToLe(pAddr_p, bByteVal_p) {*(BYTE *)(pAddr_p) = (bByteVal_p);}
112 112
113void AmiSetWordToBe(void FAR *pAddr_p, WORD wWordVal_p); 113void AmiSetWordToBe(void *pAddr_p, WORD wWordVal_p);
114void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p); 114void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p);
115void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p); 115void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p);
116void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); 116void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p);
117 117
118//--------------------------------------------------------------------------- 118//---------------------------------------------------------------------------
119// 119//
@@ -121,15 +121,15 @@ void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p);
121// 121//
122// To save code space the function AmiGetByte is replaced by 122// To save code space the function AmiGetByte is replaced by
123// an macro. 123// an macro.
124// BYTE AmiGetByte (void FAR* pAddr_p); 124// BYTE AmiGetByte (void * pAddr_p);
125 125
126#define AmiGetByteFromBe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) 126#define AmiGetByteFromBe(pAddr_p) (*(BYTE *)(pAddr_p))
127#define AmiGetByteFromLe(pAddr_p) (*(BYTE FAR*)(pAddr_p)) 127#define AmiGetByteFromLe(pAddr_p) (*(BYTE *)(pAddr_p))
128 128
129WORD AmiGetWordFromBe(void FAR *pAddr_p); 129WORD AmiGetWordFromBe(void *pAddr_p);
130DWORD AmiGetDwordFromBe(void FAR *pAddr_p); 130DWORD AmiGetDwordFromBe(void *pAddr_p);
131WORD AmiGetWordFromLe(void FAR *pAddr_p); 131WORD AmiGetWordFromLe(void *pAddr_p);
132DWORD AmiGetDwordFromLe(void FAR *pAddr_p); 132DWORD AmiGetDwordFromLe(void *pAddr_p);
133 133
134//--------------------------------------------------------------------------- 134//---------------------------------------------------------------------------
135// 135//
@@ -144,8 +144,8 @@ DWORD AmiGetDwordFromLe(void FAR *pAddr_p);
144// 144//
145//--------------------------------------------------------------------------- 145//---------------------------------------------------------------------------
146 146
147void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p); 147void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p);
148void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p); 148void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p);
149 149
150//--------------------------------------------------------------------------- 150//---------------------------------------------------------------------------
151// 151//
@@ -159,8 +159,8 @@ void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p);
159// 159//
160//--------------------------------------------------------------------------- 160//---------------------------------------------------------------------------
161 161
162DWORD AmiGetDword24FromBe(void FAR *pAddr_p); 162DWORD AmiGetDword24FromBe(void *pAddr_p);
163DWORD AmiGetDword24FromLe(void FAR *pAddr_p); 163DWORD AmiGetDword24FromLe(void *pAddr_p);
164 164
165//#ifdef USE_VAR64 165//#ifdef USE_VAR64
166 166
@@ -177,8 +177,8 @@ DWORD AmiGetDword24FromLe(void FAR *pAddr_p);
177// 177//
178//--------------------------------------------------------------------------- 178//---------------------------------------------------------------------------
179 179
180void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); 180void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p);
181void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); 181void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p);
182 182
183//--------------------------------------------------------------------------- 183//---------------------------------------------------------------------------
184// 184//
@@ -192,8 +192,8 @@ void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p);
192// 192//
193//--------------------------------------------------------------------------- 193//---------------------------------------------------------------------------
194 194
195QWORD AmiGetQword40FromBe(void FAR *pAddr_p); 195QWORD AmiGetQword40FromBe(void *pAddr_p);
196QWORD AmiGetQword40FromLe(void FAR *pAddr_p); 196QWORD AmiGetQword40FromLe(void *pAddr_p);
197 197
198//--------------------------------------------------------------------------- 198//---------------------------------------------------------------------------
199// 199//
@@ -208,8 +208,8 @@ QWORD AmiGetQword40FromLe(void FAR *pAddr_p);
208// 208//
209//--------------------------------------------------------------------------- 209//---------------------------------------------------------------------------
210 210
211void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); 211void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p);
212void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); 212void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p);
213 213
214//--------------------------------------------------------------------------- 214//---------------------------------------------------------------------------
215// 215//
@@ -223,8 +223,8 @@ void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p);
223// 223//
224//--------------------------------------------------------------------------- 224//---------------------------------------------------------------------------
225 225
226QWORD AmiGetQword48FromBe(void FAR *pAddr_p); 226QWORD AmiGetQword48FromBe(void *pAddr_p);
227QWORD AmiGetQword48FromLe(void FAR *pAddr_p); 227QWORD AmiGetQword48FromLe(void *pAddr_p);
228 228
229//--------------------------------------------------------------------------- 229//---------------------------------------------------------------------------
230// 230//
@@ -239,8 +239,8 @@ QWORD AmiGetQword48FromLe(void FAR *pAddr_p);
239// 239//
240//--------------------------------------------------------------------------- 240//---------------------------------------------------------------------------
241 241
242void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); 242void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p);
243void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); 243void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p);
244 244
245//--------------------------------------------------------------------------- 245//---------------------------------------------------------------------------
246// 246//
@@ -254,8 +254,8 @@ void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p);
254// 254//
255//--------------------------------------------------------------------------- 255//---------------------------------------------------------------------------
256 256
257QWORD AmiGetQword56FromBe(void FAR *pAddr_p); 257QWORD AmiGetQword56FromBe(void *pAddr_p);
258QWORD AmiGetQword56FromLe(void FAR *pAddr_p); 258QWORD AmiGetQword56FromLe(void *pAddr_p);
259 259
260//--------------------------------------------------------------------------- 260//---------------------------------------------------------------------------
261// 261//
@@ -270,8 +270,8 @@ QWORD AmiGetQword56FromLe(void FAR *pAddr_p);
270// 270//
271//--------------------------------------------------------------------------- 271//---------------------------------------------------------------------------
272 272
273void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p); 273void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p);
274void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p); 274void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p);
275 275
276//--------------------------------------------------------------------------- 276//---------------------------------------------------------------------------
277// 277//
@@ -285,8 +285,8 @@ void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p);
285// 285//
286//--------------------------------------------------------------------------- 286//---------------------------------------------------------------------------
287 287
288QWORD AmiGetQword64FromBe(void FAR *pAddr_p); 288QWORD AmiGetQword64FromBe(void *pAddr_p);
289QWORD AmiGetQword64FromLe(void FAR *pAddr_p); 289QWORD AmiGetQword64FromLe(void *pAddr_p);
290 290
291//--------------------------------------------------------------------------- 291//---------------------------------------------------------------------------
292// 292//
@@ -300,7 +300,7 @@ QWORD AmiGetQword64FromLe(void FAR *pAddr_p);
300// Return: void 300// Return: void
301// 301//
302//--------------------------------------------------------------------------- 302//---------------------------------------------------------------------------
303void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); 303void AmiSetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p);
304 304
305//--------------------------------------------------------------------------- 305//---------------------------------------------------------------------------
306// 306//
@@ -314,7 +314,7 @@ void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p);
314// Return: void 314// Return: void
315// 315//
316//--------------------------------------------------------------------------- 316//---------------------------------------------------------------------------
317void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p); 317void AmiGetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p);
318 318
319#ifdef __cplusplus 319#ifdef __cplusplus
320} 320}
diff --git a/drivers/staging/epl/amix86.c b/drivers/staging/epl/amix86.c
index 67a49dab2bb..bff9dfe5ff3 100644
--- a/drivers/staging/epl/amix86.c
+++ b/drivers/staging/epl/amix86.c
@@ -117,34 +117,34 @@ typedef struct {
117 117
118//------------< write BYTE in big endian >-------------------------- 118//------------< write BYTE in big endian >--------------------------
119/* 119/*
120void AmiSetByteToBe (void FAR* pAddr_p, BYTE bByteVal_p) 120void AmiSetByteToBe (void *pAddr_p, BYTE bByteVal_p)
121{ 121{
122 122
123 *(BYTE FAR*)pAddr_p = bByteVal_p; 123 *(BYTE *)pAddr_p = bByteVal_p;
124 124
125} 125}
126*/ 126*/
127 127
128//------------< write WORD in big endian >-------------------------- 128//------------< write WORD in big endian >--------------------------
129 129
130void AmiSetWordToBe(void FAR * pAddr_p, WORD wWordVal_p) 130void AmiSetWordToBe(void * pAddr_p, WORD wWordVal_p)
131{ 131{
132 twStruct FAR *pwStruct; 132 twStruct *pwStruct;
133 twStruct wValue; 133 twStruct wValue;
134 134
135 wValue.m_wWord = (WORD) ((wWordVal_p & 0x00FF) << 8); //LSB to MSB 135 wValue.m_wWord = (WORD) ((wWordVal_p & 0x00FF) << 8); //LSB to MSB
136 wValue.m_wWord |= (WORD) ((wWordVal_p & 0xFF00) >> 8); //MSB to LSB 136 wValue.m_wWord |= (WORD) ((wWordVal_p & 0xFF00) >> 8); //MSB to LSB
137 137
138 pwStruct = (twStruct FAR *) pAddr_p; 138 pwStruct = (twStruct *) pAddr_p;
139 pwStruct->m_wWord = wValue.m_wWord; 139 pwStruct->m_wWord = wValue.m_wWord;
140 140
141} 141}
142 142
143//------------< write DWORD in big endian >------------------------- 143//------------< write DWORD in big endian >-------------------------
144 144
145void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) 145void AmiSetDwordToBe(void *pAddr_p, DWORD dwDwordVal_p)
146{ 146{
147 tdwStruct FAR *pdwStruct; 147 tdwStruct *pdwStruct;
148 tdwStruct dwValue; 148 tdwStruct dwValue;
149 149
150 dwValue.m_dwDword = ((dwDwordVal_p & 0x000000FF) << 24); //LSB to MSB 150 dwValue.m_dwDword = ((dwDwordVal_p & 0x000000FF) << 24); //LSB to MSB
@@ -152,7 +152,7 @@ void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p)
152 dwValue.m_dwDword |= ((dwDwordVal_p & 0x00FF0000) >> 8); 152 dwValue.m_dwDword |= ((dwDwordVal_p & 0x00FF0000) >> 8);
153 dwValue.m_dwDword |= ((dwDwordVal_p & 0xFF000000) >> 24); //MSB to LSB 153 dwValue.m_dwDword |= ((dwDwordVal_p & 0xFF000000) >> 24); //MSB to LSB
154 154
155 pdwStruct = (tdwStruct FAR *) pAddr_p; 155 pdwStruct = (tdwStruct *) pAddr_p;
156 pdwStruct->m_dwDword = dwValue.m_dwDword; 156 pdwStruct->m_dwDword = dwValue.m_dwDword;
157 157
158} 158}
@@ -175,32 +175,32 @@ void AmiSetDwordToBe(void FAR *pAddr_p, DWORD dwDwordVal_p)
175 175
176//------------< write BYTE in little endian >-------------------------- 176//------------< write BYTE in little endian >--------------------------
177/* 177/*
178void AmiSetByteToLe (void FAR* pAddr_p, BYTE bByteVal_p) 178void AmiSetByteToLe (void *pAddr_p, BYTE bByteVal_p)
179{ 179{
180 180
181 *(BYTE FAR*)pAddr_p = bByteVal_p; 181 *(BYTE *)pAddr_p = bByteVal_p;
182 182
183} 183}
184*/ 184*/
185 185
186//------------< write WORD in little endian >-------------------------- 186//------------< write WORD in little endian >--------------------------
187 187
188void AmiSetWordToLe(void FAR *pAddr_p, WORD wWordVal_p) 188void AmiSetWordToLe(void *pAddr_p, WORD wWordVal_p)
189{ 189{
190 twStruct FAR *pwStruct; 190 twStruct *pwStruct;
191 191
192 pwStruct = (twStruct FAR *) pAddr_p; 192 pwStruct = (twStruct *) pAddr_p;
193 pwStruct->m_wWord = wWordVal_p; 193 pwStruct->m_wWord = wWordVal_p;
194 194
195} 195}
196 196
197//------------< write DWORD in little endian >------------------------- 197//------------< write DWORD in little endian >-------------------------
198 198
199void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) 199void AmiSetDwordToLe(void *pAddr_p, DWORD dwDwordVal_p)
200{ 200{
201 tdwStruct FAR *pdwStruct; 201 tdwStruct *pdwStruct;
202 202
203 pdwStruct = (tdwStruct FAR *) pAddr_p; 203 pdwStruct = (tdwStruct *) pAddr_p;
204 pdwStruct->m_dwDword = dwDwordVal_p; 204 pdwStruct->m_dwDword = dwDwordVal_p;
205 205
206} 206}
@@ -222,22 +222,22 @@ void AmiSetDwordToLe(void FAR *pAddr_p, DWORD dwDwordVal_p)
222 222
223//------------< read BYTE in big endian >--------------------------- 223//------------< read BYTE in big endian >---------------------------
224/* 224/*
225BYTE AmiGetByteFromBe (void FAR* pAddr_p) 225BYTE AmiGetByteFromBe (void *pAddr_p)
226{ 226{
227 227
228 return ( *(BYTE FAR*)pAddr_p ); 228 return ( *(BYTE *)pAddr_p );
229 229
230} 230}
231*/ 231*/
232 232
233//------------< read WORD in big endian >--------------------------- 233//------------< read WORD in big endian >---------------------------
234 234
235WORD AmiGetWordFromBe(void FAR *pAddr_p) 235WORD AmiGetWordFromBe(void *pAddr_p)
236{ 236{
237 twStruct FAR *pwStruct; 237 twStruct *pwStruct;
238 twStruct wValue; 238 twStruct wValue;
239 239
240 pwStruct = (twStruct FAR *) pAddr_p; 240 pwStruct = (twStruct *) pAddr_p;
241 241
242 wValue.m_wWord = (WORD) ((pwStruct->m_wWord & 0x00FF) << 8); //LSB to MSB 242 wValue.m_wWord = (WORD) ((pwStruct->m_wWord & 0x00FF) << 8); //LSB to MSB
243 wValue.m_wWord |= (WORD) ((pwStruct->m_wWord & 0xFF00) >> 8); //MSB to LSB 243 wValue.m_wWord |= (WORD) ((pwStruct->m_wWord & 0xFF00) >> 8); //MSB to LSB
@@ -248,12 +248,12 @@ WORD AmiGetWordFromBe(void FAR *pAddr_p)
248 248
249//------------< read DWORD in big endian >-------------------------- 249//------------< read DWORD in big endian >--------------------------
250 250
251DWORD AmiGetDwordFromBe(void FAR *pAddr_p) 251DWORD AmiGetDwordFromBe(void *pAddr_p)
252{ 252{
253 tdwStruct FAR *pdwStruct; 253 tdwStruct *pdwStruct;
254 tdwStruct dwValue; 254 tdwStruct dwValue;
255 255
256 pdwStruct = (tdwStruct FAR *) pAddr_p; 256 pdwStruct = (tdwStruct *) pAddr_p;
257 257
258 dwValue.m_dwDword = ((pdwStruct->m_dwDword & 0x000000FF) << 24); //LSB to MSB 258 dwValue.m_dwDword = ((pdwStruct->m_dwDword & 0x000000FF) << 24); //LSB to MSB
259 dwValue.m_dwDword |= ((pdwStruct->m_dwDword & 0x0000FF00) << 8); 259 dwValue.m_dwDword |= ((pdwStruct->m_dwDword & 0x0000FF00) << 8);
@@ -281,31 +281,31 @@ DWORD AmiGetDwordFromBe(void FAR *pAddr_p)
281 281
282//------------< read BYTE in little endian >--------------------------- 282//------------< read BYTE in little endian >---------------------------
283/* 283/*
284BYTE AmiGetByteFromLe (void FAR* pAddr_p) 284BYTE AmiGetByteFromLe (void *pAddr_p)
285{ 285{
286 286
287 return ( *(BYTE FAR*)pAddr_p ); 287 return ( *(BYTE *)pAddr_p );
288 288
289} 289}
290*/ 290*/
291 291
292//------------< read WORD in little endian >--------------------------- 292//------------< read WORD in little endian >---------------------------
293 293
294WORD AmiGetWordFromLe(void FAR *pAddr_p) 294WORD AmiGetWordFromLe(void *pAddr_p)
295{ 295{
296 twStruct FAR *pwStruct; 296 twStruct *pwStruct;
297 297
298 pwStruct = (twStruct FAR *) pAddr_p; 298 pwStruct = (twStruct *) pAddr_p;
299 return (pwStruct->m_wWord); 299 return (pwStruct->m_wWord);
300} 300}
301 301
302//------------< read DWORD in little endian >-------------------------- 302//------------< read DWORD in little endian >--------------------------
303 303
304DWORD AmiGetDwordFromLe(void FAR *pAddr_p) 304DWORD AmiGetDwordFromLe(void *pAddr_p)
305{ 305{
306 tdwStruct FAR *pdwStruct; 306 tdwStruct *pdwStruct;
307 307
308 pdwStruct = (tdwStruct FAR *) pAddr_p; 308 pdwStruct = (tdwStruct *) pAddr_p;
309 return (pdwStruct->m_dwDword); 309 return (pdwStruct->m_dwDword);
310} 310}
311 311
@@ -324,11 +324,11 @@ DWORD AmiGetDwordFromLe(void FAR *pAddr_p)
324// 324//
325//--------------------------------------------------------------------------- 325//---------------------------------------------------------------------------
326 326
327void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p) 327void AmiSetDword24ToBe(void *pAddr_p, DWORD dwDwordVal_p)
328{ 328{
329 ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[2]; 329 ((BYTE *) pAddr_p)[0] = ((BYTE *) & dwDwordVal_p)[2];
330 ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; 330 ((BYTE *) pAddr_p)[1] = ((BYTE *) & dwDwordVal_p)[1];
331 ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & dwDwordVal_p)[0]; 331 ((BYTE *) pAddr_p)[2] = ((BYTE *) & dwDwordVal_p)[0];
332} 332}
333 333
334//--------------------------------------------------------------------------- 334//---------------------------------------------------------------------------
@@ -346,11 +346,11 @@ void AmiSetDword24ToBe(void FAR *pAddr_p, DWORD dwDwordVal_p)
346// 346//
347//--------------------------------------------------------------------------- 347//---------------------------------------------------------------------------
348 348
349void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p) 349void AmiSetDword24ToLe(void *pAddr_p, DWORD dwDwordVal_p)
350{ 350{
351 ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & dwDwordVal_p)[0]; 351 ((BYTE *) pAddr_p)[0] = ((BYTE *) & dwDwordVal_p)[0];
352 ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & dwDwordVal_p)[1]; 352 ((BYTE *) pAddr_p)[1] = ((BYTE *) & dwDwordVal_p)[1];
353 ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & dwDwordVal_p)[2]; 353 ((BYTE *) pAddr_p)[2] = ((BYTE *) & dwDwordVal_p)[2];
354} 354}
355 355
356//--------------------------------------------------------------------------- 356//---------------------------------------------------------------------------
@@ -366,7 +366,7 @@ void AmiSetDword24ToLe(void FAR *pAddr_p, DWORD dwDwordVal_p)
366// State: not tested 366// State: not tested
367// 367//
368//--------------------------------------------------------------------------- 368//---------------------------------------------------------------------------
369DWORD AmiGetDword24FromBe(void FAR *pAddr_p) 369DWORD AmiGetDword24FromBe(void *pAddr_p)
370{ 370{
371 tdwStruct dwStruct; 371 tdwStruct dwStruct;
372 372
@@ -389,7 +389,7 @@ DWORD AmiGetDword24FromBe(void FAR *pAddr_p)
389// State: not tested 389// State: not tested
390// 390//
391//--------------------------------------------------------------------------- 391//---------------------------------------------------------------------------
392DWORD AmiGetDword24FromLe(void FAR *pAddr_p) 392DWORD AmiGetDword24FromLe(void *pAddr_p)
393{ 393{
394 tdwStruct dwStruct; 394 tdwStruct dwStruct;
395 395
@@ -415,16 +415,16 @@ DWORD AmiGetDword24FromLe(void FAR *pAddr_p)
415// State: not tested 415// State: not tested
416// 416//
417//--------------------------------------------------------------------------- 417//---------------------------------------------------------------------------
418void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) 418void AmiSetQword64ToBe(void *pAddr_p, QWORD qwQwordVal_p)
419{ 419{
420 ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[7]; 420 ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[7];
421 ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[6]; 421 ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[6];
422 ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[5]; 422 ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[5];
423 ((BYTE FAR *) pAddr_p)[3] = ((BYTE FAR *) & qwQwordVal_p)[4]; 423 ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[4];
424 ((BYTE FAR *) pAddr_p)[4] = ((BYTE FAR *) & qwQwordVal_p)[3]; 424 ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[3];
425 ((BYTE FAR *) pAddr_p)[5] = ((BYTE FAR *) & qwQwordVal_p)[2]; 425 ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[2];
426 ((BYTE FAR *) pAddr_p)[6] = ((BYTE FAR *) & qwQwordVal_p)[1]; 426 ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[1];
427 ((BYTE FAR *) pAddr_p)[7] = ((BYTE FAR *) & qwQwordVal_p)[0]; 427 ((BYTE *) pAddr_p)[7] = ((BYTE *) & qwQwordVal_p)[0];
428} 428}
429 429
430//--------------------------------------------------------------------------- 430//---------------------------------------------------------------------------
@@ -441,11 +441,11 @@ void AmiSetQword64ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p)
441// State: not tested 441// State: not tested
442// 442//
443//--------------------------------------------------------------------------- 443//---------------------------------------------------------------------------
444void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) 444void AmiSetQword64ToLe(void *pAddr_p, QWORD qwQwordVal_p)
445{ 445{
446 QWORD FAR *pqwDst; 446 QWORD *pqwDst;
447 447
448 pqwDst = (QWORD FAR *) pAddr_p; 448 pqwDst = (QWORD *) pAddr_p;
449 *pqwDst = qwQwordVal_p; 449 *pqwDst = qwQwordVal_p;
450} 450}
451 451
@@ -462,18 +462,18 @@ void AmiSetQword64ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p)
462// State: not tested 462// State: not tested
463// 463//
464//--------------------------------------------------------------------------- 464//---------------------------------------------------------------------------
465QWORD AmiGetQword64FromBe(void FAR *pAddr_p) 465QWORD AmiGetQword64FromBe(void *pAddr_p)
466{ 466{
467 tqwStruct qwStruct; 467 tqwStruct qwStruct;
468 468
469 ((BYTE FAR *) & qwStruct.m_qwQword)[0] = ((BYTE FAR *) pAddr_p)[7]; 469 ((BYTE *) & qwStruct.m_qwQword)[0] = ((BYTE *) pAddr_p)[7];
470 ((BYTE FAR *) & qwStruct.m_qwQword)[1] = ((BYTE FAR *) pAddr_p)[6]; 470 ((BYTE *) & qwStruct.m_qwQword)[1] = ((BYTE *) pAddr_p)[6];
471 ((BYTE FAR *) & qwStruct.m_qwQword)[2] = ((BYTE FAR *) pAddr_p)[5]; 471 ((BYTE *) & qwStruct.m_qwQword)[2] = ((BYTE *) pAddr_p)[5];
472 ((BYTE FAR *) & qwStruct.m_qwQword)[3] = ((BYTE FAR *) pAddr_p)[4]; 472 ((BYTE *) & qwStruct.m_qwQword)[3] = ((BYTE *) pAddr_p)[4];
473 ((BYTE FAR *) & qwStruct.m_qwQword)[4] = ((BYTE FAR *) pAddr_p)[3]; 473 ((BYTE *) & qwStruct.m_qwQword)[4] = ((BYTE *) pAddr_p)[3];
474 ((BYTE FAR *) & qwStruct.m_qwQword)[5] = ((BYTE FAR *) pAddr_p)[2]; 474 ((BYTE *) & qwStruct.m_qwQword)[5] = ((BYTE *) pAddr_p)[2];
475 ((BYTE FAR *) & qwStruct.m_qwQword)[6] = ((BYTE FAR *) pAddr_p)[1]; 475 ((BYTE *) & qwStruct.m_qwQword)[6] = ((BYTE *) pAddr_p)[1];
476 ((BYTE FAR *) & qwStruct.m_qwQword)[7] = ((BYTE FAR *) pAddr_p)[0]; 476 ((BYTE *) & qwStruct.m_qwQword)[7] = ((BYTE *) pAddr_p)[0];
477 477
478 return (qwStruct.m_qwQword); 478 return (qwStruct.m_qwQword);
479} 479}
@@ -491,12 +491,12 @@ QWORD AmiGetQword64FromBe(void FAR *pAddr_p)
491// State: not tested 491// State: not tested
492// 492//
493//--------------------------------------------------------------------------- 493//---------------------------------------------------------------------------
494QWORD AmiGetQword64FromLe(void FAR *pAddr_p) 494QWORD AmiGetQword64FromLe(void *pAddr_p)
495{ 495{
496 tqwStruct FAR *pqwStruct; 496 tqwStruct *pqwStruct;
497 tqwStruct qwStruct; 497 tqwStruct qwStruct;
498 498
499 pqwStruct = (tqwStruct FAR *) pAddr_p; 499 pqwStruct = (tqwStruct *) pAddr_p;
500 qwStruct.m_qwQword = pqwStruct->m_qwQword; 500 qwStruct.m_qwQword = pqwStruct->m_qwQword;
501 501
502 return (qwStruct.m_qwQword); 502 return (qwStruct.m_qwQword);
@@ -517,14 +517,14 @@ QWORD AmiGetQword64FromLe(void FAR *pAddr_p)
517// 517//
518//--------------------------------------------------------------------------- 518//---------------------------------------------------------------------------
519 519
520void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) 520void AmiSetQword40ToBe(void *pAddr_p, QWORD qwQwordVal_p)
521{ 521{
522 522
523 ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[4]; 523 ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[4];
524 ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[3]; 524 ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[3];
525 ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[2]; 525 ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[2];
526 ((BYTE FAR *) pAddr_p)[3] = ((BYTE FAR *) & qwQwordVal_p)[1]; 526 ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[1];
527 ((BYTE FAR *) pAddr_p)[4] = ((BYTE FAR *) & qwQwordVal_p)[0]; 527 ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[0];
528 528
529} 529}
530 530
@@ -543,11 +543,11 @@ void AmiSetQword40ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p)
543// 543//
544//--------------------------------------------------------------------------- 544//---------------------------------------------------------------------------
545 545
546void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) 546void AmiSetQword40ToLe(void *pAddr_p, QWORD qwQwordVal_p)
547{ 547{
548 548
549 ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; 549 ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0];
550 ((BYTE FAR *) pAddr_p)[4] = ((BYTE FAR *) & qwQwordVal_p)[4]; 550 ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[4];
551 551
552} 552}
553 553
@@ -565,7 +565,7 @@ void AmiSetQword40ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p)
565// 565//
566//--------------------------------------------------------------------------- 566//---------------------------------------------------------------------------
567 567
568QWORD AmiGetQword40FromBe(void FAR *pAddr_p) 568QWORD AmiGetQword40FromBe(void *pAddr_p)
569{ 569{
570 570
571 tqwStruct qwStruct; 571 tqwStruct qwStruct;
@@ -591,7 +591,7 @@ QWORD AmiGetQword40FromBe(void FAR *pAddr_p)
591// 591//
592//--------------------------------------------------------------------------- 592//---------------------------------------------------------------------------
593 593
594QWORD AmiGetQword40FromLe(void FAR *pAddr_p) 594QWORD AmiGetQword40FromLe(void *pAddr_p)
595{ 595{
596 596
597 tqwStruct qwStruct; 597 tqwStruct qwStruct;
@@ -618,15 +618,15 @@ QWORD AmiGetQword40FromLe(void FAR *pAddr_p)
618// 618//
619//--------------------------------------------------------------------------- 619//---------------------------------------------------------------------------
620 620
621void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) 621void AmiSetQword48ToBe(void *pAddr_p, QWORD qwQwordVal_p)
622{ 622{
623 623
624 ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[5]; 624 ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[5];
625 ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[4]; 625 ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[4];
626 ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[3]; 626 ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[3];
627 ((BYTE FAR *) pAddr_p)[3] = ((BYTE FAR *) & qwQwordVal_p)[2]; 627 ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[2];
628 ((BYTE FAR *) pAddr_p)[4] = ((BYTE FAR *) & qwQwordVal_p)[1]; 628 ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[1];
629 ((BYTE FAR *) pAddr_p)[5] = ((BYTE FAR *) & qwQwordVal_p)[0]; 629 ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[0];
630 630
631} 631}
632 632
@@ -645,11 +645,11 @@ void AmiSetQword48ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p)
645// 645//
646//--------------------------------------------------------------------------- 646//---------------------------------------------------------------------------
647 647
648void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) 648void AmiSetQword48ToLe(void *pAddr_p, QWORD qwQwordVal_p)
649{ 649{
650 650
651 ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; 651 ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0];
652 ((WORD FAR *) pAddr_p)[2] = ((WORD FAR *) & qwQwordVal_p)[2]; 652 ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2];
653 653
654} 654}
655 655
@@ -667,7 +667,7 @@ void AmiSetQword48ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p)
667// 667//
668//--------------------------------------------------------------------------- 668//---------------------------------------------------------------------------
669 669
670QWORD AmiGetQword48FromBe(void FAR *pAddr_p) 670QWORD AmiGetQword48FromBe(void *pAddr_p)
671{ 671{
672 672
673 tqwStruct qwStruct; 673 tqwStruct qwStruct;
@@ -693,7 +693,7 @@ QWORD AmiGetQword48FromBe(void FAR *pAddr_p)
693// 693//
694//--------------------------------------------------------------------------- 694//---------------------------------------------------------------------------
695 695
696QWORD AmiGetQword48FromLe(void FAR *pAddr_p) 696QWORD AmiGetQword48FromLe(void *pAddr_p)
697{ 697{
698 698
699 tqwStruct qwStruct; 699 tqwStruct qwStruct;
@@ -720,16 +720,16 @@ QWORD AmiGetQword48FromLe(void FAR *pAddr_p)
720// 720//
721//--------------------------------------------------------------------------- 721//---------------------------------------------------------------------------
722 722
723void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p) 723void AmiSetQword56ToBe(void *pAddr_p, QWORD qwQwordVal_p)
724{ 724{
725 725
726 ((BYTE FAR *) pAddr_p)[0] = ((BYTE FAR *) & qwQwordVal_p)[6]; 726 ((BYTE *) pAddr_p)[0] = ((BYTE *) & qwQwordVal_p)[6];
727 ((BYTE FAR *) pAddr_p)[1] = ((BYTE FAR *) & qwQwordVal_p)[5]; 727 ((BYTE *) pAddr_p)[1] = ((BYTE *) & qwQwordVal_p)[5];
728 ((BYTE FAR *) pAddr_p)[2] = ((BYTE FAR *) & qwQwordVal_p)[4]; 728 ((BYTE *) pAddr_p)[2] = ((BYTE *) & qwQwordVal_p)[4];
729 ((BYTE FAR *) pAddr_p)[3] = ((BYTE FAR *) & qwQwordVal_p)[3]; 729 ((BYTE *) pAddr_p)[3] = ((BYTE *) & qwQwordVal_p)[3];
730 ((BYTE FAR *) pAddr_p)[4] = ((BYTE FAR *) & qwQwordVal_p)[2]; 730 ((BYTE *) pAddr_p)[4] = ((BYTE *) & qwQwordVal_p)[2];
731 ((BYTE FAR *) pAddr_p)[5] = ((BYTE FAR *) & qwQwordVal_p)[1]; 731 ((BYTE *) pAddr_p)[5] = ((BYTE *) & qwQwordVal_p)[1];
732 ((BYTE FAR *) pAddr_p)[6] = ((BYTE FAR *) & qwQwordVal_p)[0]; 732 ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[0];
733 733
734} 734}
735 735
@@ -748,12 +748,12 @@ void AmiSetQword56ToBe(void FAR *pAddr_p, QWORD qwQwordVal_p)
748// 748//
749//--------------------------------------------------------------------------- 749//---------------------------------------------------------------------------
750 750
751void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p) 751void AmiSetQword56ToLe(void *pAddr_p, QWORD qwQwordVal_p)
752{ 752{
753 753
754 ((DWORD FAR *) pAddr_p)[0] = ((DWORD FAR *) & qwQwordVal_p)[0]; 754 ((DWORD *) pAddr_p)[0] = ((DWORD *) & qwQwordVal_p)[0];
755 ((WORD FAR *) pAddr_p)[2] = ((WORD FAR *) & qwQwordVal_p)[2]; 755 ((WORD *) pAddr_p)[2] = ((WORD *) & qwQwordVal_p)[2];
756 ((BYTE FAR *) pAddr_p)[6] = ((BYTE FAR *) & qwQwordVal_p)[6]; 756 ((BYTE *) pAddr_p)[6] = ((BYTE *) & qwQwordVal_p)[6];
757 757
758} 758}
759 759
@@ -771,7 +771,7 @@ void AmiSetQword56ToLe(void FAR *pAddr_p, QWORD qwQwordVal_p)
771// 771//
772//--------------------------------------------------------------------------- 772//---------------------------------------------------------------------------
773 773
774QWORD AmiGetQword56FromBe(void FAR *pAddr_p) 774QWORD AmiGetQword56FromBe(void *pAddr_p)
775{ 775{
776 776
777 tqwStruct qwStruct; 777 tqwStruct qwStruct;
@@ -797,7 +797,7 @@ QWORD AmiGetQword56FromBe(void FAR *pAddr_p)
797// 797//
798//--------------------------------------------------------------------------- 798//---------------------------------------------------------------------------
799 799
800QWORD AmiGetQword56FromLe(void FAR *pAddr_p) 800QWORD AmiGetQword56FromLe(void *pAddr_p)
801{ 801{
802 802
803 tqwStruct qwStruct; 803 tqwStruct qwStruct;
@@ -824,12 +824,11 @@ QWORD AmiGetQword56FromLe(void FAR *pAddr_p)
824// 824//
825//--------------------------------------------------------------------------- 825//---------------------------------------------------------------------------
826 826
827void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) 827void AmiSetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p)
828{ 828{
829 829
830 AmiSetDwordToLe(((BYTE FAR *) pAddr_p), 830 AmiSetDwordToLe(((BYTE *) pAddr_p), pTimeOfDay_p->m_dwMs & 0x0FFFFFFF);
831 pTimeOfDay_p->m_dwMs & 0x0FFFFFFF); 831 AmiSetWordToLe(((BYTE *) pAddr_p) + 4, pTimeOfDay_p->m_wDays);
832 AmiSetWordToLe(((BYTE FAR *) pAddr_p) + 4, pTimeOfDay_p->m_wDays);
833 832
834} 833}
835 834
@@ -848,12 +847,11 @@ void AmiSetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p)
848// 847//
849//--------------------------------------------------------------------------- 848//---------------------------------------------------------------------------
850 849
851void AmiGetTimeOfDay(void FAR *pAddr_p, tTimeOfDay FAR *pTimeOfDay_p) 850void AmiGetTimeOfDay(void *pAddr_p, tTimeOfDay *pTimeOfDay_p)
852{ 851{
853 852
854 pTimeOfDay_p->m_dwMs = 853 pTimeOfDay_p->m_dwMs = AmiGetDwordFromLe(((BYTE *) pAddr_p)) & 0x0FFFFFFF;
855 AmiGetDwordFromLe(((BYTE FAR *) pAddr_p)) & 0x0FFFFFFF; 854 pTimeOfDay_p->m_wDays = AmiGetWordFromLe(((BYTE *) pAddr_p) + 4);
856 pTimeOfDay_p->m_wDays = AmiGetWordFromLe(((BYTE FAR *) pAddr_p) + 4);
857 855
858} 856}
859 857
diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h
index 8a204ac232c..9c45c03216f 100644
--- a/drivers/staging/epl/global.h
+++ b/drivers/staging/epl/global.h
@@ -35,10 +35,6 @@
35 35
36#define MEM // Memory attribute to optimize speed and code of pointer access. 36#define MEM // Memory attribute to optimize speed and code of pointer access.
37 37
38#ifndef FAR
39#define FAR // variables mapped to external data storage location
40#endif
41
42#ifndef CONST 38#ifndef CONST
43#define CONST const // variables mapped to ROM (i.e. flash) 39#define CONST const // variables mapped to ROM (i.e. flash)
44#endif 40#endif