mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-06-05 20:09:05 -04:00
Update interrupt priorities for Fujitsu port.
This commit is contained in:
Richard Barry
parent
6610911d3e
commit
eb64d935dc
|
|
@ -362,17 +362,19 @@ F27-7=- ..\..\Source\include\task.h
|
|||
F27-8=- ..\..\Source\include\list.h
|
||||
F27-9=- SRC\watchdog\watchdog.h
|
||||
F27-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
|
||||
F28=10 c 1 SRC\utility\taskutility.c
|
||||
F28=12 c 1 SRC\utility\taskutility.c
|
||||
F28-1=- SRC\mb91467d.h
|
||||
F28-2=- SRC\vectors.h
|
||||
F28-3=- ..\..\Source\include\FreeRTOS.h
|
||||
F28-4=- ..\..\Source\include\projdefs.h
|
||||
F28-5=- SRC\FreeRTOSConfig.h
|
||||
F28-6=- ..\..\Source\include\portable.h
|
||||
F28-7=- ..\..\Source\portable\Softune\MB91460\portmacro.h
|
||||
F28-8=- ..\..\Source\include\task.h
|
||||
F28-9=- ..\..\Source\include\list.h
|
||||
F28-10=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
|
||||
F28-4=- ..\..\..\..\..\..\devtools\Softune6\LIB\911\INCLUDE\stddef.h
|
||||
F28-5=- ..\..\Source\include\projdefs.h
|
||||
F28-6=- SRC\FreeRTOSConfig.h
|
||||
F28-7=- ..\..\Source\include\portable.h
|
||||
F28-8=- ..\..\Source\portable\Softune\MB91460\portmacro.h
|
||||
F28-9=- ..\..\Source\include\task.h
|
||||
F28-10=- ..\..\Source\include\list.h
|
||||
F28-11=- ..\..\Source\include\semphr.h
|
||||
F28-12=- ..\..\Source\include\queue.h
|
||||
F29=25 c 1 SRC\main.c
|
||||
F29-1=- SRC\mb91467d.h
|
||||
F29-2=- SRC\vectors.h
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ AutoLoad=1
|
|||
WSP=C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\MB91460_Softune\
|
||||
|
||||
[EditState]
|
||||
STATE-1=SRC\main.c:1
|
||||
Count=1
|
||||
STATE-1=SRC\main.c:18
|
||||
STATE-2=..\..\Source\queue.c:988
|
||||
STATE-3=..\..\Source\tasks.c:1342
|
||||
Count=3
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
#define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 64000000 ) /* Clock setup from start91460.asm in the demo application. */
|
||||
#define configPER_CLOCK_HZ ( ( unsigned portLONG ) 16000000 ) /* Clock setup from start91460.asm in the demo application. */
|
||||
#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 6 )
|
||||
#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 70 )
|
||||
#define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 100 )
|
||||
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 32768 - 4192 ) )
|
||||
#define configMAX_TASK_NAME_LEN ( 20 )
|
||||
#define configUSE_TRACE_FACILITY 1
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ signed portBASE_TYPE xReturn;
|
|||
/*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
|
||||
interrupted. */
|
||||
portYIELDFromISR();
|
||||
portYIELD_FROM_ISR();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,43 +6,39 @@
|
|||
taskutility.C
|
||||
-
|
||||
-------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
/*************************@INCLUDE_START************************/
|
||||
#include "mb91467d.h"
|
||||
#include "vectors.h"
|
||||
#include "FreeRTOS.h"
|
||||
#include "task.h"
|
||||
|
||||
#include "semphr.h"
|
||||
|
||||
static void vUART5Task( void *pvParameters );
|
||||
|
||||
/**************************@INCLUDE_END*************************/
|
||||
/*********************@GLOBAL_VARIABLES_START*******************/
|
||||
const char ASCII[] = "0123456789ABCDEF";
|
||||
|
||||
xTaskHandle UART_TaskHandle;
|
||||
void vInitUart5( void );
|
||||
|
||||
void InitUart5(void)
|
||||
xSemaphoreHandle xSemaphore;
|
||||
|
||||
void vInitUart5( void )
|
||||
{
|
||||
//Initialize UART asynchronous mode
|
||||
BGR05 = 1666; // 9600 Baud @ 16MHz
|
||||
|
||||
SCR05 = 0x17; // 7N2
|
||||
SMR05 = 0x0d; // enable SOT3, Reset, normal mode
|
||||
SSR05 = 0x00; // LSB first
|
||||
|
||||
PFR19_D4 = 1; // enable UART
|
||||
PFR19_D5 = 1; // enable UART
|
||||
|
||||
//EPFR19 = 0x00; // enable UART
|
||||
|
||||
SSR05_RIE = 1;
|
||||
}
|
||||
|
||||
void Putch5( char ch ) /* sends a char */
|
||||
{
|
||||
while (SSR05_TDRE == 0); /* wait for transmit buffer empty */
|
||||
while( SSR05_TDRE == 0 );
|
||||
|
||||
/* wait for transmit buffer empty */
|
||||
TDR05 = ch; /* put ch into buffer */
|
||||
}
|
||||
|
||||
|
|
@ -50,15 +46,19 @@ char Getch5(void) /* waits for and returns incomming char */
|
|||
{
|
||||
volatile unsigned ch;
|
||||
|
||||
while(SSR05_RDRF == 0); /* wait for data received */
|
||||
while( SSR05_RDRF == 0 );
|
||||
|
||||
/* wait for data received */
|
||||
if( SSR05_ORE ) /* overrun error */
|
||||
{
|
||||
ch = RDR05; /* reset error flags */
|
||||
return ( char ) ( -1 );
|
||||
}
|
||||
else
|
||||
{
|
||||
return( RDR05 ); /* return char */
|
||||
}
|
||||
}
|
||||
|
||||
void Puts5( const char *Name5 ) /* Puts a String to UART */
|
||||
{
|
||||
|
|
@ -68,7 +68,10 @@ void Puts5(const char *Name5) /* Puts a String to UART */
|
|||
for( i = 0; i < strlen(Name5); i++ ) /* go through string */
|
||||
{
|
||||
if( Name5[i] == 10 )
|
||||
{
|
||||
Putch5( 13 );
|
||||
}
|
||||
|
||||
Putch5( Name5[i] ); /* send it out */
|
||||
}
|
||||
}
|
||||
|
|
@ -91,24 +94,30 @@ void Putdec5(unsigned long x, int digits)
|
|||
portSHORT i;
|
||||
portCHAR buf[10], sign = 1;
|
||||
|
||||
if (digits < 0) { /* should be print of zero? */
|
||||
if( digits < 0 )
|
||||
{ /* should be print of zero? */
|
||||
digits *= ( -1 );
|
||||
sign = 1;
|
||||
}
|
||||
|
||||
buf[digits] = '\0'; /* end sign of string */
|
||||
|
||||
for (i=digits; i>0; i--) {
|
||||
for( i = digits; i > 0; i-- )
|
||||
{
|
||||
buf[i - 1] = ASCII[x % 10];
|
||||
x = x / 10;
|
||||
}
|
||||
|
||||
if( sign )
|
||||
{
|
||||
for (i=0; buf[i]=='0'; i++) { /* no print of zero */
|
||||
for( i = 0; buf[i] == '0'; i++ )
|
||||
{ /* no print of zero */
|
||||
if( i < digits - 1 )
|
||||
{
|
||||
buf[i] = ' ';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Puts5( buf ); /* send string */
|
||||
}
|
||||
|
|
@ -116,9 +125,15 @@ void Putdec5(unsigned long x, int digits)
|
|||
void vUtilityStartTraceTask( unsigned portBASE_TYPE uxPriority )
|
||||
{
|
||||
portENTER_CRITICAL();
|
||||
InitUart5();
|
||||
vInitUart5();
|
||||
portENTER_CRITICAL();
|
||||
xTaskCreate( vUART5Task , ( signed portCHAR * ) "UART4", ( unsigned portSHORT ) 2048, ( void * ) NULL, uxPriority, &UART_TaskHandle );
|
||||
|
||||
vSemaphoreCreateBinary( xSemaphore );
|
||||
|
||||
if( xSemaphore != NULL )
|
||||
{
|
||||
xTaskCreate( vUART5Task, (signed portCHAR *) "UART4", ( unsigned portSHORT ) 2048, ( void * ) NULL, uxPriority, NULL );
|
||||
}
|
||||
}
|
||||
|
||||
static void vUART5Task( void *pvParameters )
|
||||
|
|
@ -140,7 +155,9 @@ static void vUART5Task( void *pvParameters )
|
|||
|
||||
SSR05_RIE = 1;
|
||||
|
||||
vTaskSuspend(NULL);
|
||||
/* Block on the semaphore. The UART interrupt will use the semaphore to
|
||||
wake this task when required. */
|
||||
xSemaphoreTake( xSemaphore, portMAX_DELAY );
|
||||
|
||||
ch = Getch5();
|
||||
|
||||
|
|
@ -169,15 +186,24 @@ static void vUART5Task( void *pvParameters )
|
|||
for( j = 0; j < trace_len; j++ )
|
||||
{
|
||||
Puthex5( trace_buff[j], 2 );
|
||||
if(j%4==3) Puts5(" | ");
|
||||
if(j%16==15) Puts5("\n");
|
||||
if( j % 4 == 3 )
|
||||
{
|
||||
Puts5( " | " );
|
||||
}
|
||||
|
||||
if( j % 16 == 15 )
|
||||
{
|
||||
Puts5( "\n" );
|
||||
}
|
||||
}
|
||||
|
||||
Puts5( "\r--------------------------------------------------------" );
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Puts5( "\n" );
|
||||
}
|
||||
}
|
||||
|
|
@ -185,5 +211,5 @@ static void vUART5Task( void *pvParameters )
|
|||
__interrupt void UART5_RxISR( void )
|
||||
{
|
||||
SSR05_RIE = 0;
|
||||
vTaskResume( UART_TaskHandle );
|
||||
xSemaphoreGiveFromISR( xSemaphore, pdFALSE );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ void InitIrqLevels(void)
|
|||
/* External Interrupt 13 */
|
||||
ICR07 = 31; /* External Interrupt 14 */
|
||||
/* External Interrupt 15 */
|
||||
ICR08 = 23; /* Reload Timer 0 */
|
||||
ICR08 = 30; /* Reload Timer 0 */
|
||||
/* Reload Timer 1 */
|
||||
ICR09 = 31; /* Reload Timer 2 */
|
||||
/* Reload Timer 3 */
|
||||
|
|
@ -75,17 +75,17 @@ void InitIrqLevels(void)
|
|||
/* USART (LIN) 0 TX */
|
||||
ICR20 = 31; /* USART (LIN) 1 RX */
|
||||
/* USART (LIN) 1 TX */
|
||||
ICR21 = 21; /* USART (LIN) 2 RX */
|
||||
ICR21 = 30; /* USART (LIN) 2 RX */
|
||||
/* USART (LIN) 2 TX */
|
||||
ICR22 = 31; /* USART (LIN) 3 RX */
|
||||
/* USART (LIN) 3 TX */
|
||||
ICR23 = 23; /* System Reserved */
|
||||
ICR23 = 30; /* System Reserved */
|
||||
/* Delayed Interrupt */
|
||||
ICR24 = 31; /* System Reserved */
|
||||
/* System Reserved */
|
||||
ICR25 = 31; /* USART (LIN, FIFO) 4 RX */
|
||||
/* USART (LIN, FIFO) 4 TX */
|
||||
ICR26 = 21; /* USART (LIN, FIFO) 5 RX */
|
||||
ICR26 = 30; /* USART (LIN, FIFO) 5 RX */
|
||||
/* USART (LIN, FIFO) 5 TX */
|
||||
ICR27 = 31; /* USART (LIN, FIFO) 6 RX */
|
||||
/* USART (LIN, FIFO) 6 TX */
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ AssemblyState=0
|
|||
AssemblyFGColor=0 0 255
|
||||
CommandSize=132 138 958 562
|
||||
CommandState=0
|
||||
Assembly Address=H'00044F1C
|
||||
Assembly Address=H'00042412
|
||||
Memory Address=H'0002F038
|
||||
Memory Mode=H'00000003
|
||||
Memory Ascii=H'00000001
|
||||
|
|
@ -132,7 +132,7 @@ WatchState=0
|
|||
Source2Name=SRC\main.c
|
||||
Source2Size=66 69 1074 448
|
||||
Source2State=0
|
||||
Source2Line=7C
|
||||
Source2Line=124
|
||||
Source2Mode=2
|
||||
Source3Name=SRC\watchdog\watchdog.c
|
||||
Source3Size=44 46 998 421
|
||||
|
|
@ -148,6 +148,12 @@ Source4Size=198 207 1086 679
|
|||
Source4State=0
|
||||
Source4Line=913
|
||||
Source4Mode=2
|
||||
Layer11=2000,SRC\vectors.c
|
||||
Source5Name=SRC\vectors.c
|
||||
Source5Size=22 23 859 518
|
||||
Source5State=2
|
||||
Source5Line=49
|
||||
Source5Mode=2
|
||||
[Path Environment]
|
||||
Flag=Enable
|
||||
Source=
|
||||
|
|
|
|||
Loading…
Reference in a new issue