X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=betty%2Flpcload.c;h=30a808ec6ef8cb2baa6afda566e8a646303c3b9d;hb=cc9a44bee2152e887691958d3580e17ef15810e2;hp=80af804153dc5697da32ba6ae3f30a598cfcd45d;hpb=9fe785e6bc1cf36626f4a3db7877b5f7df76ed61;p=my-code%2Farm.git

diff --git a/betty/lpcload.c b/betty/lpcload.c
index 80af804..30a808e 100644
--- a/betty/lpcload.c
+++ b/betty/lpcload.c
@@ -19,11 +19,12 @@
 #define VERBOSE			(1<<0)
 #define FIRMWARE		(1<<1)
 
+#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"
@@ -58,8 +59,8 @@ typedef struct s_lpc {
 	char fwfile[128];	/* firmware file */
 	u8 info;		/* info/mode */
 	char freq[8];		/* frequency */
-	u32 hoff;		/* start addr of ihex file */
 	u32 roff;		/* ram offset of uc */
+	u32 jaddr;		/* addr for the jump */
 } t_lpc;
 
 void usage(void) {
@@ -93,8 +94,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
 
@@ -120,7 +121,7 @@ int open_serial_device(t_lpc *lpc) {
 	// more control options -> timeout / flow control
 	
 	term.c_cc[VMIN]=0;
-	term.c_cc[VTIME]=40;	// 4 second timeout
+	term.c_cc[VTIME]=10;	// 1 second timeout
 	term.c_cc[VSTART]=0x11;
 	term.c_cc[VSTOP]=0x13;
 
@@ -131,9 +132,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);
@@ -141,16 +139,6 @@ int open_firmware(t_lpc *lpc) {
 	if(lpc->fwfd<0)
 		perror("fw open");
 
-	/* read hex file offset */
-
-	ret=read(lpc->fwfd,buf,7);
-	if(buf[0]!=':') {
-		printf("fw open: not an intel hex file?\n");
-		return -1;
-	}
-	sscanf(buf+3,"%04x",&(lpc->hoff));
-	lseek(lpc->fwfd,0,SEEK_SET);
-
 	return lpc->fwfd;
 }
 
@@ -251,6 +239,11 @@ int txrx(t_lpc *lpc,char *buf,int len,u8 type) {
 	}
 	buf[cnt+1]='\0';
 
+	/* return if type is go */
+
+	if(type==TXRX_TYPE_GO)
+		return 0;
+
 	/* check/strip return code if type is cmd */
 
 	if(type==TXRX_TYPE_CMD) {
@@ -319,9 +312,9 @@ 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,len,TXRX_TYPE_CMD);
+	ret=txrx(lpc,buf,len,TXRX_TYPE_GO);
 
 	return ret;
 }
@@ -361,7 +354,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)
@@ -450,10 +443,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);
@@ -479,10 +468,18 @@ int firmware_to_ram(t_lpc *lpc) {
 			//	/* 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 0x01:
-				write_to_ram(lpc,buf,addr,len);
+			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);
@@ -497,7 +494,6 @@ int main(int argc,char **argv) {
 
 	t_lpc lpc;
 	int i;
-	u8 buf[BUFSIZE];
 	int ret;
 
 	/*
@@ -507,6 +503,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 */
 
@@ -569,29 +566,6 @@ int main(int argc,char **argv) {
 	printf("go ...\n");
 	ret=go(&lpc);
 
-	/* tell the user that the error might be due to the jump */
-	printf("\n\n");
-	if(ret<0)
-		printf("the above error might be due to the jump!\n\n");
-
-	/* query user for serial port listening */
-	printf("continue listening on serial port? (ctrl+c to quit) [y|n]: ");
-	buf[0]=getchar();
-	printf("\n");
-
-	if(buf[0]!='y')
-		goto end;
-
-	/* continue lsitening on serial port */
-	ret=1;
-	while(ret) {
-		ret=read(lpc.sfd,buf,BUFSIZE);
-		printf("\rread %d bytes: ",ret);
-		for(i=0;i<ret;i++)
-			printf("%02x ",buf[i]);
-		printf("\n");
-	}
-
 end:
 	close(lpc.sfd);
 	close(lpc.fwfd);