Skip to content

Commit

Permalink
Staging: comedi: s526: Take account of arch's byte order.
Browse files Browse the repository at this point in the history
Signed-off-by: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Oct 9, 2009
1 parent ca98ee7 commit 2b0318a
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions drivers/staging/comedi/drivers/s526.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ comedi_config /dev/comedi0 s526 0x2C0,0x3

#include "../comedidev.h"
#include <linux/ioport.h>
#include <asm/byteorder.h>

#define S526_SIZE 64

Expand Down Expand Up @@ -113,6 +114,7 @@ static const int s526_ports[] = {
};

struct counter_mode_register_t {
#if defined (__LITTLE_ENDIAN_BITFIELD)
unsigned short coutSource:1;
unsigned short coutPolarity:1;
unsigned short autoLoadResetRcap:3;
Expand All @@ -124,6 +126,21 @@ struct counter_mode_register_t {
unsigned short outputRegLatchCtrl:1;
unsigned short preloadRegSel:1;
unsigned short reserved:1;
#elif defined(__BIG_ENDIAN_BITFIELD)
unsigned short reserved:1;
unsigned short preloadRegSel:1;
unsigned short outputRegLatchCtrl:1;
unsigned short countDirCtrl:1;
unsigned short countDir:1;
unsigned short clockSource:2;
unsigned short ctEnableCtrl:2;
unsigned short hwCtEnableSource:2;
unsigned short autoLoadResetRcap:3;
unsigned short coutPolarity:1;
unsigned short coutSource:1;
#else
#error Unknown bit field order
#endif
};

union cmReg {
Expand Down

0 comments on commit 2b0318a

Please sign in to comment.