jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Build fixes for ethernet.c, and hook it up.

Browse Source
This commit is contained in:
Uwe Hermann 2010-12-17 05:37:22 +01:00
parent af61aaef21
commit e2d82ff44c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile
View File

@ -28,7 +28,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../include -fno-common \
# ARFLAGS = rcsv # ARFLAGS = rcsv
ARFLAGS = rcs ARFLAGS = rcs
OBJS = vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o \ 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 usb_f103.o usb.o usb_control.o usb_standard.o
VPATH += usb VPATH += usb

20
lib/ethernet.c
View File

@ -22,32 +22,32 @@
void eth_smi_write(u8 phy, u8 reg, u16 data) void eth_smi_write(u8 phy, u8 reg, u16 data)
{ {
/* Set PHY and register addresses for write access. */ /* 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_MACMIIAR |= (phy << 11) | (reg << 6) | ETH_MACMIIAR_MW; ETH_MACMIIAR |= (phy << 11) | (reg << 6) | ETH_MACMIIAR_MW;
/* Set register value. */ /* Set register value. */
*ETH_MACMIIDR = data; ETH_MACMIIDR = data;
/* Begin transaction. */ /* Begin transaction. */
*ETH_MACMIIAR |= ETH_MACMIIAR_MB; ETH_MACMIIAR |= ETH_MACMIIAR_MB;
/* Wait for not busy. */ /* Wait for not busy. */
while (*ETH_MACMIIAR & ETH_MACMIIAR_MB); while (ETH_MACMIIAR & ETH_MACMIIAR_MB);
} }
u16 eth_smi_read(u8 phy, u8 reg) u16 eth_smi_read(u8 phy, u8 reg)
{ {
/* Set PHY and register addresses for write access. */ /* 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_MACMIAR_MW);
*ETH_MACMIIAR |= (phy << 11) | (reg << 6); ETH_MACMIIAR |= (phy << 11) | (reg << 6);
/* Begin transaction. */ /* Begin transaction. */
*ETH_MACMIIAR |= ETH_MACMIIAR_MB; ETH_MACMIIAR |= ETH_MACMIIAR_MB;
/* Wait for not busy. */ /* Wait for not busy. */
while (*ETH_MACMIIAR & ETH_MACMIIAR_MB); while (ETH_MACMIIAR & ETH_MACMIIAR_MB);
/* Set register value. */ /* Set register value. */
return (u16)(*ETH_MACMIIDR); return (u16)(ETH_MACMIIDR);
} }