Skip to content

R
rt-thread

宁楠萍 / rt-thread
与 Fork 源项目一致

Fork自 RT-Thread / rt-thread

通知 2
Star 0
Fork 0
R
rt-thread

体验新版 GitCode，发现更多精彩内容 >>

提交 b8503207 编写于 作者: wuyangyong's avatar wuyangyong
浏览文件
操作

update en28j60 driver 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1571 bbd45198-f89e-11dd-88c7-29a3b14d5316
上级 04c19da4
隐藏空白更改
内联 并排
Showing with 71 addition and 61 deletion
bsp/stm32f10x/enc28j60.c
浏览文件 @ b8503207
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#define MAX_ADDR_LEN 6 #define MAX_ADDR_LEN 6
#define CSACTIVE GPIOB->BRR = GPIO_Pin_12; #define CSACTIVE GPIOC->BRR = GPIO_Pin_12;
#define CSPASSIVE GPIOB->BSRR = GPIO_Pin_12; #define CSPASSIVE GPIOC->BSRR = GPIO_Pin_12;
struct net_device struct net_device
{ {
...@@ -56,27 +56,28 @@ rt_uint8_t spi_read_op(rt_uint8_t op, rt_uint8_t address) ...@@ -56,27 +56,28 @@ rt_uint8_t spi_read_op(rt_uint8_t op, rt_uint8_t address)
int temp=0; int temp=0;
CSACTIVE; CSACTIVE;
SPI_I2S_SendData(SPI2, (op | (address & ADDR_MASK))); SPI_I2S_SendData(SPI1, (op | (address & ADDR_MASK)));
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET); while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);
SPI_I2S_ReceiveData(SPI2); SPI_I2S_ReceiveData(SPI1);
SPI_I2S_SendData(SPI2, 0x00); SPI_I2S_SendData(SPI1, 0x00);
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET); while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);
// do dummy read if needed (for mac and mii, see datasheet page 29) // do dummy read if needed (for mac and mii, see datasheet page 29)
if(address & 0x80) if(address & 0x80)
{ {
SPI_I2S_ReceiveData(SPI2); SPI_I2S_ReceiveData(SPI1);
SPI_I2S_SendData(SPI2, 0x00); SPI_I2S_SendData(SPI1, 0x00);
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET); while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);
} }
// release CS // release CS
temp=SPI_I2S_ReceiveData(SPI2); temp=SPI_I2S_ReceiveData(SPI1);
// for(t=0;t<20;t++); // for(t=0;t<20;t++);
CSPASSIVE; CSPASSIVE;
return (temp); return (temp);
} }
// : ,ַ,
void spi_write_op(rt_uint8_t op, rt_uint8_t address, rt_uint8_t data) void spi_write_op(rt_uint8_t op, rt_uint8_t address, rt_uint8_t data)
{ {
rt_uint32_t level; rt_uint32_t level;
...@@ -84,10 +85,10 @@ void spi_write_op(rt_uint8_t op, rt_uint8_t address, rt_uint8_t data) ...@@ -84,10 +85,10 @@ void spi_write_op(rt_uint8_t op, rt_uint8_t address, rt_uint8_t data)
level = rt_hw_interrupt_disable(); level = rt_hw_interrupt_disable();
CSACTIVE; CSACTIVE;
SPI_I2S_SendData(SPI2, op | (address & ADDR_MASK)); SPI_I2S_SendData(SPI1, op | (address & ADDR_MASK));
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET); while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);
SPI_I2S_SendData(SPI2,data); SPI_I2S_SendData(SPI1,data);
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET); while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);
CSPASSIVE; CSPASSIVE;
rt_hw_interrupt_enable(level); rt_hw_interrupt_enable(level);
...@@ -117,18 +118,18 @@ void spi_read_buffer(rt_uint8_t* data, rt_size_t len) ...@@ -117,18 +118,18 @@ void spi_read_buffer(rt_uint8_t* data, rt_size_t len)
{ {
CSACTIVE; CSACTIVE;
SPI_I2S_SendData(SPI2,ENC28J60_READ_BUF_MEM); SPI_I2S_SendData(SPI1,ENC28J60_READ_BUF_MEM);
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET); while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);
SPI_I2S_ReceiveData(SPI2); SPI_I2S_ReceiveData(SPI1);
while(len) while(len)
{ {
len--; len--;
SPI_I2S_SendData(SPI2,0x00) ; SPI_I2S_SendData(SPI1,0x00) ;
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET); while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);
*data= SPI_I2S_ReceiveData(SPI2); *data= SPI_I2S_ReceiveData(SPI1);
data++; data++;
} }
...@@ -181,12 +182,12 @@ void enc28j60_clkout(rt_uint8_t clk) ...@@ -181,12 +182,12 @@ void enc28j60_clkout(rt_uint8_t clk)
{ {
//setup clkout: 2 is 12.5MHz: //setup clkout: 2 is 12.5MHz:
spi_write(ECOCON, clk & 0x7); spi_write(ECOCON, clk & 0x7);
} }
rt_inline rt_uint32_t enc28j60_interrupt_disable()
{
rt_uint32_t level;
rt_inline rt_uint32_t enc28j60_interrupt_disable()
{
rt_uint32_t level;
/* switch to bank 0 */ /* switch to bank 0 */
enc28j60_set_bank(EIE); enc28j60_set_bank(EIE);
...@@ -195,15 +196,15 @@ rt_inline rt_uint32_t enc28j60_interrupt_disable() ...@@ -195,15 +196,15 @@ rt_inline rt_uint32_t enc28j60_interrupt_disable()
/* disable interrutps */ /* disable interrutps */
spi_write_op(ENC28J60_BIT_FIELD_CLR, EIE, level); spi_write_op(ENC28J60_BIT_FIELD_CLR, EIE, level);
return level; return level;
} }
rt_inline void enc28j60_interrupt_enable(rt_uint32_t level) rt_inline void enc28j60_interrupt_enable(rt_uint32_t level)
{ {
/* switch to bank 0 */ /* switch to bank 0 */
enc28j60_set_bank(EIE); enc28j60_set_bank(EIE);
spi_write_op(ENC28J60_BIT_FIELD_SET, EIE, level); spi_write_op(ENC28J60_BIT_FIELD_SET, EIE, level);
} }
/* /*
* Access the PHY to determine link status * Access the PHY to determine link status
...@@ -499,7 +500,7 @@ rt_err_t enc28j60_tx( rt_device_t dev, struct pbuf* p) ...@@ -499,7 +500,7 @@ rt_err_t enc28j60_tx( rt_device_t dev, struct pbuf* p)
rt_uint8_t* ptr; rt_uint8_t* ptr;
rt_uint32_t level; rt_uint32_t level;
// rt_kprintf("tx pbuf: 0x%08x, total len %d\n", p, p->tot_len); //rt_kprintf("tx pbuf: 0x%08x, total len %d\n", p, p->tot_len);
/* lock enc28j60 */ /* lock enc28j60 */
rt_sem_take(&lock_sem, RT_WAITING_FOREVER); rt_sem_take(&lock_sem, RT_WAITING_FOREVER);
...@@ -520,15 +521,15 @@ rt_err_t enc28j60_tx( rt_device_t dev, struct pbuf* p) ...@@ -520,15 +521,15 @@ rt_err_t enc28j60_tx( rt_device_t dev, struct pbuf* p)
{ {
CSACTIVE; CSACTIVE;
SPI_I2S_SendData(SPI2, ENC28J60_WRITE_BUF_MEM); SPI_I2S_SendData(SPI1, ENC28J60_WRITE_BUF_MEM);
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET); while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);
len = q->len; len = q->len;
ptr = q->payload; ptr = q->payload;
while(len) while(len)
{ {
SPI_I2S_SendData(SPI2,*ptr) ; SPI_I2S_SendData(SPI1,*ptr) ;
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET);; while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);;
ptr++; ptr++;
len--; len--;
...@@ -612,18 +613,18 @@ struct pbuf *enc28j60_rx(rt_device_t dev) ...@@ -612,18 +613,18 @@ struct pbuf *enc28j60_rx(rt_device_t dev)
CSACTIVE; CSACTIVE;
SPI_I2S_SendData(SPI2,ENC28J60_READ_BUF_MEM); SPI_I2S_SendData(SPI1,ENC28J60_READ_BUF_MEM);
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET); while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);
SPI_I2S_ReceiveData(SPI2); SPI_I2S_ReceiveData(SPI1);
while(len) while(len)
{ {
len--; len--;
SPI_I2S_SendData(SPI2,0x00) ; SPI_I2S_SendData(SPI1,0x00) ;
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY)==SET); while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY)==SET);
*data= SPI_I2S_ReceiveData(SPI2); *data= SPI_I2S_ReceiveData(SPI1);
data++; data++;
} }
...@@ -659,11 +660,13 @@ struct pbuf *enc28j60_rx(rt_device_t dev) ...@@ -659,11 +660,13 @@ struct pbuf *enc28j60_rx(rt_device_t dev)
static void RCC_Configuration(void) static void RCC_Configuration(void)
{ {
/* enable spi2 clock */ //RCC_PCLK2Config ( uint32_t RCC_HCLK )
RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI2, ENABLE); /* enable SPI1 clock */
RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE);
/* enable gpiob port clock */ /* enable gpiob port clock */
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB | RCC_APB2Periph_AFIO, ENABLE); //RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC | RCC_APB2Periph_AFIO, ENABLE);
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOC , ENABLE);
} }
static void NVIC_Configuration(void) static void NVIC_Configuration(void)
...@@ -674,7 +677,7 @@ static void NVIC_Configuration(void) ...@@ -674,7 +677,7 @@ static void NVIC_Configuration(void)
NVIC_PriorityGroupConfig(NVIC_PriorityGroup_1); NVIC_PriorityGroupConfig(NVIC_PriorityGroup_1);
/* Enable the EXTI0 Interrupt */ /* Enable the EXTI0 Interrupt */
NVIC_InitStructure.NVIC_IRQChannel = EXTI0_IRQn; NVIC_InitStructure.NVIC_IRQChannel = EXTI2_IRQn;
NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0; NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0; NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE; NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
...@@ -687,33 +690,33 @@ static void GPIO_Configuration() ...@@ -687,33 +690,33 @@ static void GPIO_Configuration()
EXTI_InitTypeDef EXTI_InitStructure; EXTI_InitTypeDef EXTI_InitStructure;
/* configure PB0 as external interrupt */ /* configure PB0 as external interrupt */
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0; GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPD; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPD;
GPIO_Init(GPIOB, &GPIO_InitStructure); GPIO_Init(GPIOC, &GPIO_InitStructure);
/* Configure SPI2 pins: SCK, MISO and MOSI ----------------------------*/ /* Configure SPI1 pins: SCK, MISO and MOSI ----------------------------*/
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15; GPIO_InitStructure.GPIO_Pin = GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_10MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_10MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
GPIO_Init(GPIOB, &GPIO_InitStructure); GPIO_Init(GPIOA, &GPIO_InitStructure);
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_12; GPIO_InitStructure.GPIO_Pin = GPIO_Pin_12;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
GPIO_Init(GPIOB, &GPIO_InitStructure); GPIO_Init(GPIOC, &GPIO_InitStructure);
/* Connect ENC28J60 EXTI Line to GPIOB Pin 0 */ /* Connect ENC28J60 EXTI Line to GPIOB Pin 0 */
GPIO_EXTILineConfig(GPIO_PortSourceGPIOB, GPIO_PinSource0); GPIO_EXTILineConfig(GPIO_PortSourceGPIOC, GPIO_PinSource2);
/* Configure ENC28J60 EXTI Line to generate an interrupt on falling edge */ /* Configure ENC28J60 EXTI Line to generate an interrupt on falling edge */
EXTI_InitStructure.EXTI_Line = EXTI_Line0; EXTI_InitStructure.EXTI_Line = EXTI_Line2;
EXTI_InitStructure.EXTI_Mode = EXTI_Mode_Interrupt; EXTI_InitStructure.EXTI_Mode = EXTI_Mode_Interrupt;
EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Falling; EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Falling;
EXTI_InitStructure.EXTI_LineCmd = ENABLE; EXTI_InitStructure.EXTI_LineCmd = ENABLE;
EXTI_Init(&EXTI_InitStructure); EXTI_Init(&EXTI_InitStructure);
/* Clear the Key Button EXTI line pending bit */ /* Clear the Key Button EXTI line pending bit */
EXTI_ClearITPendingBit(EXTI_Line0); EXTI_ClearITPendingBit(EXTI_Line2);
} }
static void SetupSPI (void) static void SetupSPI (void)
...@@ -725,11 +728,11 @@ static void SetupSPI (void) ...@@ -725,11 +728,11 @@ static void SetupSPI (void)
SPI_InitStructure.SPI_CPOL = SPI_CPOL_Low; SPI_InitStructure.SPI_CPOL = SPI_CPOL_Low;
SPI_InitStructure.SPI_CPHA = SPI_CPHA_1Edge; SPI_InitStructure.SPI_CPHA = SPI_CPHA_1Edge;
SPI_InitStructure.SPI_NSS = SPI_NSS_Soft; SPI_InitStructure.SPI_NSS = SPI_NSS_Soft;
SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_4; SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_8;//SPI_BaudRatePrescaler_4;
SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB; SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB;
SPI_InitStructure.SPI_CRCPolynomial = 7; SPI_InitStructure.SPI_CRCPolynomial = 7;
SPI_Init(SPI2, &SPI_InitStructure); SPI_Init(SPI1, &SPI_InitStructure);
SPI_Cmd(SPI2, ENABLE); SPI_Cmd(SPI1, ENABLE);
} }
void rt_hw_enc28j60_init() void rt_hw_enc28j60_init()
...@@ -760,5 +763,12 @@ void rt_hw_enc28j60_init() ...@@ -760,5 +763,12 @@ void rt_hw_enc28j60_init()
rt_sem_init(&lock_sem, "lock", 1, RT_IPC_FLAG_FIFO); rt_sem_init(&lock_sem, "lock", 1, RT_IPC_FLAG_FIFO);
eth_device_init(&(enc28j60_dev->parent), "e0"); eth_device_init(&(enc28j60_dev->parent), "e0");
}
#include <finsh.h>
void show_reg(void)
{
//
} }
FINSH_FUNCTION_EXPORT(show_reg,show en28j60 regs)
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或