OpenCores
URL https://opencores.org/ocsvn/openrisc_2011-10-31/openrisc_2011-10-31/trunk

Subversion Repositories openrisc_2011-10-31

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /openrisc
    from Rev 635 to Rev 636
    ↔ Reverse comparison
  •

Rev 635 → Rev 636

/trunk/rtos/freertos-6.1.1/Demo/OpenRISC_SIM_GCC/serial/serial.c
55,7 → 55,12
 
/* Demo application includes. */
#include "serial.h"
 
/* bsp includes. */
#include "support.h"
#include "spr_defs.h"
#include "uart.h"
#include "interrupts.h"
 
/*-----------------------------------------------------------*/
 
80,56 → 85,54
xQueueHandle *pxCharsForTx );
 
/*-----------------------------------------------------------*/
// TODO : Porting
static portBASE_TYPE prvUSART_ISR_NonNakedBehaviour( void )
static void vUSART_ISR( void *arg )
{
/* Now we can declare the local variables. */
signed portCHAR cChar;
portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
unsigned portLONG ulStatus;
// FIXME
#define ADDR_UART_BASE (0x90000000)
volatile portBASE_TYPE *usart = ADDR_UART_BASE;
arg = arg;
signed portCHAR cChar;
portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
unsigned portLONG ulStatus;
portBASE_TYPE retstatus;
 
/* What caused the interrupt? */
// FIXME
// ulStatus = usart->csr & usart->imr;
ulStatus = uart_get_iir(0);
// TODO : TX RADY INTERRUPT, FIXME
// if (ulStatus & AVR32_USART_CSR_TXRDY_MASK)
if (ulStatus & 0x1)
// TX RADY INTERRUPT
if (ulStatus & UART_IIR_THRI)
{
/* The interrupt was caused by the THR becoming empty. Are there any
more characters to transmit?
Because FreeRTOS is not supposed to run with nested interrupts, put all OS
calls in a critical section . */
/* FIXME, entering, exiting ciritical section around
xQueueReceiveFromISR is not work */
#if 0
portENTER_CRITICAL();
retstatus = xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken );
portEXIT_CRITICAL();
#else
retstatus = xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken );
#endif
 
if (retstatus == pdTRUE)
{
/* A character was retrieved from the queue so can be sent to the
THR now. */
// FIXME
// usart->thr = cChar;
uart_putc_noblock(0, cChar);
}
else
{
/* Queue empty, nothing to send so turn off the Tx interrupt. */
// FIXME
// usart->idr = AVR32_USART_IDR_TXRDY_MASK;
uart_txint_disable(0);
}
}
 
// TODO : RX RADY INTERRUPT, FIXME
// if (ulStatus & AVR32_USART_CSR_RXRDY_MASK)
if (ulStatus & 0x2)
// RX RADY INTERRUPT
if (ulStatus & UART_IIR_RDI)
{
/* The interrupt was caused by the receiver getting data. */
// FIXME
// cChar = usart->rhr;
cChar = uart_getc_noblock(0);
 
/* Because FreeRTOS is not supposed to run with nested interrupts, put all OS
calls in a critical section . */
140,31 → 143,11
 
/* The return value will be used by portEXIT_SWITCHING_ISR() to know if it
should perform a vTaskSwitchContext(). */
return ( xHigherPriorityTaskWoken );
// return ( xHigherPriorityTaskWoken );
}
/*-----------------------------------------------------------*/
 
/*
* USART interrupt service routine.
*/
// FIXME it was __naked__ fuction
static void vUSART_ISR( void )
{
/* This ISR can cause a context switch, so the first statement must be a
call to the portENTER_SWITCHING_ISR() macro. This must be BEFORE any
variable declarations. */
portENTER_SWITCHING_ISR(); // TODO
 
prvUSART_ISR_NonNakedBehaviour();
 
/* Exit the ISR. If a task was woken by either a character being received
or transmitted then a context switch will occur. */
portEXIT_SWITCHING_ISR(); // TODO
}
/*-----------------------------------------------------------*/
 
 
// TODO : porting
/*
* Init the serial port for the Minimal implementation.
*/
171,10 → 154,6
xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
{
xComPortHandle xReturn = serHANDLE;
// FIXME
#define ADDR_UART_BASE (0x90000000)
volatile portBASE_TYPE *usart = ADDR_UART_BASE;
int cd; /* USART Clock Divider. */
 
/* Create the rx and tx queues. */
vprvSerialCreateQueues( uxQueueLength, &xRxedChars, &xCharsForTx );
186,14 → 165,8
{
portENTER_CRITICAL();
{
if( cd > 65535 )
{
/* Baudrate is too low */
return serINVALID_COMPORT_HANDLER;
}
// FIXME
// INTC_register_interrupt((__int_handler)&vUSART_ISR, serialPORT_USART_IRQ, INT1); // interrupt register
// register interrupt handler
int_add(UART0_IRQ, vUSART_ISR, 0x0);
}
portEXIT_CRITICAL();
}
226,6 → 199,7
 
void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength )
{
usStringLength = usStringLength;
signed portCHAR *pxNext;
 
/* NOTE: This implementation does not handle the queue being full as no
246,9 → 220,8
 
signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )
{
// FIXME
#define ADDR_UART_BASE (0x90000000)
volatile portBASE_TYPE *usart = ADDR_UART_BASE;
/* The port handle is not required as this driver only supports UART0. */
( void ) pxPort;
 
/* Place the character in the queue of characters to be transmitted. */
if( xQueueSend( xCharsForTx, &cOutChar, xBlockTime ) != pdPASS )
260,11 → 233,8
queue and send it. This does not need to be in a critical section as
if the interrupt has already removed the character the next interrupt
will simply turn off the Tx interrupt again. */
uart_txint_enable(0);
 
// FIXME
// usart->ier = (1 << AVR32_USART_IER_TXRDY_OFFSET);
// TODO : Turn on TX interrupt
 
return pdPASS;
}
/*-----------------------------------------------------------*/
272,6 → 242,7
void vSerialClose( xComPortHandle xPort )
{
/* Not supported as not required by the demo application. */
xPort = xPort; // prevent compiler warning
}
/*-----------------------------------------------------------*/
 

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.