projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 16bit colour support in lcd.h
[oweals/u-boot.git]
/
drivers
/
net
/
s3c4510b_eth.h
diff --git
a/drivers/net/s3c4510b_eth.h
b/drivers/net/s3c4510b_eth.h
index cbddba71a4007db112d55d11eea04733961a6859..18a52a7f4db8ddc15c94c64eb6e43a6cdf623083 100644
(file)
--- a/
drivers/net/s3c4510b_eth.h
+++ b/
drivers/net/s3c4510b_eth.h
@@
-30,8
+30,6
@@
*
*/
*
*/
-#define __packed __attribute__ ((packed))
-
#define ETH_MAC_ADDR_SIZE (6) /* dst,src addr is 6bytes each */
#define ETH_MaxTxFrames (16) /* Max number of Tx Frames */
#define ETH_MAC_ADDR_SIZE (6) /* dst,src addr is 6bytes each */
#define ETH_MaxTxFrames (16) /* Max number of Tx Frames */
@@
-283,12
+281,14
@@
typedef struct __RX_FrameDescriptor {
} RX_FrameDescriptor;
/* MAC Frame Structure */
} RX_FrameDescriptor;
/* MAC Frame Structure */
-typedef struct __MACFrame {
- u8 m_dstAddr[6] __packed;
- u8 m_srcAddr[6] __packed;
- u16 m_lengthOrType __packed;
- u8 m_payload[1506] __packed;
-} MACFrame;
+struct __MACFrame {
+ u8 m_dstAddr[6];
+ u8 m_srcAddr[6];
+ u16 m_lengthOrType;
+ u8 m_payload[1506];
+} __attribute__ ((packed));
+
+typedef struct __MACFrame MACFrame;
/* Ethernet Control block */
typedef struct __ETH {
/* Ethernet Control block */
typedef struct __ETH {
@@
-296,7
+296,7
@@
typedef struct __ETH {
TX_FrameDescriptor *m_baseTX_FD; /* pointer to base TX frame descriptor */
RX_FrameDescriptor *m_curRX_FD; /* pointer to current RX frame descriptor */
RX_FrameDescriptor *m_baseRX_FD; /* pointer to base RX frame descriptor */
TX_FrameDescriptor *m_baseTX_FD; /* pointer to base TX frame descriptor */
RX_FrameDescriptor *m_curRX_FD; /* pointer to current RX frame descriptor */
RX_FrameDescriptor *m_baseRX_FD; /* pointer to base RX frame descriptor */
- u8
*m_mac
; /* pointer to our MAC address */
+ u8
m_mac[6]
; /* pointer to our MAC address */
} ETH;
#endif
} ETH;
#endif