Merge pull request #1102 from MCUdude/flip2-reset
Add support for Flip 2 reset on exit
This commit is contained in:
commit
83232bc7e1
|
@ -462,11 +462,17 @@ MCU type, a previous invocation of
|
||||||
.Nm
|
.Nm
|
||||||
with this option specified is one of the possible ways to guarantee this
|
with this option specified is one of the possible ways to guarantee this
|
||||||
condition.
|
condition.
|
||||||
|
.Em reset
|
||||||
|
is supported by the linuxspi and flip2 programmer options, as well as all
|
||||||
|
parallel port based programmers.
|
||||||
.It Ar noreset
|
.It Ar noreset
|
||||||
The
|
The
|
||||||
.Ql /RESET
|
.Ql /RESET
|
||||||
line will be deactivated at program exit, thus allowing the MCU target
|
line will be deactivated at program exit, thus allowing the MCU target
|
||||||
program to run while the programming hardware remains connected.
|
program to run while the programming hardware remains connected.
|
||||||
|
.Em noreset
|
||||||
|
is supported by the linuxspi and flip2 programmer options, as well as all
|
||||||
|
parallel port based programmers.
|
||||||
.It Ar vcc
|
.It Ar vcc
|
||||||
This option will leave those parallel port pins active
|
This option will leave those parallel port pins active
|
||||||
.Pq \&i. \&e. Em high
|
.Pq \&i. \&e. Em high
|
||||||
|
|
|
@ -556,12 +556,16 @@ Note in particular that the programming algorithm for the AT90S1200
|
||||||
device mandates that the `/RESET' signal is active before powering up
|
device mandates that the `/RESET' signal is active before powering up
|
||||||
the MCU, so in case an external power supply is used for this MCU type,
|
the MCU, so in case an external power supply is used for this MCU type,
|
||||||
a previous invocation of AVRDUDE with this option specified is one of
|
a previous invocation of AVRDUDE with this option specified is one of
|
||||||
the possible ways to guarantee this condition.
|
the possible ways to guarantee this condition. @code{reset} is supported
|
||||||
|
by the @code{linuxspi} and @code{flip2} programmer options, as well as
|
||||||
|
all parallel port based programmers.
|
||||||
|
|
||||||
@item noreset
|
@item noreset
|
||||||
The `/RESET' line will be deactivated at program exit, thus allowing the
|
The `/RESET' line will be deactivated at program exit, thus allowing the
|
||||||
MCU target program to run while the programming hardware remains
|
MCU target program to run while the programming hardware remains
|
||||||
connected.
|
connected. @code{noreset} is supported by the @code{linuxspi} and
|
||||||
|
@code{flip2} programmer options, as well as all parallel port based
|
||||||
|
programmers.
|
||||||
|
|
||||||
@item vcc
|
@item vcc
|
||||||
This option will leave those parallel port pins active (i. e. high) that
|
This option will leave those parallel port pins active (i. e. high) that
|
||||||
|
|
125
src/flip2.c
125
src/flip2.c
|
@ -131,6 +131,7 @@ static void flip2_disable(const PROGRAMMER *pgm);
|
||||||
static void flip2_display(const PROGRAMMER *pgm, const char *prefix);
|
static void flip2_display(const PROGRAMMER *pgm, const char *prefix);
|
||||||
static int flip2_program_enable(const PROGRAMMER *pgm, const AVRPART *part);
|
static int flip2_program_enable(const PROGRAMMER *pgm, const AVRPART *part);
|
||||||
static int flip2_chip_erase(const PROGRAMMER *pgm, const AVRPART *part);
|
static int flip2_chip_erase(const PROGRAMMER *pgm, const AVRPART *part);
|
||||||
|
static int flip2_start_app(const PROGRAMMER *pgm);
|
||||||
static int flip2_read_byte(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
static int flip2_read_byte(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
||||||
unsigned long addr, unsigned char *value);
|
unsigned long addr, unsigned char *value);
|
||||||
static int flip2_write_byte(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
static int flip2_write_byte(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
||||||
|
@ -140,6 +141,7 @@ static int flip2_paged_load(const PROGRAMMER *pgm, const AVRPART *part, const AV
|
||||||
static int flip2_paged_write(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
static int flip2_paged_write(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
||||||
unsigned int page_size, unsigned int addr, unsigned int n_bytes);
|
unsigned int page_size, unsigned int addr, unsigned int n_bytes);
|
||||||
static int flip2_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem);
|
static int flip2_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem);
|
||||||
|
static int flip2_parseexitspecs(PROGRAMMER* pgm, const char *s);
|
||||||
static void flip2_setup(PROGRAMMER * pgm);
|
static void flip2_setup(PROGRAMMER * pgm);
|
||||||
static void flip2_teardown(PROGRAMMER * pgm);
|
static void flip2_teardown(PROGRAMMER * pgm);
|
||||||
|
|
||||||
|
@ -166,10 +168,6 @@ static const char * flip2_status_str(const struct dfu_status *status);
|
||||||
static const char * flip2_mem_unit_str(enum flip2_mem_unit mem_unit);
|
static const char * flip2_mem_unit_str(enum flip2_mem_unit mem_unit);
|
||||||
static enum flip2_mem_unit flip2_mem_unit(const char *name);
|
static enum flip2_mem_unit flip2_mem_unit(const char *name);
|
||||||
|
|
||||||
#endif /* HAVE_LIBUSB */
|
|
||||||
|
|
||||||
/* THE INITPGM FUNCTION DEFINITIONS */
|
|
||||||
|
|
||||||
void flip2_initpgm(PROGRAMMER *pgm) {
|
void flip2_initpgm(PROGRAMMER *pgm) {
|
||||||
strcpy(pgm->type, "flip2");
|
strcpy(pgm->type, "flip2");
|
||||||
|
|
||||||
|
@ -187,11 +185,11 @@ void flip2_initpgm(PROGRAMMER *pgm) {
|
||||||
pgm->read_byte = flip2_read_byte;
|
pgm->read_byte = flip2_read_byte;
|
||||||
pgm->write_byte = flip2_write_byte;
|
pgm->write_byte = flip2_write_byte;
|
||||||
pgm->read_sig_bytes = flip2_read_sig_bytes;
|
pgm->read_sig_bytes = flip2_read_sig_bytes;
|
||||||
|
pgm->parseexitspecs = flip2_parseexitspecs;
|
||||||
pgm->setup = flip2_setup;
|
pgm->setup = flip2_setup;
|
||||||
pgm->teardown = flip2_teardown;
|
pgm->teardown = flip2_teardown;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_LIBUSB
|
|
||||||
/* EXPORTED PROGRAMMER FUNCTION DEFINITIONS */
|
/* EXPORTED PROGRAMMER FUNCTION DEFINITIONS */
|
||||||
|
|
||||||
int flip2_open(PROGRAMMER *pgm, const char *port_spec) {
|
int flip2_open(PROGRAMMER *pgm, const char *port_spec) {
|
||||||
|
@ -315,6 +313,9 @@ flip2_initialize_fail:
|
||||||
void flip2_close(PROGRAMMER* pgm)
|
void flip2_close(PROGRAMMER* pgm)
|
||||||
{
|
{
|
||||||
if (FLIP2(pgm)->dfu != NULL) {
|
if (FLIP2(pgm)->dfu != NULL) {
|
||||||
|
if (pgm->exit_reset == EXIT_RESET_ENABLED)
|
||||||
|
flip2_start_app(pgm);
|
||||||
|
|
||||||
dfu_close(FLIP2(pgm)->dfu);
|
dfu_close(FLIP2(pgm)->dfu);
|
||||||
FLIP2(pgm)->dfu = NULL;
|
FLIP2(pgm)->dfu = NULL;
|
||||||
}
|
}
|
||||||
|
@ -375,6 +376,22 @@ int flip2_chip_erase(const PROGRAMMER *pgm, const AVRPART *part) {
|
||||||
return cmd_result;
|
return cmd_result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int flip2_start_app(const PROGRAMMER *pgm) {
|
||||||
|
avrdude_message(MSG_INFO, "%s: Starting application\n", progname);
|
||||||
|
|
||||||
|
struct flip2_cmd cmd = {
|
||||||
|
FLIP2_CMD_GROUP_EXEC, FLIP2_CMD_START_APP, { 0x00, 0, 0, 0 }
|
||||||
|
};
|
||||||
|
|
||||||
|
// queue command
|
||||||
|
int cmd_result = dfu_dnload(FLIP2(pgm)->dfu, &cmd, sizeof(cmd));
|
||||||
|
|
||||||
|
// repeat dnload to actually execute
|
||||||
|
dfu_dnload(FLIP2(pgm)->dfu, &cmd, sizeof(cmd));
|
||||||
|
|
||||||
|
return cmd_result;
|
||||||
|
}
|
||||||
|
|
||||||
int flip2_read_byte(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
int flip2_read_byte(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
||||||
unsigned long addr, unsigned char *value)
|
unsigned long addr, unsigned char *value)
|
||||||
{
|
{
|
||||||
|
@ -489,6 +506,29 @@ int flip2_paged_write(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *
|
||||||
return (result == 0) ? n_bytes : -1;
|
return (result == 0) ? n_bytes : -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Parse the -E option flag
|
||||||
|
int flip2_parseexitspecs(PROGRAMMER *pgm, const char *sp) {
|
||||||
|
char *cp, *s, *str = cfg_strdup("flip2_parseextitspecs()", sp);
|
||||||
|
|
||||||
|
s = str;
|
||||||
|
while ((cp = strtok(s, ","))) {
|
||||||
|
s = NULL;
|
||||||
|
if (!strcmp(cp, "reset")) {
|
||||||
|
pgm->exit_reset = EXIT_RESET_ENABLED;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!strcmp(cp, "noreset")) {
|
||||||
|
pgm->exit_reset = EXIT_RESET_DISABLED;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
free(str);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
free(str);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int flip2_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem) {
|
int flip2_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem) {
|
||||||
if (FLIP2(pgm)->dfu == NULL)
|
if (FLIP2(pgm)->dfu == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -905,76 +945,17 @@ enum flip2_mem_unit flip2_mem_unit(const char *name) {
|
||||||
return FLIP2_MEM_UNIT_UNKNOWN;
|
return FLIP2_MEM_UNIT_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
#else /* HAVE_LIBUSB */
|
#else /* !HAVE_LIBUSB */
|
||||||
|
|
||||||
/* EXPORTED PROGRAMMER FUNCTION DEFINITIONS */
|
// Give a proper error if we were not compiled with libusb
|
||||||
|
static int flip2_nousb_open(PROGRAMMER* pgm, const char* name) {
|
||||||
int flip2_open(PROGRAMMER *pgm, const char *port_spec) {
|
avrdude_message(MSG_INFO, "%s: error, no USB support; please compile with libusb installed\n", progname);
|
||||||
fprintf(stderr, "%s: Error: No USB support in this compile of avrdude\n",
|
return -1;
|
||||||
progname);
|
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int flip2_initialize(const PROGRAMMER *pgm, const AVRPART *part) {
|
void flip2_initpgm(PROGRAMMER *pgm) {
|
||||||
return -1;
|
strcpy(pgm->type, "flip2");
|
||||||
|
pgm->open = flip2_nousb_open;
|
||||||
}
|
}
|
||||||
|
|
||||||
void flip2_close(PROGRAMMER* pgm)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void flip2_enable(PROGRAMMER *pgm, const AVRPART *p) {
|
|
||||||
}
|
|
||||||
|
|
||||||
void flip2_disable(const PROGRAMMER *pgm) {
|
|
||||||
}
|
|
||||||
|
|
||||||
void flip2_display(const PROGRAMMER *pgm, const char *prefix) {
|
|
||||||
}
|
|
||||||
|
|
||||||
int flip2_program_enable(const PROGRAMMER *pgm, const AVRPART *part) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int flip2_chip_erase(const PROGRAMMER *pgm, const AVRPART *part) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int flip2_read_byte(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
|
||||||
unsigned long addr, unsigned char *value)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int flip2_write_byte(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
|
||||||
unsigned long addr, unsigned char value)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int flip2_paged_load(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
|
||||||
unsigned int page_size, unsigned int addr, unsigned int n_bytes)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int flip2_paged_write(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem,
|
|
||||||
unsigned int page_size, unsigned int addr, unsigned int n_bytes)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int flip2_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *part, const AVRMEM *mem) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void flip2_setup(PROGRAMMER * pgm)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void flip2_teardown(PROGRAMMER * pgm)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* HAVE_LIBUSB */
|
#endif /* HAVE_LIBUSB */
|
||||||
|
|
Loading…
Reference in New Issue