23c23
< * $FreeBSD: head/sys/dev/asr/dptalign.h 87826 2001-12-13 23:48:34Z obrien $
---
> * $FreeBSD: head/sys/dev/asr/dptalign.h 96551 2002-05-14 00:53:08Z obrien $
26c26
< #define __DPTALIGN_H
---
> #define __DPTALIGN_H
173c173
< #define I2O_TID_MASK ((unsigned DPT_4_BYTES) ((1L<<I2O_TID_SZ)-1))
---
> #define I2O_TID_MASK ((unsigned DPT_4_BYTES) ((1L<<I2O_TID_SZ)-1))
179,184c179,184
< #define getUP1(x,y) (((unsigned char __FAR__ *)(x))+(unsigned DPT_4_BYTES)(y))
< #define getU1(x,y) (*getUP1(x,y))
< #define setU1(x,y,z) (*((unsigned char *)getUP1(x,y)) = (unsigned char)(z))
< #define orU1(x,y,z) (*getUP1(x,y) |= (unsigned char)(z))
< #define andU1(x,y,z) (*getUP1(x,y) &= (unsigned char)(z))
< #define getUP2(x,y) ((unsigned short __FAR__ *)(((unsigned char __FAR__ *) \
---
> #define getUP1(x,y) (((unsigned char __FAR__ *)(x))+(unsigned DPT_4_BYTES)(y))
> #define getU1(x,y) (*getUP1(x,y))
> #define setU1(x,y,z) (*((unsigned char *)getUP1(x,y)) = (unsigned char)(z))
> #define orU1(x,y,z) (*getUP1(x,y) |= (unsigned char)(z))
> #define andU1(x,y,z) (*getUP1(x,y) &= (unsigned char)(z))
> #define getUP2(x,y) ((unsigned short __FAR__ *)(((unsigned char __FAR__ *) \
186c186
< #define getBU2(x,y) ((unsigned short)osdLocal2((unsigned short __FAR__ *) \
---
> #define getBU2(x,y) ((unsigned short)osdLocal2((unsigned short __FAR__ *) \
188c188
< #define getLU2(x,y) ((unsigned short)osdSLocal2((unsigned short __FAR__ *) \
---
> #define getLU2(x,y) ((unsigned short)osdSLocal2((unsigned short __FAR__ *) \
191c191
< #define getU2(x,y) ((unsigned short)osdLocal2((unsigned short __FAR__ *) \
---
> #define getU2(x,y) ((unsigned short)osdLocal2((unsigned short __FAR__ *) \
213c213
< #define getU3(x,y) ((unsigned DPT_4_BYTES)osdLocal3((unsigned DPT_4_BYTES __FAR__ *) \
---
> #define getU3(x,y) ((unsigned DPT_4_BYTES)osdLocal3((unsigned DPT_4_BYTES __FAR__ *) \
234c234
< #define getBU3(x,y) ((unsigned DPT_4_BYTES)osdLocal3((unsigned DPT_4_BYTES __FAR__ *) \
---
> #define getBU3(x,y) ((unsigned DPT_4_BYTES)osdLocal3((unsigned DPT_4_BYTES __FAR__ *) \
253c253
< #define getUP4(x,y) ((unsigned DPT_4_BYTES __FAR__ *)(((unsigned char __FAR__ *) \
---
> #define getUP4(x,y) ((unsigned DPT_4_BYTES __FAR__ *)(((unsigned char __FAR__ *) \
255c255
< #define getBU4(x,y) ((unsigned DPT_4_BYTES)osdLocal4((unsigned DPT_4_BYTES __FAR__ *) \
---
> #define getBU4(x,y) ((unsigned DPT_4_BYTES)osdLocal4((unsigned DPT_4_BYTES __FAR__ *) \
257c257
< #define getLU4(x,y) ((unsigned DPT_4_BYTES)osdSLocal4((unsigned DPT_4_BYTES __FAR__ *) \
---
> #define getLU4(x,y) ((unsigned DPT_4_BYTES)osdSLocal4((unsigned DPT_4_BYTES __FAR__ *) \
260c260
< #define getU4(x,y) ((unsigned DPT_4_BYTES)osdSLocal4((unsigned DPT_4_BYTES __FAR__ *) \
---
> #define getU4(x,y) ((unsigned DPT_4_BYTES)osdSLocal4((unsigned DPT_4_BYTES __FAR__ *) \
283c283
< #define osdSwap16bit(x) ( (((unsigned short )x & 0xf000) >> 12) | \
---
> #define osdSwap16bit(x) ( (((unsigned short )x & 0xf000) >> 12) | \
292c292
< #define osdSwap12bit(x) (( (((unsigned short )x & 0x0f00) >> 8) | \
---
> #define osdSwap12bit(x) (( (((unsigned short )x & 0x0f00) >> 8) | \
296c296
< #define osdSwap8bit(x) ( (((unsigned char )x & 0x0f) << 4) | \
---
> #define osdSwap8bit(x) ( (((unsigned char )x & 0x0f) << 4) | \
299c299
< #define getL24bit1(w,x,y) ((unsigned DPT_4_BYTES)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
---
> #define getL24bit1(w,x,y) ((unsigned DPT_4_BYTES)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
303c303
< #define setL24bit1(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
---
> #define setL24bit1(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
308c308
< #define getL16bit(w,x,y) ((unsigned short)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
---
> #define getL16bit(w,x,y) ((unsigned short)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
311c311
< #define setL16bit(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
---
> #define setL16bit(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
315c315
< #define getL16bit2(w,x,y) ((unsigned short)((unsigned char __FAR__ *)(&w->x))[2+(y)] \
---
> #define getL16bit2(w,x,y) ((unsigned short)((unsigned char __FAR__ *)(&w->x))[2+(y)] \
318c318
< #define setL16bit2(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[2+(y)] = (z); \
---
> #define setL16bit2(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[2+(y)] = (z); \
323c323
< #define getL4bit(w,x,y) \
---
> #define getL4bit(w,x,y) \
326c326
< #define setL4bit(w,x,y,z) { \
---
> #define setL4bit(w,x,y,z) { \
331c331
< #define getL1bit(w,x,y) \
---
> #define getL1bit(w,x,y) \
334c334
< #define setL1bit(w,x,y,z) { \
---
> #define setL1bit(w,x,y,z) { \
338c338
< #define getL1bit1(w,x,y) \
---
> #define getL1bit1(w,x,y) \
341c341
< #define setL1bit1(w,x,y,z) { \
---
> #define setL1bit1(w,x,y,z) { \
349c349
< #define getL12bit(w,x,y) ((unsigned short)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
---
> #define getL12bit(w,x,y) ((unsigned short)((unsigned char __FAR__ *)(&w->x))[0+(y)] \
352c352
< #define setL12bit(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
---
> #define setL12bit(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[0+(y)] = (z); \
357c357
< #define getL12bit1(w,x,y) (((unsigned short)((unsigned char __FAR__ *)(&w->x))[1+(y)]) >> 4 \
---
> #define getL12bit1(w,x,y) (((unsigned short)((unsigned char __FAR__ *)(&w->x))[1+(y)]) >> 4 \
360c360
< #define setL12bit1(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[1+(y)] &= 0x0F; \
---
> #define setL12bit1(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[1+(y)] &= 0x0F; \
367c367
< #define getL12bit2(w,x,y) ((unsigned short)((unsigned char __FAR__ *)(&w->x))[2+(y)] \
---
> #define getL12bit2(w,x,y) ((unsigned short)((unsigned char __FAR__ *)(&w->x))[2+(y)] \
370c370
< #define setL12bit2(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[2+(y)] = (z); \
---
> #define setL12bit2(w,x,y,z) { ((unsigned char __FAR__ *)(&w->x))[2+(y)] = (z); \
375c375
< #define getL8bit(w,x,y) (\
---
> #define getL8bit(w,x,y) (\
379c379
< #define setL8bit(w,x,y,z) {\
---
> #define setL8bit(w,x,y,z) {\