1 files changed, 79 insertions, 79 deletions

diff --git a/drivers/net/ni52.h b/drivers/net/ni52.h
index a33ea0884aaf..1f28a4d1a319 100644
--- a/drivers/net/ni52.h
+++ b/drivers/net/ni52.h
@@ -36,12 +36,12 @@
 
 struct scp_struct
 {
-  unsigned short zero_dum0;     /* has to be zero */
-  unsigned char  sysbus;        /* 0=16Bit,1=8Bit */
-  unsigned char  zero_dum1;     /* has to be zero for 586 */
-  unsigned short zero_dum2;
-  unsigned short zero_dum3;
-  char          *iscp;          /* pointer to the iscp-block */
+        u16 zero_dum0;  /* has to be zero */
+        u8 sysbus;      /* 0=16Bit,1=8Bit */
+        u8 zero_dum1;   /* has to be zero for 586 */
+        u8 zero_dum2;
+        u8 zero_dum3;
+        u32 iscp;               /* pointer to the iscp-block */
 };
 
 
@@ -50,10 +50,10 @@ struct scp_struct
  */
 struct iscp_struct
 {
-  unsigned char  busy;          /* 586 clears after successful init */
-  unsigned char  zero_dummy;    /* has to be zero */
-  unsigned short scb_offset;    /* pointeroffset to the scb_base */
-  char          *scb_base;      /* base-address of all 16-bit offsets */
+        u8 busy;          /* 586 clears after successful init */
+        u8 zero_dummy;    /* has to be zero */
+        u16 scb_offset;    /* pointeroffset to the scb_base */
+        u32 scb_base;      /* base-address of all 16-bit offsets */
 };
 
 /*
@@ -61,16 +61,16 @@ struct iscp_struct
  */
 struct scb_struct
 {
-  unsigned char rus;
-  unsigned char cus;
-  unsigned char cmd_ruc;           /* command word: RU part */
-  unsigned char cmd_cuc;           /* command word: CU part & ACK */
-  unsigned short cbl_offset;    /* pointeroffset, command block list */
-  unsigned short rfa_offset;    /* pointeroffset, receive frame area */
-  unsigned short crc_errs;      /* CRC-Error counter */
-  unsigned short aln_errs;      /* alignmenterror counter */
-  unsigned short rsc_errs;      /* Resourceerror counter */
-  unsigned short ovrn_errs;     /* OVerrunerror counter */
+        u8 rus;
+        u8 cus;
+        u8 cmd_ruc;        /* command word: RU part */
+        u8 cmd_cuc;        /* command word: CU part & ACK */
+        u16 cbl_offset;    /* pointeroffset, command block list */
+        u16 rfa_offset;    /* pointeroffset, receive frame area */
+        u16 crc_errs;      /* CRC-Error counter */
+        u16 aln_errs;      /* alignmenterror counter */
+        u16 rsc_errs;      /* Resourceerror counter */
+        u16 ovrn_errs;     /* OVerrunerror counter */
 };
 
 /*
@@ -119,16 +119,16 @@ struct scb_struct
  */
 struct rfd_struct
 {
-  unsigned char  stat_low;      /* status word */
-  unsigned char  stat_high;     /* status word */
-  unsigned char  rfd_sf;        /* 82596 mode only */
-  unsigned char  last;          /* Bit15,Last Frame on List / Bit14,suspend */
-  unsigned short next;          /* linkoffset to next RFD */
-  unsigned short rbd_offset;    /* pointeroffset to RBD-buffer */
-  unsigned char  dest[6];       /* ethernet-address, destination */
-  unsigned char  source[6];     /* ethernet-address, source */
-  unsigned short length;        /* 802.3 frame-length */
-  unsigned short zero_dummy;    /* dummy */
+        u8  stat_low;   /* status word */
+        u8  stat_high;  /* status word */
+        u8  rfd_sf;     /* 82596 mode only */
+        u8  last;               /* Bit15,Last Frame on List / Bit14,suspend */
+        u16 next;               /* linkoffset to next RFD */
+        u16 rbd_offset; /* pointeroffset to RBD-buffer */
+        u8  dest[6];    /* ethernet-address, destination */
+        u8  source[6];  /* ethernet-address, source */
+        u16 length;     /* 802.3 frame-length */
+        u16 zero_dummy; /* dummy */
 };
 
 #define RFD_LAST     0x80       /* last: last rfd in the list */
@@ -153,11 +153,11 @@ struct rfd_struct
  */
 struct rbd_struct
 {
-  unsigned short status;        /* status word,number of used bytes in buff */
-  unsigned short next;          /* pointeroffset to next RBD */
-  char          *buffer;        /* receive buffer address pointer */
-  unsigned short size;          /* size of this buffer */
-  unsigned short zero_dummy;    /* dummy */
+        u16 status;     /* status word,number of used bytes in buff */
+        u16 next;               /* pointeroffset to next RBD */
+        u32 buffer;     /* receive buffer address pointer */
+        u16 size;               /* size of this buffer */
+        u16 zero_dummy;    /* dummy */
 };
 
 #define RBD_LAST        0x8000  /* last buffer */
@@ -195,9 +195,9 @@ struct rbd_struct
  */
 struct nop_cmd_struct
 {
-  unsigned short cmd_status;    /* status of this command */
-  unsigned short cmd_cmd;       /* the command itself (+bits) */
-  unsigned short cmd_link;      /* offsetpointer to next command */
+        u16 cmd_status; /* status of this command */
+        u16 cmd_cmd;       /* the command itself (+bits) */
+        u16 cmd_link;      /* offsetpointer to next command */
 };
 
 /*
@@ -205,10 +205,10 @@ struct nop_cmd_struct
  */
 struct iasetup_cmd_struct
 {
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned char  iaddr[6];
+        u16 cmd_status;
+        u16 cmd_cmd;
+        u16 cmd_link;
+        u8  iaddr[6];
 };
 
 /*
@@ -216,21 +216,21 @@ struct iasetup_cmd_struct
  */
 struct configure_cmd_struct
 {
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned char  byte_cnt;   /* size of the config-cmd */
-  unsigned char  fifo;       /* fifo/recv monitor */
-  unsigned char  sav_bf;     /* save bad frames (bit7=1)*/
-  unsigned char  adr_len;    /* adr_len(0-2),al_loc(3),pream(4-5),loopbak(6-7)*/
-  unsigned char  priority;   /* lin_prio(0-2),exp_prio(4-6),bof_metd(7) */
-  unsigned char  ifs;        /* inter frame spacing */
-  unsigned char  time_low;   /* slot time low */
-  unsigned char  time_high;  /* slot time high(0-2) and max. retries(4-7) */
-  unsigned char  promisc;    /* promisc-mode(0) , et al (1-7) */
-  unsigned char  carr_coll;  /* carrier(0-3)/collision(4-7) stuff */
-  unsigned char  fram_len;   /* minimal frame len */
-  unsigned char  dummy;      /* dummy */
+        u16 cmd_status;
+        u16 cmd_cmd;
+        u16 cmd_link;
+        u8  byte_cnt;   /* size of the config-cmd */
+        u8  fifo;       /* fifo/recv monitor */
+        u8  sav_bf;     /* save bad frames (bit7=1)*/
+        u8  adr_len;    /* adr_len(0-2),al_loc(3),pream(4-5),loopbak(6-7)*/
+        u8  priority;   /* lin_prio(0-2),exp_prio(4-6),bof_metd(7) */
+        u8  ifs;        /* inter frame spacing */
+        u8  time_low;   /* slot time low */
+        u8  time_high;  /* slot time high(0-2) and max. retries(4-7) */
+        u8  promisc;    /* promisc-mode(0) , et al (1-7) */
+        u8  carr_coll;  /* carrier(0-3)/collision(4-7) stuff */
+        u8  fram_len;   /* minimal frame len */
+        u8  dummy;           /* dummy */
 };
 
 /*
@@ -238,11 +238,11 @@ struct configure_cmd_struct
  */
 struct mcsetup_cmd_struct
 {
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned short mc_cnt;                /* number of bytes in the MC-List */
-  unsigned char  mc_list[0][6];         /* pointer to 6 bytes entries */
+        u16 cmd_status;
+        u16 cmd_cmd;
+        u16 cmd_link;
+        u16 mc_cnt;             /* number of bytes in the MC-List */
+        u8  mc_list[0][6];      /* pointer to 6 bytes entries */
 };
 
 /*
@@ -250,10 +250,10 @@ struct mcsetup_cmd_struct
  */
 struct dump_cmd_struct
 {
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned short dump_offset;    /* pointeroffset to DUMP space */
+        u16 cmd_status;
+        u16 cmd_cmd;
+        u16 cmd_link;
+        u16 dump_offset;    /* pointeroffset to DUMP space */
 };
 
 /*
@@ -261,12 +261,12 @@ struct dump_cmd_struct
  */
 struct transmit_cmd_struct
 {
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned short tbd_offset;    /* pointeroffset to TBD */
-  unsigned char  dest[6];       /* destination address of the frame */
-  unsigned short length;        /* user defined: 802.3 length / Ether type */
+        u16 cmd_status;
+        u16 cmd_cmd;
+        u16 cmd_link;
+        u16 tbd_offset; /* pointeroffset to TBD */
+        u8  dest[6];       /* destination address of the frame */
+        u16 length;     /* user defined: 802.3 length / Ether type */
 };
 
 #define TCMD_ERRMASK     0x0fa0
@@ -281,10 +281,10 @@ struct transmit_cmd_struct
 
 struct tdr_cmd_struct
 {
-  unsigned short cmd_status;
-  unsigned short cmd_cmd;
-  unsigned short cmd_link;
-  unsigned short status;
+        u16 cmd_status;
+        u16 cmd_cmd;
+        u16 cmd_link;
+        u16 status;
 };
 
 #define TDR_LNK_OK      0x8000  /* No link problem identified */
@@ -298,9 +298,9 @@ struct tdr_cmd_struct
  */
 struct tbd_struct
 {
-  unsigned short size;          /* size + EOF-Flag(15) */
-  unsigned short next;          /* pointeroffset to next TBD */
-  char          *buffer;        /* pointer to buffer */
+        u16 size;               /* size + EOF-Flag(15) */
+        u16 next;          /* pointeroffset to next TBD */
+        u32 buffer;        /* pointer to buffer */
 };
 
 #define TBD_LAST 0x8000         /* EOF-Flag, indicates last buffer in list */