* Move UART code into its own file

* Set up vectored interrupt controller
* Set up timer interrupt
This commit is contained in:
2011-05-21 22:26:19 +00:00
parent 91c1c7e6be
commit e1b1b60a53
9 changed files with 272 additions and 84 deletions

86
main.c
View File

@@ -2,93 +2,17 @@
#include "wmp.h"
#include "i2c.h"
#include "timer.h"
#define UARTBASE 0xE000C000
#define RBR 0x00
#define THR 0x00
#define DLL 0x00
#define DLM 0x04
#define IER 0x04
#define IIR 0x08
#define FCR 0x08
#define LCR 0x0c
#define LSR 0x14
#define SCR 0x1c
#define ACR 0x20
#define FDR 0x28
#define TER 0x30
#define UREG(x) (((volatile unsigned char *)UARTBASE)[x])
#define U0THRE ((UREG(LSR) & (1<<5))) /* UART0 transmitter holding register is empty */
#define U0DR ((UREG(LSR) & (1<<0))) /* UART0 data ready */
#include "uart.h"
#include "interrupt.h"
#define PINSEL0 (*((volatile unsigned char *) 0xE002C000))
void init_uart(void)
{
UREG(FDR) = 0x10; /* DivAddVal = 0, MulVal = 1 */
UREG(LCR) = 0x80;
UREG(DLM) = 0x00;
UREG(DLL) = 0x08; /* 14745600 / (16*115200) */
UREG(LCR) = 0x13;
UREG(FCR) = 0x07;
}
void init_pins(void)
{
PINSEL0 = 0x00000055; /* P0.0 and P0.1 assigned to UART */
/* P0.2 and P0.3 assigned to I2C */
}
void putch(char c) {
while (!U0THRE);
UREG(THR) = c;
}
void putstr(char *s) {
while (*s) putch(*s++);
}
void putint(unsigned int n) {
char s[11];
int i;
i = 10;
s[i] = '\0';
do {
s[--i] = n % 10 + '0';
} while ((n /= 10) > 0);
putstr(s+i);
}
void puthex(unsigned int n) {
char s[9];
int i;
i = 8;
s[i] = '\0';
do {
int x = n % 16;
if (x > 9)
x += 'A' - '0' - 10;
s[--i] = x + '0';
} while ((n /= 16) > 0);
putstr(s+i);
}
char getch(void) {
while (!U0DR);
return UREG(RBR);
}
void reply(char *str)
{
putstr(str);
@@ -228,6 +152,7 @@ void average_sample(void)
int main(void) {
int i;
init_interrupt();
init_uart();
init_i2c();
init_pins();
@@ -330,6 +255,11 @@ int main(void) {
puthex(timer_read());
reply(".");
break;
case 'P':
putstr("Initialising timer... ");
timer_set_period(10000*TIMER_MS);
reply("done");
break;
default:
reply("Unrecognised command.");
break;