提交: master - h8flash (git)

Commit MetaInfo

• 修訂: 3c7279492996a0bba0b98d175e6db6e3f1437ba0 (tree)
• 時間: 2021-06-05 00:10:06
• 作者: Yoshinori Sato <yo-satoh@sios...>
• Commiter: Yoshinori Sato

Log Message

fix some error.

Change Summary

• modified: comm.c
• modified: compile
• modified: main.c
• modified: serial.c

差異

--- a/comm.c
+++ b/comm.c
@@ -550,12 +550,14 @@ static int skipcheck(unsigned char *data, unsigned short size)
 static int write_rom(struct port_t *port, struct arealist_t *arealist, enum mat_t mat)
 {
 	unsigned char *buf = NULL;
+	unsigned char cmdbuf[32];
 	unsigned int romaddr;
 	int i;
 	struct area_t *area;
 
 	puts("Erase flash...");
 	/* enter writemode */
+	buf = cmdbuf;
 	buf[0] = WRITEMODE;
 	send(port, buf, 1);
 	if (receive(port, buf) != 1) {
@@ -625,6 +627,7 @@ static int write_rom(struct port_t *port, struct arealist_t *arealist, enum mat_
 		}
 	}
 	/* write finish */
+	buf = cmdbuf;
 	*(buf + 0) = WRITE;
 	memset(buf + 1, 0xff, 4);
 	send(port, buf, 5);
@@ -635,9 +638,9 @@ static int write_rom(struct port_t *port, struct arealist_t *arealist, enum mat_
 	if (!verbose)
 		putc('\n', stdout);
 
-	return 1;
- error:
 	return 0;
+ error:
+	return 1;
 }
 
 /* connect to target chip */

--- a/compile
+++ b/compile
@@ -1 +1 @@
-/usr/share/automake-1.14/compile
\ No newline at end of file
+/usr/share/automake-1.16/compile
\ No newline at end of file

--- a/main.c
+++ b/main.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #ifdef HAVE_GELF_H
 #include <gelf.h>
 #endif
@@ -81,7 +82,7 @@ static int write_binary(FILE *fp, struct comm_t *com,
 		area = lookup_area(arealist, addr);
 		len = bin_len < (area->end - area->start)?
 			bin_len:(area->end - area->start);
-		if (len > read(area->image, len, fno))
+		if (len > read(fno, area->image, len))
 			goto error_perror;
 		bin_len -= len;
 		addr += len;

--- a/serial.c
+++ b/serial.c
@@ -188,7 +188,7 @@ struct port_t *open_serial(char *ser_port)
 
 	ser_fd = open(ser_port, O_RDWR);
 	if (ser_fd == -1) {
-		perror("PROGNAME: ");
+		perror(PROGNAME ": port open failed");
 		return NULL;
 	}