projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-bringup: Check for Loader USB id before attempting dfu-util
[fw/altos]
/
ao-tools
/
ao-rawload
/
ao-rawload.c
diff --git
a/ao-tools/ao-rawload/ao-rawload.c
b/ao-tools/ao-rawload/ao-rawload.c
index 1f1537b9f12d59eb49f6de87c7e96ed39e7e1e1f..17ed73cae20e5ac58a7176ba8583459da22b7e07 100644
(file)
--- a/
ao-tools/ao-rawload/ao-rawload.c
+++ b/
ao-tools/ao-rawload/ao-rawload.c
@@
-19,15
+19,18
@@
#include <unistd.h>
#include <getopt.h>
#include "ccdbg.h"
#include <unistd.h>
#include <getopt.h>
#include "ccdbg.h"
+#include "cc.h"
static const struct option options[] = {
{ .name = "tty", .has_arg = 1, .val = 'T' },
static const struct option options[] = {
{ .name = "tty", .has_arg = 1, .val = 'T' },
+ { .name = "device", .has_arg = 1, .val = 'D' },
+ { .name = "run", .has_arg = 0, .val = 'r' },
{ 0, 0, 0, 0},
};
static void usage(char *program)
{
{ 0, 0, 0, 0},
};
static void usage(char *program)
{
- fprintf(stderr, "usage: %s [--tty <tty-name>] file.ihx\n", program);
+ fprintf(stderr, "usage: %s [--tty <tty-name>]
[--device <device-name>] [--run]
file.ihx\n", program);
exit(1);
}
exit(1);
}
@@
-37,18
+40,26
@@
main (int argc, char **argv)
struct ccdbg *dbg;
uint8_t status;
uint16_t pc;
struct ccdbg *dbg;
uint8_t status;
uint16_t pc;
- struct
hex_file
*hex;
- struct hex_image *image;
+ struct
ao_hex_file
*hex;
+ struct
ao_
hex_image *image;
char *filename;
FILE *file;
char *tty = NULL;
char *filename;
FILE *file;
char *tty = NULL;
+ char *device = NULL;
int c;
int c;
+ int run = 0;
- while ((c = getopt_long(argc, argv, "
T
:", options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "
rT:D
:", options, NULL)) != -1) {
switch (c) {
case 'T':
tty = optarg;
break;
switch (c) {
case 'T':
tty = optarg;
break;
+ case 'D':
+ device = optarg;
+ break;
+ case 'r':
+ run = 1;
+ break;
default:
usage(argv[0]);
break;
default:
usage(argv[0]);
break;
@@
-56,7
+67,7
@@
main (int argc, char **argv)
}
filename = argv[optind];
if (filename == NULL) {
}
filename = argv[optind];
if (filename == NULL) {
-
fprintf(stderr, "usage: %s <filename.ihx>\n",
argv[0]);
+
usage(
argv[0]);
exit(1);
}
file = fopen(filename, "r");
exit(1);
}
file = fopen(filename, "r");
@@
-64,17
+75,19
@@
main (int argc, char **argv)
perror(filename);
exit(1);
}
perror(filename);
exit(1);
}
- hex =
ccdbg
_hex_file_read(file, filename);
+ hex =
ao
_hex_file_read(file, filename);
fclose(file);
if (!hex)
exit (1);
fclose(file);
if (!hex)
exit (1);
- image =
ccdbg
_hex_image_create(hex);
+ image =
ao
_hex_image_create(hex);
if (!image) {
fprintf(stderr, "image create failed\n");
exit (1);
}
if (!image) {
fprintf(stderr, "image create failed\n");
exit (1);
}
- ccdbg_hex_file_free(hex);
+ ao_hex_file_free(hex);
+ if (!tty)
+ tty = cc_usbdevs_find_by_arg(device, "TIDongle");
dbg = ccdbg_open(tty);
if (!dbg)
exit (1);
dbg = ccdbg_open(tty);
if (!dbg)
exit (1);
@@
-94,12
+107,14
@@
main (int argc, char **argv)
} else {
printf("Cannot load code to 0x%04x\n",
image->address);
} else {
printf("Cannot load code to 0x%04x\n",
image->address);
-
ccdbg
_hex_image_free(image);
+
ao
_hex_image_free(image);
ccdbg_close(dbg);
exit(1);
}
ccdbg_close(dbg);
exit(1);
}
- ccdbg_set_pc(dbg, image->address);
- ccdbg_resume(dbg);
+ if (run) {
+ ccdbg_set_pc(dbg, image->address);
+ ccdbg_resume(dbg);
+ }
ccdbg_close(dbg);
exit (0);
}
ccdbg_close(dbg);
exit (0);
}