#include "stlink-common.h"
#include "ao-elf.h"
#include "ccdbg.h"
-#include "cc-usb.h"
#include "cc.h"
#include "ao-stmload.h"
#include "ao-selfload.h"
}
static uint16_t
-get_uint16(stlink_t *sl, struct cc_usb *cc, uint32_t addr)
+get_uint16(stlink_t *sl, uint32_t addr)
{
uint16_t result;
- if (cc)
- result = ao_self_get_uint16(cc, addr);
- else
- result = get_uint16_sl(sl, addr);
+ result = get_uint16_sl(sl, addr);
printf ("read 0x%08x = 0x%04x\n", addr, result);
return result;
}
* alignment
*/
static uint32_t
-get_uint32(stlink_t *sl, struct cc_usb *cc, uint32_t addr)
+get_uint32(stlink_t *sl, uint32_t addr)
{
uint32_t result;
- if (cc)
- result = ao_self_get_uint32(cc, addr);
- else
- result = get_uint32_sl(sl, addr);
+ result = get_uint32_sl(sl, addr);
printf ("read 0x%08x = 0x%08x\n", addr, result);
return result;
}
* places this at 0x100 from the start of the rom section
*/
static int
-check_flashed(stlink_t *sl, struct cc_usb *cc)
+check_flashed(stlink_t *sl)
{
- uint16_t romconfig_version = get_uint16(sl, cc, AO_ROMCONFIG_VERSION);
- uint16_t romconfig_check = get_uint16(sl, cc, AO_ROMCONFIG_CHECK);
+ uint16_t romconfig_version = get_uint16(sl, AO_ROMCONFIG_VERSION);
+ uint16_t romconfig_check = get_uint16(sl, AO_ROMCONFIG_CHECK);
if (romconfig_version != (uint16_t) ~romconfig_check) {
fprintf (stderr, "Device has not been flashed before\n");
}
static const struct option options[] = {
- { .name = "stlink", .has_arg = 0, .val = 'S' },
{ .name = "tty", .has_arg = 1, .val = 'T' },
{ .name = "device", .has_arg = 1, .val = 'D' },
{ .name = "cal", .has_arg = 1, .val = 'c' },
static void usage(char *program)
{
- fprintf(stderr, "usage: %s [--stlink] [--verbose=<verbose>] [--device=<device>] [-tty=<tty>] [--cal=<radio-cal>] [--serial=<serial>] file.{elf,ihx}\n", program);
+ fprintf(stderr, "usage: %s [--verbose=<verbose>] [--device=<device>] [-tty=<tty>] [--cal=<radio-cal>] [--serial=<serial>] file.{elf,ihx}\n", program);
exit(1);
}
void
-done(stlink_t *sl, struct cc_usb *cc, int code)
+done(stlink_t *sl, int code)
{
- if (cc) {
-/* cc_usb_printf(cc, "a\n"); */
- cc_usb_close(cc);
- }
- if (sl) {
- stlink_reset(sl);
- stlink_run(sl);
- stlink_exit_debug_mode(sl);
- stlink_close(sl);
- }
+ stlink_reset(sl);
+ stlink_run(sl);
+ stlink_exit_debug_mode(sl);
+ stlink_close(sl);
exit (code);
}
int was_flashed = 0;
struct ao_hex_image *load;
int tries;
- struct cc_usb *cc = NULL;
- int use_stlink = 0;
char *tty = NULL;
int success;
int verbose = 0;
struct ao_sym *file_symbols;
int num_file_symbols;
- while ((c = getopt_long(argc, argv, "T:D:c:s:Sv:", options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "T:D:c:s:v:", options, NULL)) != -1) {
switch (c) {
case 'T':
tty = optarg;
if (serial_end == optarg || *serial_end != '\0')
usage(argv[0]);
break;
- case 'S':
- use_stlink = 1;
- break;
case 'v':
verbose++;
break;
if (ao_editaltos_find_symbols(file_symbols, num_file_symbols, ao_symbols, ao_num_symbols))
fprintf(stderr, "Cannot find required symbols\n");
- if (use_stlink) {
- /* Connect to the programming dongle
- */
+ /* Connect to the programming dongle
+ */
- for (tries = 0; tries < 3; tries++) {
- if (device) {
- sl = stlink_v1_open(50);
- } else {
- sl = stlink_open_usb(50);
+ for (tries = 0; tries < 3; tries++) {
+ if (device) {
+ sl = stlink_v1_open(50);
+ } else {
+ sl = stlink_open_usb(50);
- }
- if (!sl) {
- fprintf (stderr, "No STLink devices present\n");
- done (sl, NULL, 1);
- }
-
- if (sl->chip_id != 0)
- break;
- stlink_reset(sl);
- stlink_close(sl);
- sl = NULL;
}
if (!sl) {
- fprintf (stderr, "Debugger connection failed\n");
- exit(1);
+ fprintf (stderr, "No STLink devices present\n");
+ done (sl, 1);
}
- /* Verify that the loaded image fits entirely within device flash
- */
- if (load->address < sl->flash_base ||
- sl->flash_base + sl->flash_size < load->address + load->length) {
- fprintf (stderr, "\%s\": Invalid memory range 0x%08x - 0x%08x\n", filename,
- load->address, load->address + load->length);
- done(sl, NULL, 1);
- }
+ if (sl->chip_id != 0)
+ break;
+ stlink_reset(sl);
+ stlink_close(sl);
+ sl = NULL;
+ }
+ if (!sl) {
+ fprintf (stderr, "Debugger connection failed\n");
+ exit(1);
+ }
- /* Enter debugging mode
- */
- if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
- stlink_exit_dfu_mode(sl);
-
- if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
- stlink_enter_swd_mode(sl);
- } else {
- int is_loader;
- int tries;
-
- for (tries = 0; tries < 3; tries++) {
- char *this_tty = tty;
- if (!this_tty)
- this_tty = cc_usbdevs_find_by_arg(device, "AltosFlash");
- if (!this_tty)
- this_tty = cc_usbdevs_find_by_arg(device, "MegaMetrum");
- if (!this_tty)
- this_tty = getenv("ALTOS_TTY");
- if (!this_tty)
- this_tty="/dev/ttyACM0";
-
- cc = cc_usb_open(this_tty);
-
- if (!cc)
- exit(1);
- cc_usb_printf(cc, "v\n");
- is_loader = 0;
- for (;;) {
- char line[256];
- cc_usb_getline(cc, line, sizeof(line));
- if (!strncmp(line, "altos-loader", 12))
- is_loader = 1;
- if (!strncmp(line, "software-version", 16))
- break;
- }
- if (is_loader)
- break;
- printf ("rebooting to loader\n");
- cc_usb_printf(cc, "X\n");
- cc_usb_close(cc);
- sleep(1);
- cc = NULL;
- }
- if (!is_loader) {
- fprintf(stderr, "Cannot switch to boot loader\n");
- exit(1);
- }
-#if 0
- {
- uint8_t check[256];
- int i = 0;
-
- ao_self_block_read(cc, AO_BOOT_APPLICATION_BASE, check);
- for (;;) {
- uint8_t block[256];
- putchar ('.');
- if (++i == 40) {
- putchar('\n');
- i = 0;
- }
- fflush(stdout);
- ao_self_block_write(cc, AO_BOOT_APPLICATION_BASE, block);
- ao_self_block_read(cc, AO_BOOT_APPLICATION_BASE, block);
- if (memcmp(block, check, 256) != 0) {
- fprintf (stderr, "read differed\n");
- exit(1);
- }
- }
- }
-#endif
+ /* Verify that the loaded image fits entirely within device flash
+ */
+ if (load->address < sl->flash_base ||
+ sl->flash_base + sl->flash_size < load->address + load->length) {
+ fprintf (stderr, "\%s\": Invalid memory range 0x%08x - 0x%08x\n", filename,
+ load->address, load->address + load->length);
+ done(sl, 1);
}
+ /* Enter debugging mode
+ */
+ if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
+ stlink_exit_dfu_mode(sl);
+
+ if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
+ stlink_enter_swd_mode(sl);
+
/* Go fetch existing config values
* if available
*/
- was_flashed = check_flashed(sl, cc);
+ was_flashed = check_flashed(sl);
if (!serial) {
if (!was_flashed) {
fprintf (stderr, "Must provide serial number\n");
- done(sl, cc, 1);
+ done(sl, 1);
}
- serial = get_uint16(sl, cc, AO_SERIAL_NUMBER);
+ serial = get_uint16(sl, AO_SERIAL_NUMBER);
if (!serial || serial == 0xffff) {
fprintf (stderr, "Invalid existing serial %d\n", serial);
- done(sl, cc, 1);
+ done(sl, 1);
}
}
if (!cal && AO_RADIO_CAL && was_flashed) {
- cal = get_uint32(sl, cc, AO_RADIO_CAL);
+ cal = get_uint32(sl, AO_RADIO_CAL);
if (!cal || cal == 0xffffffff) {
fprintf (stderr, "Invalid existing rf cal %d\n", cal);
- done(sl, cc, 1);
+ done(sl, 1);
}
}
if (!ao_editaltos(load, serial, cal))
- done(sl, cc, 1);
+ done(sl, 1);
/* And flash the resulting image to the device
*/
- if (cc)
- success = ao_self_write(cc, load);
- else
- success = (stlink_write_flash(sl, load->address, load->data, load->length) >= 0);
+
+ success = (stlink_write_flash(sl, load->address, load->data, load->length) >= 0);
if (!success) {
fprintf (stderr, "\"%s\": Write failed\n", filename);
- done(sl, cc, 1);
+ done(sl, 1);
}
- done(sl, cc, 0);
+ done(sl, 0);
}
projects / fw / altos / blobdiff