From: Bdale Garbee <bdale@gag.com>
Date: Wed, 19 Aug 2009 00:09:38 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 0.5~5
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=4685fc541466afbeefc151bcb64cd054739c048b;hp=-c

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
	ao-tools/ao-bitbang/Makefile.am
	ao-tools/ao-eeprom/Makefile.am
	ao-tools/ao-load/Makefile.am
	ao-tools/ao-load/ao-load.c
	ao-tools/ao-rawload/Makefile.am
---

4685fc541466afbeefc151bcb64cd054739c048b
diff --combined ao-tools/ao-bitbang/Makefile.am
index f094c7bd,b27c4090..f01cddd4
--- a/ao-tools/ao-bitbang/Makefile.am
+++ b/ao-tools/ao-bitbang/Makefile.am
@@@ -8,3 -8,5 +8,5 @@@ ao_bitbang_DEPENDENCIES = $(AO_BITBANG_
  ao_bitbang_LDADD=$(AO_BITBANG_LIBS) $(LIBUSB_LIBS)
  
  ao_bitbang_SOURCES = ao-bitbang.c
+ 
 -man_MANS=ao-bitbang.1
++man_MANS=ao-bitbang.1
diff --combined ao-tools/ao-eeprom/Makefile.am
index 587acee7,ffd437e8..efeed976
--- a/ao-tools/ao-eeprom/Makefile.am
+++ b/ao-tools/ao-eeprom/Makefile.am
@@@ -8,3 -8,5 +8,5 @@@ ao_eeprom_DEPENDENCIES = $(AO_EEPROM_LI
  ao_eeprom_LDADD=$(AO_EEPROM_LIBS) $(LIBUSB_LIBS)
  
  ao_eeprom_SOURCES = ao-eeprom.c
+ 
 -man_MANS = ao-eeprom.1
++man_MANS = ao-eeprom.1
diff --combined ao-tools/ao-load/Makefile.am
index 8a8392af,e8fed8b0..3c48dc27
--- a/ao-tools/ao-load/Makefile.am
+++ b/ao-tools/ao-load/Makefile.am
@@@ -8,3 -8,5 +8,5 @@@ ao_load_DEPENDENCIES = $(AO_LOAD_LIBS
  ao_load_LDADD=$(AO_LOAD_LIBS) $(LIBUSB_LIBS)
  
  ao_load_SOURCES = ao-load.c
+ 
 -man_MANS = ao-load.1
++man_MANS = ao-load.1
diff --combined ao-tools/ao-load/ao-load.c
index 6966dd3a,c27fcbe9..642af2fe
--- a/ao-tools/ao-load/ao-load.c
+++ b/ao-tools/ao-load/ao-load.c
@@@ -25,13 -25,6 +25,6 @@@
  
  #define AO_USB_DESC_STRING		3
  
- void
- usage(char *program)
- {
- 	fprintf(stderr, "usage: %s <filename.ihx> <serial>\n", program);
- 	exit(1);
- }
- 
  struct sym {
  	unsigned	addr;
  	char		*name;
@@@ -96,7 -89,17 +89,21 @@@ rewrite(struct hex_image *image, unsign
  	memcpy(image->data + addr - image->address, data, len);
  }
  
++<<<<<<< HEAD:ao-tools/ao-load/ao-load.c
 +static const struct option
++=======
+ static const struct option options[] = {
+ 	{ .name = "tty", .has_arg = 1, .val = 'T' },
+ 	{ 0, 0, 0, 0},
+ };
+ 
+ static void usage(char *program)
+ {
+ 	fprintf(stderr, "usage: %s [--tty <tty-name>] file.ihx serial-number\n", program);
+ 	exit(1);
+ }
+ 
++>>>>>>> c29275b72438637d46d7a50742882d2736eb176a:ao-tools/ao-load/ao-load.c
  int
  main (int argc, char **argv)
  {
@@@ -105,12 -108,12 +112,12 @@@
  	uint16_t	pc;
  	struct hex_file	*hex;
  	struct hex_image *image;
- 	char *filename;
- 	FILE *file;
- 	FILE *map;
- 	char *serial_string;
- 	unsigned int serial;
- 	char *mapname, *dot;
+ 	char		*filename;
+ 	FILE		*file;
+ 	FILE		*map;
+ 	char		*serial_string;
+ 	unsigned int	serial;
+ 	char		*mapname, *dot;
  	char		*serial_ucs2;
  	int		serial_ucs2_len;
  	char		serial_int[2];
@@@ -118,8 -121,20 +125,20 @@@
  	int		i;
  	unsigned	usb_descriptors;
  	int		string_num;
- 
- 	filename = argv[1];
+ 	char		*tty = NULL;
+ 	int		c;
+ 
+ 	while ((c = getopt_long(argc, argv, "T:", options, NULL)) != -1) {
+ 		switch (c) {
+ 		case 'T':
+ 			tty = optarg;
+ 			break;
+ 		default:
+ 			usage(argv[0]);
+ 			break;
+ 		}
+ 	}
+ 	filename = argv[optind];
  	if (filename == NULL)
  		usage(argv[0]);
  	mapname = strdup(filename);
@@@ -128,7 -143,7 +147,7 @@@
  		usage(argv[0]);
  	strcpy(dot, ".map");
  
- 	serial_string = argv[2];
+ 	serial_string = argv[optind + 1];
  	if (serial_string == NULL)
  		usage(argv[0]);
  
@@@ -163,7 -178,7 +182,7 @@@
  
  	serial = strtoul(serial_string, NULL, 0);
  	if (!serial)
- 		usage(argv[0]);
+ (argv[0]);
  
  	serial_int[0] = serial & 0xff;
  	serial_int[1] = (serial >> 8) & 0xff;
@@@ -204,7 -219,7 +223,7 @@@
  	if (!rewrite(image, usb_descriptors + 2 + image->address, serial_ucs2, serial_ucs2_len))
  		usage(argv[0]);
  
- 	dbg = ccdbg_open();
+ 	dbg = ccdbg_open(tty);
  	if (!dbg)
  		exit (1);
  
diff --combined ao-tools/ao-rawload/Makefile.am
index 24013a85,c157d3d9..d2c55658
--- a/ao-tools/ao-rawload/Makefile.am
+++ b/ao-tools/ao-rawload/Makefile.am
@@@ -8,3 -8,5 +8,5 @@@ ao_rawload_DEPENDENCIES = $(AO_RAWLOAD_
  ao_rawload_LDADD=$(AO_RAWLOAD_LIBS) $(LIBUSB_LIBS)
  
  ao_rawload_SOURCES = ao-rawload.c
+ 
 -man_MANS=ao-rawload.1
++man_MANS=ao-rawload.1