Mirrors_Framework/FreeRTOS
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS.git synced 2026-10-01 10:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up 16bit Fujitsu port ready for release.

Browse Source
This commit is contained in:
Richard Barry
2008-02-17 18:24:03 +00:00
parent 95189f40d2
commit 6bc6cc282d
12 changed files with 607 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/FreeRTOS_96348hs_SK16FX100PMC.prj
+200 -200
View File
File diff suppressed because it is too large Load Diff
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opb
+3 -2
View File
@@ -9,7 +9,6 @@
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\mb96348hs.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\Start.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\vectors.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\__STD_LIB_sbrk.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\port.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\croutine.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\list.obj"
@@ -25,10 +24,12 @@
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\integer.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\PollQ.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\semtest.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\heap_3.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\serial.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\watchdog.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\taskutility.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\crflash_sk16fx100mpc.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\partest.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\printf_stdarg.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\__STD_LIB_sbrk.obj"
-a "C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\heap_3.obj"
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opc
+4 -5
View File
@@ -9,15 +9,14 @@
-I "..\..\..\Source\include"
-I "..\..\..\Source\portable\Softune\MB96340"
-I ".\Src\utility"
-O 4
-K SPEED
-O 1
-model MEDIUM
-B
-xauto 127
-x vTaskSwitchContext,vTaskIncrementTick
-K EOPT
-K LIB
-K UNROLL
-K NOEOPT
-K NOLIB
-K NOUNROLL
-c
-cwno
-cpu MB96F348HSA
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/STANDALONE/OPT/FreeRTOS_96348hs_SK16FX100PMC.opl
+3 -2
View File
@@ -28,7 +28,6 @@
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\mb96348hs.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\Start.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\vectors.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\__STD_LIB_sbrk.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\port.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\croutine.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\list.obj"
@@ -44,10 +43,12 @@
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\integer.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\PollQ.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\semtest.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\heap_3.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\serial.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\watchdog.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\taskutility.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\crflash_sk16fx100mpc.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\partest.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\printf_stdarg.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\__STD_LIB_sbrk.obj"
"C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB96340_Softune\FreeRTOS_96348hs_SK16FX100PMC\STANDALONE\OBJ\heap_3.obj"
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h
+4 -4
View File
@@ -75,15 +75,15 @@ when running the application using the EUROScope debugger. */
#define configUSE_TICK_HOOK 0
#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 56000000 ) /* Clock setup from start.asm in the demo application. */
#define configCLKP1_CLOCK_HZ ( ( unsigned portLONG ) 56000000 ) /* Clock setup from start.asm in the demo application. */
#define configTICK_RATE_HZ ( (portTickType) 100 )
#define configTICK_RATE_HZ ( (portTickType) 1000 )
#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 6 )
#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 176 )
#define configTOTAL_HEAP_SIZE ( (size_t) (21504) )
#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 80 )
#define configTOTAL_HEAP_SIZE ( (size_t) (20000) )
#define configMAX_TASK_NAME_LEN ( 20 )
#define configUSE_TRACE_FACILITY 1
#define configUSE_16_BIT_TICKS 1
#define configIDLE_SHOULD_YIELD 1
#define configUSE_MUTEXES 1
#define configUSE_TRACE_FACILITY 1
/* Co-routine definitions. */
#define configUSE_CO_ROUTINES 1
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c
+16 -11
View File
@@ -94,7 +94,7 @@
/* Demo task priorities. */
#define WTC_TASK_PRIORITY ( tskIDLE_PRIORITY + 5 )
#define mainCHECK_TASK_PRIORITY ( tskIDLE_PRIORITY + 4 )
#define TASK_UTILITY_PRIORITY ( tskIDLE_PRIORITY + 3 )
#define TASK_UTILITY_PRIORITY ( tskIDLE_PRIORITY )
#define mainSEM_TEST_PRIORITY ( tskIDLE_PRIORITY + 3 )
#define mainCOM_TEST_PRIORITY ( tskIDLE_PRIORITY + 2 )
#define mainQUEUE_POLL_PRIORITY ( tskIDLE_PRIORITY + 2 )
@@ -153,8 +153,7 @@ void main( void )
/* Start the standard demo application tasks. */
vStartLEDFlashTasks( mainLED_TASK_PRIORITY );
vStartIntegerMathTasks( tskIDLE_PRIORITY );
vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED - 1 );
vStartIntegerMathTasks( tskIDLE_PRIORITY );
vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
vStartBlockingQueueTasks( mainQUEUE_BLOCK_PRIORITY );
@@ -166,7 +165,9 @@ void main( void )
/* The definition INCLUDE_TraceListTasks is set within FreeRTOSConfig.h.
It should be set to 0 if using the EUROScope debugger. */
#if INCLUDE_TraceListTasks == 1
vTraceListTasks( TASK_UTILITY_PRIORITY );
vUtilityStartTraceTask( TASK_UTILITY_PRIORITY );
#else
vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED - 1 );
#endif
/* Start the 'Check' task which is defined in this file. */
@@ -245,11 +246,6 @@ static portSHORT prvCheckOtherTasksAreStillRunning( void )
sNoErrorFound = pdFALSE;
}
if( xAreComTestTasksStillRunning() != pdTRUE )
{
sNoErrorFound = pdFALSE;
}
if( xArePollingQueuesStillRunning() != pdTRUE )
{
sNoErrorFound = pdFALSE;
@@ -290,6 +286,15 @@ static portSHORT prvCheckOtherTasksAreStillRunning( void )
sNoErrorFound = pdFALSE;
}
#if INCLUDE_TraceListTasks == 0
{
if( xAreComTestTasksStillRunning() != pdTRUE )
{
sNoErrorFound = pdFALSE;
}
}
#endif
return sNoErrorFound;
}
/*-----------------------------------------------------------*/
@@ -305,6 +310,8 @@ static portSHORT prvCheckOtherTasksAreStillRunning( void )
#if WATCHDOG == WTC_IN_IDLE
Kick_Watchdog();
#endif
vCoRoutineSchedule();
}
#else
#if WATCHDOG == WTC_IN_IDLE
@@ -325,8 +332,6 @@ static portSHORT prvCheckOtherTasksAreStillRunning( void )
#if WATCHDOG == WTC_IN_TICK
Kick_Watchdog();
#endif
vCoRoutineSchedule();
}
#else
#if WATCHDOG == WTC_IN_TICK
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c
+2 -4
View File
@@ -42,7 +42,7 @@
/* BASIC INTERRUPT DRIVEN SERIAL PORT DRIVER.
*
* This file only supports UART 1
* This file only supports UART 0
*/
/* Standard includes. */
@@ -97,7 +97,6 @@ xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned
DDR08_D2 = 0; /* switch P08_2 to input */
DDR08_D3 = 1; /* switch P08_3 to output */
}
portEXIT_CRITICAL();
/* Unlike other ports, this serial code does not allow for more than one
@@ -166,7 +165,6 @@ signed portBASE_TYPE xReturn;
SSR0_TIE = 1;
}
}
portEXIT_CRITICAL();
return pdPASS;
@@ -184,7 +182,7 @@ volatile signed portCHAR cChar;
characters. */
cChar = RDR0;
if( xQueueGenericSendFromISR(xRxedChars, ( const void *const ) &cChar, (signed portBASE_TYPE) pdFALSE, (portBASE_TYPE) 0) )
if( xQueueSendFromISR( xRxedChars, ( const void *const ) &cChar, (signed portBASE_TYPE) pdFALSE ) )
{
/*If the post causes a task to wake force a context switch
as the woken task may have a higher priority than the task we have
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/printf_stdarg.c
+286
View File
File diff suppressed because it is too large Load Diff
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/utility/taskutility.c
+72 -64
View File
File diff suppressed because it is too large Load Diff
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/vectors.c
+9 -17
View File
@@ -38,10 +38,6 @@ volatile int irq;
ICR = ( 79 << 8 ) | configKERNEL_INTERRUPT_PRIORITY; /* UART 0 Rx of MB9634x Series */
ICR = ( 80 << 8 ) | configKERNEL_INTERRUPT_PRIORITY; /* UART 0 Tx of MB9634x Series */
#if ( INCLUDE_TraceListTasks == 1 )
ICR = ( 81 << 8 ) | configKERNEL_INTERRUPT_PRIORITY; /* UART 1 Rx of MB9634x Series */
#endif
}
/*---------------------------------------------------------------------------
@@ -53,15 +49,14 @@ __interrupt void DefaultIRQHandler( void );
extern __interrupt void prvRLT0_TICKISR( void );
#if ( INCLUDE_AltStartComTestTasks == 1 )
extern __interrupt void UART0_RxISR( void );
extern __interrupt void UART0_TxISR( void );
#endif
extern __interrupt void UART0_TraceRxISR( void );
extern __interrupt void vPortYield( void );
extern __interrupt void vPortYieldDelayed( void );
#if ( INCLUDE_TraceListTasks == 1 )
extern __interrupt void UART1_RxISR( void );
extern __interrupt void UART1_RxISR( void );
#endif
/*---------------------------------------------------------------------------
@@ -145,18 +140,15 @@ extern __interrupt void UART1_RxISR( void );
#pragma intvect DefaultIRQHandler 77 /* ALARM0 */
#pragma intvect DefaultIRQHandler 78 /* ALARM1 */
#if ( INCLUDE_AltStartComTestTasks == 1 )
#pragma intvect UART0_RxISR 79 /* LIN-UART 0 RX */
#pragma intvect UART0_TxISR 80 /* LIN-UART 0 TX */
#if ( INCLUDE_TraceListTasks == 1 )
#pragma intvect UART0_TraceRxISR 79 /* LIN-UART 0 RX */
#pragma intvect DefaultIRQHandler 80 /* LIN-UART 0 TX */
#else
#pragma intvect DefaultIRQHandler 79 /* LIN-UART 0 RX */
#pragma intvect DefaultIRQHandler 80 /* LIN-UART 0 TX */
#endif
#if ( INCLUDE_TraceListTasks == 1 )
#pragma intvect UART1_RxISR 81 /* LIN-UART 1 RX */
#else
#pragma intvect DefaultIRQHandler 81 /* LIN-UART 1 RX */
#pragma intvect UART0_RxISR 79 /* LIN-UART 0 RX */
#pragma intvect UART0_TxISR 80 /* LIN-UART 0 TX */
#endif
#pragma intvect DefaultIRQHandler 81 /* LIN-UART 1 RX */
#pragma intvect DefaultIRQHandler 82 /* LIN-UART 1 TX */
#pragma intvect DefaultIRQHandler 83 /* LIN-UART 2 RX */
#pragma intvect DefaultIRQHandler 84 /* LIN-UART 2 TX */
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/watchdog/watchdog.h
+1 -1
View File
@@ -19,7 +19,7 @@
#define WTC_IN_TICK 2 /* Clear Watchdog in TICK Hook */
#define WTC_IN_IDLE 3 /* Clear Watchdog in Idle Hook */
#define WATCHDOG WTC_IN_TASK /* Clear Watchdog in vWatchdogTask() */
#define WATCHDOG WTC_NONE /* Clear Watchdog in vWatchdogTask() */
/*------------------------------------------------------------------------*/
Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/options.dat
+7 -8
View File
@@ -12,21 +12,20 @@ $0
-I "..\..\..\Source\include"
-I "..\..\..\Source\portable\Softune\MB96340"
-I ".\Src\utility"
-O 4
-K SPEED
-O 1
-model MEDIUM
-B
-Xdof
-xauto 127
-x vTaskSwitchContext,vTaskIncrementTick
-K EOPT
-K LIB
-K UNROLL
-K NOEOPT
-K NOLIB
-K NOUNROLL
$other
-INF srcin
-D __96340
$time
1202908049
1203265443
$end
$1
-g
@@ -72,7 +71,7 @@ $2
$other
-Xset_rora
$time
1202908772
1203262255
$end
$3
-dt s,d,r,a
@@ -82,7 +81,7 @@ $3
-Xdof
$other
$time
1202908772
1203262255
$end
$4
-Xdof