diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2009-09-21 15:38:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-09 16:47:25 -0400 |
commit | 2b0318a600989ed85fe020079fa20132f8aebaf3 (patch) | |
tree | ab5937afbab1dad7a638418bf877bf9ce5090a9f | |
parent | ca98ee7bb4005365ad395b53229e2f6d01ca7cbd (diff) |
Staging: comedi: s526: Take account of arch's byte order.
Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/comedi/drivers/s526.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c index dbde118f2a16..9a8ebbe96999 100644 --- a/drivers/staging/comedi/drivers/s526.c +++ b/drivers/staging/comedi/drivers/s526.c | |||
@@ -43,6 +43,7 @@ comedi_config /dev/comedi0 s526 0x2C0,0x3 | |||
43 | 43 | ||
44 | #include "../comedidev.h" | 44 | #include "../comedidev.h" |
45 | #include <linux/ioport.h> | 45 | #include <linux/ioport.h> |
46 | #include <asm/byteorder.h> | ||
46 | 47 | ||
47 | #define S526_SIZE 64 | 48 | #define S526_SIZE 64 |
48 | 49 | ||
@@ -113,6 +114,7 @@ static const int s526_ports[] = { | |||
113 | }; | 114 | }; |
114 | 115 | ||
115 | struct counter_mode_register_t { | 116 | struct counter_mode_register_t { |
117 | #if defined (__LITTLE_ENDIAN_BITFIELD) | ||
116 | unsigned short coutSource:1; | 118 | unsigned short coutSource:1; |
117 | unsigned short coutPolarity:1; | 119 | unsigned short coutPolarity:1; |
118 | unsigned short autoLoadResetRcap:3; | 120 | unsigned short autoLoadResetRcap:3; |
@@ -124,6 +126,21 @@ struct counter_mode_register_t { | |||
124 | unsigned short outputRegLatchCtrl:1; | 126 | unsigned short outputRegLatchCtrl:1; |
125 | unsigned short preloadRegSel:1; | 127 | unsigned short preloadRegSel:1; |
126 | unsigned short reserved:1; | 128 | unsigned short reserved:1; |
129 | #elif defined(__BIG_ENDIAN_BITFIELD) | ||
130 | unsigned short reserved:1; | ||
131 | unsigned short preloadRegSel:1; | ||
132 | unsigned short outputRegLatchCtrl:1; | ||
133 | unsigned short countDirCtrl:1; | ||
134 | unsigned short countDir:1; | ||
135 | unsigned short clockSource:2; | ||
136 | unsigned short ctEnableCtrl:2; | ||
137 | unsigned short hwCtEnableSource:2; | ||
138 | unsigned short autoLoadResetRcap:3; | ||
139 | unsigned short coutPolarity:1; | ||
140 | unsigned short coutSource:1; | ||
141 | #else | ||
142 | #error Unknown bit field order | ||
143 | #endif | ||
127 | }; | 144 | }; |
128 | 145 | ||
129 | union cmReg { | 146 | union cmReg { |