len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-08-19 17:48:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

Continue work on the SmartFusion demo web interface. The uIP task has been updated to use software timers, and the mac interface updated to use vTaskDelay() in place of busy waits.

Browse source
This commit is contained in:
Richard Barry 2011-04-17 14:38:50 +00:00
parent e659759671
commit 9c6a0e4e69
4 changed files with 204 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Demo/CORTEX_A2F200_SoftConsole/MicroSemi_Code/drivers/mss_ethernet_mac/mss_ethernet_mac.c
View file

@ -14,6 +14,7 @@ extern "C" {
#endif
#include "FreeRTOS.h"
#include "task.h"
#include "crc32.h"
@ -111,16 +112,15 @@ MSS_MAC_init
)
{
const uint8_t mac_address[6] = { DEFAULT_MAC_ADDRESS };
int32_t a;
/* Try to reset chip */
MAC_BITBAND->CSR0_SWR = 1u;
while ( 1u == MAC_BITBAND->CSR0_SWR )
do
{
;
}
vTaskDelay( 10 );
} while ( 1u == MAC_BITBAND->CSR0_SWR );
/* Check reset values of some registers to constrol
* base address validity */
@ -145,7 +145,7 @@ MSS_MAC_init
for( a = 0; a < TX_RING_SIZE; a++ )
{
g_mss_mac.tx_descriptors[a].buffer_1 = (uint32_t)g_mss_mac.tx_buffers[a];
g_mss_mac.tx_descriptors[a].buffer_1 = ( unsigned long ) NULL; /* _RB_ used to be "(uint32_t)g_mss_mac.tx_buffers[a];" but set to NULL now to implement a zero copy scheme. */
}
g_mss_mac.tx_descriptors[TX_RING_SIZE - 1].descriptor_1 |= TDES1_TER;
@ -197,11 +197,7 @@ MSS_MAC_init
/* Set default MAC address and reset mac filters */
MAC_memcpy( g_mss_mac.mac_address, mac_address, 6u );
MSS_MAC_set_mac_filters( 0u, NULL_buffer );
/* Start receiving and transmission */
MAC_start_receiving();
MAC_start_transmission();
MAC_BITBAND->CSR6_RA = 1; /* Receive all. */
}
@ -266,9 +262,6 @@ MSS_MAC_configure
((((configuration & MSS_MAC_CFG_TRANSMIT_THRESHOLD_MODE) != 0u) ? MSS_MAC_LINK_STATUS_100MB : 0u ) |
(((configuration & MSS_MAC_CFG_FULL_DUPLEX_MODE) != 0u) ? MSS_MAC_LINK_STATUS_FDX : 0u )) );
MAC_start_transmission();
MAC_start_receiving();
MSS_MAC_auto_setup_link();
}
@ -460,10 +453,8 @@ MSS_MAC_tx_packet
{
pacLen = (uint16_t)MSS_TX_BUFF_SIZE;
}
MAC_memcpy(
(uint8_t*)
g_mss_mac.tx_descriptors[ g_mss_mac.tx_desc_index ].buffer_1,
pacData, (uint32_t)pacLen );
g_mss_mac.tx_descriptors[ g_mss_mac.tx_desc_index ].buffer_1 = ( unsigned long ) pacData;
/* update counters */
desc = g_mss_mac.tx_descriptors[ g_mss_mac.tx_desc_index ].descriptor_0;

10
Demo/CORTEX_A2F200_SoftConsole/MicroSemi_Code/drivers/mss_ethernet_mac/phy.c
View file

@ -20,6 +20,9 @@ extern "C" {
#include "phy.h"
#include "FreeRTOS.h"
#include "task.h"
extern MAC_instance_t g_mss_mac;
/***************************** MDIO FUNCTIONS *********************************/
@ -267,7 +270,6 @@ void PHY_auto_negotiate( void )
{
int32_t a;
uint16_t reg;
int32_t exit = 1;
reg = MDIO_read( PHYREG_MIIMCR );
MDIO_write( PHYREG_MIIMCR,
@ -275,10 +277,12 @@ void PHY_auto_negotiate( void )
MIIMCR_RESTART_AUTONEGOTIATION |
reg) );
for(a=0; (a<1000) && (exit); a++) {
for( ;; ) {
reg = MDIO_read( PHYREG_MIIMSR );
if( (reg & MIIMSR_ANC) != 0 ) {
exit = 0;
break;
} else {
vTaskDelay( 200 );
}
}
}