aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann2010-12-17 05:37:22 +0100
committerUwe Hermann2010-12-17 05:50:00 +0100
commite2d82ff44c55c52131c407a264cfbd1f71c4b14d (patch)
tree847b08a79696ad070542f248b84bdb8bea30d82f
parentaf61aaef21e85769e969e0760e4706eebc18eb5a (diff)
Build fixes for ethernet.c, and hook it up.
-rw-r--r--lib/Makefile2
-rw-r--r--lib/ethernet.c20
2 files changed, 11 insertions, 11 deletions
diff --git a/lib/Makefile b/lib/Makefile
index cb22b65..2e57624 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -28,7 +28,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../include -fno-common \
# ARFLAGS = rcsv
ARFLAGS = rcs
OBJS = vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o \
- rtc.o i2c.o dma.o systick.o exti.o scb.o \
+ rtc.o i2c.o dma.o systick.o exti.o scb.o ethernet.o \
usb_f103.o usb.o usb_control.o usb_standard.o
VPATH += usb
diff --git a/lib/ethernet.c b/lib/ethernet.c
index d8c0b06..4d17abf 100644
--- a/lib/ethernet.c
+++ b/lib/ethernet.c
@@ -22,32 +22,32 @@
void eth_smi_write(u8 phy, u8 reg, u16 data)
{
/* Set PHY and register addresses for write access. */
- *ETH_MACMIIAR &= ~(ETH_MACMIIAR_MR | ETH_MACMIIAR_PA);
- *ETH_MACMIIAR |= (phy << 11) | (reg << 6) | ETH_MACMIIAR_MW;
+ ETH_MACMIIAR &= ~(ETH_MACMIIAR_MR | ETH_MACMIIAR_PA);
+ ETH_MACMIIAR |= (phy << 11) | (reg << 6) | ETH_MACMIIAR_MW;
/* Set register value. */
- *ETH_MACMIIDR = data;
+ ETH_MACMIIDR = data;
/* Begin transaction. */
- *ETH_MACMIIAR |= ETH_MACMIIAR_MB;
+ ETH_MACMIIAR |= ETH_MACMIIAR_MB;
/* Wait for not busy. */
- while (*ETH_MACMIIAR & ETH_MACMIIAR_MB);
+ while (ETH_MACMIIAR & ETH_MACMIIAR_MB);
}
u16 eth_smi_read(u8 phy, u8 reg)
{
/* Set PHY and register addresses for write access. */
- *ETH_MACMIIAR &= ~(ETH_MACMIIAR_MR | ETH_MACMIIAR_PA |
+ ETH_MACMIIAR &= ~(ETH_MACMIIAR_MR | ETH_MACMIIAR_PA |
ETH_MACMIAR_MW);
- *ETH_MACMIIAR |= (phy << 11) | (reg << 6);
+ ETH_MACMIIAR |= (phy << 11) | (reg << 6);
/* Begin transaction. */
- *ETH_MACMIIAR |= ETH_MACMIIAR_MB;
+ ETH_MACMIIAR |= ETH_MACMIIAR_MB;
/* Wait for not busy. */
- while (*ETH_MACMIIAR & ETH_MACMIIAR_MB);
+ while (ETH_MACMIIAR & ETH_MACMIIAR_MB);
/* Set register value. */
- return (u16)(*ETH_MACMIIDR);
+ return (u16)(ETH_MACMIIDR);
}