mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2026-02-20 00:55:28 -05:00
Update the demo directory to use the version 8 type naming conventions.
This commit is contained in:
parent
c6d8892b0d
commit
5a2a8fc319
639 changed files with 3127 additions and 3470 deletions
|
|
@ -179,7 +179,7 @@ static void vWriteMDIO(volatile avr32_macb_t * macb, unsigned short usAddress, u
|
|||
|
||||
#ifdef FREERTOS_USED
|
||||
/* The semaphore used by the MACB ISR to wake the MACB task. */
|
||||
static xSemaphoreHandle xSemaphore = NULL;
|
||||
static SemaphoreHandle_t xSemaphore = NULL;
|
||||
#else
|
||||
static volatile Bool DataToRead = FALSE;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
#define configUSE_TICK_HOOK 0
|
||||
#define configCPU_CLOCK_HZ ( 48000000 ) /* Hz clk gen */
|
||||
#define configPBA_CLOCK_HZ ( 24000000 )
|
||||
#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
|
||||
#define configTICK_RATE_HZ ( ( TickType_t ) 1000 )
|
||||
#define configMAX_PRIORITIES ( 8 )
|
||||
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 256 )
|
||||
/* configTOTAL_HEAP_SIZE is not used when heap_3.c is used. */
|
||||
|
|
|
|||
|
|
@ -47,12 +47,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;
|
||||
|
||||
#endif /* __SYS_RTXC_H__ */
|
||||
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ static err_t
|
|||
low_level_output(struct netif *netif, struct pbuf *p)
|
||||
{
|
||||
struct pbuf *q;
|
||||
static xSemaphoreHandle xTxSemaphore = NULL;
|
||||
static SemaphoreHandle_t xTxSemaphore = NULL;
|
||||
err_t xReturn = ERR_OK;
|
||||
|
||||
/* Parameter not used. */
|
||||
|
|
@ -175,7 +175,7 @@ low_level_input(struct netif *netif) {
|
|||
struct pbuf *p = NULL;
|
||||
struct pbuf *q;
|
||||
u16_t len = 0;
|
||||
static xSemaphoreHandle xRxSemaphore = NULL;
|
||||
static SemaphoreHandle_t xRxSemaphore = NULL;
|
||||
|
||||
/* Parameter not used. */
|
||||
( void ) netif;
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
struct timeoutlist
|
||||
{
|
||||
struct sys_timeouts timeouts;
|
||||
xTaskHandle pid;
|
||||
TaskHandle_t pid;
|
||||
};
|
||||
|
||||
static struct timeoutlist timeoutlist[SYS_THREAD_MAX];
|
||||
|
|
@ -81,7 +81,7 @@ extern void ethernetif_input( void * pvParameters );
|
|||
sys_mbox_t
|
||||
sys_mbox_new(void)
|
||||
{
|
||||
xQueueHandle mbox;
|
||||
QueueHandle_t mbox;
|
||||
|
||||
mbox = xQueueCreate( archMESG_QUEUE_LENGTH, sizeof( void * ) );
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ sys_mbox_free(sys_mbox_t mbox)
|
|||
void
|
||||
sys_mbox_post(sys_mbox_t mbox, void *data)
|
||||
{
|
||||
xQueueSend( mbox, &data, ( portTickType ) ( archPOST_BLOCK_TIME_MS / portTICK_RATE_MS ) );
|
||||
xQueueSend( mbox, &data, ( TickType_t ) ( archPOST_BLOCK_TIME_MS / portTICK_PERIOD_MS ) );
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -134,7 +134,7 @@ sys_mbox_post(sys_mbox_t mbox, void *data)
|
|||
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();
|
||||
|
||||
|
|
@ -183,7 +183,7 @@ portTickType StartTime, EndTime, Elapsed;
|
|||
sys_sem_t
|
||||
sys_sem_new(u8_t count)
|
||||
{
|
||||
xSemaphoreHandle xSemaphore = NULL;
|
||||
SemaphoreHandle_t xSemaphore = NULL;
|
||||
|
||||
portENTER_CRITICAL();
|
||||
vSemaphoreCreateBinary( xSemaphore );
|
||||
|
|
@ -219,7 +219,7 @@ 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();
|
||||
|
||||
|
|
@ -310,7 +310,7 @@ struct sys_timeouts *
|
|||
sys_arch_timeouts(void)
|
||||
{
|
||||
int i;
|
||||
xTaskHandle pid;
|
||||
TaskHandle_t pid;
|
||||
struct timeoutlist *tl;
|
||||
|
||||
pid = xTaskGetCurrentTaskHandle( );
|
||||
|
|
@ -348,7 +348,7 @@ struct timeoutlist *tl;
|
|||
*/
|
||||
sys_thread_t sys_thread_new(void (* thread)(void *arg), void *arg, int prio)
|
||||
{
|
||||
xTaskHandle CreatedTask;
|
||||
TaskHandle_t CreatedTask;
|
||||
int result = pdFAIL;
|
||||
static int iCall = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -59,23 +59,23 @@
|
|||
|
||||
/* Constants to setup and access the USART. */
|
||||
#define serINVALID_COMPORT_HANDLER ( ( xComPortHandle ) 0 )
|
||||
#define serINVALID_QUEUE ( ( xQueueHandle ) 0 )
|
||||
#define serINVALID_QUEUE ( ( QueueHandle_t ) 0 )
|
||||
#define serHANDLE ( ( xComPortHandle ) 1 )
|
||||
#define serNO_BLOCK ( ( portTickType ) 0 )
|
||||
#define serNO_BLOCK ( ( TickType_t ) 0 )
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/* Queues used to hold received characters, and characters waiting to be
|
||||
transmitted. */
|
||||
static xQueueHandle xRxedChars;
|
||||
static xQueueHandle xCharsForTx;
|
||||
static QueueHandle_t xRxedChars;
|
||||
static QueueHandle_t xCharsForTx;
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
/* Forward declaration. */
|
||||
static void vprvSerialCreateQueues( unsigned portBASE_TYPE uxQueueLength,
|
||||
xQueueHandle *pxRxedChars,
|
||||
xQueueHandle *pxCharsForTx );
|
||||
QueueHandle_t *pxRxedChars,
|
||||
QueueHandle_t *pxCharsForTx );
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
|
|
@ -278,7 +278,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned port
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )
|
||||
signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, TickType_t xBlockTime )
|
||||
{
|
||||
/* The port handle is not required as this driver only supports UART0. */
|
||||
( void ) pxPort;
|
||||
|
|
@ -316,7 +316,7 @@ signed char *pxNext;
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )
|
||||
signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, TickType_t xBlockTime )
|
||||
{
|
||||
volatile avr32_usart_t *usart0 = &AVR32_USART0;
|
||||
|
||||
|
|
@ -347,7 +347,7 @@ void vSerialClose( xComPortHandle xPort )
|
|||
/*
|
||||
* Create the rx and tx queues.
|
||||
*/
|
||||
static void vprvSerialCreateQueues( unsigned portBASE_TYPE uxQueueLength, xQueueHandle *pxRxedChars, xQueueHandle *pxCharsForTx )
|
||||
static void vprvSerialCreateQueues( unsigned portBASE_TYPE uxQueueLength, QueueHandle_t *pxRxedChars, QueueHandle_t *pxCharsForTx )
|
||||
{
|
||||
/* Create the queues used to hold Rx and Tx characters. */
|
||||
xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue