X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fnet%2Fbfin_mac.h;h=54ffb3830e2be000f6c7c971bbc35ecf6607220c;hb=cc35734358540a1bbaf042fdf9f4cb2de17389ed;hp=b1623e0408b12e8209fc4e402488af21d6afd671;hpb=a7ec6ac8b2c6dce6fc670a2a855deb6eee340e04;p=u-boot diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h index b1623e0408..54ffb3830e 100644 --- a/drivers/net/bfin_mac.h +++ b/drivers/net/bfin_mac.h @@ -35,7 +35,10 @@ typedef struct adi_ether_frame_buffer { 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 */ @@ -55,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_send(struct eth_device *dev, volatile void *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 void bfin_EMAC_setup_addr(bd_t *bd); +static int bfin_EMAC_setup_addr(struct eth_device *dev); #endif