projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net, phy: fix AR8031 phy_mask
[oweals/u-boot.git]
/
drivers
/
net
/
bfin_mac.h
diff --git
a/drivers/net/bfin_mac.h
b/drivers/net/bfin_mac.h
index c41b4d4181a62c7d2b577ad0a37852b50494455a..54ffb3830e2be000f6c7c971bbc35ecf6607220c 100644
(file)
--- a/
drivers/net/bfin_mac.h
+++ b/
drivers/net/bfin_mac.h
@@
-9,7
+9,6
@@
#ifndef __BFIN_MAC_H__
#define __BFIN_MAC_H__
#ifndef __BFIN_MAC_H__
#define __BFIN_MAC_H__
-#define PHYADDR 0x01
#define RECV_BUFSIZE (0x614)
typedef struct ADI_DMA_CONFIG_REG {
#define RECV_BUFSIZE (0x614)
typedef struct ADI_DMA_CONFIG_REG {
@@
-36,7
+35,10
@@
typedef struct adi_ether_frame_buffer {
typedef struct dma_descriptor {
struct dma_descriptor *NEXT_DESC_PTR;
u32 START_ADDR;
typedef struct dma_descriptor {
struct dma_descriptor *NEXT_DESC_PTR;
u32 START_ADDR;
- ADI_DMA_CONFIG_REG CONFIG;
+ union {
+ u16 CONFIG_DATA;
+ ADI_DMA_CONFIG_REG CONFIG;
+ };
} DMA_DESCRIPTOR;
/* 10 bytes/struct in 12 bytes */
} DMA_DESCRIPTOR;
/* 10 bytes/struct in 12 bytes */
@@
-56,9
+58,8
@@
static ADI_ETHER_BUFFER *SetupTxBuffer(int no);
static int bfin_EMAC_init(struct eth_device *dev, bd_t *bd);
static void bfin_EMAC_halt(struct eth_device *dev);
static int bfin_EMAC_init(struct eth_device *dev, bd_t *bd);
static void bfin_EMAC_halt(struct eth_device *dev);
-static int bfin_EMAC_send(struct eth_device *dev, vo
latile vo
id *packet, int length);
+static int bfin_EMAC_send(struct eth_device *dev, void *packet, int length);
static int bfin_EMAC_recv(struct eth_device *dev);
static int bfin_EMAC_recv(struct eth_device *dev);
-
-static void bfin_EMAC_setup_addr(bd_t *bd);
+static int bfin_EMAC_setup_addr(struct eth_device *dev);
#endif
#endif