X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=betty%2Flpcload.c;h=f7911a89e2730f0ccc0f51b825f1a85cd37713d3;hb=d24fd4a34d026918724fad1ddbb0da1de9d28c63;hp=905ebbdcb2e29a0544989d05c0fcce4092cb5c85;hpb=c085074294f2852dbe03000d077c9a44b0d7d888;p=my-code%2Farm.git

diff --git a/betty/lpcload.c b/betty/lpcload.c
index 905ebbd..f7911a8 100644
--- a/betty/lpcload.c
+++ b/betty/lpcload.c
@@ -1,8 +1,10 @@
 /*
  * lpcload.c - load firmware into ram of lpc2220 via uart0
  *
- * author: hackbard@hackdaworld.org
+ * author: hackbard@hackdaworld.org, rolf.anders@physik.uni-augsburg.de
  *
+ * build: make
+ * usage: sudo ./lpcload -d /dev/ttyS0 -f firmware.hex [-v]
  */
 
 #include <stdio.h>
@@ -16,12 +18,24 @@
 
 #define VERBOSE			(1<<0)
 #define FIRMWARE		(1<<1)
+#define BANK0			(1<<2)
+#define BANK2			(1<<3)
+#define BL			(1<<4)
 
+#define BANK0_ADDR		0x80000000
+#define BANK2_ADDR		0x82000000
+#define BANK_SIZE		0x00100000
+#define BL_ADDR			0x7fffe000
+#define BL_SIZE			0x00000800
+
+#define CMD_READ		'R'		// stay compatible to fwflash!
+
+#define TXRX_TYPE_SYNC		0x00
+#define TXRX_TYPE_CKSM		0x00
 #define TXRX_TYPE_BAUD		0x01
-#define TXRX_TYPE_SYNC		0x02
-#define TXRX_TYPE_CMD		0x03
-#define TXRX_TYPE_DATA		0x04
-#define TXRX_TYPE_CKSM		0x05
+#define TXRX_TYPE_CMD		0x02
+#define TXRX_TYPE_DATA		0x03
+#define TXRX_TYPE_GO		0x04
 
 #define CMD_SUCCESS		"0\r\n"
 #define INVALID_COMMAND		"1\r\n"
@@ -56,19 +70,24 @@ typedef struct s_lpc {
 	char fwfile[128];	/* firmware file */
 	u8 info;		/* info/mode */
 	char freq[8];		/* frequency */
-	int partid;		/* part id */
-	u8 bcv[2];		/* boot code version */
-	u32 hoff;		/* start addr of ihex file */
+	char bank0[127];	/* flash dump bank0 */
+	int b0fd;		/* dumpfile fd bank0 */
+	char bank2[127];	/* flash dump bank2 */
+	int b2fd;		/* dumpfile fd bank0 */
+	char bl[127];		/* flash dump bootloader */
+	int blfd;		/* dumpfile fd bootloader */
 	u32 roff;		/* ram offset of uc */
+	u32 jaddr;		/* addr for the jump */
 } t_lpc;
 
 void usage(void) {
 
 	printf("possible argv:\n");
-	printf("  -d <serial device>\n");
-	printf("  -f <firmware>\n");
-	printf("  -c <crystal freq>\n");
-	printf("  -r <ram offset>\n");
+	printf("  -d  <serial device>\n");
+	printf("  -f  <firmware>\n");
+	printf("  -c  <crystal freq>\n");
+	printf("  -Dx <filename>\n");
+	printf("      x=0: bank0, x=2: bank2, x=b: bootloader\n");
 	printf("  -v\n");
 
 }
@@ -93,8 +112,8 @@ int open_serial_device(t_lpc *lpc) {
 
 	// input/output baudrate
 
-	cfsetispeed(&term,B9600);
-	cfsetospeed(&term,B9600);
+	cfsetispeed(&term,B38400);
+	cfsetospeed(&term,B38400);
 
 	// control options -> 8n1
 
@@ -110,8 +129,12 @@ int open_serial_device(t_lpc *lpc) {
 	// input options -> enable flow control
 	
 	//term.c_iflag&=~(IXON|IXOFF|IXANY|INLCR|ICRNL);
-	term.c_iflag&=~(INLCR|ICRNL);
-	term.c_iflag|=(IXON|IXOFF|IXANY);
+	term.c_iflag&=~(INLCR|ICRNL|IXANY);
+	term.c_iflag|=(IXON|IXOFF);
+	
+	// output options
+
+	term.c_oflag=0;
 
 	// more control options -> timeout / flow control
 	
@@ -127,9 +150,6 @@ int open_serial_device(t_lpc *lpc) {
 
 int open_firmware(t_lpc *lpc) {
 
-	int ret;
-	char buf[BUFSIZE];
-
 	/* open firmware file */
 
 	lpc->fwfd=open(lpc->fwfile,O_RDONLY);
@@ -137,19 +157,40 @@ int open_firmware(t_lpc *lpc) {
 	if(lpc->fwfd<0)
 		perror("fw open");
 
-	/* read hex file offset */
+	return lpc->fwfd;
+}
+
+int open_dumpfiles(t_lpc *lpc) {
 
-	ret=read(lpc->fwfd,buf,7);
-	if(buf[0]!=':') {
-		printf("fw open: not an intel hex file?\n");
-		return -1;
+	/* open dumpfiles */
+
+	if(lpc->info&BANK0) {
+		lpc->b0fd=open(lpc->bank0,O_WRONLY|O_CREAT);
+		if(lpc->b0fd<0) {
+			perror("bank0 dump file open");
+			return lpc->b0fd;
+		}
 	}
-	sscanf(buf+3,"%04x",&(lpc->hoff));
-	lseek(lpc->fwfd,0,SEEK_SET);
 
-	return lpc->fwfd;
-}
+	if(lpc->info&BANK2) {
+		lpc->b2fd=open(lpc->bank2,O_WRONLY|O_CREAT);
+		if(lpc->b2fd<0) {
+			perror("bank2 dump file open");
+			return lpc->b2fd;
+		}
+	}
 
+	if(lpc->info&BL) {
+		lpc->blfd=open(lpc->bl,O_WRONLY|O_CREAT);
+		if(lpc->blfd<0) {
+			perror("bootloader dump file open");
+			return lpc->blfd;
+		}
+	}
+
+	return 0;
+
+}
 int txrx(t_lpc *lpc,char *buf,int len,u8 type) {
 
 	int ret,cnt;
@@ -181,82 +222,78 @@ int txrx(t_lpc *lpc,char *buf,int len,u8 type) {
 		printf("| (%d)\n",cnt);
 	}
 
+
+
 	/* cut the echo if not of type auto baud */
 
 	if(type!=TXRX_TYPE_BAUD) {
-		while(cnt>0) {
+		while(cnt) {
 			ret=read(lpc->sfd,buf,cnt);
 			if(ret<0) {
 				perror("txrx echo cut");
 				return ret;
 			}
-			if(type==TXRX_TYPE_CKSM) {
-				printf("   cksm resp: ");
-				for(i=0;i<ret;i++)
-					printf("%02x ",buf[i]);
-				printf("\n");
-			}
-			for(i=0;i<ret;i++) {
-				if(buf[i]==0x13)
-					printf("STOP !!!\n");
-			}
 			cnt-=ret;
 		}
 	}
 
-	/* return here if type is data */
+	/* return if type is go */
 
-	if(type==TXRX_TYPE_DATA) {
-		ret=1;
-		while(ret) {
-			ret=read(lpc->sfd,buf,BUFSIZE);
-			for(i=0;i<ret;i++) {
-				if(buf[i]!='\n') {
-					printf("FATAL!!!\n");
-					int j;
-					for(j=0;j<ret;j++) printf("%02x ",buf[j]);
-					printf("\n");
-				}
-			}
-		}
+	if(type==TXRX_TYPE_GO)
 		return cnt;
-	}
 
-	/* wait, if cksum has to be verified */
-	
-	//if(type==TXRX_TYPE_CKSM)
-	//	sleep(3);
+	/* return here if type is data */
+
+	if(type==TXRX_TYPE_DATA)
+		return cnt;
 
 	/* read */
 
-	if(lpc->info&VERBOSE)
-		printf("  << ");
+	ret=read(lpc->sfd,buf,1);
+	if(ret<0) {
+		perror("txrx read (first byte)");
+		return ret;
+	}
+		
+	switch(buf[0]) {
+		case 'S':
+			cnt=13;
+			break;
+		case 'O':
+			cnt=3;
+			break;
+		case 'R':
+			cnt=7;
+			break;
+		case '0':
+			cnt=2;
+			break;
+		default:
+			printf("txrx read: bad return byte '%02x'\n",buf[0]);
+			break;
+	}
+
 	ret=1;
-	cnt=0;
-	while(ret) {
-		ret=read(lpc->sfd,buf+cnt,BUFSIZE-cnt);
+	i=cnt;
+	while(i) {
+		ret=read(lpc->sfd,buf+1+cnt-i,i);
 		if(ret<0) {
-			perror("txrx read");
+			perror("txrx read (next bytes)");
 			return ret;
 		}
-		if(ret+cnt>BUFSIZE) {
-			printf("txrx read: too small buf size (%d)!\n",BUFSIZE);
-			return -1;
-		}
-		if(lpc->info&VERBOSE)
-			for(i=0;i<ret;i++)
-				printf("%c",
-				       ((buf[cnt+i]>0x19)&(buf[cnt+i]<0x7f))?
-				       buf[cnt+i]:'.');
-		cnt+=ret;
+		i-=ret;
 	}
 	if(lpc->info&VERBOSE) {
+		printf("  << ");
+		for(i=0;i<cnt+1;i++)
+			printf("%c",((buf[i]>0x19)&(buf[i]<0x7f))?
+			            buf[i]:'.');
 		printf(" | ");
-		for(i=0;i<cnt;i++)
+		for(i=0;i<cnt+1;i++)
 			printf("%02x ",buf[i]);
-		printf("| (%d)\n",cnt);
+		printf("| (%d)\n",cnt+1);
 	}
-	buf[cnt]='\0';
+	buf[cnt+1]='\0';
 
 	/* check/strip return code if type is cmd */
 
@@ -284,7 +321,7 @@ int bl_init(t_lpc *lpc) {
 	/* auto baud sequence */
 	buf[0]='?';
 	txrx(lpc,buf,1,TXRX_TYPE_BAUD);
-	if(strncmp(buf,"Synchronized",12)) {
+	if(strncmp(buf,"Synchronized\r\n",14)) {
 		printf("auto baud detection failed\n");
 		return -1;
 	}
@@ -310,32 +347,6 @@ int bl_init(t_lpc *lpc) {
 	return 0;
 }
 
-int read_part_id(t_lpc *lpc) {
-
-	char buf[BUFSIZE];
-
-	memcpy(buf,"J\r\n",3);
-	txrx(lpc,buf,3,TXRX_TYPE_CMD);
-	lpc->partid=atoi(buf);
-
-	return lpc->partid;
-}
-
-int read_bcv(t_lpc *lpc) {
-
-	char buf[BUFSIZE];
-	char *ptr;
-
-	memcpy(buf,"K\r\n",3);
-	txrx(lpc,buf,3,TXRX_TYPE_CMD);
-	ptr=strtok(buf,"\r\n");
-	lpc->bcv[0]=strtol(ptr,NULL,16);
-	ptr=strtok(NULL,"\r\n");
-	lpc->bcv[1]=strtol(ptr,NULL,16);
-
-	return 0;
-}
-
 int unlock_go(t_lpc *lpc) {
 
 	char buf[BUFSIZE];
@@ -352,29 +363,20 @@ int go(t_lpc *lpc) {
 	char buf[BUFSIZE];
 	int ret,len;
 
-	snprintf(buf,BUFSIZE,"G %d A\r\n",lpc->roff);
+	snprintf(buf,BUFSIZE,"G %d A\r\n",lpc->jaddr);
 	len=strlen(buf);
-	ret=txrx(lpc,buf,ret,TXRX_TYPE_CMD);
+	ret=txrx(lpc,buf,len,TXRX_TYPE_GO);
 
 	return ret;
 }
 
-int uuencode(char *in,char *out) {
-
-	int i;
+int uuencode(u8 *in,u8 *out,int len) {
 
-	out[0]=0x20+((in[0]>>2)&0x3f);
-	out[1]=0x20+(((in[0]<<4)|(in[1]>>4))&0x3f);
-	out[2]=0x20+(((in[1]<<2)|(in[2]>>6))&0x3f);
-	out[3]=0x20+(in[2]&0x3f);
-
-	printf("  enc: ");
-	for(i=0;i<3;i++)
-		printf("%02x ",in[i]);
-	printf("-> ");
-	for(i=0;i<4;i++)
-		printf("%02x ",out[i]);
-	printf("\n");
+	out[0]=0x20+len;
+	out[1]=0x20+((in[0]>>2)&0x3f);
+	out[2]=0x20+(((in[0]<<4)|(in[1]>>4))&0x3f);
+	out[3]=0x20+(((in[1]<<2)|(in[2]>>6))&0x3f);
+	out[4]=0x20+(in[2]&0x3f);
 
 	return 0;
 }
@@ -395,7 +397,7 @@ int write_to_ram(t_lpc *lpc,char *buf,u32 addr,int len) {
 	}
 
 	/* make it a multiple of 3 (reason: uuencode) */
-	nlen=(len/3+1)*3;
+	nlen=(!(len%3))?len:((len/3+1)*3);
 	if(nlen>BUFSIZE) {
 		printf("ram write: too much data\n");
 		return -1;
@@ -403,7 +405,7 @@ int write_to_ram(t_lpc *lpc,char *buf,u32 addr,int len) {
 	for(i=len;i<nlen;i++) buf[i]=0;
 
 	/* prepare addr */
-	addr+=(lpc->roff-lpc->hoff);
+	addr+=lpc->roff;
 
 	/* prepare write command */
 	if(lpc->info&VERBOSE)
@@ -413,10 +415,6 @@ int write_to_ram(t_lpc *lpc,char *buf,u32 addr,int len) {
 
 	/* send command and check return code */
 	txrx(lpc,txrxbuf,slen,TXRX_TYPE_CMD);
-	//if(strncmp(txrxbuf,"OK\r\n",4)) {
-	//	printf("ram write: write command failed\n");
-	//	return -1;
-	//}
 
 	/* send data */
 	lcount=0;
@@ -426,16 +424,16 @@ int write_to_ram(t_lpc *lpc,char *buf,u32 addr,int len) {
 	while(bcnt<nlen) {
 
 		/* uuencode / prepare data bytes */
-		uuencode(buf+bcnt,txrxbuf);
-		txrxbuf[4]='\r';
-		txrxbuf[5]='\n';
+		uuencode((u8 *)(buf+bcnt),(u8 *)(txrxbuf),
+		         (bcnt==nlen-3)?(len%3?len%3:3):3);
+		txrxbuf[5]='\r';
+		txrxbuf[6]='\n';
 
 		/* checksum */
-		checksum+=(buf[bcnt]+buf[bcnt+1]+buf[bcnt+2]);
-		printf("----> %d %d\n",checksum,bcnt);
+		checksum+=((u8)buf[bcnt]+(u8)buf[bcnt+1]+(u8)buf[bcnt+2]);
 
 		/* send a data line */
-		txrx(lpc,txrxbuf,6,TXRX_TYPE_DATA);
+		txrx(lpc,txrxbuf,7,TXRX_TYPE_DATA);
 
 		/* increase counters */
 		lcount+=1;
@@ -444,11 +442,15 @@ int write_to_ram(t_lpc *lpc,char *buf,u32 addr,int len) {
 
 		/* checksum */
 		if((!(lcount%20))|(bcnt==nlen)) {
+			/* send backtick */
+			memcpy(txrxbuf,"`\r\n",3);
+			//txrx(lpc,txrxbuf,3,TXRX_TYPE_DATA);
 			/* send checksum */
-			snprintf(txrxbuf,BUFSIZE,"%d\r\n",checksum%0x100);
+			snprintf(txrxbuf,BUFSIZE,"%d\r\n",checksum);
 			slen=strlen(txrxbuf);
 			txrx(lpc,txrxbuf,slen,TXRX_TYPE_CKSM);
-			if(!strncmp(txrxbuf,"RESEND\r\n",8)) {
+			if(!strncmp(txrxbuf,"RESE",4)) {
+				read(lpc->sfd,txrxbuf+4,4);
 				printf("ram write: resending ...\n");
 				bcnt-=count;
 			}
@@ -470,9 +472,10 @@ int firmware_to_ram(t_lpc *lpc) {
 
 	char buf[BUFSIZE];
 	u32 addr,len,type;
-	int ret;
+	int ret,temp;
 
 	/* read a line */
+	ret=1;
 	while(ret) {
 		/* sync line */
 		ret=read(lpc->fwfd,buf,1);
@@ -491,10 +494,6 @@ int firmware_to_ram(t_lpc *lpc) {
 		/* read len */
 		ret=read(lpc->fwfd,buf,2);
 		sscanf(buf,"%02x",&len);
-		if(len%4) {
-			printf("fw to ram: len not a multiple of 4\n");
-			return -1;
-		}
 		/* read addr */
 		ret=read(lpc->fwfd,buf,4);
 		sscanf(buf,"%04x",&addr);
@@ -504,22 +503,35 @@ int firmware_to_ram(t_lpc *lpc) {
 		/* successfull return if type is end of file */
 		if(type==0x01)
 			return 0;
-		/* read data */
-		ret=read(lpc->fwfd,buf,2*len);
-		if(ret!=(2*len)) {
+		/* read data (and cksum) */
+		ret=read(lpc->fwfd,buf,2*(len+1));
+		if(ret!=(2*(len+1))) {
 			printf("fw to ram: data missing\n");
 				return -1;
 		}
-		/* checksum */
-		ret=read(lpc->fwfd,buf,2);
+		for(ret=0;ret<len;ret++) {
+			sscanf(buf+2*ret,"%02x",&temp);
+			buf[ret]=temp;
+		}
 		/* act according to type */
 		switch(type) {
-			case 0x03:
-				/* get cs and ip */
-				break;
+			//case 0x03:
+			//	/* get cs and ip */
+			//	break;
 			case 0x00:
+				if(len%4) {
+					printf("fw to ram: invalid len\n");
+					return -1;
+				}
 				write_to_ram(lpc,buf,addr,len);
 				break;
+			case 0x04:
+				lpc->roff=((buf[0]<<24)|(buf[1]<<16));
+				break;
+			case 0x05:
+				lpc->jaddr=((buf[0]<<24)|(buf[1]<<16));
+				lpc->jaddr|=((buf[2]<<8)|buf[3]);
+				break;
 			default:
 				printf("fw to ram: unknown type %02x\n",type);
 				return -1;
@@ -529,10 +541,90 @@ int firmware_to_ram(t_lpc *lpc) {
 	return 0;
 }
 
+int lpc_txbuf_flush(t_lpc *lpc) {
+
+	int i,ret;
+	u8 buf[16];
+
+	ret=1;
+	printf("flushing lpc tx buffer: ");
+	while(ret) {
+		ret=read(lpc->sfd,buf,16);
+		for(i=0;i<ret;i++)
+			printf("%02x ",buf[i]);
+	}
+	printf("\n");
+
+	return 0;
+}
+
+int dump_files(int sfd,int dfd,u32 addr,u32 len) {
+
+	int ret;
+	int size;
+	int cnt;
+	int i;
+	u8 buf[16];
+
+	printf("dumping content (addr=0x%08x, len=0x%08x) ...\n",addr,len);
+
+	/* send cmd */
+	size=1+4+4;
+	cnt=0;
+	buf[0]=CMD_READ;
+	buf[1]=(addr>>24)&0xff;
+	buf[2]=(addr>>16)&0xff;
+	buf[3]=(addr>>8)&0xff;
+	buf[4]=addr&0xff;
+	buf[5]=(len>>24)&0xff;
+	buf[6]=(len>>16)&0xff;
+	buf[7]=(len>>8)&0xff;
+	buf[8]=len&0xff;
+	printf("  sending cmd: ");
+	while(size) {
+		ret=write(sfd,buf+cnt,size);
+		for(i=cnt;i<cnt+ret;i++)
+			printf("%02x ",buf[i]);
+		if(ret<0) {
+			perror("dump file: send cmd ");
+			return ret;
+		}
+		size-=ret;
+		cnt+=ret;
+	}
+	printf("\n");
+
+	/* receive data and dump it to file */
+	ret=1;
+	cnt=0;
+	printf("  receiving data ...\n");
+	while(ret) {
+		ret=read(sfd,buf,16);
+		if(ret<0) {
+			perror("dump file: read data");
+			return ret;
+		}
+		size=ret;
+		cnt=0;
+		while(size) {
+			ret=write(dfd,buf+cnt,size-cnt);
+			if(ret<0) {
+				perror("dump file: write data");
+				return ret;
+			}
+			cnt+=ret;
+			size-=ret;
+		}
+	}
+
+	return 0;
+}
+
 int main(int argc,char **argv) {
 
 	t_lpc lpc;
 	int i;
+	int ret;
 
 	/*
 	 * initial ... 
@@ -541,6 +633,7 @@ int main(int argc,char **argv) {
 	memset(&lpc,0,sizeof(t_lpc));
 	strncpy(lpc.freq,CRYSTFREQ,7);
 	lpc.roff=RAMOFFSET;
+	lpc.jaddr=RAMOFFSET;
 
 	/* parse argv */
 
@@ -565,6 +658,27 @@ int main(int argc,char **argv) {
 			case 'c':
 				strncpy(lpc.freq,argv[++i],7);
 				break;
+			case 'D':
+				if(argv[i][2]=='0') {
+					lpc.info|=BANK0;
+					strncpy(lpc.bank0,argv[++i],127);
+					break;
+				}
+				else if(argv[i][2]=='2') {
+					lpc.info|=BANK2;
+					strncpy(lpc.bank2,argv[++i],127);
+					break;
+				}
+				else if(argv[i][2]=='b') {
+					lpc.info|=BANK0;
+					strncpy(lpc.bl,argv[++i],127);
+					break;
+				}
+				else {
+					usage();
+					return -1;
+				}
+				
 			default:
 				usage();
 				return -1;
@@ -576,35 +690,59 @@ int main(int argc,char **argv) {
 	if(open_serial_device(&lpc)<0)
 		goto end;
 
-	/* open firmware file */
-	if(open_firmware(&lpc)<0)
-		goto end;
-
 	/* boot loader init */
 	printf("boot loader init ...\n");
 	if(bl_init(&lpc)<0)
 		return -1;
 
-	/* read part id */
-	read_part_id(&lpc);
-	printf("part id: %d\n",lpc.partid);
+	/* quit if there is no hex file to process */
+	if(!(lpc.info&FIRMWARE)) {
+		printf("no firmware -> aborting\n");
+		goto end;
+	}
+
+	/* open firmware file */
+	if(open_firmware(&lpc)<0)
+		goto end;
 
-	/* read boot code version */
-	read_bcv(&lpc);
-	printf("boot code version: %02x %02x\n",lpc.bcv[0],lpc.bcv[1]);
+	/* open dump files */
+	if(open_dumpfiles(&lpc)<0)
+		goto end;
 
 	/* parse intel hex file and write to ram */
+	printf("write firmware to ram ...\n");
 	firmware_to_ram(&lpc);
 
 	/* unlock go cmd */
+	printf("unlock go command ...\n");
 	unlock_go(&lpc);
 
 	/* go! */
-	go(&lpc);
+	printf("go ...\n");
+	ret=go(&lpc);
+
+	/* flush the lpc2220 tx buf */
+	lpc_txbuf_flush(&lpc);
+
+	/* download flash/bootloader content */
+	if(lpc.info&BANK0)
+		dump_files(lpc.sfd,lpc.b0fd,BANK0_ADDR,BANK_SIZE);
+	if(lpc.info&BANK2)
+		dump_files(lpc.sfd,lpc.b2fd,BANK2_ADDR,BANK_SIZE);
+	if(lpc.info&BL)
+		dump_files(lpc.sfd,lpc.blfd,BL_ADDR,BL_SIZE);
 
 end:
-	close(lpc.sfd);
-	close(lpc.fwfd);
+	if(lpc.sfd)
+		close(lpc.sfd);
+	if(lpc.fwfd)
+		close(lpc.fwfd);
+	if(lpc.b0fd)
+		close(lpc.b0fd);
+	if(lpc.b2fd)
+		close(lpc.b2fd);
+	if(lpc.blfd)
+		close(lpc.blfd);
 
 	return 0;
 }