From 3284d01875a63f46337f6864fb8dd1b741727b7e Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 13 Aug 2006 11:39:35 +0200 Subject: [GCC4] fix warnings in drivers/isdn/eicon/eicon*.h This patch fixes these warnings with gcc 4 : In file included from eicon_mod.c:34: eicon.h:157: warning: 'packed' attribute ignored for field of type '__u8' eicon.h:158: warning: 'packed' attribute ignored for field of type '__u8' eicon.h:159: warning: 'packed' attribute ignored for field of type '__u8' ... In file included from eicon.h:345, from eicon_mod.c:34: eicon_idi.h:61: warning: 'packed' attribute ignored for field of type '__u8' eicon_idi.h:62: warning: 'packed' attribute ignored for field of type '__u8' eicon_idi.h:63: warning: 'packed' attribute ignored for field of type '__u8' ... --- drivers/isdn/eicon/eicon.h | 24 ++++++++++++------------ drivers/isdn/eicon/eicon_idi.h | 32 ++++++++++++++++---------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/isdn/eicon/eicon.h b/drivers/isdn/eicon/eicon.h index 0805f5c..3833ddc 100644 --- a/drivers/isdn/eicon/eicon.h +++ b/drivers/isdn/eicon/eicon.h @@ -154,18 +154,18 @@ typedef struct { __u16 NextReq __attribute__ ((packed)); /* pointer to next Req Buffer */ __u16 NextRc __attribute__ ((packed)); /* pointer to next Rc Buffer */ __u16 NextInd __attribute__ ((packed)); /* pointer to next Ind Buffer */ - __u8 ReqInput __attribute__ ((packed)); /* number of Req Buffers sent */ - __u8 ReqOutput __attribute__ ((packed)); /* number of Req Buffers returned */ - __u8 ReqReserved __attribute__ ((packed));/*number of Req Buffers reserved */ - __u8 Int __attribute__ ((packed)); /* ISDN-P interrupt */ - __u8 XLock __attribute__ ((packed)); /* Lock field for arbitration */ - __u8 RcOutput __attribute__ ((packed)); /* number of Rc buffers received */ - __u8 IndOutput __attribute__ ((packed)); /* number of Ind buffers received */ - __u8 IMask __attribute__ ((packed)); /* Interrupt Mask Flag */ - __u8 Reserved1[2] __attribute__ ((packed)); /* reserved field, do not use */ - __u8 ReadyInt __attribute__ ((packed)); /* request field for ready int */ - __u8 Reserved2[12] __attribute__ ((packed)); /* reserved field, do not use */ - __u8 InterfaceType __attribute__ ((packed)); /* interface type 1=16K */ + __u8 ReqInput; /* number of Req Buffers sent */ + __u8 ReqOutput; /* number of Req Buffers returned */ + __u8 ReqReserved;/*number of Req Buffers reserved */ + __u8 Int; /* ISDN-P interrupt */ + __u8 XLock; /* Lock field for arbitration */ + __u8 RcOutput; /* number of Rc buffers received */ + __u8 IndOutput; /* number of Ind buffers received */ + __u8 IMask; /* Interrupt Mask Flag */ + __u8 Reserved1[2]; /* reserved field, do not use */ + __u8 ReadyInt; /* request field for ready int */ + __u8 Reserved2[12]; /* reserved field, do not use */ + __u8 InterfaceType; /* interface type 1=16K */ __u16 Signature __attribute__ ((packed)); /* ISDN-P initialized ind */ __u8 B[1]; /* buffer space for Req,Ind and Rc */ } eicon_pr_ram; diff --git a/drivers/isdn/eicon/eicon_idi.h b/drivers/isdn/eicon/eicon_idi.h index eefa56e..579f672 100644 --- a/drivers/isdn/eicon/eicon_idi.h +++ b/drivers/isdn/eicon/eicon_idi.h @@ -58,35 +58,35 @@ typedef struct { typedef struct { __u16 next __attribute__ ((packed)); - __u8 Req __attribute__ ((packed)); - __u8 ReqId __attribute__ ((packed)); - __u8 ReqCh __attribute__ ((packed)); - __u8 Reserved1 __attribute__ ((packed)); + __u8 Req; + __u8 ReqId; + __u8 ReqCh; + __u8 Reserved1; __u16 Reference __attribute__ ((packed)); - __u8 Reserved[8] __attribute__ ((packed)); + __u8 Reserved[8]; eicon_PBUFFER XBuffer; } eicon_REQ; typedef struct { __u16 next __attribute__ ((packed)); - __u8 Rc __attribute__ ((packed)); - __u8 RcId __attribute__ ((packed)); - __u8 RcCh __attribute__ ((packed)); - __u8 Reserved1 __attribute__ ((packed)); + __u8 Rc; + __u8 RcId; + __u8 RcCh; + __u8 Reserved1; __u16 Reference __attribute__ ((packed)); - __u8 Reserved2[8] __attribute__ ((packed)); + __u8 Reserved2[8]; } eicon_RC; typedef struct { __u16 next __attribute__ ((packed)); - __u8 Ind __attribute__ ((packed)); - __u8 IndId __attribute__ ((packed)); - __u8 IndCh __attribute__ ((packed)); - __u8 MInd __attribute__ ((packed)); + __u8 Ind; + __u8 IndId; + __u8 IndCh; + __u8 MInd; __u16 MLength __attribute__ ((packed)); __u16 Reference __attribute__ ((packed)); - __u8 RNR __attribute__ ((packed)); - __u8 Reserved __attribute__ ((packed)); + __u8 RNR; + __u8 Reserved; __u32 Ack __attribute__ ((packed)); eicon_PBUFFER RBuffer; } eicon_IND; -- 1.4.2