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

added handling function for checkin if uart is transmitting or receiving - patch by Klaus Stengel

Browse source
This commit is contained in:
joxe 2009-01-31 12:46:57 +00:00
parent e5f0d786a8
commit 5a8dc2df28
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cpu/msp430/dev/uart1.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)$Id: uart1.c,v 1.7 2008/09/18 17:59:27 joxe Exp $
* @(#)$Id: uart1.c,v 1.8 2009/01/31 12:46:57 joxe Exp $
*/
/*
@ -43,7 +43,12 @@
#include "dev/watchdog.h"
static int (*uart1_input_handler)(unsigned char c);
static uint8_t rx_in_progress;
/*---------------------------------------------------------------------------*/
uint8_t
uart1_active(void) {
return ((~ UTCTL1) & TXEPT) | rx_in_progress;
}
/*---------------------------------------------------------------------------*/
void
uart1_set_input(int (*input)(unsigned char c))
@ -92,23 +97,21 @@ uart1_init(unsigned long ubr)
UTCTL1 = SSEL1; /* UCLK = MCLK */
UBR01 = ubr;
UBR11 = ubr >> 8; /* always zero */
UBR11 = ubr >> 8;
/*
* UMCTL1 values calculated using
* http://mspgcc.sourceforge.net/baudrate.html and are not
* complete. Also the table assumes that F_CPU = 2,457,600 Hz.
* http://mspgcc.sourceforge.net/baudrate.html
* Table assumes that F_CPU = 2,457,600 Hz.
*/
switch(ubr) {
case UART1_BAUD2UBR(115200):
case UART1_BAUD2UBR(115200ul):
UMCTL1 = 0x4a;
break;
case UART1_BAUD2UBR(57600):
case UART1_BAUD2UBR(57600ul):
UMCTL1 = 0x5b;
break;
case UART1_BAUD2UBR(19600):
UMCTL1 = 0x4a;
break;
default:
/* 9600, 19200, 38400 don't require any correction */
UMCTL1 = 0x00;
}
@ -118,8 +121,11 @@ uart1_init(unsigned long ubr)
UCTL1 &= ~SWRST;
/* XXX Clear pending interrupts before enable!!! */
IFG2 &= ~URXIFG1;
U1TCTL |= URXSE;
rx_in_progress = 0;
IE2 |= URXIE1; /* Enable USART1 RX interrupt */
}
@ -133,8 +139,10 @@ uart1_interrupt(void)
/* Edge detect if IFG not set? */
U1TCTL &= ~URXSE; /* Clear the URXS signal */
U1TCTL |= URXSE; /* Re-enable URXS - needed here?*/
rx_in_progress = 1;
LPM4_EXIT;
} else {
rx_in_progress = 0;
/* Check status register for receive errors. */
if(URCTL1 & RXERR) {
volatile unsigned dummy;

3
cpu/msp430/dev/uart1.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: uart1.h,v 1.3 2008/01/08 08:04:09 adamdunkels Exp $
* $Id: uart1.h,v 1.4 2009/01/31 12:46:57 joxe Exp $
*/
/**
@ -48,5 +48,6 @@
void uart1_set_input(int (*input)(unsigned char c));
void uart1_writeb(unsigned char c);
void uart1_init(unsigned long ubr);
uint8_t uart1_active(void);
#endif /* __UART1_H__ */