deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1376 from sumanpanchal/wismote-uart1-dma

Browse source 
Wismote : Direct memory access using UART.
This commit is contained in:
Nicolas Tsiftes 2015-11-26 11:08:43 +01:00
parent ddb6e4b3d7 8d139222f6
commit 6def22b3c5
2 changed files with 57 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
cpu/msp430/f5xxx/uart1.c
View file

@ -44,6 +44,36 @@ static int (*uart1_input_handler)(unsigned char c);
static volatile uint8_t transmitting; static volatile uint8_t transmitting;
#ifdef UART1_CONF_RX_WITH_DMA
#define RX_WITH_DMA UART1_CONF_RX_WITH_DMA
#else /* UART1_CONF_RX_WITH_DMA */
#define RX_WITH_DMA 1
#endif /* UART1_CONF_RX_WITH_DMA */
#if RX_WITH_DMA
#define RXBUFSIZE 128
static uint8_t rxbuf[RXBUFSIZE];
static uint16_t last_size;
static struct ctimer rxdma_timer;
static void
handle_rxdma_timer(void *ptr)
{
uint16_t size;
size = DMA0SZ; /* Note: loop requires that size is less or eq to RXBUFSIZE */
while(last_size != size) {
uart1_input_handler((unsigned char)rxbuf[RXBUFSIZE - last_size]);
last_size--;
if(last_size == 0) {
last_size = RXBUFSIZE;
}
}
ctimer_reset(&rxdma_timer);
}
#endif /* RX_WITH_DMA */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
uint8_t uint8_t
uart1_active(void) uart1_active(void)
@ -54,6 +84,9 @@ uart1_active(void)
void void
uart1_set_input(int (*input)(unsigned char c)) uart1_set_input(int (*input)(unsigned char c))
{ {
#if RX_WITH_DMA /* This needs to be called after ctimer process is started */
ctimer_set(&rxdma_timer, CLOCK_SECOND / 64, handle_rxdma_timer, NULL);
#endif
uart1_input_handler = input; uart1_input_handler = input;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -87,7 +120,7 @@ uart1_init(unsigned long ubr)
P4DIR |= BIT5; P4DIR |= BIT5;
P4OUT |= BIT5; P4OUT |= BIT5;
P5SEL |= BIT6|BIT7; // P5.6,7 = USCI_A1 TXD/RXD P5SEL |= BIT6 | BIT7; /* P5.6,7 = USCI_A1 TXD/RXD */
P4SEL |= BIT7; P4SEL |= BIT7;
P4DIR |= BIT7; P4DIR |= BIT7;
@ -102,8 +135,24 @@ uart1_init(unsigned long ubr)
UCA1CTL1 &= ~UCSWRST; /* Initialize USCI state machine **before** enabling interrupts */ UCA1CTL1 &= ~UCSWRST; /* Initialize USCI state machine **before** enabling interrupts */
UCA1IE |= UCRXIE; /* Enable UCA1 RX interrupt */ UCA1IE |= UCRXIE; /* Enable UCA1 RX interrupt */
#if RX_WITH_DMA
UCA1IE &= ~UCRXIE; /* disable USART1 RX interrupt */
/* UART1_RX trigger */
DMACTL0 = DMA0TSEL_20;
/* source address = RXBUF1 */
DMA0SA = (unsigned int)&UCA1RXBUF;
DMA0DA = (unsigned int)&rxbuf;
DMA0SZ = RXBUFSIZE;
last_size = RXBUFSIZE;
DMA0CTL = DMADT_4 + DMASBDB + DMADSTINCR_3 + DMAEN + DMAREQ;
msp430_add_lpm_req(MSP430_REQUIRE_LPM1);
#endif /* RX_WITH_DMA */
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if !RX_WITH_DMA
ISR(USCI_A1, uart1_rx_interrupt) ISR(USCI_A1, uart1_rx_interrupt)
{ {
uint8_t c; uint8_t c;
@ -123,4 +172,5 @@ ISR(USCI_A1, uart1_rx_interrupt)
} }
ENERGEST_OFF(ENERGEST_TYPE_IRQ); ENERGEST_OFF(ENERGEST_TYPE_IRQ);
} }
#endif /* !RX_WITH_DMA */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

5
platform/wismote/contiki-conf.h
View file

@ -107,7 +107,6 @@
#define ELFLOADER_CONF_TEXTMEMORY_SIZE 0x800 #define ELFLOADER_CONF_TEXTMEMORY_SIZE 0x800
#endif /* ELFLOADER_CONF_TEXTMEMORY_SIZE */ #endif /* ELFLOADER_CONF_TEXTMEMORY_SIZE */
#define AODV_COMPLIANCE #define AODV_COMPLIANCE
#define AODV_NUM_RT_ENTRIES 32 #define AODV_NUM_RT_ENTRIES 32
@ -117,6 +116,8 @@
#define PROCESS_CONF_STATS 1 #define PROCESS_CONF_STATS 1
/*#define PROCESS_CONF_FASTPOLL 4*/ /*#define PROCESS_CONF_FASTPOLL 4*/
#define UART1_CONF_RX_WITH_DMA 0
#ifdef NETSTACK_CONF_WITH_IPV6 #ifdef NETSTACK_CONF_WITH_IPV6
#define LINKADDR_CONF_SIZE 8 #define LINKADDR_CONF_SIZE 8
@ -187,8 +188,6 @@
#define UIP_CONF_TCP_SPLIT 0 #define UIP_CONF_TCP_SPLIT 0
/* include the project config */ /* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */ /* PROJECT_CONF_H might be defined in the project Makefile */
#ifdef PROJECT_CONF_H #ifdef PROJECT_CONF_H