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

cleaned up uart1-loopback

Browse source
This commit is contained in:
Mariano Alvira 2010-02-24 14:45:45 -05:00
parent 3342c647d0
commit 637c9ddab2
2 changed files with 21 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/Makefile
View file

@ -1,6 +1,6 @@
MC1322X := .. MC1322X := ..
TARGETS := blink-red blink-green blink-blue blink-white blink-allio TARGETS := blink-red blink-green blink-blue blink-white blink-allio uart1-loopback
include $(MC1322X)/Makefile.include include $(MC1322X)/Makefile.include

46
tests/uart1-loopback.c
View file

@ -1,44 +1,34 @@
#define GPIO_FUNC_SEL0 0x80000018 /* GPIO 15 - 0; 2 bit blocks */ #include <mc1322x.h>
#include <board.h>
#define BASE_UART1 0x80005000 #include <uart1.h>
#define UART1_CON 0x80005000
#define UART1_STAT 0x80005004
#define UART1_DATA 0x80005008
#define UR1CON 0x8000500c
#define UT1CON 0x80005010
#define UART1_CTS 0x80005014
#define UART1_BR 0x80005018
#include "embedded_types.h"
#include "isr.h"
__attribute__ ((section ("startup")))
void main(void) {
/* Restore UART regs. to default */
/* in case there is still bootloader state leftover */
*(volatile uint32_t *)UART1_CON = 0x0000c800; /* mask interrupts, 16 bit sample --- helps explain the baud rate */
/* INC = 767; MOD = 9999 works: 115200 @ 24 MHz 16 bit sample */ /* INC = 767; MOD = 9999 works: 115200 @ 24 MHz 16 bit sample */
#define INC 767 #define INC 767
#define MOD 9999 #define MOD 9999
*(volatile uint32_t *)UART1_BR = INC<<16 | MOD;
void main(void) {
/* mask interrupts, 16 bit sample --- helps explain the baud rate */
*UART1_CON = 0x0000c800;
*UART1_BR = INC<<16 | MOD;
/* see Section 11.5.1.2 Alternate Modes */ /* see Section 11.5.1.2 Alternate Modes */
/* you must enable the peripheral first BEFORE setting the function in GPIO_FUNC_SEL */ /* you must enable the peripheral first BEFORE setting the function in GPIO_FUNC_SEL */
/* From the datasheet: "The peripheral function will control operation of the pad IF */ /* From the datasheet: "The peripheral function will control operation of the pad IF */
/* THE PERIPHERAL IS ENABLED. */ /* THE PERIPHERAL IS ENABLED. */
*(volatile uint32_t *)UART1_CON = 0x00000003; /* enable receive and transmit */ *UART1_CON = 0x00000003; /* enable receive and transmit */
*(volatile uint32_t *)GPIO_FUNC_SEL0 = ( (0x01 << (14*2)) | (0x01 << (15*2)) ); /* set GPIO15-14 to UART (UART1 TX and RX)*/ *GPIO_FUNC_SEL0 = ( (0x01 << (14*2)) | (0x01 << (15*2)) ); /* set GPIO15-14 to UART (UART1 TX and RX)*/
uint8_t c; uint8_t c;
while(1) { while(1) {
// *(volatile uint32_t *)UART1_DATA = (uint8_t)'U'; if(*UART1_CON > 0) {
if(*(volatile uint32_t*)UR1CON > 0) {
/* Receive buffer isn't empty */ /* Receive buffer isn't empty */
/* read a byte and write it to the transmit buffer */ /* read a byte and write it to the transmit buffer */
c = *(volatile uint32_t *)UART1_DATA; c = *UART1_DATA;
*(volatile uint32_t *)UART1_DATA = c; *UART1_DATA = c;
} }
}; }
} }