Removing obsolete code and files only.

This commit is contained in:
Richard Barry
2019-05-10 22:19:18 +00:00
parent 53cb12e389
commit db5d265c07
13 changed files with 66 additions and 26028 deletions
@@ -264,7 +264,7 @@ uint32_t ulNextValue = 0;
char cExpectedString[ 15 ]; char cExpectedString[ 15 ];
char cReceivedString[ 15 ]; char cReceivedString[ 15 ];
char cMessage; char cMessage;
const TickType_t xShortBlockTime = pdMS_TO_TICKS( 5 ); const TickType_t xShortBlockTime = pdMS_TO_TICKS( 150 );
/* This task is created more than once so the task's parameter is used to /* This task is created more than once so the task's parameter is used to
pass in a task number, which is then used as an index into the message pass in a task number, which is then used as an index into the message
@@ -332,28 +332,9 @@ const TickType_t xShortBlockTime = pdMS_TO_TICKS( 5 );
void vGenerateM4ToM7Interrupt( void * xUpdatedMessageBuffer ) void vGenerateM4ToM7Interrupt( void * xUpdatedMessageBuffer )
{ {
MessageBufferHandle_t xUpdatedBuffer = ( MessageBufferHandle_t ) xUpdatedMessageBuffer;
const char cMessage[] = "\r\nvGenerateM4ToM7Interrupt\r\n";
/* Called by the implementation of sbRECEIVE_COMPLETED() in FreeRTOSConfig.h. /* Called by the implementation of sbRECEIVE_COMPLETED() in FreeRTOSConfig.h.
See the comments at the top of this file. Write the handle of the data See the comments at the top of this file. Write the handle of the data
message buffer to which data was written to the control message buffer. */ message buffer to which data was written to the control message buffer. */
#if 0
if( xUpdatedBuffer != xControlMessageBuffer )
{
while( xMessageBufferSend( xControlMessageBuffer, &xUpdatedBuffer, sizeof( xUpdatedBuffer ), mbaDONT_BLOCK ) != sizeof( xUpdatedBuffer ) )
{
/* Nothing to do here. Note it is very bad to loop in an interrupt
service routine. If a loop is really required then defer the
routine to a task. */
}
/* Generate interrupt in the M4 core. */
HAL_EXTI_D1_EventInputConfig( EXTI_LINE0, EXTI_MODE_IT, DISABLE );
HAL_EXTI_D2_EventInputConfig( EXTI_LINE0, EXTI_MODE_IT, ENABLE );
HAL_EXTI_GenerateSWInterrupt( EXTI_LINE0 );
}
#endif
/* Generate interrupt in the M7 core. */ /* Generate interrupt in the M7 core. */
HAL_EXTI_D2_EventInputConfig( EXTI_LINE1, EXTI_MODE_IT, DISABLE ); HAL_EXTI_D2_EventInputConfig( EXTI_LINE1, EXTI_MODE_IT, DISABLE );
@@ -244,7 +244,6 @@ static void prvM7CoreTasks( void *pvParameters )
{ {
BaseType_t x; BaseType_t x;
uint32_t ulNextValue = 0; uint32_t ulNextValue = 0;
const TickType_t xDelay = pdMS_TO_TICKS( 25 );
char cString[ 15 ]; char cString[ 15 ];
size_t xStringLength; size_t xStringLength;
@@ -270,9 +269,6 @@ size_t xStringLength;
( void * ) cString, ( void * ) cString,
xStringLength, xStringLength,
portMAX_DELAY ) != xStringLength ); portMAX_DELAY ) != xStringLength );
/* Delay before repeating */
// vTaskDelay( xDelay );
} }
ulNextValue++; ulNextValue++;
@@ -56,6 +56,46 @@ static void prvSetupHardware( void );
static void prvBootNonSecure( uint32_t ulNonSecureStartAddress ); static void prvBootNonSecure( uint32_t ulNonSecureStartAddress );
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Secure main. */
int main(void)
{
/* Unlock protected registers. */
SYS_UnlockReg();
/* Initialize the hardware. */
prvSetupHardware();
/* Print banner. */
printf( "\n" );
printf( "+---------------------------------------------+\n" );
printf( "| Secure is running ... |\n" );
printf( "+---------------------------------------------+\n" );
/* Do not generate Systick interrupt on secure side. */
SysTick_Config( 1 );
/* Set GPIO Port A to non-secure for controlling LEDs from the non-secure
* side . */
SCU_SET_IONSSET( SCU_IONSSET_PA_Msk );
/* Set UART0 to non-secure for debug output from non-secure side. */
SCU_SET_PNSSET( UART0_Attr );
/* Lock protected registers before booting non-secure code. */
SYS_LockReg();
/* Boot the non-secure code. */
printf( "Entering non-secure world ...\n" );
prvBootNonSecure( mainNONSECURE_APP_START_ADDRESS );
/* Non-secure software does not return, this code is not executed. */
for( ; ; )
{
/* Should not reach here. */
}
}
/*-----------------------------------------------------------*/
static void prvSetupHardware( void ) static void prvSetupHardware( void )
{ {
/* Init System Clock. */ /* Init System Clock. */
@@ -126,42 +166,3 @@ static void prvBootNonSecure( uint32_t ulNonSecureStartAddress )
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Secure main. */
int main(void)
{
/* Unlock protected registers. */
SYS_UnlockReg();
/* Initialize the hardware. */
prvSetupHardware();
/* Print banner. */
printf( "\n" );
printf( "+---------------------------------------------+\n" );
printf( "| Secure is running ... |\n" );
printf( "+---------------------------------------------+\n" );
/* Do not generate Systick interrupt on secure side. */
SysTick_Config( 1 );
/* Set GPIO Port A to non-secure for controlling LEDs from the non-secure
* side . */
SCU_SET_IONSSET( SCU_IONSSET_PA_Msk );
/* Set UART0 to non-secure for debug output from non-secure side. */
SCU_SET_PNSSET( UART0_Attr );
/* Lock protected registers before booting non-secure code. */
SYS_LockReg();
/* Boot the non-secure code. */
printf( "Entering non-secure world ...\n" );
prvBootNonSecure( mainNONSECURE_APP_START_ADDRESS );
/* Non-secure software does not return, this code is not executed. */
for( ; ; )
{
/* Should not reach here. */
}
}
/*-----------------------------------------------------------*/
File diff suppressed because it is too large Load Diff
@@ -64,6 +64,31 @@ static void prvBootNonSecure( uint32_t ulNonSecureStartAddress );
void SystemInitHook( void ); void SystemInitHook( void );
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Secure main(). */
int main(void)
{
PRINTF( "Booting Secure World.\r\n" );
/* Attach main clock divide to FLEXCOMM0 (debug console). */
CLOCK_AttachClk( BOARD_DEBUG_UART_CLK_ATTACH );
/* Init board hardware. */
BOARD_InitPins();
BOARD_BootClockFROHF96M();
BOARD_InitDebugConsole();
/* Boot the non-secure code. */
PRINTF( "Booting Non-Secure World.\r\n" );
prvBootNonSecure( mainNONSECURE_APP_START_ADDRESS );
/* Non-secure software does not return, this code is not executed. */
for( ; ; )
{
/* Should not reach here. */
}
}
/*-----------------------------------------------------------*/
static void prvBootNonSecure( uint32_t ulNonSecureStartAddress ) static void prvBootNonSecure( uint32_t ulNonSecureStartAddress )
{ {
NonSecureResetHandler_t pxNonSecureResetHandler; NonSecureResetHandler_t pxNonSecureResetHandler;
@@ -100,27 +125,3 @@ void SystemInitHook( void )
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Secure main(). */
int main(void)
{
PRINTF( "Booting Secure World.\r\n" );
/* Attach main clock divide to FLEXCOMM0 (debug console). */
CLOCK_AttachClk( BOARD_DEBUG_UART_CLK_ATTACH );
/* Init board hardware. */
BOARD_InitPins();
BOARD_BootClockFROHF96M();
BOARD_InitDebugConsole();
/* Boot the non-secure code. */
PRINTF( "Booting Non-Secure World.\r\n" );
prvBootNonSecure( mainNONSECURE_APP_START_ADDRESS );
/* Non-secure software does not return, this code is not executed. */
for( ; ; )
{
/* Should not reach here. */
}
}
/*-----------------------------------------------------------*/