X-Git-Url: https://hackdaworld.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=betty%2Fbetty.c;h=45e6ae741c513c46f30f8337363e74a43f1e9be9;hb=5da509dc909c60d63c5fba98e7ced43040eb6827;hp=f3e08ce2304fa06cd380ac3ccc247e6e7b0e7e9a;hpb=afe6191925fbdac90169ed8a463bd9928276a863;p=my-code%2Farm.git

diff --git a/betty/betty.c b/betty/betty.c
index f3e08ce..45e6ae7 100644
--- a/betty/betty.c
+++ b/betty/betty.c
@@ -5,185 +5,70 @@
  *
  */
 
-/*
- * includes
- */
-
-#include "lpc2xxx.h"
+/* includes */
+#include "betty.h"
 
 /*
- * defines
+ * functions
  */
 
-/* bank 0/2 and boootloader addr/size */
-#define BANK0			0x80000000
-#define BANK2			0x82000000
-#define BANK_SIZE		0x00100000
-#define BOOTLOADER		0x7fffe000
-#define BL_SIZE			0x00002000
-
-/* flash cmd addresses - flash[0-18] <--> arm[1-19]*/
-#define B0F555	(*((volatile unsigned short *)(BANK0|0xaaa)))	// 0x555
-#define B0F2AA	(*((volatile unsigned short *)(BANK0|0x554)))	// 0x2aa
-#define B0F	(*((volatile unsigned short *)(BANK0)))
-#define B2F555	(*((volatile unsigned short *)(BANK2|0xaaa)))	// 0x555
-#define B2F2AA	(*((volatile unsigned short *)(BANK2|0x554)))	// 0x2aa
-#define B2F	(*((volatile unsigned short *)(BANK2)))
+#define cc1100_init	spi1_init(8,SPI_MASTER,8)
 
 /*
- * type definitions
+ * main function
  */
 
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-
- /*
-  * functions
-  */
+int main() {
 
-void mmap_init(u8 memtype) {
+	char announce[]="betty - live from flash at 0x80000000! ;)\r\n";
+	t_button button;
+	u32 addr;
 
-	MEMMAP=memtype;
-}
-
-void pll_init(void) {
-
-	/* configuration */
-	PLLCFG=0x42;	// multiplier = 3 (for cclk), dividor = 4 (for f_cco)
-	PLLCON=0x03;	// enable and set as clk source for the lpc
-	/* feed sequence */
-	PLLFEED=0xaa;
-	PLLFEED=0x55;
-	/* wait for lock */
-	while(!(PLLSTAT&(1<<10)))
-		continue;
-}
+	/* system init */
+	pll_init();
 
-void ext_mem_bank_init(void) {
+	/* uart init */
+	uart0_init();
 
-	BCFG0=0x10000420;       // flash 1
-	BCFG1=0x00000c42;       // lcd
-	BCFG2=0x10000420;       // flash 2
-}
+	/* display init */
+	bl_init();
 
+	/* button init */
+	button_init(&button);
+	button_set_retries(&button,100);
 
-void pin_select_init() {
+	/* flash init */
+	flash_init();
 
 	/*
-	 * a[19:2] -> address lines
+	 * start it ...
 	 */
 
-	PINSEL2=0x0d6041d4;
-}
-
-void uart0_init(void) {
-
-	PINSEL0=0x05;			// pin select -> tx, rx
-	UART0_FCR=0x07;			// enable fifo
-	UART0_LCR=0x83;			// set dlab + word length
-	UART0_DLL=0x04;			// br: 38400 @ 10/4 mhz
-	UART0_DLM=0x00;
-	UART0_LCR=0x03;			// unset dlab
-}
-
-void uart0_send_string(char *txbuf) {
+	/* pause - seems to not work if running from flash! (?) */
+	pause(0xffffff);
 
-	int i;
+	/* announce */
+	uart0_send_string(announce);
 
-	i=0;
-
-	while(txbuf[i]) {
-		UART0_THR=txbuf[i++];
-		/* flush if tx buffer maximum reached */
-		if(!(i%16))
-			while(!(UART0_LSR&(1<<6)))
-				continue;
-	}
-	
-	/* flush if \n and \r do not fit in the tx buffer */
-	if(i>14)
-		while(!(UART0_LSR&(1<<6)))
-			continue;
-
-	UART0_THR='\n';
-	UART0_THR='\r';
-
-	/* flush uart0 anyways */
-	while(!(UART0_LSR&(1<<6)))
-		continue;
-}
-
-void uart0_send_buf16(u16 *buf,int len) {
-
-	int i;
-
-	i=0;
-
-	for(i=0;i<len/2;i++) {
-		if(!(i%8))
-			while(!(UART0_LSR&(1<<6)))
-				continue;
-		UART0_THR=buf[i]&0xff;
-		UART0_THR=(buf[i]>>8)&0xff;
-	}
-}
+	/* toggle backlight */
+	bl_toggle();
 
-void uart0_send_buf32(u32 *buf,int len) {
-
-	int i;
-
-	i=0;
-
-	for(i=0;i<len/4;i++) {
-		if(!(i%4))
-			while(!(UART0_LSR&(1<<6)))
-				continue;
-		UART0_THR=buf[i]&0xff;
-		UART0_THR=(buf[i]>>8)&0xff;
-		UART0_THR=(buf[i]>>16)&0xff;
-		UART0_THR=(buf[i]>>24)&0xff;
-	}
-}
-
-void uart0_send_byte(u8 send) {
-
-	while(!(UART0_LSR&(1<<5)))
-		continue;
-
-	UART0_THR=send;
-}
-
-u8 uart0_get_byte(void) {
-
-	u8 rx;
-
-	while(!(UART0_LSR&(1<<0)))
-		continue;
-
-	rx=UART0_RBR;
-
-	return rx;
-}
-
-/*
- * main function
- */
-
-int main() {
-
-	char buf[]="betty - live from the flash at 0x80000000! ;)\r\n";
-	u8 byte;
-
-	pll_init();
-	uart0_init();
-	ext_mem_bank_init();
-	pin_select_init();
+	//addr=0x82000000;
+	flash_sector_erase(BANK2,0);
+	addr=FLASH_BANK2;
 
 	while(1) {
-		byte=uart0_get_byte();
-		uart0_send_string(buf);
-		uart0_send_byte(byte);
+		pause(0x0fffff);
+
+		/* button test! */
+		if(button_get_event(&button)) {
+			uart0_send_string(announce);
+			if(button.key[0]==BUTTON_POWER) {
+				bl_toggle();
+				flash_write_buf(addr,(u16 *)announce,42);
+				addr+=64;
+			}
+		}
 	}
 
 	return 0;