diff options
Diffstat (limited to 'FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib')
5 files changed, 39 insertions, 39 deletions
diff --git a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/MCF5225x_ethernetif.c b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/MCF5225x_ethernetif.c index 36e612f08..3e885f3dd 100644 --- a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/MCF5225x_ethernetif.c +++ b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/MCF5225x_ethernetif.c @@ -38,7 +38,7 @@ #include "FreeRTOS.h"
#include "task.h"
-xTaskHandle xEthIntTask;
+TaskHandle_t xEthIntTask;
/* lwIP includes. */
#include "lwip/def.h"
@@ -55,10 +55,10 @@ xTaskHandle xEthIntTask; /* Delay to wait for a DMA buffer to become available if one is not already
available. */
#define netifBUFFER_WAIT_ATTEMPTS 10
-#define netifBUFFER_WAIT_DELAY (10 / portTICK_RATE_MS)
+#define netifBUFFER_WAIT_DELAY (10 / portTICK_PERIOD_MS)
/* Delay between polling the PHY to see if a link has been established. */
-#define netifLINK_DELAY ( 500 / portTICK_RATE_MS )
+#define netifLINK_DELAY ( 500 / portTICK_PERIOD_MS )
/* Delay between looking for incoming packets. In ideal world this would be
infinite. */
@@ -85,7 +85,7 @@ static unsigned char ucFECRxBuffers[ ( configNUM_FEC_RX_BUFFERS * configFEC_BUFF static unsigned portBASE_TYPE uxNextRxBuffer = 0, uxNextTxBuffer = 0;
/* Semaphore used by the FEC interrupt handler to wake the handler task. */
-static xSemaphoreHandle xFecSemaphore;
+static SemaphoreHandle_t xFecSemaphore;
#pragma options align= packed
struct ethernetif
diff --git a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/__sys_arch.c b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/__sys_arch.c index 7097b3307..18e395567 100644 --- a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/__sys_arch.c +++ b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/__sys_arch.c @@ -56,16 +56,16 @@ /* This is the number of threads that can be started with sys_thead_new() */
#define SYS_MBOX_SIZE ( 16 )
#define MS_TO_TICKS( ms ) \
- ( portTickType )( ( portTickType ) ( ms ) / portTICK_RATE_MS )
+ ( TickType_t )( ( TickType_t ) ( ms ) / portTICK_PERIOD_MS )
#define TICKS_TO_MS( ticks ) \
- ( unsigned long )( ( portTickType ) ( ticks ) * portTICK_RATE_MS )
+ ( unsigned long )( ( TickType_t ) ( ticks ) * portTICK_PERIOD_MS )
#define THREAD_STACK_SIZE ( 256 /*FSL:1024*/ )
#define THREAD_NAME "lwIP"
#define THREAD_INIT( tcb ) \
do { \
tcb->next = NULL; \
- tcb->pid = ( xTaskHandle )0; \
+ tcb->pid = ( TaskHandle_t )0; \
tcb->timeouts.next = NULL; \
} while( 0 )
@@ -74,7 +74,7 @@ typedef struct sys_tcb {
struct sys_tcb *next;
struct sys_timeouts timeouts;
- xTaskHandle pid;
+ TaskHandle_t pid;
} sys_tcb_t;
/* ------------------------ Prototypes ------------------------------------ */
@@ -223,7 +223,7 @@ sys_arch_thread_remove( sys_thread_t hdl ) {
sys_tcb_t *current = tasks, *prev;
sys_tcb_t *toremove = hdl;
- xTaskHandle pid = ( xTaskHandle ) 0;
+ TaskHandle_t pid = ( TaskHandle_t ) 0;
LWIP_ASSERT( "sys_arch_thread_remove: assertion hdl != NULL failed!", hdl != NULL );
@@ -261,7 +261,7 @@ sys_arch_thread_remove( sys_thread_t hdl ) * resources.
*/
vPortExitCritical( );
- if( pid != ( xTaskHandle ) 0 )
+ if( pid != ( TaskHandle_t ) 0 )
{
vTaskDelete( pid );
/* not reached. */
@@ -276,7 +276,7 @@ sys_thread_t sys_arch_thread_current( void )
{
sys_tcb_t *p = tasks;
- xTaskHandle pid = xTaskGetCurrentTaskHandle( );
+ TaskHandle_t pid = xTaskGetCurrentTaskHandle( );
vPortEnterCritical( );
while( ( p != NULL ) && ( p->pid != pid ) )
@@ -316,7 +316,7 @@ sys_arch_timeouts( void ) sys_sem_t
sys_sem_new( u8_t count )
{
- xSemaphoreHandle xSemaphore;
+ SemaphoreHandle_t xSemaphore;
vSemaphoreCreateBinary( xSemaphore );
if( xSemaphore != SYS_SEM_NULL )
@@ -386,7 +386,7 @@ u32_t sys_arch_sem_wait( sys_sem_t sem, u32_t timeout )
{
portBASE_TYPE xStatus;
- portTickType xTicksStart, xTicksEnd, xTicksElapsed;
+ TickType_t xTicksStart, xTicksEnd, xTicksElapsed;
u32_t timespent;
LWIP_ASSERT( "sys_arch_sem_wait: sem != SYS_SEM_NULL", sem != SYS_SEM_NULL );
@@ -425,7 +425,7 @@ sys_arch_sem_wait( sys_sem_t sem, u32_t timeout ) sys_mbox_t
sys_mbox_new( /*paolo:void*/int size )
{
- xQueueHandle mbox;
+ QueueHandle_t mbox;
mbox = xQueueCreate( SYS_MBOX_SIZE/*size*/, sizeof( void * ) );
if( mbox != SYS_MBOX_NULL )
@@ -523,7 +523,7 @@ sys_arch_mbox_fetch( sys_mbox_t mbox, void **msg, u32_t timeout ) {
void *ret_msg;
portBASE_TYPE xStatus;
- portTickType xTicksStart, xTicksEnd, xTicksElapsed;
+ TickType_t xTicksStart, xTicksEnd, xTicksElapsed;
u32_t timespent;
LWIP_ASSERT( "sys_arch_mbox_fetch: mbox != SYS_MBOX_NULL", mbox != SYS_MBOX_NULL );
@@ -565,7 +565,7 @@ sys_arch_mbox_fetch( sys_mbox_t mbox, void **msg, u32_t timeout ) u32_t
sys_jiffies( void )
{
- portTickType xTicks = xTaskGetTickCount( );
+ TickType_t xTicks = xTaskGetTickCount( );
return ( u32_t )TICKS_TO_MS( xTicks );
}
diff --git a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/arch/sys_arch.h b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/arch/sys_arch.h index 9fee9b5c4..20b2e9d39 100644 --- a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/arch/sys_arch.h +++ b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/arch/sys_arch.h @@ -37,12 +37,12 @@ #include "queue.h"
#include "semphr.h"
-#define SYS_MBOX_NULL (xQueueHandle)0
-#define SYS_SEM_NULL (xSemaphoreHandle)0
+#define SYS_MBOX_NULL (QueueHandle_t)0
+#define SYS_SEM_NULL (SemaphoreHandle_t)0
-typedef xSemaphoreHandle sys_sem_t;
-typedef xQueueHandle sys_mbox_t;
-typedef xTaskHandle sys_thread_t;
+typedef SemaphoreHandle_t sys_sem_t;
+typedef QueueHandle_t sys_mbox_t;
+typedef TaskHandle_t sys_thread_t;
/* Message queue constants. */
#define archMESG_QUEUE_LENGTH ( 6 )
diff --git a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/STR91x/arch/sys_arch.h b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/STR91x/arch/sys_arch.h index 870bfc845..2f50a9b6c 100644 --- a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/STR91x/arch/sys_arch.h +++ b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/STR91x/arch/sys_arch.h @@ -37,12 +37,12 @@ #include "queue.h"
#include "semphr.h"
-#define SYS_MBOX_NULL (xQueueHandle)0
-#define SYS_SEM_NULL (xSemaphoreHandle)0
+#define SYS_MBOX_NULL (QueueHandle_t)0
+#define SYS_SEM_NULL (SemaphoreHandle_t)0
-typedef xSemaphoreHandle sys_sem_t;
-typedef xQueueHandle sys_mbox_t;
-typedef xTaskHandle sys_thread_t;
+typedef SemaphoreHandle_t sys_sem_t;
+typedef QueueHandle_t sys_mbox_t;
+typedef TaskHandle_t sys_thread_t;
/* Message queue constants. */
#define archMESG_QUEUE_LENGTH ( 6 )
diff --git a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/sys_arch.c b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/sys_arch.c index bd7ff38fb..4f781c11a 100644 --- a/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/sys_arch.c +++ b/FreeRTOS/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/sys_arch.c @@ -40,7 +40,7 @@ struct timeoutlist
{
struct sys_timeouts timeouts;
- xTaskHandle pid;
+ TaskHandle_t pid;
};
/* This is the number of threads that can be started with sys_thread_new() */
@@ -54,7 +54,7 @@ static u16_t s_nextthread = 0; // Creates an empty mailbox.
sys_mbox_t sys_mbox_new(int size)
{
- xQueueHandle mbox;
+ QueueHandle_t mbox;
( void ) size;
@@ -146,7 +146,7 @@ err_t result; u32_t sys_arch_mbox_fetch(sys_mbox_t mbox, void **msg, u32_t timeout)
{
void *dummyptr;
-portTickType StartTime, EndTime, Elapsed;
+TickType_t StartTime, EndTime, Elapsed;
StartTime = xTaskGetTickCount();
@@ -157,10 +157,10 @@ portTickType StartTime, EndTime, Elapsed; if ( timeout != 0 )
{
- if ( pdTRUE == xQueueReceive( mbox, &(*msg), timeout / portTICK_RATE_MS ) )
+ if ( pdTRUE == xQueueReceive( mbox, &(*msg), timeout / portTICK_PERIOD_MS ) )
{
EndTime = xTaskGetTickCount();
- Elapsed = (EndTime - StartTime) * portTICK_RATE_MS;
+ Elapsed = (EndTime - StartTime) * portTICK_PERIOD_MS;
return ( Elapsed );
}
@@ -175,7 +175,7 @@ portTickType StartTime, EndTime, Elapsed; {
while( pdTRUE != xQueueReceive( mbox, &(*msg), portMAX_DELAY ) ){} // time is arbitrary
EndTime = xTaskGetTickCount();
- Elapsed = (EndTime - StartTime) * portTICK_RATE_MS;
+ Elapsed = (EndTime - StartTime) * portTICK_PERIOD_MS;
return ( Elapsed ); // return time blocked TODO test
}
@@ -210,7 +210,7 @@ void *dummyptr; // the initial state of the semaphore.
sys_sem_t sys_sem_new(u8_t count)
{
- xSemaphoreHandle xSemaphore;
+ SemaphoreHandle_t xSemaphore;
vSemaphoreCreateBinary( xSemaphore );
@@ -257,16 +257,16 @@ sys_sem_t sys_sem_new(u8_t count) */
u32_t sys_arch_sem_wait(sys_sem_t sem, u32_t timeout)
{
-portTickType StartTime, EndTime, Elapsed;
+TickType_t StartTime, EndTime, Elapsed;
StartTime = xTaskGetTickCount();
if( timeout != 0)
{
- if( xSemaphoreTake( sem, timeout / portTICK_RATE_MS ) == pdTRUE )
+ if( xSemaphoreTake( sem, timeout / portTICK_PERIOD_MS ) == pdTRUE )
{
EndTime = xTaskGetTickCount();
- Elapsed = (EndTime - StartTime) * portTICK_RATE_MS;
+ Elapsed = (EndTime - StartTime) * portTICK_PERIOD_MS;
return (Elapsed); // return time blocked TODO test
}
@@ -279,7 +279,7 @@ portTickType StartTime, EndTime, Elapsed; {
while( xSemaphoreTake( sem, portMAX_DELAY ) != pdTRUE ){}
EndTime = xTaskGetTickCount();
- Elapsed = (EndTime - StartTime) * portTICK_RATE_MS;
+ Elapsed = (EndTime - StartTime) * portTICK_PERIOD_MS;
return ( Elapsed ); // return time blocked
@@ -337,7 +337,7 @@ void sys_init(void) struct sys_timeouts *sys_arch_timeouts(void)
{
int i;
-xTaskHandle pid;
+TaskHandle_t pid;
struct timeoutlist *tl;
pid = xTaskGetCurrentTaskHandle( );
@@ -367,7 +367,7 @@ struct timeoutlist *tl; */
sys_thread_t sys_thread_new(char *name, void (* thread)(void *arg), void *arg, int stacksize, int prio)
{
-xTaskHandle CreatedTask;
+TaskHandle_t CreatedTask;
int result;
if ( s_nextthread < SYS_THREAD_MAX )
|