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

update nvm-write

Browse source
This commit is contained in:
Mariano Alvira 2010-02-26 13:03:37 -05:00
parent 8f6e672cc0
commit a791be393b
3 changed files with 22 additions and 52 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 uart1-loopback nvm-read TARGETS := blink-red blink-green blink-blue blink-white blink-allio uart1-loopback nvm-read nvm-write
include $(MC1322X)/Makefile.include include $(MC1322X)/Makefile.include

4
tests/nvm-read.c
View file

@ -46,10 +46,6 @@ void main(void) {
vreg_init(); vreg_init();
// puts("CRM status: 0x");
// put_hex32(reg(0x80003018));
// puts("\n\r");
puts("Detecting internal nvm\n\r"); puts("Detecting internal nvm\n\r");
err = nvm_detect(gNvmInternalInterface_c, &type); err = nvm_detect(gNvmInternalInterface_c, &type);

68
tests/nvm-write.c
View file

@ -1,27 +1,19 @@
#define GPIO_FUNC_SEL0 0x80000018 /* GPIO 15 - 0; 2 bit blocks */ #include <mc1322x.h>
#include <board.h>
#include <uart1.h>
#include <nvm.h>
#define BASE_UART1 0x80005000 /* INC = 767; MOD = 9999 works: 115200 @ 24 MHz 16 bit sample */
#define UART1_CON 0x80005000 #define INC 767
#define UART1_STAT 0x80005004 #define MOD 9999
#define UART1_DATA 0x80005008
#define UR1CON 0x8000500c
#define UT1CON 0x80005010
#define UART1_CTS 0x80005014
#define UART1_BR 0x80005018
#define GPIO_PAD_DIR0 0x80000000 #define NBYTES 8
#define GPIO_DATA0 0x80000008 #define WRITE_ADDR 0x1e000
#define WRITEVAL0 0xdeadbeef
#define WRITEVAL1 0xdeadbeef
#include "embedded_types.h" void putc(char c);
#include "nvm.h" void puts(char *s);
#include "maca.h"
#define reg(x) (*(volatile uint32_t *)(x))
#define DELAY 400000
void putc(uint8_t c);
void puts(uint8_t *s);
void put_hex(uint8_t x); void put_hex(uint8_t x);
void put_hex16(uint16_t x); void put_hex16(uint16_t x);
void put_hex32(uint32_t x); void put_hex32(uint32_t x);
@ -29,46 +21,28 @@ void put_hex32(uint32_t x);
const uint8_t hex[16]={'0','1','2','3','4','5','6','7', const uint8_t hex[16]={'0','1','2','3','4','5','6','7',
'8','9','a','b','c','d','e','f'}; '8','9','a','b','c','d','e','f'};
#include "isr.h"
#define NBYTES 8
#define WRITE_ADDR 0x1e000
//#define WRITE_ADDR 0x0
#define WRITEVAL0 0x00000001
#define WRITEVAL1 0x00000000
__attribute__ ((section ("startup")))
void main(void) { void main(void) {
nvmType_t type=0; nvmType_t type=0;
nvmErr_t err; nvmErr_t err;
uint32_t buf[NBYTES/4]; uint32_t buf[NBYTES/4];
uint32_t i; uint32_t i;
*(volatile uint32_t *)GPIO_PAD_DIR0 = 0x00000100; *UART1_CON = 0x0000c800; /* mask interrupts, 16 bit sample --- helps explain the baud rate */
/* Restore UART regs. to default */
/* in case there is still bootloader state leftover */
reg(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
reg(UART1_BR) = INC<<16 | MOD; *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. */
reg(UART1_CON) = 0x00000003; /* enable receive and transmit */ *UART1_CON = 0x00000003; /* enable receive and transmit */
reg(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)*/
vreg_init(); vreg_init();
// puts("CRM status: 0x");
// put_hex32(reg(0x80003018));
// puts("\n\r");
puts("Detecting internal nvm\n\r"); puts("Detecting internal nvm\n\r");
err = nvm_detect(gNvmInternalInterface_c, &type); err = nvm_detect(gNvmInternalInterface_c, &type);
@ -115,12 +89,12 @@ void main(void) {
while(1) {continue;}; while(1) {continue;};
} }
void putc(uint8_t c) { void putc(char c) {
while(reg(UT1CON)==31); /* wait for there to be room in the buffer */ while(*UT1CON == 31); /* wait for there to be room in the buffer */
reg(UART1_DATA) = c; *UART1_DATA = c;
} }
void puts(uint8_t *s) { void puts(char *s) {
while(s && *s!=0) { while(s && *s!=0) {
putc(*s++); putc(*s++);
} }