X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Farm.git;a=blobdiff_plain;f=betty%2Flpcload.c;h=bd69fbe1edce3ec1a47c86aa6f1f76d07e4872a7;hp=5cc15eddf34f1936081f4639903b47a184efbd35;hb=0063836254cf1caf26cb35af0486fab97b2d1407;hpb=2165e10d147da7710983de06bbc11ac9b58274dd

diff --git a/betty/lpcload.c b/betty/lpcload.c
index 5cc15ed..bd69fbe 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,7 +59,6 @@ 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 */
 } t_lpc;
 
@@ -93,8 +93,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
 
@@ -131,9 +131,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 +138,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 +238,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) {
@@ -321,7 +313,7 @@ int go(t_lpc *lpc) {
 
 	snprintf(buf,BUFSIZE,"G %d A\r\n",lpc->roff);
 	len=strlen(buf);
-	ret=txrx(lpc,buf,len,TXRX_TYPE_CMD);
+	ret=txrx(lpc,buf,len,TXRX_TYPE_GO);
 
 	return ret;
 }
@@ -361,7 +353,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)
@@ -479,10 +471,15 @@ 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]<<28)|(buf[1]<<24));
+				lpc->roff|=((buf[2]<<20)|(buf[3]<<16));
 				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;
 
 	/*
@@ -567,26 +563,7 @@ int main(int argc,char **argv) {
 
 	/* go! */
 	printf("go ...\n");
-	go(&lpc);
-
-	printf("\n\n");
-	printf("the above error might be due to the jump!\n");
-	printf("\n\n");
-
-	printf("sleeping for 5 seconds ...\n\n");
-	sleep(5);
-
-	printf("continue listening on the serial port. ctrl+c to quit!\n\n");
-
-	/* testing */
-
-	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]);
-	}
+	ret=go(&lpc);
 
 end:
 	close(lpc.sfd);