Revert some library files back to using standard types as they are not FreeRTOS files.
diff --git a/FreeRTOS/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h.scsc b/FreeRTOS/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h.scsc
deleted file mode 100644
index 3dba27a..0000000
--- a/FreeRTOS/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h.scsc
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
-
- This file is part of the FreeRTOS distribution.
-
- FreeRTOS is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License (version 2) as published by the
- Free Software Foundation and modified by the FreeRTOS exception.
- **NOTE** The exception to the GPL is included to allow you to distribute a
- combined work that includes FreeRTOS without being obliged to provide the
- source code for proprietary components outside of the FreeRTOS kernel.
- Alternative commercial license and support terms are also available upon
- request. See the licensing section of http://www.FreeRTOS.org for full
- license details.
-
- FreeRTOS is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
- You should have received a copy of the GNU General Public License along
- with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59
- Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-
- ***************************************************************************
- * *
- * Looking for a quick start? Then check out the FreeRTOS eBook! *
- * See http://www.FreeRTOS.org/Documentation for details *
- * *
- ***************************************************************************
-
- 1 tab == 4 spaces!
-
- Please ensure to read the configuration and relevant port sections of the
- online documentation.
-
- http://www.FreeRTOS.org - Documentation, latest information, license and
- contact details.
-
- http://www.SafeRTOS.com - A version that is certified for use in safety
- critical systems.
-
- http://www.OpenRTOS.com - Commercial support, development, porting,
- licensing and training services.
-*/
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
- *
- * See http://www.freertos.org/a00110.html.
- *----------------------------------------------------------*/
-
-#define configUSE_PREEMPTION 1
-#define configUSE_IDLE_HOOK 0
-#define configUSE_TICK_HOOK 1
-#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 62500000 )
-#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
-#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 5 )
-#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 128 )
-#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 30 * 1024 ) )
-#define configMAX_TASK_NAME_LEN ( 16 )
-#define configUSE_TRACE_FACILITY 1
-#define configUSE_16_BIT_TICKS 0
-#define configIDLE_SHOULD_YIELD 1
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES 0
-#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
-
-#define configUSE_MUTEXES 1
-#define configUSE_COUNTING_SEMAPHORES 0
-#define configUSE_ALTERNATIVE_API 0
-#define configCHECK_FOR_STACK_OVERFLOW 2
-#define configUSE_RECURSIVE_MUTEXES 1
-#define configQUEUE_REGISTRY_SIZE 0
-#define configGENERATE_RUN_TIME_STATS 1
-
-/* Set the following definitions to 1 to include the API function, or zero
-to exclude the API function. */
-
-#define INCLUDE_vTaskPrioritySet 1
-#define INCLUDE_uxTaskPriorityGet 1
-#define INCLUDE_vTaskDelete 1
-#define INCLUDE_vTaskCleanUpResources 0
-#define INCLUDE_vTaskSuspend 1
-#define INCLUDE_vTaskDelayUntil 1
-#define INCLUDE_vTaskDelay 1
-
-/* This is the raw value as per the Cortex-M3 NVIC. Values can be 255
-(lowest) to 0 (1?) (highest). */
-#define configKERNEL_INTERRUPT_PRIORITY 255
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY 191 /* equivalent to 0xb0, or priority 11. */
-
-
-/* This is the value being used as per the ST library which permits 16
-priority values, 0 to 15. This must correspond to the
-configKERNEL_INTERRUPT_PRIORITY setting. Here 15 corresponds to the lowest
-NVIC value of 255. */
-#define configLIBRARY_KERNEL_INTERRUPT_PRIORITY 15
-
-/*-----------------------------------------------------------
- * Ethernet configuration.
- *-----------------------------------------------------------*/
-
-/* MAC address configuration. */
-#define configMAC_ADDR0 0x00
-#define configMAC_ADDR1 0x12
-#define configMAC_ADDR2 0x13
-#define configMAC_ADDR3 0x10
-#define configMAC_ADDR4 0x15
-#define configMAC_ADDR5 0x11
-
-/* IP address configuration. */
-#define configIP_ADDR0 172
-#define configIP_ADDR1 25
-#define configIP_ADDR2 218
-#define configIP_ADDR3 202
-
-/* Netmask configuration. */
-#define configNET_MASK0 255
-#define configNET_MASK1 255
-#define configNET_MASK2 255
-#define configNET_MASK3 0
-
-
-/*-----------------------------------------------------------
- * Macros required to setup the timer for the run time stats.
- *-----------------------------------------------------------*/
-/* The run time stats time base just uses the existing high frequency timer
-test clock. All these macros do is clear and return the high frquency
-interrupt count respectively. */
-extern unsigned long ulRunTimeStatsClock;
-#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() ulRunTimeStatsClock = 0
-#define portGET_RUN_TIME_COUNTER_VALUE() ulRunTimeStatsClock
-
-
-#endif /* FREERTOS_CONFIG_H */
-
diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj
index c5b25c8..17939b4 100644
--- a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj
+++ b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj
@@ -180,8 +180,8 @@
<ClCompile Include="Run-time-stats-utils.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\Source\include\event_groups.h" />
<ClInclude Include="..\..\Source\include\timers.h" />
- <ClInclude Include="..\..\Source\include\timer_test.h" />
<ClInclude Include="..\..\Source\portable\MSVC-MingW\portmacro.h" />
<ClInclude Include="FreeRTOSConfig.h" />
<ClInclude Include="..\..\Source\include\croutine.h" />
diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters
index b897c34..aa37ddf 100644
--- a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters
+++ b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters
@@ -171,14 +171,14 @@
<ClInclude Include="..\..\Source\include\timers.h">
<Filter>FreeRTOS Source\Include</Filter>
</ClInclude>
- <ClInclude Include="..\..\Source\include\timer_test.h">
- <Filter>FreeRTOS Source\Include</Filter>
- </ClInclude>
<ClInclude Include="Trace_Recorder_Configuration\trcHardwarePort.h">
<Filter>Configuration Files</Filter>
</ClInclude>
<ClInclude Include="Trace_Recorder_Configuration\trcConfig.h">
<Filter>Configuration Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\include\event_groups.h">
+ <Filter>FreeRTOS Source\Include</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/FreeRTOS/Demo/WIN32-MSVC/main_full.c b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
index d5fc311..0164a52 100644
--- a/FreeRTOS/Demo/WIN32-MSVC/main_full.c
+++ b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
@@ -345,7 +345,7 @@
direct use from application code, hence their prototypes are not in queue.h. */
extern void vQueueSetQueueNumber( xQueueHandle pxQueue, unsigned portBASE_TYPE uxQueueNumber );
extern unsigned portBASE_TYPE uxQueueGetQueueNumber( xQueueHandle pxQueue );
-extern unsigned char ucQueueGetQueueType( xQueueHandle pxQueue );
+extern uint8_t ucQueueGetQueueType( xQueueHandle pxQueue );
extern void vTaskSetTaskNumber( xTaskHandle xTask, unsigned portBASE_TYPE uxHandle );
extern unsigned portBASE_TYPE uxTaskGetTaskNumber( xTaskHandle xTask );
diff --git a/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/lib_AT91SAM7X256.h b/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/lib_AT91SAM7X256.h
index ffa5504..e66b4e1 100644
--- a/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/lib_AT91SAM7X256.h
+++ b/FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/lib_AT91SAM7X256.h
@@ -2262,7 +2262,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_US_SetIrdaFilter (
AT91PS_USART pUSART,
- uint8_t value
+ unsigned char value
)
{
pUSART->US_IF = value;
@@ -2704,7 +2704,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_SetAddress (
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t address) // \arg new UDP address
+ unsigned char address) // \arg new UDP address
{
pUDP->UDP_FADDR = (AT91C_UDP_FEN | address);
}
@@ -2715,7 +2715,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EnableEp (
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_EPEDS;
}
@@ -2726,7 +2726,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_DisableEp (
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] &= ~AT91C_UDP_EPEDS;
}
@@ -2771,7 +2771,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpStall(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_FORCESTALL;
}
@@ -2782,8 +2782,8 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpWrite(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
- uint8_t value) // \arg value to be written in the DPR
+ unsigned char endpoint, // \arg endpoint number
+ unsigned char value) // \arg value to be written in the DPR
{
pUDP->UDP_FDR[endpoint] = value;
}
@@ -2794,7 +2794,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_UDP_EpRead(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
return pUDP->UDP_FDR[endpoint];
}
@@ -2805,7 +2805,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpEndOfWr(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_TXPKTRDY;
}
@@ -2816,7 +2816,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpClear(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
+ unsigned char endpoint, // \arg endpoint number
unsigned int flag) // \arg flag to be cleared
{
pUDP->UDP_CSR[endpoint] &= ~(flag);
@@ -2828,7 +2828,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpSet(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
+ unsigned char endpoint, // \arg endpoint number
unsigned int flag) // \arg flag to be cleared
{
pUDP->UDP_CSR[endpoint] |= flag;
@@ -2840,7 +2840,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_UDP_EpStatus(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
return pUDP->UDP_CSR[endpoint];
}
@@ -3158,7 +3158,7 @@
__inline void AT91F_CAN_CfgMessageIDReg (
AT91PS_CAN_MB CAN_Mailbox, // pointer to a CAN Mailbox
unsigned int id,
- uint8_t version)
+ unsigned char version)
{
if(version==0) // IDvA Standard Format
CAN_Mailbox->CAN_MB_MID = id<<18;
@@ -3680,7 +3680,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_AES_SetCryptoKey (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3693,7 +3693,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_AES_InputData (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index,
+ unsigned char index,
unsigned int indata
)
{
@@ -3706,7 +3706,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_AES_GetOutputData (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index
+ unsigned char index
)
{
return pAES->AES_ODATAxR[index];
@@ -3718,7 +3718,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_AES_SetInitializationVector (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index,
+ unsigned char index,
unsigned int initvector
)
{
@@ -3845,7 +3845,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetCryptoKey1 (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3858,7 +3858,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetCryptoKey2 (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3871,7 +3871,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetCryptoKey3 (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3884,7 +3884,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_InputData (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int indata
)
{
@@ -3897,7 +3897,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_TDES_GetOutputData (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index
+ unsigned char index
)
{
return pTDES->TDES_ODATAxR[index];
@@ -3909,7 +3909,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetInitializationVector (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int initvector
)
{
diff --git a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7S64.h b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7S64.h
index 08e3d29..9d012c4 100644
--- a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7S64.h
+++ b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7S64.h
@@ -2472,7 +2472,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_US_SetIrdaFilter (
AT91PS_USART pUSART,
- uint8_t value
+ unsigned char value
)
{
pUSART->US_IF = value;
@@ -2511,7 +2511,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_SetAddress (
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t address) // \arg new UDP address
+ unsigned char address) // \arg new UDP address
{
pUDP->UDP_FADDR = (AT91C_UDP_FEN | address);
}
@@ -2577,7 +2577,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpStall(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_FORCESTALL;
}
@@ -2588,8 +2588,8 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpWrite(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
- uint8_t value) // \arg value to be written in the DPR
+ unsigned char endpoint, // \arg endpoint number
+ unsigned char value) // \arg value to be written in the DPR
{
pUDP->UDP_FDR[endpoint] = value;
}
@@ -2600,7 +2600,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_UDP_EpRead(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
return pUDP->UDP_FDR[endpoint];
}
@@ -2611,7 +2611,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpEndOfWr(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_TXPKTRDY;
}
@@ -2622,7 +2622,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpClear(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
+ unsigned char endpoint, // \arg endpoint number
unsigned int flag) // \arg flag to be cleared
{
pUDP->UDP_CSR[endpoint] &= ~(flag);
@@ -2634,7 +2634,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpSet(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
+ unsigned char endpoint, // \arg endpoint number
unsigned int flag) // \arg flag to be cleared
{
pUDP->UDP_CSR[endpoint] |= flag;
@@ -2646,7 +2646,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_UDP_EpStatus(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
return pUDP->UDP_CSR[endpoint];
}
diff --git a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7X128.h b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7X128.h
index cb33b6f..805a2bc 100644
--- a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7X128.h
+++ b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7X128.h
@@ -2262,7 +2262,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_US_SetIrdaFilter (
AT91PS_USART pUSART,
- uint8_t value
+ unsigned char value
)
{
pUSART->US_IF = value;
@@ -2704,7 +2704,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_SetAddress (
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t address) // \arg new UDP address
+ unsigned char address) // \arg new UDP address
{
pUDP->UDP_FADDR = (AT91C_UDP_FEN | address);
}
@@ -2715,7 +2715,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EnableEp (
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_EPEDS;
}
@@ -2726,7 +2726,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_DisableEp (
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] &= ~AT91C_UDP_EPEDS;
}
@@ -2771,7 +2771,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpStall(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_FORCESTALL;
}
@@ -2782,8 +2782,8 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpWrite(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
- uint8_t value) // \arg value to be written in the DPR
+ unsigned char endpoint, // \arg endpoint number
+ unsigned char value) // \arg value to be written in the DPR
{
pUDP->UDP_FDR[endpoint] = value;
}
@@ -2794,7 +2794,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_UDP_EpRead(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
return pUDP->UDP_FDR[endpoint];
}
@@ -2805,7 +2805,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpEndOfWr(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_TXPKTRDY;
}
@@ -2816,7 +2816,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpClear(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
+ unsigned char endpoint, // \arg endpoint number
unsigned int flag) // \arg flag to be cleared
{
pUDP->UDP_CSR[endpoint] &= ~(flag);
@@ -2828,7 +2828,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpSet(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
+ unsigned char endpoint, // \arg endpoint number
unsigned int flag) // \arg flag to be cleared
{
pUDP->UDP_CSR[endpoint] |= flag;
@@ -2840,7 +2840,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_UDP_EpStatus(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
return pUDP->UDP_CSR[endpoint];
}
@@ -3158,7 +3158,7 @@
__inline void AT91F_CAN_CfgMessageIDReg (
AT91PS_CAN_MB CAN_Mailbox, // pointer to a CAN Mailbox
unsigned int id,
- uint8_t version)
+ unsigned char version)
{
if(version==0) // IDvA Standard Format
CAN_Mailbox->CAN_MB_MID = id<<18;
@@ -3680,7 +3680,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_AES_SetCryptoKey (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3693,7 +3693,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_AES_InputData (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index,
+ unsigned char index,
unsigned int indata
)
{
@@ -3706,7 +3706,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_AES_GetOutputData (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index
+ unsigned char index
)
{
return pAES->AES_ODATAxR[index];
@@ -3718,7 +3718,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_AES_SetInitializationVector (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index,
+ unsigned char index,
unsigned int initvector
)
{
@@ -3845,7 +3845,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetCryptoKey1 (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3858,7 +3858,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetCryptoKey2 (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3871,7 +3871,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetCryptoKey3 (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3884,7 +3884,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_InputData (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int indata
)
{
@@ -3897,7 +3897,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_TDES_GetOutputData (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index
+ unsigned char index
)
{
return pTDES->TDES_ODATAxR[index];
@@ -3909,7 +3909,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetInitializationVector (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int initvector
)
{
diff --git a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7X256.h b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7X256.h
index 0a1553e..02ee900 100644
--- a/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7X256.h
+++ b/FreeRTOS/Source/portable/IAR/AtmelSAM7S64/lib_AT91SAM7X256.h
@@ -2262,7 +2262,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_US_SetIrdaFilter (
AT91PS_USART pUSART,
- uint8_t value
+ unsigned char value
)
{
pUSART->US_IF = value;
@@ -2704,7 +2704,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_SetAddress (
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t address) // \arg new UDP address
+ unsigned char address) // \arg new UDP address
{
pUDP->UDP_FADDR = (AT91C_UDP_FEN | address);
}
@@ -2715,7 +2715,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EnableEp (
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_EPEDS;
}
@@ -2726,7 +2726,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_DisableEp (
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] &= ~AT91C_UDP_EPEDS;
}
@@ -2771,7 +2771,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpStall(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_FORCESTALL;
}
@@ -2782,8 +2782,8 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpWrite(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
- uint8_t value) // \arg value to be written in the DPR
+ unsigned char endpoint, // \arg endpoint number
+ unsigned char value) // \arg value to be written in the DPR
{
pUDP->UDP_FDR[endpoint] = value;
}
@@ -2794,7 +2794,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_UDP_EpRead(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
return pUDP->UDP_FDR[endpoint];
}
@@ -2805,7 +2805,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpEndOfWr(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
pUDP->UDP_CSR[endpoint] |= AT91C_UDP_TXPKTRDY;
}
@@ -2816,7 +2816,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpClear(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
+ unsigned char endpoint, // \arg endpoint number
unsigned int flag) // \arg flag to be cleared
{
pUDP->UDP_CSR[endpoint] &= ~(flag);
@@ -2828,7 +2828,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_UDP_EpSet(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint, // \arg endpoint number
+ unsigned char endpoint, // \arg endpoint number
unsigned int flag) // \arg flag to be cleared
{
pUDP->UDP_CSR[endpoint] |= flag;
@@ -2840,7 +2840,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_UDP_EpStatus(
AT91PS_UDP pUDP, // \arg pointer to a UDP controller
- uint8_t endpoint) // \arg endpoint number
+ unsigned char endpoint) // \arg endpoint number
{
return pUDP->UDP_CSR[endpoint];
}
@@ -3158,7 +3158,7 @@
__inline void AT91F_CAN_CfgMessageIDReg (
AT91PS_CAN_MB CAN_Mailbox, // pointer to a CAN Mailbox
unsigned int id,
- uint8_t version)
+ unsigned char version)
{
if(version==0) // IDvA Standard Format
CAN_Mailbox->CAN_MB_MID = id<<18;
@@ -3680,7 +3680,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_AES_SetCryptoKey (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3693,7 +3693,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_AES_InputData (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index,
+ unsigned char index,
unsigned int indata
)
{
@@ -3706,7 +3706,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_AES_GetOutputData (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index
+ unsigned char index
)
{
return pAES->AES_ODATAxR[index];
@@ -3718,7 +3718,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_AES_SetInitializationVector (
AT91PS_AES pAES, // pointer to a AES controller
- uint8_t index,
+ unsigned char index,
unsigned int initvector
)
{
@@ -3845,7 +3845,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetCryptoKey1 (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3858,7 +3858,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetCryptoKey2 (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3871,7 +3871,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetCryptoKey3 (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int keyword
)
{
@@ -3884,7 +3884,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_InputData (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int indata
)
{
@@ -3897,7 +3897,7 @@
//*----------------------------------------------------------------------------
__inline unsigned int AT91F_TDES_GetOutputData (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index
+ unsigned char index
)
{
return pTDES->TDES_ODATAxR[index];
@@ -3909,7 +3909,7 @@
//*----------------------------------------------------------------------------
__inline void AT91F_TDES_SetInitializationVector (
AT91PS_TDES pTDES, // pointer to a TDES controller
- uint8_t index,
+ unsigned char index,
unsigned int initvector
)
{
