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

update build system for board specific code that's 'local' to the

Browse source 
program you are building.

update tests to consolidate common code.
This commit is contained in:
Mariano Alvira 2010-02-26 14:04:10 -05:00
parent a791be393b
commit 87cd9c7a36
13 changed files with 126 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

57
tests/nvm-write.c
View file

@ -1,7 +1,7 @@
#include <mc1322x.h>
#include <board.h>
#include <uart1.h>
#include <nvm.h>
#include "tests.h"
/* INC = 767; MOD = 9999 works: 115200 @ 24 MHz 16 bit sample */
#define INC 767
@ -12,34 +12,15 @@
#define WRITEVAL0 0xdeadbeef
#define WRITEVAL1 0xdeadbeef
void putc(char c);
void puts(char *s);
void put_hex(uint8_t x);
void put_hex16(uint16_t x);
void put_hex32(uint32_t x);
const uint8_t hex[16]={'0','1','2','3','4','5','6','7',
'8','9','a','b','c','d','e','f'};
void main(void) {
nvmType_t type=0;
nvmErr_t err;
uint32_t buf[NBYTES/4];
uint32_t i;
*UART1_CON = 0x0000c800; /* mask interrupts, 16 bit sample --- helps explain the baud rate */
uart_init(INC, MOD);
/* INC = 767; MOD = 9999 works: 115200 @ 24 MHz 16 bit sample */
#define INC 767
#define MOD 9999
*UART1_BR = INC<<16 | MOD;
/* see Section 11.5.1.2 Alternate Modes */
/* 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 */
/* THE PERIPHERAL IS ENABLED. */
*UART1_CON = 0x00000003; /* enable receive and transmit */
*GPIO_FUNC_SEL0 = ( (0x01 << (14*2)) | (0x01 << (15*2)) ); /* set GPIO15-14 to UART (UART1 TX and RX)*/
print_welcome("nvm-write");
vreg_init();
@ -89,33 +70,3 @@ void main(void) {
while(1) {continue;};
}
void putc(char c) {
while(*UT1CON == 31); /* wait for there to be room in the buffer */
*UART1_DATA = c;
}
void puts(char *s) {
while(s && *s!=0) {
putc(*s++);
}
}
void put_hex(uint8_t x)
{
putc(hex[x >> 4]);
putc(hex[x & 15]);
}
void put_hex16(uint16_t x)
{
put_hex((x >> 8) & 0xFF);
put_hex((x) & 0xFF);
}
void put_hex32(uint32_t x)
{
put_hex((x >> 24) & 0xFF);
put_hex((x >> 16) & 0xFF);
put_hex((x >> 8) & 0xFF);
put_hex((x) & 0xFF);
}