Fix issue on OSX (and other platforms) where stm32flash only works if the serial device name starts with /dev/tty, as on OSX some serial devices start with /dev/cu. Also corrected mistake about .a file in stm32 parsers folder, and hopefully removed the .a file from source control
This commit is contained in:
parent
7217137875
commit
176db5f9d0
|
@ -6,4 +6,4 @@ other/maple-bootloader/cscope.out
|
||||||
other/maple-bootloader/build
|
other/maple-bootloader/build
|
||||||
other/maple-bootloader/*~
|
other/maple-bootloader/*~
|
||||||
*.o
|
*.o
|
||||||
tools/src/stm32flash/src/parsers/parsers.a
|
tools/src/stm32flash_serial/src/parsers/parsers.a
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -198,18 +198,34 @@ static port_err_t serial_setup(serial_t *h, const serial_baud_t baud,
|
||||||
return PORT_ERR_OK;
|
return PORT_ERR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Roger clark.
|
||||||
|
* This function is no longer used. But has just been commented out in case it needs
|
||||||
|
* to be reinstated in the future
|
||||||
|
|
||||||
static int startswith(const char *haystack, const char *needle) {
|
static int startswith(const char *haystack, const char *needle) {
|
||||||
return strncmp(haystack, needle, strlen(needle)) == 0;
|
return strncmp(haystack, needle, strlen(needle)) == 0;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
static int is_tty(const char *path) {
|
static int is_tty(const char *path) {
|
||||||
char resolved[PATH_MAX];
|
char resolved[PATH_MAX];
|
||||||
|
|
||||||
if(!realpath(path, resolved)) return 0;
|
if(!realpath(path, resolved)) return 0;
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Roger Clark
|
||||||
|
* Commented out this check, because on OSX some devices are /dev/cu
|
||||||
|
* and some users use symbolic links to devices, hence the name may not even start
|
||||||
|
* with /dev
|
||||||
|
|
||||||
if(startswith(resolved, "/dev/tty")) return 1;
|
if(startswith(resolved, "/dev/tty")) return 1;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
*/
|
||||||
|
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static port_err_t serial_posix_open(struct port_interface *port,
|
static port_err_t serial_posix_open(struct port_interface *port,
|
||||||
|
|
Loading…
Reference in New Issue