diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-04-01 15:59:09 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-04-06 11:08:29 +0200 |
commit | 8cf468582612ef95dc277167b6e50e1add66dc86 (patch) | |
tree | c329ab106420c1fd0d51b8d7255ef413f671a0da | |
parent | 63d08b510759902fba599792724165b904abe166 (diff) | |
download | barebox-8cf468582612ef95dc277167b6e50e1add66dc86.tar.gz barebox-8cf468582612ef95dc277167b6e50e1add66dc86.tar.xz |
fec_imx: do not typedef struct types #2
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | drivers/net/fec_imx.c | 17 | ||||
-rw-r--r-- | drivers/net/fec_imx.h | 14 |
2 files changed, 16 insertions, 15 deletions
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 1a026a80f9..5f14278531 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -211,7 +211,7 @@ static void fec_tbd_init(struct fec_priv *fec) * @param[in] last 1 if this is the last buffer descriptor in the chain, else 0 * @param[in] pRbd buffer descriptor to mark free again */ -static void fec_rbd_clean(int last, FEC_BD *pRbd) +static void fec_rbd_clean(int last, struct buffer_descriptor *pRbd) { /* * Reset buffer descriptor as empty @@ -282,8 +282,7 @@ static int fec_init(struct eth_device *dev) * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock * and do not drop the Preamble. */ -// writel(((imx_get_fecclk() >> 20) / 5) << 1, fec->regs + FEC_MII_SPEED); /* No MII for 7-wire mode */ - writel( ((((imx_get_fecclk() / 2 + 4999999) / 2500000) / 2) & 0x3F) << 1, fec->regs + FEC_MII_SPEED); + writel(((imx_get_fecclk() >> 20) / 5) << 1, fec->regs + FEC_MII_SPEED); /* No MII for 7-wire mode */ } if (fec->xcv_type == RMII) { @@ -466,7 +465,7 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length) static int fec_recv(struct eth_device *dev) { struct fec_priv *fec = (struct fec_priv *)dev->priv; - FEC_BD *rbd = &fec->rbd_base[fec->rbd_index]; + struct buffer_descriptor *rbd = &fec->rbd_base[fec->rbd_index]; unsigned long ievent; int frame_length, len = 0; NBUF *frame; @@ -568,13 +567,15 @@ static int fec_probe(struct device_d *dev) * reserve memory for both buffer descriptor chains at once * Datasheet forces the startaddress of each chain is 16 byte aligned */ - base = (uint32_t)xzalloc( (2 + FEC_RBD_NUM) * sizeof(FEC_BD) + 2 * DB_ALIGNMENT ); + base = (uint32_t)xzalloc((2 + FEC_RBD_NUM) * + sizeof (struct buffer_descriptor) + 2 * DB_ALIGNMENT ); base += (DB_ALIGNMENT-1); base &= ~(DB_ALIGNMENT-1); - fec->rbd_base = (FEC_BD*)base; - base += FEC_RBD_NUM * sizeof(FEC_BD) + (DB_ALIGNMENT-1); + fec->rbd_base = (struct buffer_descriptor *)base; + base += FEC_RBD_NUM * sizeof (struct buffer_descriptor) + + (DB_ALIGNMENT - 1); base &= ~(DB_ALIGNMENT-1); - fec->tbd_base = (FEC_BD*)base; + fec->tbd_base = (struct buffer_descriptor *)base; writel((uint32_t)fec->tbd_base, fec->regs + FEC_ETDSR); writel((uint32_t)fec->rbd_base, fec->regs + FEC_ERDSR); diff --git a/drivers/net/fec_imx.h b/drivers/net/fec_imx.h index e3d6797055..353799c3c2 100644 --- a/drivers/net/fec_imx.h +++ b/drivers/net/fec_imx.h @@ -125,22 +125,22 @@ * * Note: The first BD must be aligned (see DB_ALIGNMENT) */ -typedef struct buffer_descriptor { +struct buffer_descriptor { uint16_t data_length; /**< payload's length in bytes */ uint16_t status; /**< BD's staus (see datasheet) */ uint32_t data_pointer; /**< payload's buffer address */ -} FEC_BD; +}; /** * @brief i.MX27-FEC private structure */ struct fec_priv { void *regs; - xceiver_type xcv_type; /**< transceiver type */ - FEC_BD *rbd_base; /**< RBD ring */ - int rbd_index; /**< next receive BD to read */ - FEC_BD *tbd_base; /**< TBD ring */ - int tbd_index; /**< next transmit BD to write */ + xceiver_type xcv_type; /* transceiver type */ + struct buffer_descriptor *rbd_base; /* RBD ring */ + int rbd_index; /* next receive BD to read */ + struct buffer_descriptor *tbd_base; /* TBD ring */ + int tbd_index; /* next transmit BD to write */ struct miiphy_device miiphy; }; |