X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-sky-flash%2Fsky_flash.c;fp=ao-tools%2Fao-sky-flash%2Fsky_flash.c;h=16c6ee424d8394205d946b7e5b15bfa52b8a1c23;hp=7dbb69548b92cf7b259d8a42c8f180f75918f012;hb=6f729ff46b2f4531db68f0af85e7e9fe0f6d1969;hpb=f14c799ae7ff3be56c28f5694f04c03daff7708e

diff --git a/ao-tools/ao-sky-flash/sky_flash.c b/ao-tools/ao-sky-flash/sky_flash.c
index 7dbb6954..16c6ee42 100644
--- a/ao-tools/ao-sky-flash/sky_flash.c
+++ b/ao-tools/ao-sky-flash/sky_flash.c
@@ -23,12 +23,12 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <getopt.h>
+#include <unistd.h>
 #include "cc.h"
 
 static const struct option options[] = {
 	{ .name = "tty", .has_arg = 1, .val = 'T' },
 	{ .name = "device", .has_arg = 1, .val = 'D' },
-	{ .name = "loader", .has_arg = 1, .val = 'l' },
 	{ .name = "firmware", .has_arg = 1, .val = 'f' },
 	{ .name = "query", .has_arg = 0, .val = 'q' },
 	{ .name = "raw", .has_arg = 0, .val = 'r' },
@@ -46,7 +46,6 @@ usage(char *program)
 	fprintf(stderr,
 		"usage: %s [--tty <tty-name>]\n"
 		"          [--device <device-name>]\n"
-		"          [--loader <srec bootloader file>]\n"
 		"          [--firmware <binary firmware file>]\n"
 		"          [--query]\n"
 		"          [--quiet]\n"
@@ -54,7 +53,7 @@ usage(char *program)
 	exit(1);
 }
 
-int
+static int
 skytraq_expect(int fd, uint8_t want, int timeout) {
 	int	c;
 
@@ -66,12 +65,12 @@ skytraq_expect(int fd, uint8_t want, int timeout) {
 	return 0;
 }
 
-int
+static int
 skytraq_wait_reply(int fd, uint8_t reply, uint8_t *buf, uint8_t reply_len) {
 
 	for(;;) {
 		uint8_t	a, b;
-		uint8_t	cksum_computed, cksum_read;
+		uint8_t	cksum_computed;
 		int	len;
 		switch (skytraq_expect(fd, 0xa0, 10000)) {
 		case -1:
@@ -135,16 +134,10 @@ int
 main(int argc, char **argv)
 {
 	int	fd;
-	char	buf[512];
 	int	ret;
-	FILE	*input;
-	long	size;
-	unsigned char	cksum;
 	int	c;
-	char	message[1024];
 	char	*tty = NULL;
 	char	*device = NULL;
-	char	*loader = "srec_115200.bin";
 	char	*file = NULL;
 	int	query = 0;
 	int	raw = 0;
@@ -157,9 +150,6 @@ main(int argc, char **argv)
 		case 'D':
 			device = optarg;
 			break;
-		case 'l':
-			loader = optarg;
-			break;
 		case 'f':
 			file = optarg;
 			break;