From c035c91db5b57ad7f005cff3a77624dc102a9de8 Mon Sep 17 00:00:00 2001 From: Marius Greuel Date: Tue, 28 Dec 2021 11:26:09 +0100 Subject: [PATCH 1/5] Add compatibility shim for MSVC --- src/CMakeLists.txt | 66 ++++- src/avrftdi.c | 51 +++- src/avrftdi_private.h | 7 +- src/dfu.h | 2 +- src/flip2.c | 4 +- src/ft245r.c | 7 +- src/msvc/getopt.c | 562 ++++++++++++++++++++++++++++++++++++++++ src/msvc/getopt.h | 95 +++++++ src/msvc/gettimeofday.c | 76 ++++++ src/msvc/msvc_compat.h | 62 +++++ src/msvc/sys/time.h | 30 +++ src/msvc/unistd.h | 38 +++ src/msvc/usleep.cpp | 93 +++++++ src/pickit2.c | 8 +- src/ppiwin.c | 2 +- src/ser_avrdoper.c | 9 +- src/serbb_win32.c | 8 +- src/stk500.c | 4 + 18 files changed, 1086 insertions(+), 38 deletions(-) create mode 100644 src/msvc/getopt.c create mode 100644 src/msvc/getopt.h create mode 100644 src/msvc/gettimeofday.c create mode 100644 src/msvc/msvc_compat.h create mode 100644 src/msvc/sys/time.h create mode 100644 src/msvc/unistd.h create mode 100644 src/msvc/usleep.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eff0b5e1..bbb24df6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -218,14 +218,14 @@ endif() # ------------------------------------- # Find libhidapi +find_library(HAVE_LIBHID NAMES hid) + find_library(HAVE_LIBHIDAPI NAMES ${PREFERRED_LIBHIDAPI}) if(HAVE_LIBHIDAPI) set(LIB_LIBHIDAPI ${HAVE_LIBHIDAPI}) check_include_file(hidapi/hidapi.h HAVE_HIDAPI_HIDAPI_H) endif() -find_library(HAVE_LIBHID NAMES hid) - # ------------------------------------- # Find libftdi @@ -251,6 +251,44 @@ if(HAVE_LIBREADLINE) set(LIB_LIBREADLINE ${HAVE_LIBREADLINE}) endif() +# ===================================== +# Use local libraries if requested +# ===================================== + +if(USE_EXTERNAL) + if(EXISTS "${AVRDUDE_EXTERNAL_PATH}/libelf/CMakeLists.txt") + message(STATUS "Using local library 'libelf'") + add_subdirectory(${AVRDUDE_EXTERNAL_PATH}/libelf) + set(LIB_LIBELF libelf) + set(HAVE_LIBELF 1) + set(HAVE_LIBELF_H 1) + endif() + + if(EXISTS "${AVRDUDE_EXTERNAL_PATH}/libusb/CMakeLists.txt") + message(STATUS "Using local library 'libusb'") + add_subdirectory(${AVRDUDE_EXTERNAL_PATH}/libusb) + set(LIB_LIBUSB libusb) + set(HAVE_LIBUSB 1) + set(HAVE_LUSB0_USB_H 1) + endif() + + if(EXISTS "${AVRDUDE_EXTERNAL_PATH}/libhidapi/CMakeLists.txt") + message(STATUS "Using local library 'libhidapi'") + add_subdirectory(${AVRDUDE_EXTERNAL_PATH}/libhidapi) + set(LIB_LIBHIDAPI libhidapi) + set(HAVE_LIBHIDAPI 1) + set(HAVE_HIDAPI_HIDAPI_H 1) + endif() + + if(EXISTS "${AVRDUDE_EXTERNAL_PATH}/libftdi/CMakeLists.txt") + message(STATUS "Using local library 'libftdi'") + add_subdirectory(${AVRDUDE_EXTERNAL_PATH}/libftdi) + set(LIB_LIBFTDI libftdi) + set(HAVE_LIBFTDI 1) + set(HAVE_LIBFTDI_TYPE_232H 1) + endif() +endif() + # ===================================== # Setup target specific options # ===================================== @@ -269,6 +307,29 @@ if(NOT WIN32) #add_compile_options(-Wall -Wextra -pedantic) endif() +if(MSVC) + # The following functions are implemented in the MSVC compatibility layer + set(HAVE_USLEEP 1) + set(HAVE_GETTIMEOFDAY 1) + set(HAVE_STRCASECMP 1) + + add_compile_definitions(_CRT_SECURE_NO_WARNINGS=1) + add_compile_definitions(_CRT_NONSTDC_NO_WARNINGS=1) + add_compile_definitions(_WINSOCK_DEPRECATED_NO_WARNINGS=1) + add_compile_options(/W3) + add_compile_options(/wd5105) # warning C5105: macro expansion producing 'xxx' has undefined behavior + + set(EXTRA_WINDOWS_SOURCES ${EXTRA_WINDOWS_SOURCES} + "${PROJECT_SOURCE_DIR}/msvc/getopt.c" + "${PROJECT_SOURCE_DIR}/msvc/gettimeofday.c" + "${PROJECT_SOURCE_DIR}/msvc/usleep.cpp" + ) + set(EXTRA_WINDOWS_INCLUDES ${EXTRA_WINDOWS_INCLUDES} + "${PROJECT_SOURCE_DIR}/msvc" + "${PROJECT_SOURCE_DIR}/msvc/generated" + ) +endif() + # ===================================== # Setup default port names # ===================================== @@ -308,6 +369,7 @@ if (DEBUG_CMAKE) message(STATUS "HAVE_LIBUSB: ${HAVE_LIBUSB}") message(STATUS "HAVE_LIBUSB_1_0: ${HAVE_LIBUSB_1_0}") message(STATUS "HAVE_LIBUSB_WIN32: ${HAVE_LIBUSB_WIN32}") + message(STATUS "HAVE_LIBHID: ${HAVE_LIBHID}") message(STATUS "HAVE_LIBHIDAPI: ${HAVE_LIBHIDAPI}") message(STATUS "HAVE_LIBFTDI: ${HAVE_LIBFTDI}") message(STATUS "HAVE_LIBFTDI1: ${HAVE_LIBFTDI1}") diff --git a/src/avrftdi.c b/src/avrftdi.c index e7437ddc..d9313932 100644 --- a/src/avrftdi.c +++ b/src/avrftdi.c @@ -356,6 +356,16 @@ static int avrftdi_transmit_bb(PROGRAMMER * pgm, unsigned char mode, const unsig blocksize = MAX(1,(max_size-7)/((8*2*6)+(8*1*2))); //avrdude_message(MSG_INFO, "blocksize %d \n",blocksize); + size_t send_buffer_size = (8 * 2 * 6) * blocksize + (8 * 1 * 2) * blocksize + 7; + size_t recv_buffer_size = 2 * 16 * blocksize; +#ifdef _MSC_VER + unsigned char* send_buffer = _alloca(send_buffer_size); + unsigned char* recv_buffer = _alloca(recv_buffer_size); +#else + unsigned char send_buffer[send_buffer_size]; + unsigned char recv_buffer[recv_buffer_size]; +#endif + while(remaining) { @@ -364,7 +374,6 @@ static int avrftdi_transmit_bb(PROGRAMMER * pgm, unsigned char mode, const unsig // (8*2) outputs per data byte, 6 transmit bytes per output (SET_BITS_LOW/HIGH), // (8*1) inputs per data byte, 2 transmit bytes per input (GET_BITS_LOW/HIGH), // 1x SEND_IMMEDIATE - unsigned char send_buffer[(8*2*6)*transfer_size+(8*1*2)*transfer_size+7]; int len = 0; int i; @@ -384,7 +393,6 @@ static int avrftdi_transmit_bb(PROGRAMMER * pgm, unsigned char mode, const unsig E(ftdi_write_data(pdata->ftdic, send_buffer, len) != len, pdata->ftdic); if (mode & MPSSE_DO_READ) { - unsigned char recv_buffer[2*16*transfer_size]; int n; int k = 0; do { @@ -761,7 +769,11 @@ static int avrftdi_open(PROGRAMMER * pgm, char *port) pdata->tx_buffer_size = 1024; break; #else +#ifdef _MSC_VER +#pragma message("No support for 232H, use a newer libftdi, version >= 0.20") +#else #warning No support for 232H, use a newer libftdi, version >= 0.20 +#endif #endif case TYPE_4232H: pdata->pin_limit = 8; @@ -953,10 +965,16 @@ static int avrftdi_eeprom_read(PROGRAMMER *pgm, AVRPART *p, AVRMEM *m, unsigned int page_size, unsigned int addr, unsigned int len) { unsigned char cmd[4]; - unsigned char buffer[len], *bufptr = buffer; unsigned int add; +#ifdef _MSC_VER + unsigned char* buffer = _alloca(len); +#else + unsigned char buffer[len]; +#endif + unsigned char* bufptr = buffer; + + memset(buffer, 0, len); - memset(buffer, 0, sizeof(buffer)); for (add = addr; add < addr + len; add++) { memset(cmd, 0, sizeof(cmd)); @@ -984,9 +1002,15 @@ static int avrftdi_flash_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, unsigned char poll_byte; unsigned char *buffer = &m->buf[addr]; - unsigned char buf[4*len+4], *bufptr = buf; + unsigned int alloc_size = 4 * len + 4; +#ifdef _MSC_VER + unsigned char* buf = _alloca(alloc_size); +#else + unsigned char buf[alloc_size]; +#endif + unsigned char* bufptr = buf; - memset(buf, 0, sizeof(buf)); + memset(buf, 0, alloc_size); /* pre-check opcodes */ if (m->op[AVR_OP_LOADPAGE_LO] == NULL) { @@ -1102,13 +1126,18 @@ static int avrftdi_flash_read(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, int use_lext_address = m->op[AVR_OP_LOAD_EXT_ADDR] != NULL; unsigned int address = addr/2; - unsigned char o_buf[4*len+4]; - unsigned char i_buf[4*len+4]; + unsigned int buf_size = 4 * len + 4; +#ifdef _MSC_VER + unsigned char* o_buf = _alloca(buf_size); + unsigned char* i_buf = _alloca(buf_size); +#else + unsigned char o_buf[buf_size]; + unsigned char i_buf[buf_size]; +#endif unsigned int index; - - memset(o_buf, 0, sizeof(o_buf)); - memset(i_buf, 0, sizeof(i_buf)); + memset(o_buf, 0, buf_size); + memset(i_buf, 0, buf_size); /* pre-check opcodes */ if (m->op[AVR_OP_READ_LO] == NULL) { diff --git a/src/avrftdi_private.h b/src/avrftdi_private.h index e89d250e..3c965ed8 100644 --- a/src/avrftdi_private.h +++ b/src/avrftdi_private.h @@ -12,11 +12,14 @@ # include # undef HAVE_LIBFTDI_TYPE_232H # define HAVE_LIBFTDI_TYPE_232H 1 -#elif defined(HAVE_LIBFTDI) && defined(HAVE_USB_H) -/* ftdi.h includes usb.h */ +#elif defined(HAVE_LIBFTDI) #include #else +#ifdef _MSC_VER +#pragma message("No libftdi or libusb support. Install libftdi1/libusb-1.0 or libftdi/libusb and run configure/make again.") +#else #warning No libftdi or libusb support. Install libftdi1/libusb-1.0 or libftdi/libusb and run configure/make again. +#endif #define DO_NOT_BUILD_AVRFTDI #endif diff --git a/src/dfu.h b/src/dfu.h index 020a75f2..fa5da416 100644 --- a/src/dfu.h +++ b/src/dfu.h @@ -61,7 +61,7 @@ struct dfu_dev #else struct dfu_dev { - // empty + int dummy; }; #endif diff --git a/src/flip2.c b/src/flip2.c index ba90086a..d59147e2 100644 --- a/src/flip2.c +++ b/src/flip2.c @@ -617,7 +617,7 @@ int flip2_read_memory(struct dfu_dev *dfu, return -1; } - ptr += read_size; + ptr = (char*)ptr + read_size; addr += read_size; size -= read_size; } @@ -680,7 +680,7 @@ int flip2_write_memory(struct dfu_dev *dfu, return -1; } - ptr += write_size; + ptr = (const char*)ptr + write_size; addr += write_size; size -= write_size; } diff --git a/src/ft245r.c b/src/ft245r.c index 3964bd6a..42edbb51 100644 --- a/src/ft245r.c +++ b/src/ft245r.c @@ -84,11 +84,14 @@ # include # endif # include -#elif defined(HAVE_LIBFTDI) && defined(HAVE_USB_H) -/* ftdi.h includes usb.h */ +#elif defined(HAVE_LIBFTDI) #include #else +#ifdef _MSC_VER +#pragma message("No libftdi or libusb support. Install libftdi1/libusb-1.0 or libftdi/libusb and run configure/make again.") +#else #warning No libftdi or libusb support. Install libftdi1/libusb-1.0 or libftdi/libusb and run configure/make again. +#endif #define DO_NOT_BUILD_FT245R #endif diff --git a/src/msvc/getopt.c b/src/msvc/getopt.c new file mode 100644 index 00000000..ac1fda42 --- /dev/null +++ b/src/msvc/getopt.c @@ -0,0 +1,562 @@ +/* $OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $ */ +/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */ + +/* + * Copyright (c) 2002 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Sponsored in part by the Defense Advanced Research Projects + * Agency (DARPA) and Air Force Research Laboratory, Air Force + * Materiel Command, USAF, under agreement number F39502-99-1-0512. + */ +/*- + * Copyright (c) 2000 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Dieter Baron and Thomas Klausner. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include + +#define REPLACE_GETOPT /* use this getopt as the system getopt(3) */ + +#ifdef REPLACE_GETOPT +int opterr = 1; /* if error message should be printed */ +int optind = 1; /* index into parent argv vector */ +int optopt = '?'; /* character checked for validity */ +#undef optreset /* see getopt.h */ +#define optreset __mingw_optreset +int optreset; /* reset getopt */ +char *optarg; /* argument associated with option */ +#endif + +#define PRINT_ERROR ((opterr) && (*options != ':')) + +#define FLAG_PERMUTE 0x01 /* permute non-options to the end of argv */ +#define FLAG_ALLARGS 0x02 /* treat non-options as args to option "-1" */ +#define FLAG_LONGONLY 0x04 /* operate as getopt_long_only */ + +/* return values */ +#define BADCH (int)'?' +#define BADARG ((*options == ':') ? (int)':' : (int)'?') +#define INORDER (int)1 + +#ifndef __CYGWIN__ +#define __progname __argv[0] +#else +extern char __declspec(dllimport) *__progname; +#endif + +#ifdef __CYGWIN__ +static char EMSG[] = ""; +#else +#define EMSG "" +#endif + +static int getopt_internal(int, char * const *, const char *, + const struct option *, int *, int); +static int parse_long_options(char * const *, const char *, + const struct option *, int *, int); +static int gcd(int, int); +static void permute_args(int, int, int, char * const *); + +static char *place = EMSG; /* option letter processing */ + +/* XXX: set optreset to 1 rather than these two */ +static int nonopt_start = -1; /* first non option argument (for permute) */ +static int nonopt_end = -1; /* first option after non options (for permute) */ + +/* Error messages */ +static const char recargchar[] = "option requires an argument -- %c"; +static const char recargstring[] = "option requires an argument -- %s"; +static const char ambig[] = "ambiguous option -- %.*s"; +static const char noarg[] = "option doesn't take an argument -- %.*s"; +static const char illoptchar[] = "unknown option -- %c"; +static const char illoptstring[] = "unknown option -- %s"; + +static void +_vwarnx(const char *fmt,va_list ap) +{ + (void)fprintf(stderr,"%s: ",__progname); + if (fmt != NULL) + (void)vfprintf(stderr,fmt,ap); + (void)fprintf(stderr,"\n"); +} + +static void +warnx(const char *fmt,...) +{ + va_list ap; + va_start(ap,fmt); + _vwarnx(fmt,ap); + va_end(ap); +} + +/* + * Compute the greatest common divisor of a and b. + */ +static int +gcd(int a, int b) +{ + int c; + + c = a % b; + while (c != 0) { + a = b; + b = c; + c = a % b; + } + + return (b); +} + +/* + * Exchange the block from nonopt_start to nonopt_end with the block + * from nonopt_end to opt_end (keeping the same order of arguments + * in each block). + */ +static void +permute_args(int panonopt_start, int panonopt_end, int opt_end, + char * const *nargv) +{ + int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; + char *swap; + + /* + * compute lengths of blocks and number and size of cycles + */ + nnonopts = panonopt_end - panonopt_start; + nopts = opt_end - panonopt_end; + ncycle = gcd(nnonopts, nopts); + cyclelen = (opt_end - panonopt_start) / ncycle; + + for (i = 0; i < ncycle; i++) { + cstart = panonopt_end+i; + pos = cstart; + for (j = 0; j < cyclelen; j++) { + if (pos >= panonopt_end) + pos -= nnonopts; + else + pos += nopts; + swap = nargv[pos]; + /* LINTED const cast */ + ((char **) nargv)[pos] = nargv[cstart]; + /* LINTED const cast */ + ((char **)nargv)[cstart] = swap; + } + } +} + +/* + * parse_long_options -- + * Parse long options in argc/argv argument vector. + * Returns -1 if short_too is set and the option does not match long_options. + */ +static int +parse_long_options(char * const *nargv, const char *options, + const struct option *long_options, int *idx, int short_too) +{ + char *current_argv, *has_equal; + size_t current_argv_len; + int i, ambiguous, match; + +#define IDENTICAL_INTERPRETATION(_x, _y) \ + (long_options[(_x)].has_arg == long_options[(_y)].has_arg && \ + long_options[(_x)].flag == long_options[(_y)].flag && \ + long_options[(_x)].val == long_options[(_y)].val) + + current_argv = place; + match = -1; + ambiguous = 0; + + optind++; + + if ((has_equal = strchr(current_argv, '=')) != NULL) { + /* argument found (--option=arg) */ + current_argv_len = has_equal - current_argv; + has_equal++; + } else + current_argv_len = strlen(current_argv); + + for (i = 0; long_options[i].name; i++) { + /* find matching long option */ + if (strncmp(current_argv, long_options[i].name, + current_argv_len)) + continue; + + if (strlen(long_options[i].name) == current_argv_len) { + /* exact match */ + match = i; + ambiguous = 0; + break; + } + /* + * If this is a known short option, don't allow + * a partial match of a single character. + */ + if (short_too && current_argv_len == 1) + continue; + + if (match == -1) /* partial match */ + match = i; + else if (!IDENTICAL_INTERPRETATION(i, match)) + ambiguous = 1; + } + if (ambiguous) { + /* ambiguous abbreviation */ + if (PRINT_ERROR) + warnx(ambig, (int)current_argv_len, + current_argv); + optopt = 0; + return (BADCH); + } + if (match != -1) { /* option found */ + if (long_options[match].has_arg == no_argument + && has_equal) { + if (PRINT_ERROR) + warnx(noarg, (int)current_argv_len, + current_argv); + /* + * XXX: GNU sets optopt to val regardless of flag + */ + if (long_options[match].flag == NULL) + optopt = long_options[match].val; + else + optopt = 0; + return (BADARG); + } + if (long_options[match].has_arg == required_argument || + long_options[match].has_arg == optional_argument) { + if (has_equal) + optarg = has_equal; + else if (long_options[match].has_arg == + required_argument) { + /* + * optional argument doesn't use next nargv + */ + optarg = nargv[optind++]; + } + } + if ((long_options[match].has_arg == required_argument) + && (optarg == NULL)) { + /* + * Missing argument; leading ':' indicates no error + * should be generated. + */ + if (PRINT_ERROR) + warnx(recargstring, + current_argv); + /* + * XXX: GNU sets optopt to val regardless of flag + */ + if (long_options[match].flag == NULL) + optopt = long_options[match].val; + else + optopt = 0; + --optind; + return (BADARG); + } + } else { /* unknown option */ + if (short_too) { + --optind; + return (-1); + } + if (PRINT_ERROR) + warnx(illoptstring, current_argv); + optopt = 0; + return (BADCH); + } + if (idx) + *idx = match; + if (long_options[match].flag) { + *long_options[match].flag = long_options[match].val; + return (0); + } else + return (long_options[match].val); +#undef IDENTICAL_INTERPRETATION +} + +/* + * getopt_internal -- + * Parse argc/argv argument vector. Called by user level routines. + */ +static int +getopt_internal(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx, int flags) +{ + char *oli; /* option letter list index */ + int optchar, short_too; + static int posixly_correct = -1; + + if (options == NULL) + return (-1); + + /* + * XXX Some GNU programs (like cvs) set optind to 0 instead of + * XXX using optreset. Work around this braindamage. + */ + if (optind == 0) + optind = optreset = 1; + + /* + * Disable GNU extensions if POSIXLY_CORRECT is set or options + * string begins with a '+'. + * + * CV, 2009-12-14: Check POSIXLY_CORRECT anew if optind == 0 or + * optreset != 0 for GNU compatibility. + */ + if (posixly_correct == -1 || optreset != 0) + posixly_correct = (getenv("POSIXLY_CORRECT") != NULL); + if (*options == '-') + flags |= FLAG_ALLARGS; + else if (posixly_correct || *options == '+') + flags &= ~FLAG_PERMUTE; + if (*options == '+' || *options == '-') + options++; + + optarg = NULL; + if (optreset) + nonopt_start = nonopt_end = -1; +start: + if (optreset || !*place) { /* update scanning pointer */ + optreset = 0; + if (optind >= nargc) { /* end of argument vector */ + place = EMSG; + if (nonopt_end != -1) { + /* do permutation, if we have to */ + permute_args(nonopt_start, nonopt_end, + optind, nargv); + optind -= nonopt_end - nonopt_start; + } + else if (nonopt_start != -1) { + /* + * If we skipped non-options, set optind + * to the first of them. + */ + optind = nonopt_start; + } + nonopt_start = nonopt_end = -1; + return (-1); + } + if (*(place = nargv[optind]) != '-' || + (place[1] == '\0' && strchr(options, '-') == NULL)) { + place = EMSG; /* found non-option */ + if (flags & FLAG_ALLARGS) { + /* + * GNU extension: + * return non-option as argument to option 1 + */ + optarg = nargv[optind++]; + return (INORDER); + } + if (!(flags & FLAG_PERMUTE)) { + /* + * If no permutation wanted, stop parsing + * at first non-option. + */ + return (-1); + } + /* do permutation */ + if (nonopt_start == -1) + nonopt_start = optind; + else if (nonopt_end != -1) { + permute_args(nonopt_start, nonopt_end, + optind, nargv); + nonopt_start = optind - + (nonopt_end - nonopt_start); + nonopt_end = -1; + } + optind++; + /* process next argument */ + goto start; + } + if (nonopt_start != -1 && nonopt_end == -1) + nonopt_end = optind; + + /* + * If we have "-" do nothing, if "--" we are done. + */ + if (place[1] != '\0' && *++place == '-' && place[1] == '\0') { + optind++; + place = EMSG; + /* + * We found an option (--), so if we skipped + * non-options, we have to permute. + */ + if (nonopt_end != -1) { + permute_args(nonopt_start, nonopt_end, + optind, nargv); + optind -= nonopt_end - nonopt_start; + } + nonopt_start = nonopt_end = -1; + return (-1); + } + } + + /* + * Check long options if: + * 1) we were passed some + * 2) the arg is not just "-" + * 3) either the arg starts with -- we are getopt_long_only() + */ + if (long_options != NULL && place != nargv[optind] && + (*place == '-' || (flags & FLAG_LONGONLY))) { + short_too = 0; + if (*place == '-') + place++; /* --foo long option */ + else if (*place != ':' && strchr(options, *place) != NULL) + short_too = 1; /* could be short option too */ + + optchar = parse_long_options(nargv, options, long_options, + idx, short_too); + if (optchar != -1) { + place = EMSG; + return (optchar); + } + } + + if ((optchar = (int)*place++) == (int)':' || + (optchar == (int)'-' && *place != '\0') || + (oli = strchr(options, optchar)) == NULL) { + /* + * If the user specified "-" and '-' isn't listed in + * options, return -1 (non-option) as per POSIX. + * Otherwise, it is an unknown option character (or ':'). + */ + if (optchar == (int)'-' && *place == '\0') + return (-1); + if (!*place) + ++optind; + if (PRINT_ERROR) + warnx(illoptchar, optchar); + optopt = optchar; + return (BADCH); + } + if (long_options != NULL && optchar == 'W' && oli[1] == ';') { + /* -W long-option */ + if (*place) /* no space */ + /* NOTHING */; + else if (++optind >= nargc) { /* no arg */ + place = EMSG; + if (PRINT_ERROR) + warnx(recargchar, optchar); + optopt = optchar; + return (BADARG); + } else /* white space */ + place = nargv[optind]; + optchar = parse_long_options(nargv, options, long_options, + idx, 0); + place = EMSG; + return (optchar); + } + if (*++oli != ':') { /* doesn't take argument */ + if (!*place) + ++optind; + } else { /* takes (optional) argument */ + optarg = NULL; + if (*place) /* no white space */ + optarg = place; + else if (oli[1] != ':') { /* arg not optional */ + if (++optind >= nargc) { /* no arg */ + place = EMSG; + if (PRINT_ERROR) + warnx(recargchar, optchar); + optopt = optchar; + return (BADARG); + } else + optarg = nargv[optind]; + } + place = EMSG; + ++optind; + } + /* dump back option letter */ + return (optchar); +} + +#ifdef REPLACE_GETOPT +/* + * getopt -- + * Parse argc/argv argument vector. + * + * [eventually this will replace the BSD getopt] + */ +int +getopt(int nargc, char * const *nargv, const char *options) +{ + + /* + * We don't pass FLAG_PERMUTE to getopt_internal() since + * the BSD getopt(3) (unlike GNU) has never done this. + * + * Furthermore, since many privileged programs call getopt() + * before dropping privileges it makes sense to keep things + * as simple (and bug-free) as possible. + */ + return (getopt_internal(nargc, nargv, options, NULL, NULL, 0)); +} +#endif /* REPLACE_GETOPT */ + +/* + * getopt_long -- + * Parse argc/argv argument vector. + */ +int +getopt_long(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx) +{ + + return (getopt_internal(nargc, nargv, options, long_options, idx, + FLAG_PERMUTE)); +} + +/* + * getopt_long_only -- + * Parse argc/argv argument vector. + */ +int +getopt_long_only(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx) +{ + + return (getopt_internal(nargc, nargv, options, long_options, idx, + FLAG_PERMUTE|FLAG_LONGONLY)); +} diff --git a/src/msvc/getopt.h b/src/msvc/getopt.h new file mode 100644 index 00000000..1922a0ef --- /dev/null +++ b/src/msvc/getopt.h @@ -0,0 +1,95 @@ +#ifndef __GETOPT_H__ +/** + * DISCLAIMER + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * + * The mingw-w64 runtime package and its code is distributed in the hope that it + * will be useful but WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESSED OR + * IMPLIED ARE HEREBY DISCLAIMED. This includes but is not limited to + * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +#define __GETOPT_H__ + +/* All the headers include this file. */ +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern int optind; /* index of first non-option in argv */ +extern int optopt; /* single option character, as parsed */ +extern int opterr; /* flag to enable built-in diagnostics... */ + /* (user may set to zero, to suppress) */ + +extern char *optarg; /* pointer to argument of current option */ + +extern int getopt(int nargc, char * const *nargv, const char *options); + +#ifdef _BSD_SOURCE +/* + * BSD adds the non-standard `optreset' feature, for reinitialisation + * of `getopt' parsing. We support this feature, for applications which + * proclaim their BSD heritage, before including this header; however, + * to maintain portability, developers are advised to avoid it. + */ +# define optreset __mingw_optreset +extern int optreset; +#endif +#ifdef __cplusplus +} +#endif +/* + * POSIX requires the `getopt' API to be specified in `unistd.h'; + * thus, `unistd.h' includes this header. However, we do not want + * to expose the `getopt_long' or `getopt_long_only' APIs, when + * included in this manner. Thus, close the standard __GETOPT_H__ + * declarations block, and open an additional __GETOPT_LONG_H__ + * specific block, only when *not* __UNISTD_H_SOURCED__, in which + * to declare the extended API. + */ +#endif /* !defined(__GETOPT_H__) */ + +#if !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__) +#define __GETOPT_LONG_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +struct option /* specification for a long form option... */ +{ + const char *name; /* option name, without leading hyphens */ + int has_arg; /* does it take an argument? */ + int *flag; /* where to save its status, or NULL */ + int val; /* its associated status value */ +}; + +enum /* permitted values for its `has_arg' field... */ +{ + no_argument = 0, /* option never takes an argument */ + required_argument, /* option always requires an argument */ + optional_argument /* option may take an argument */ +}; + +extern int getopt_long(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx); +extern int getopt_long_only(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx); +/* + * Previous MinGW implementation had... + */ +#ifndef HAVE_DECL_GETOPT +/* + * ...for the long form API only; keep this for compatibility. + */ +# define HAVE_DECL_GETOPT 1 +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__) */ diff --git a/src/msvc/gettimeofday.c b/src/msvc/gettimeofday.c new file mode 100644 index 00000000..c7a9844d --- /dev/null +++ b/src/msvc/gettimeofday.c @@ -0,0 +1,76 @@ +/** +* This file has no copyright assigned and is placed in the Public Domain. +* This file is part of the mingw-w64 runtime package. +* No warranty is given; refer to the file DISCLAIMER.PD within this package. +*/ +#include +#include +#include +#include +#include + +#define FILETIME_1970 116444736000000000ull /* seconds between 1/1/1601 and 1/1/1970 */ +#define HECTONANOSEC_PER_SEC 10000000ull + +int getntptimeofday(struct timespec *, struct timezone *); + +int getntptimeofday(struct timespec *tp, struct timezone *z) +{ + int res = 0; + union + { + unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */ + FILETIME ft; + } _now; + TIME_ZONE_INFORMATION TimeZoneInformation; + DWORD tzi; + + if (z != NULL) + { + if ((tzi = GetTimeZoneInformation(&TimeZoneInformation)) != TIME_ZONE_ID_INVALID) + { + z->tz_minuteswest = TimeZoneInformation.Bias; + if (tzi == TIME_ZONE_ID_DAYLIGHT) + z->tz_dsttime = 1; + else + z->tz_dsttime = 0; + } + else + { + z->tz_minuteswest = 0; + z->tz_dsttime = 0; + } + } + + if (tp != NULL) + { + GetSystemTimeAsFileTime(&_now.ft); /* 100-nanoseconds since 1-1-1601 */ + /* The actual accuracy on XP seems to be 125,000 nanoseconds = 125 microseconds = 0.125 milliseconds */ + _now.ns100 -= FILETIME_1970; /* 100 nano-seconds since 1-1-1970 */ + tp->tv_sec = _now.ns100 / HECTONANOSEC_PER_SEC; /* seconds since 1-1-1970 */ + tp->tv_nsec = (long)(_now.ns100 % HECTONANOSEC_PER_SEC) * 100; /* nanoseconds */ + } + return res; +} + +int __cdecl gettimeofday(struct timeval *p, void *z) +{ + struct timespec tp; + + if (getntptimeofday(&tp, (struct timezone *) z)) + return -1; + p->tv_sec = (long)tp.tv_sec; + p->tv_usec = (tp.tv_nsec / 1000); + return 0; +} + +int __cdecl mingw_gettimeofday(struct timeval *p, struct timezone *z) +{ + struct timespec tp; + + if (getntptimeofday(&tp, z)) + return -1; + p->tv_sec = (long)tp.tv_sec; + p->tv_usec = (tp.tv_nsec / 1000); + return 0; +} diff --git a/src/msvc/msvc_compat.h b/src/msvc/msvc_compat.h new file mode 100644 index 00000000..58a26f21 --- /dev/null +++ b/src/msvc/msvc_compat.h @@ -0,0 +1,62 @@ +/* + * avrdude - A Downloader/Uploader for AVR device programmers + * Copyright (C) 2018 Marius Greuel + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once +#include +#include +#include +#include +#include + +#pragma warning(disable : 4018) // warning C4018: signed/unsigned mismatch +#pragma warning(disable : 4244) // warning C4244: conversion from '...' to '...', possible loss of data +#pragma warning(disable : 4267) // warning C4267: conversion from '...' to '...', possible loss of data +#pragma warning(disable : 5105) // warning C5105: macro expansion producing 'defined' has undefined behavior + +#pragma comment(lib, "hid.lib") +#pragma comment(lib, "ws2_32.lib") +#pragma comment(lib, "setupapi.lib") + +#define PATH_MAX _MAX_PATH + +#define __builtin_popcount __popcnt + +#define setvbuf msvc_setvbuf + +static inline int msvc_setvbuf( + FILE* const public_stream, + char* const buffer, + int const type, + size_t const buffer_size_in_bytes +) +{ + // Just ignore calls to setvbuf with invalid buffer size. + // Purpose of setvbuf calls unknown, probably in an attempt to fix broken + // programs that capture stdout and stderr using separate stream handles? + return 0; +} + +static inline int strcasecmp(const char* s1, const char* s2) +{ + return _stricmp(s1, s2); +} + +static inline int strncasecmp(const char* s1, const char* s2, size_t n) +{ + return _strnicmp(s1, s2, n); +} diff --git a/src/msvc/sys/time.h b/src/msvc/sys/time.h new file mode 100644 index 00000000..30b02b3c --- /dev/null +++ b/src/msvc/sys/time.h @@ -0,0 +1,30 @@ +/* + * avrdude - A Downloader/Uploader for AVR device programmers + * Copyright (C) 2018 Marius Greuel + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _TIME_H_ +#define _TIME_H_ + +struct timezone +{ + int tz_minuteswest; + int tz_dsttime; +}; + +int __cdecl gettimeofday(struct timeval* p, void* z); + +#endif diff --git a/src/msvc/unistd.h b/src/msvc/unistd.h new file mode 100644 index 00000000..49d5114e --- /dev/null +++ b/src/msvc/unistd.h @@ -0,0 +1,38 @@ +/* + * avrdude - A Downloader/Uploader for AVR device programmers + * Copyright (C) 2018 Marius Greuel + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef _UNISTD_H +#define _UNISTD_H + +#define STDIN_FILENO _fileno(stdin) +#define STDERR_FILENO _fileno(stderr) + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +typedef unsigned int useconds_t; +int usleep(unsigned int us); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/msvc/usleep.cpp b/src/msvc/usleep.cpp new file mode 100644 index 00000000..6759b721 --- /dev/null +++ b/src/msvc/usleep.cpp @@ -0,0 +1,93 @@ +/* + * avrdude - A Downloader/Uploader for AVR device programmers + * Copyright (C) 2018 Marius Greuel + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "unistd.h" + +#define WIN32_LEAN_AND_MEAN +#include +#include +#pragma comment(lib, "winmm.lib") + +class MicroSleep +{ +public: + MicroSleep() + { + if (::timeBeginPeriod(timerPeriod) == TIMERR_NOERROR) + { + m_resetTimerPeriod = true; + } + } + + ~MicroSleep() + { + if (m_resetTimerPeriod) + { + ::timeEndPeriod(timerPeriod); + } + } + + int Sleep(DWORD us) + { + if (us == 0) + { + return 0; + } + + LARGE_INTEGER frequency{}; + if (QueryPerformanceFrequency(&frequency)) + { + LARGE_INTEGER start{}; + QueryPerformanceCounter(&start); + + if (us > 10000) + { + ::Sleep((us - 5000) / 1000); + } + + LARGE_INTEGER end{}; + end.QuadPart = start.QuadPart + (frequency.QuadPart * us / 1000000); + + while (true) + { + LARGE_INTEGER current; + QueryPerformanceCounter(¤t); + if (current.QuadPart >= end.QuadPart) + { + break; + } + } + } + else + { + ::Sleep((us / 1000) + 1); + } + + return 0; + } + +private: + static const UINT timerPeriod = 1; // 1ms + bool m_resetTimerPeriod = false; +}; + +int usleep(unsigned int us) +{ + static MicroSleep microSleep; + return microSleep.Sleep(us); +} diff --git a/src/pickit2.c b/src/pickit2.c index 5a0a5f6c..52396bbb 100644 --- a/src/pickit2.c +++ b/src/pickit2.c @@ -58,11 +58,7 @@ #if (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) #include -#if defined(HAVE_DDK_HIDSDI_H) -# include -#else -# include "my_ddk_hidsdi.h" -#endif +#include #include #else #if defined(HAVE_USB_H) @@ -94,7 +90,7 @@ // win32native only: #if (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) static HANDLE open_hid(unsigned short vid, unsigned short pid); -const char *usb_strerror() +static const char *usb_strerror() { return ""; } diff --git a/src/ppiwin.c b/src/ppiwin.c index bedbaf92..15017277 100644 --- a/src/ppiwin.c +++ b/src/ppiwin.c @@ -32,7 +32,7 @@ reg = register as defined in an enum in ppi.h. This must be converted #include "ac_cfg.h" -#if defined (WIN32NATIVE) +#if defined(HAVE_PARPORT) && defined(WIN32NATIVE) #include #include diff --git a/src/ser_avrdoper.c b/src/ser_avrdoper.c index 8eae2c3f..c834411b 100644 --- a/src/ser_avrdoper.c +++ b/src/ser_avrdoper.c @@ -163,13 +163,8 @@ static int usbGetReport(union filedescriptor *fdp, int reportType, int reportNum #include #include - -#if defined(HAVE_DDK_HIDSDI_H) -# include -#else -# include "my_ddk_hidsdi.h" -#endif -#include +#include +#include #ifdef USB_DEBUG #define DEBUG_PRINT(arg) printf arg diff --git a/src/serbb_win32.c b/src/serbb_win32.c index 0e889745..ff087c4e 100644 --- a/src/serbb_win32.c +++ b/src/serbb_win32.c @@ -308,8 +308,8 @@ static int serbb_open(PROGRAMMER *pgm, char *port) progname, port); return -1; } - avrdude_message(MSG_DEBUG, "%s: ser_open(): opened comm port \"%s\", handle 0x%x\n", - progname, port, (int)hComPort); + avrdude_message(MSG_DEBUG, "%s: ser_open(): opened comm port \"%s\", handle 0x%zx\n", + progname, port, (INT_PTR)hComPort); pgm->fd.pfd = (void *)hComPort; @@ -326,8 +326,8 @@ static void serbb_close(PROGRAMMER *pgm) pgm->setpin(pgm, PIN_AVR_RESET, 1); CloseHandle (hComPort); } - avrdude_message(MSG_DEBUG, "%s: ser_close(): closed comm port handle 0x%x\n", - progname, (int)hComPort); + avrdude_message(MSG_DEBUG, "%s: ser_close(): closed comm port handle 0x%zx\n", + progname, (INT_PTR)hComPort); hComPort = INVALID_HANDLE_VALUE; } diff --git a/src/stk500.c b/src/stk500.c index 88944afc..41bc4d06 100644 --- a/src/stk500.c +++ b/src/stk500.c @@ -760,7 +760,11 @@ static int stk500_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, unsigned int page_size, unsigned int addr, unsigned int n_bytes) { +#ifdef _MSC_VER + unsigned char* buf = _alloca(page_size + 16); +#else unsigned char buf[page_size + 16]; +#endif int memtype; int a_div; int block_size; From 1fb88c30400cbb4d2c4d5440f8f7e2f761a1d8ad Mon Sep 17 00:00:00 2001 From: Marius Greuel Date: Tue, 28 Dec 2021 14:14:41 +0100 Subject: [PATCH 2/5] Add external libraries to CMake project --- .github/workflows/build_cmake.yml | 28 +++++++++++ src/CMakeLists.txt | 79 +++++++++++++++++++------------ 2 files changed, 76 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index bcbf72ef..ced14df7 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -95,6 +95,34 @@ jobs: name: macos-x86_64 path: | ${{github.workspace}}/build/* + msvc-x86_64: + runs-on: windows-latest + defaults: + run: + working-directory: ./src + steps: + - uses: actions/checkout@v2 + - name: Install prerequisites + run: choco install winflexbison3 + - name: Configure + run: >- + cmake + -D DEBUG_CMAKE=1 + -D CMAKE_SYSTEM_VERSION=11 + -D CMAKE_C_FLAGS_RELWITHDEBINFO="/MT /GL /Zi /O2 /Ob1 /DNDEBUG" + -D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /GL /Zi /O2 /Ob1 /DNDEBUG" + -D CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO="/DEBUG /INCREMENTAL:NO /LTCG /OPT:REF /OPT:ICF" + -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + -D USE_EXTERNAL=1 + -B ../build + - name: Build + run: cmake --build ../build --config ${{env.BUILD_TYPE}} + - name: Archive build artifacts + uses: actions/upload-artifact@v2 + with: + name: msvc-x86_64 + path: | + ${{github.workspace}}/build/* mingw: runs-on: windows-latest defaults: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bbb24df6..37c44e2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,15 +30,16 @@ option(BUILD_DOC "Enable building documents" OFF) option(HAVE_LINUXGPIO "Enable Linux sysfs GPIO support" OFF) option(HAVE_LINUXSPI "Enable Linux SPI support" OFF) option(HAVE_PARPORT "Enable parallel port support" OFF) -option(USE_EXTERNAL "Use local code from the 'external' folder" OFF) +option(USE_EXTERNAL "Use external libraries from AVRDUDE GitHub repositories" OFF) option(USE_LIBUSBWIN32 "Prefer libusb-win32 over libusb" OFF) option(DEBUG_CMAKE "Enable debugging output for this CMake project" OFF) include(CheckIncludeFile) include(CheckFunctionExists) include(CheckSymbolExists) -include(GNUInstallDirs) +include(FetchContent) include(FindPackageMessage) +include(GNUInstallDirs) set(CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}") set(AVRDUDE_FULL_VERSION ${CMAKE_PROJECT_VERSION}) @@ -252,41 +253,57 @@ if(HAVE_LIBREADLINE) endif() # ===================================== -# Use local libraries if requested +# Use external libraries if requested # ===================================== if(USE_EXTERNAL) - if(EXISTS "${AVRDUDE_EXTERNAL_PATH}/libelf/CMakeLists.txt") - message(STATUS "Using local library 'libelf'") - add_subdirectory(${AVRDUDE_EXTERNAL_PATH}/libelf) - set(LIB_LIBELF libelf) - set(HAVE_LIBELF 1) - set(HAVE_LIBELF_H 1) - endif() + FetchContent_Declare(libelf + GIT_REPOSITORY https://github.com/avrdudes/libelf.git + GIT_TAG e5a39bf19bd6598c42e09172be5a78ceec2a065c + ) - if(EXISTS "${AVRDUDE_EXTERNAL_PATH}/libusb/CMakeLists.txt") - message(STATUS "Using local library 'libusb'") - add_subdirectory(${AVRDUDE_EXTERNAL_PATH}/libusb) - set(LIB_LIBUSB libusb) - set(HAVE_LIBUSB 1) - set(HAVE_LUSB0_USB_H 1) - endif() + FetchContent_Declare(libusb + GIT_REPOSITORY https://github.com/avrdudes/libusb.git + GIT_TAG 632bc25d04eff563cc00de29435b9a7ed6f4654c + ) - if(EXISTS "${AVRDUDE_EXTERNAL_PATH}/libhidapi/CMakeLists.txt") - message(STATUS "Using local library 'libhidapi'") - add_subdirectory(${AVRDUDE_EXTERNAL_PATH}/libhidapi) - set(LIB_LIBHIDAPI libhidapi) - set(HAVE_LIBHIDAPI 1) - set(HAVE_HIDAPI_HIDAPI_H 1) - endif() + FetchContent_Declare(libhidapi + GIT_REPOSITORY https://github.com/avrdudes/libhidapi.git + GIT_TAG e3700e951f762ef92871ff4fc94586e4d1c042a6 + ) - if(EXISTS "${AVRDUDE_EXTERNAL_PATH}/libftdi/CMakeLists.txt") - message(STATUS "Using local library 'libftdi'") - add_subdirectory(${AVRDUDE_EXTERNAL_PATH}/libftdi) - set(LIB_LIBFTDI libftdi) - set(HAVE_LIBFTDI 1) - set(HAVE_LIBFTDI_TYPE_232H 1) - endif() + FetchContent_Declare(libftdi + GIT_REPOSITORY https://github.com/avrdudes/libftdi.git + GIT_TAG facd9b16336539b68e8e824ece994d3d3eb2f091 + ) + + message(STATUS "Fetching external libraries, please wait...") + FetchContent_MakeAvailable( + libelf + libusb + libhidapi + libftdi + ) + + message(STATUS "Using external library 'libelf'") + set(LIB_LIBELF libelf) + set(HAVE_LIBELF 1) + set(HAVE_LIBELF_H 1) + + message(STATUS "Using external library 'libusb'") + set(LIB_LIBUSB libusb) + set(HAVE_LIBUSB 1) + set(HAVE_LUSB0_USB_H 1) + + message(STATUS "Using external library 'libhidapi'") + set(LIB_LIBHIDAPI libhidapi) + set(HAVE_LIBHIDAPI 1) + set(HAVE_HIDAPI_HIDAPI_H 1) + + message(STATUS "Using external library 'libftdi'") + set(LIB_LIBFTDI libftdi) + set(HAVE_LIBFTDI 1) + set(HAVE_LIBFTDI_TYPE_232H 1) endif() # ===================================== From d05c2db3fb4d34889133d40a6a33ff3933bd3f57 Mon Sep 17 00:00:00 2001 From: Marius Greuel Date: Tue, 4 Jan 2022 18:27:41 +0100 Subject: [PATCH 3/5] Add a missing define to the MSVC compatiblity shim --- src/msvc/msvc_compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/msvc/msvc_compat.h b/src/msvc/msvc_compat.h index 58a26f21..19acf5b8 100644 --- a/src/msvc/msvc_compat.h +++ b/src/msvc/msvc_compat.h @@ -32,6 +32,8 @@ #pragma comment(lib, "ws2_32.lib") #pragma comment(lib, "setupapi.lib") +#define F_OK 0 + #define PATH_MAX _MAX_PATH #define __builtin_popcount __popcnt From fe6f08d48f723b38d57f40cd5aaa0731d48b12dd Mon Sep 17 00:00:00 2001 From: Marius Greuel Date: Fri, 7 Jan 2022 17:23:50 +0100 Subject: [PATCH 4/5] Use alloca for stack based memory allocation --- src/CMakeLists.txt | 4 ++++ src/avrftdi.c | 37 ++++++++----------------------------- src/buspirate.c | 3 --- src/msvc/msvc_compat.h | 6 +----- src/stk500.c | 6 +----- 5 files changed, 14 insertions(+), 42 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37c44e2a..346c71fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -334,7 +334,11 @@ if(MSVC) add_compile_definitions(_CRT_NONSTDC_NO_WARNINGS=1) add_compile_definitions(_WINSOCK_DEPRECATED_NO_WARNINGS=1) add_compile_options(/W3) + add_compile_options(/wd4018) # warning C4018: signed/unsigned mismatch + add_compile_options(/wd4244) # warning C4244: conversion from '...' to '...', possible loss of data + add_compile_options(/wd4267) # warning C4267: conversion from '...' to '...', possible loss of data add_compile_options(/wd5105) # warning C5105: macro expansion producing 'xxx' has undefined behavior + add_compile_options(/wd6255) # warning C6255: _alloca indicates failure by raising a stack overflow exception. Consider using _malloca instead set(EXTRA_WINDOWS_SOURCES ${EXTRA_WINDOWS_SOURCES} "${PROJECT_SOURCE_DIR}/msvc/getopt.c" diff --git a/src/avrftdi.c b/src/avrftdi.c index d9313932..e41d775e 100644 --- a/src/avrftdi.c +++ b/src/avrftdi.c @@ -356,15 +356,8 @@ static int avrftdi_transmit_bb(PROGRAMMER * pgm, unsigned char mode, const unsig blocksize = MAX(1,(max_size-7)/((8*2*6)+(8*1*2))); //avrdude_message(MSG_INFO, "blocksize %d \n",blocksize); - size_t send_buffer_size = (8 * 2 * 6) * blocksize + (8 * 1 * 2) * blocksize + 7; - size_t recv_buffer_size = 2 * 16 * blocksize; -#ifdef _MSC_VER - unsigned char* send_buffer = _alloca(send_buffer_size); - unsigned char* recv_buffer = _alloca(recv_buffer_size); -#else - unsigned char send_buffer[send_buffer_size]; - unsigned char recv_buffer[recv_buffer_size]; -#endif + unsigned char* send_buffer = alloca((8 * 2 * 6) * blocksize + (8 * 1 * 2) * blocksize + 7); + unsigned char* recv_buffer = alloca(2 * 16 * blocksize); while(remaining) { @@ -966,11 +959,7 @@ static int avrftdi_eeprom_read(PROGRAMMER *pgm, AVRPART *p, AVRMEM *m, { unsigned char cmd[4]; unsigned int add; -#ifdef _MSC_VER - unsigned char* buffer = _alloca(len); -#else - unsigned char buffer[len]; -#endif + unsigned char* buffer = alloca(len); unsigned char* bufptr = buffer; memset(buffer, 0, len); @@ -998,19 +987,14 @@ static int avrftdi_flash_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, unsigned int word; unsigned int poll_index; - unsigned int buf_size; unsigned char poll_byte; unsigned char *buffer = &m->buf[addr]; - unsigned int alloc_size = 4 * len + 4; -#ifdef _MSC_VER - unsigned char* buf = _alloca(alloc_size); -#else - unsigned char buf[alloc_size]; -#endif + unsigned int buf_size = 4 * len + 4; + unsigned char* buf = alloca(buf_size); unsigned char* bufptr = buf; - memset(buf, 0, alloc_size); + memset(buf, 0, buf_size); /* pre-check opcodes */ if (m->op[AVR_OP_LOADPAGE_LO] == NULL) { @@ -1127,13 +1111,8 @@ static int avrftdi_flash_read(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, unsigned int address = addr/2; unsigned int buf_size = 4 * len + 4; -#ifdef _MSC_VER - unsigned char* o_buf = _alloca(buf_size); - unsigned char* i_buf = _alloca(buf_size); -#else - unsigned char o_buf[buf_size]; - unsigned char i_buf[buf_size]; -#endif + unsigned char* o_buf = alloca(buf_size); + unsigned char* i_buf = alloca(buf_size); unsigned int index; memset(o_buf, 0, buf_size); diff --git a/src/buspirate.c b/src/buspirate.c index 84b2f042..e765797f 100644 --- a/src/buspirate.c +++ b/src/buspirate.c @@ -41,9 +41,6 @@ #include #include #include -#if defined(WIN32NATIVE) -# include /* for alloca() */ -#endif #include "avrdude.h" #include "libavrdude.h" diff --git a/src/msvc/msvc_compat.h b/src/msvc/msvc_compat.h index 19acf5b8..aef86b05 100644 --- a/src/msvc/msvc_compat.h +++ b/src/msvc/msvc_compat.h @@ -22,11 +22,7 @@ #include #include #include - -#pragma warning(disable : 4018) // warning C4018: signed/unsigned mismatch -#pragma warning(disable : 4244) // warning C4244: conversion from '...' to '...', possible loss of data -#pragma warning(disable : 4267) // warning C4267: conversion from '...' to '...', possible loss of data -#pragma warning(disable : 5105) // warning C5105: macro expansion producing 'defined' has undefined behavior +#include #pragma comment(lib, "hid.lib") #pragma comment(lib, "ws2_32.lib") diff --git a/src/stk500.c b/src/stk500.c index 41bc4d06..ea87b899 100644 --- a/src/stk500.c +++ b/src/stk500.c @@ -760,11 +760,7 @@ static int stk500_paged_write(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, unsigned int page_size, unsigned int addr, unsigned int n_bytes) { -#ifdef _MSC_VER - unsigned char* buf = _alloca(page_size + 16); -#else - unsigned char buf[page_size + 16]; -#endif + unsigned char* buf = alloca(page_size + 16); int memtype; int a_div; int block_size; From fc54ef5e59ee2947b8b48adccf4d2e89b519aefe Mon Sep 17 00:00:00 2001 From: Marius Greuel Date: Fri, 7 Jan 2022 13:15:55 +0100 Subject: [PATCH 5/5] Clean up legacy code --- src/CMakeLists.txt | 30 +-------------- src/Makefile.am | 1 - src/avrdude.h | 27 +------------- src/bitbang.c | 29 ++++++++------- src/cmake_config.h.in | 27 -------------- src/config_gram.y | 2 +- src/configure.ac | 10 +---- src/confwin.c | 10 +---- src/fileio.c | 4 +- src/flip1.c | 8 +--- src/flip2.c | 7 +--- src/ft245r.c | 4 -- src/libavrdude.h | 12 ++---- src/main.c | 10 ++--- src/msvc/getopt.c | 1 + src/msvc/gettimeofday.c | 1 + src/msvc/sys/time.h | 13 +++++++ src/my_ddk_hidsdi.h | 48 ------------------------ src/pickit2.c | 30 +++++++-------- src/ppi.c | 4 +- src/ppiwin.c | 81 +---------------------------------------- src/ser_avrdoper.c | 7 ++-- src/ser_posix.c | 11 +----- src/ser_win32.c | 35 +++--------------- src/serbb_posix.c | 4 +- src/serbb_win32.c | 5 ++- src/stk500v2.c | 2 +- src/term.c | 4 +- src/updi_link.c | 9 +---- src/usb_hidapi.c | 5 --- src/usb_libusb.c | 2 +- src/usbtiny.c | 8 +--- 32 files changed, 91 insertions(+), 360 deletions(-) delete mode 100644 src/my_ddk_hidsdi.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 346c71fe..466a619c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,7 +35,6 @@ option(USE_LIBUSBWIN32 "Prefer libusb-win32 over libusb" OFF) option(DEBUG_CMAKE "Enable debugging output for this CMake project" OFF) include(CheckIncludeFile) -include(CheckFunctionExists) include(CheckSymbolExists) include(FetchContent) include(FindPackageMessage) @@ -126,24 +125,6 @@ else() endif() endif() -# ===================================== -# Detect headers -# ===================================== - -check_include_file(stdint.h HAVE_STDINT_H) -check_include_file(stdlib.h HAVE_STDLIB_H) -check_include_file(inttypes.h HAVE_INTTYPES_H) -check_include_file(netinet/in.h HAVE_NETINET_IN_H) - -# ===================================== -# Detect functions -# ===================================== - -check_function_exists(usleep HAVE_USLEEP) -check_function_exists(getaddrinfo HAVE_GETADDRINFO) -check_function_exists(gettimeofday HAVE_GETTIMEOFDAY) -check_function_exists(strcasecmp HAVE_STRCASECMP) - # ===================================== # Detect installed libraries # ===================================== @@ -274,7 +255,7 @@ if(USE_EXTERNAL) FetchContent_Declare(libftdi GIT_REPOSITORY https://github.com/avrdudes/libftdi.git - GIT_TAG facd9b16336539b68e8e824ece994d3d3eb2f091 + GIT_TAG f3a54da710002a7d25a32a69e667a69ef84cc120 ) message(STATUS "Fetching external libraries, please wait...") @@ -313,10 +294,8 @@ endif() add_compile_definitions(CONFIG_DIR=\"${CONFIG_DIR}\") if(WIN32) - set(HAVE_LIBWS2_32 1) set(EXTRA_WINDOWS_SOURCES "${PROJECT_BINARY_DIR}/windows.rc") set(EXTRA_WINDOWS_LIBRARIES setupapi ws2_32) - add_compile_definitions(WIN32NATIVE=1) endif() if(NOT WIN32) @@ -325,11 +304,6 @@ if(NOT WIN32) endif() if(MSVC) - # The following functions are implemented in the MSVC compatibility layer - set(HAVE_USLEEP 1) - set(HAVE_GETTIMEOFDAY 1) - set(HAVE_STRCASECMP 1) - add_compile_definitions(_CRT_SECURE_NO_WARNINGS=1) add_compile_definitions(_CRT_NONSTDC_NO_WARNINGS=1) add_compile_definitions(_WINSOCK_DEPRECATED_NO_WARNINGS=1) @@ -395,7 +369,6 @@ if (DEBUG_CMAKE) message(STATUS "HAVE_LIBFTDI: ${HAVE_LIBFTDI}") message(STATUS "HAVE_LIBFTDI1: ${HAVE_LIBFTDI1}") message(STATUS "HAVE_LIBREADLINE: ${HAVE_LIBREADLINE}") - message(STATUS "HAVE_LIBWS2_32: ${HAVE_LIBWS2_32}") message(STATUS "HAVE_LIBELF_H: ${HAVE_LIBELF_H}") message(STATUS "HAVE_LIBELF_LIBELF_H: ${HAVE_LIBELF_LIBELF_H}") message(STATUS "HAVE_USB_H: ${HAVE_USB_H}") @@ -555,7 +528,6 @@ add_library(libavrdude STATIC lists.c micronucleus.c micronucleus.h - my_ddk_hidsdi.h par.c par.h pgm.c diff --git a/src/Makefile.am b/src/Makefile.am index c104e295..dd7adb57 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -138,7 +138,6 @@ libavrdude_a_SOURCES = \ lists.c \ micronucleus.c \ micronucleus.h \ - my_ddk_hidsdi.h \ par.c \ par.h \ pgm.c \ diff --git a/src/avrdude.h b/src/avrdude.h index b4c7ee87..05048d5d 100644 --- a/src/avrdude.h +++ b/src/avrdude.h @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -/* $Id$ */ + /* $Id$ */ #ifndef avrdude_h #define avrdude_h #define SYSTEM_CONF_FILE "avrdude.conf" -#if defined(WIN32NATIVE) +#if defined(WIN32) #define USER_CONF_FILE "avrdude.rc" #else #define USER_CONF_FILE ".avrduderc" @@ -44,27 +44,4 @@ int avrdude_message(const int msglvl, const char *format, ...); #define MSG_TRACE (4) /* displayed with -vvvv, show trace commuication */ #define MSG_TRACE2 (5) /* displayed with -vvvvv */ -#if defined(WIN32NATIVE) - -#include "ac_cfg.h" -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#if !defined(HAVE_USLEEP) -int usleep(unsigned int us); -#endif - -#if !defined(HAVE_GETTIMEOFDAY) -struct timezone; -int gettimeofday(struct timeval *tv, struct timezone *tz); -#endif /* HAVE_GETTIMEOFDAY */ - -#ifdef __cplusplus -} -#endif -#endif /* defined(WIN32NATIVE) */ - #endif diff --git a/src/bitbang.c b/src/bitbang.c index fe06c425..592ca124 100644 --- a/src/bitbang.c +++ b/src/bitbang.c @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -/* $Id$ */ + /* $Id$ */ #include "ac_cfg.h" @@ -28,9 +28,12 @@ #include #include -#if !defined(WIN32NATIVE) -# include -# include +#if defined(WIN32) +#define WIN32_LEAN_AND_MEAN +#include +#else +#include +#include #endif #include "avrdude.h" @@ -43,7 +46,7 @@ static int delay_decrement; -#if defined(WIN32NATIVE) +#if defined(WIN32) static int has_perfcount; static LARGE_INTEGER freq; #else @@ -57,14 +60,14 @@ static void alarmhandler(int signo) done = 1; signal(SIGALRM, saved_alarmhandler); } -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ /* * Calibrate the microsecond delay loop below. */ static void bitbang_calibrate_delay(void) { -#if defined(WIN32NATIVE) +#if defined(WIN32) /* * If the hardware supports a high-resolution performance counter, * we ultimately prefer that one, as it gives quite accurate delays @@ -91,7 +94,7 @@ static void bitbang_calibrate_delay(void) progname); delay_decrement = 100; } -#else /* !WIN32NATIVE */ +#else /* !WIN32 */ struct itimerval itv; volatile int i; @@ -124,7 +127,7 @@ static void bitbang_calibrate_delay(void) delay_decrement = -i / 100000; avrdude_message(MSG_NOTICE2, " calibrated to %d cycles per us\n", delay_decrement); -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ } /* @@ -134,7 +137,7 @@ static void bitbang_calibrate_delay(void) */ void bitbang_delay(unsigned int us) { -#if defined(WIN32NATIVE) +#if defined(WIN32) LARGE_INTEGER countNow, countEnd; if (has_perfcount) @@ -147,14 +150,14 @@ void bitbang_delay(unsigned int us) } else /* no performance counters -- run normal uncalibrated delay */ { -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ volatile unsigned int del = us * delay_decrement; while (del > 0) del--; -#if defined(WIN32NATIVE) +#if defined(WIN32) } -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ } /* diff --git a/src/cmake_config.h.in b/src/cmake_config.h.in index d4ca65a6..4b051b04 100644 --- a/src/cmake_config.h.in +++ b/src/cmake_config.h.in @@ -35,18 +35,6 @@ /* ----- Functions ----- */ -/* Define to 1 if you have the `usleep' function. */ -#cmakedefine HAVE_USLEEP 1 - -/* Define to 1 if you have the `getaddrinfo' function. */ -#cmakedefine HAVE_GETADDRINFO 1 - -/* Define to 1 if you have the `gettimeofday' function. */ -#cmakedefine HAVE_GETTIMEOFDAY 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#cmakedefine HAVE_STRCASECMP 1 - /* Define if lex/flex has yylex_destroy */ #cmakedefine HAVE_YYLEX_DESTROY 1 @@ -61,15 +49,6 @@ /* Define to 1 if the system has the type `ulong_t'. */ #cmakedefine HAVE_ULONG_T 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_INTTYPES_H 1 - /* Define if ELF support is enabled via libelf */ #cmakedefine HAVE_LIBELF 1 @@ -120,9 +99,3 @@ /* Define to 1 if you have the `readline' library (-lreadline). */ #cmakedefine HAVE_LIBREADLINE 1 - -/* Define to 1 if you have the `ws2_32' library (-lws2_32). */ -#cmakedefine HAVE_LIBWS2_32 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_NETINET_IN_H 1 diff --git a/src/config_gram.y b/src/config_gram.y index 468706e5..bea56068 100644 --- a/src/config_gram.y +++ b/src/config_gram.y @@ -30,7 +30,7 @@ #include "libavrdude.h" #include "config.h" -#if defined(WIN32NATIVE) +#if defined(WIN32) #define strtok_r( _s, _sep, _lasts ) \ ( *(_lasts) = strtok( (_s), (_sep) ) ) #endif diff --git a/src/configure.ac b/src/configure.ac index 21442bb9..cd44d496 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -228,9 +228,6 @@ AC_HEADER_TIME AC_CHECK_HEADERS([netinet/in.h]) -# WinSock2 -AC_CHECK_LIB([ws2_32], [puts]) - # Checks for library functions. AC_CHECK_FUNCS([memset select strcasecmp strdup strerror strncasecmp strtol strtoul gettimeofday usleep getaddrinfo]) @@ -239,12 +236,7 @@ SAVED_LIBS="${LIBS}" case $target in *-*-mingw32* | *-*-cygwin* | *-*-windows*) LIBHID="-lhid -lsetupapi" - if test $ac_cv_header_ddk_hidsdi_h = yes - then - HIDINCLUDE="#include " - else - HIDINCLUDE="#include \"my_ddk_hidsdi.h\"" - fi + HIDINCLUDE="#include " ;; *) LIBHID="" diff --git a/src/confwin.c b/src/confwin.c index 1be95e87..9624947f 100644 --- a/src/confwin.c +++ b/src/confwin.c @@ -20,15 +20,13 @@ #include "avrdude.h" #include "libavrdude.h" -#if defined(WIN32NATIVE) +#if defined(WIN32) -#include +#define WIN32_LEAN_AND_MEAN #include - static char *filename; - void win_sys_config_set(char sys_config[PATH_MAX]) { sys_config[0] = 0; @@ -38,7 +36,6 @@ void win_sys_config_set(char sys_config[PATH_MAX]) return; } - void win_usr_config_set(char usr_config[PATH_MAX]) { usr_config[0] = 0; @@ -48,7 +45,4 @@ void win_usr_config_set(char usr_config[PATH_MAX]) return; } - #endif - - diff --git a/src/fileio.c b/src/fileio.c index e03aa7fa..06519c66 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1369,7 +1369,7 @@ static int fmt_autodetect(char * fname) int found; int first = 1; -#if defined(WIN32NATIVE) +#if defined(WIN32) f = fopen(fname, "r"); #else f = fopen(fname, "rb"); @@ -1518,7 +1518,7 @@ int fileio(int op, char * filename, FILEFMT format, } } -#if defined(WIN32NATIVE) +#if defined(WIN32) /* Open Raw Binary and ELF format in binary mode on Windows.*/ if(format == FMT_RBIN || format == FMT_ELF) { diff --git a/src/flip1.c b/src/flip1.c index 220a9426..0c8a3ab2 100644 --- a/src/flip1.c +++ b/src/flip1.c @@ -23,6 +23,7 @@ #include "ac_cfg.h" +#include #include #include #include @@ -30,13 +31,6 @@ #include #include -#if HAVE_STDINT_H -#include -#elif HAVE_INTTYPES_H -#include -#endif - - #include "avrdude.h" #include "libavrdude.h" diff --git a/src/flip2.c b/src/flip2.c index d59147e2..34ad30f5 100644 --- a/src/flip2.c +++ b/src/flip2.c @@ -20,6 +20,7 @@ #include "ac_cfg.h" +#include #include #include #include @@ -27,12 +28,6 @@ #include #include -#if HAVE_STDINT_H -#include -#elif HAVE_INTTYPES_H -#include -#endif - #include "avrdude.h" #include "libavrdude.h" diff --git a/src/ft245r.c b/src/ft245r.c index 42edbb51..d009d9ed 100644 --- a/src/ft245r.c +++ b/src/ft245r.c @@ -73,10 +73,6 @@ #define TPIPCR_GT_0b 0x07 #define TPI_STOP_BITS 0x03 -#if defined(_WIN32) -#include -#endif - #if defined(HAVE_LIBFTDI1) && defined(HAVE_LIBUSB_1_0) # if defined(HAVE_LIBUSB_1_0_LIBUSB_H) # include diff --git a/src/libavrdude.h b/src/libavrdude.h index 0d1bf3a3..40b49b53 100644 --- a/src/libavrdude.h +++ b/src/libavrdude.h @@ -27,15 +27,9 @@ #include #include #include - -/* lets try to select at least 32 bits */ -#ifdef HAVE_STDINT_H #include -typedef uint32_t pinmask_t; -#else -#error Need a C99 capable compiler -#endif +typedef uint32_t pinmask_t; /* formerly lists.h */ @@ -958,7 +952,7 @@ int read_config(const char * file); /* formerly confwin.h */ -#if defined(WIN32NATIVE) +#if defined(WIN32) #ifdef __cplusplus extern "C" { @@ -971,7 +965,7 @@ void win_usr_config_set(char usr_config[PATH_MAX]); } #endif -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ #endif /* libavrdude_h */ diff --git a/src/main.c b/src/main.c index 94222f56..4f5b37ae 100644 --- a/src/main.c +++ b/src/main.c @@ -362,7 +362,7 @@ int main(int argc, char * argv []) char * safemode_response; int fuses_updated = 0; -#if !defined(WIN32NATIVE) +#if !defined(WIN32) char * homedir; #endif @@ -377,10 +377,10 @@ int main(int argc, char * argv []) progname = strrchr(argv[0],'/'); -#if defined (WIN32NATIVE) +#if defined (WIN32) /* take care of backslash as dir sep in W32 */ if (!progname) progname = strrchr(argv[0],'\\'); -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ if (progname) progname++; @@ -730,7 +730,7 @@ int main(int argc, char * argv []) } if (!sys_config_found) { // 3. Check CONFIG_DIR/avrdude.conf -#if defined(WIN32NATIVE) +#if defined(WIN32) win_sys_config_set(sys_config); #else strcpy(sys_config, CONFIG_DIR); @@ -754,7 +754,7 @@ int main(int argc, char * argv []) * ----------- * Determine the location of '.avrduderc'. */ -#if defined(WIN32NATIVE) +#if defined(WIN32) win_usr_config_set(usr_config); #else usr_config[0] = 0; diff --git a/src/msvc/getopt.c b/src/msvc/getopt.c index ac1fda42..9a0347d4 100644 --- a/src/msvc/getopt.c +++ b/src/msvc/getopt.c @@ -49,6 +49,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#define WIN32_LEAN_AND_MEAN #include #include #include diff --git a/src/msvc/gettimeofday.c b/src/msvc/gettimeofday.c index c7a9844d..eb62d0c7 100644 --- a/src/msvc/gettimeofday.c +++ b/src/msvc/gettimeofday.c @@ -3,6 +3,7 @@ * This file is part of the mingw-w64 runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ +#define WIN32_LEAN_AND_MEAN #include #include #include diff --git a/src/msvc/sys/time.h b/src/msvc/sys/time.h index 30b02b3c..d5c3a8c4 100644 --- a/src/msvc/sys/time.h +++ b/src/msvc/sys/time.h @@ -19,6 +19,19 @@ #ifndef _TIME_H_ #define _TIME_H_ +// If you need both and , +// make sure you include first. +#ifndef _WINSOCKAPI_ +#ifndef _TIMEVAL_DEFINED +#define _TIMEVAL_DEFINED +struct timeval +{ + long tv_sec; + long tv_usec; +}; +#endif /* _TIMEVAL_DEFINED */ +#endif /* _WINSOCKAPI_ */ + struct timezone { int tz_minuteswest; diff --git a/src/my_ddk_hidsdi.h b/src/my_ddk_hidsdi.h deleted file mode 100644 index 46c17d67..00000000 --- a/src/my_ddk_hidsdi.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * avrdude - A Downloader/Uploader for AVR device programmers - * Copyright (C) 2006 Christian Starkjohann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* $Id$ */ - -/* -The following is a replacement for hidsdi.h from the Windows DDK. It defines some -of the types and function prototypes of this header for our project. If you -have the Windows DDK version of this file or a version shipped with MinGW, use -that instead. -*/ -#ifndef MY_DDK_HIDSDI_H -#define MY_DDK_HIDSDI_H -#include -#include -#include -typedef struct{ - ULONG Size; - USHORT VendorID; - USHORT ProductID; - USHORT VersionNumber; -}HIDD_ATTRIBUTES; -void __stdcall HidD_GetHidGuid(OUT LPGUID hidGuid); -BOOLEAN __stdcall HidD_GetAttributes(IN HANDLE device, OUT HIDD_ATTRIBUTES *attributes); -BOOLEAN __stdcall HidD_GetManufacturerString(IN HANDLE device, OUT void *buffer, IN ULONG bufferLen); -BOOLEAN __stdcall HidD_GetProductString(IN HANDLE device, OUT void *buffer, IN ULONG bufferLen); -BOOLEAN __stdcall HidD_GetSerialNumberString(IN HANDLE device, OUT void *buffer, IN ULONG bufferLen); -BOOLEAN __stdcall HidD_GetFeature(IN HANDLE device, OUT void *reportBuffer, IN ULONG bufferLen); -BOOLEAN __stdcall HidD_SetFeature(IN HANDLE device, IN void *reportBuffer, IN ULONG bufferLen); -BOOLEAN __stdcall HidD_GetNumInputBuffers(IN HANDLE device, OUT ULONG *numBuffers); -BOOLEAN __stdcall HidD_SetNumInputBuffers(IN HANDLE device, OUT ULONG numBuffers); -#include -#endif /* MY_DDK_HIDSDI_H */ diff --git a/src/pickit2.c b/src/pickit2.c index 52396bbb..9e4be94c 100644 --- a/src/pickit2.c +++ b/src/pickit2.c @@ -54,9 +54,10 @@ #include "avrdude.h" #include "libavrdude.h" -#if defined(HAVE_LIBUSB) || (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) +#if defined(HAVE_LIBUSB) || (defined(WIN32) && defined(HAVE_LIBHID)) -#if (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) +#if (defined(WIN32) && defined(HAVE_LIBHID)) +#define WIN32_LEAN_AND_MEAN #include #include #include @@ -87,8 +88,7 @@ #define SPI_MAX_CHUNK (64 - 10) // max packet size less the command overhead -// win32native only: -#if (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) +#if (defined(WIN32) && defined(HAVE_LIBHID)) static HANDLE open_hid(unsigned short vid, unsigned short pid); static const char *usb_strerror() { @@ -102,7 +102,7 @@ static int usb_open_device(struct usb_dev_handle **dev, int vid, int pid); #define USB_ERROR_NOTFOUND 2 #define USB_ERROR_BUSY 16 #define USB_ERROR_IO 5 -#endif // WIN32NATIVE +#endif // WIN32 static int pickit2_write_report(PROGRAMMER *pgm, const unsigned char report[65]); static int pickit2_read_report(PROGRAMMER *pgm, unsigned char report[65]); @@ -116,7 +116,7 @@ static int pickit2_read_report(PROGRAMMER *pgm, unsigned char report[65]); */ struct pdata { -#if (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) +#if (defined(WIN32) && defined(HAVE_LIBHID)) HANDLE usb_handle, write_event, read_event; #else struct usb_dev_handle *usb_handle; // LIBUSB STUFF @@ -181,7 +181,7 @@ static void pickit2_teardown(PROGRAMMER * pgm) static int pickit2_open(PROGRAMMER * pgm, char * port) { -#if (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) +#if (defined(WIN32) && defined(HAVE_LIBHID)) PDATA(pgm)->usb_handle = open_hid(PICKIT2_VID, PICKIT2_PID); if (PDATA(pgm)->usb_handle == INVALID_HANDLE_VALUE) @@ -229,13 +229,13 @@ static int pickit2_open(PROGRAMMER * pgm, char * port) static void pickit2_close(PROGRAMMER * pgm) { -#if (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) +#if (defined(WIN32) && defined(HAVE_LIBHID)) CloseHandle(PDATA(pgm)->usb_handle); CloseHandle(PDATA(pgm)->read_event); CloseHandle(PDATA(pgm)->write_event); #else usb_close(PDATA(pgm)->usb_handle); -#endif // WIN32NATIVE +#endif // WIN32 } @@ -810,7 +810,7 @@ static int pickit2_spi(struct programmer_t * pgm, const unsigned char *cmd, return n_bytes; } -#if (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) +#if (defined(WIN32) && defined(HAVE_LIBHID)) /* Func: open_hid() Desc: finds & opens device having specified VID & PID. @@ -1120,7 +1120,7 @@ static int pickit2_read_report(PROGRAMMER * pgm, unsigned char report[65]) return usb_read_interrupt(pgm, report, 65, PDATA(pgm)->transaction_timeout); } -#else // WIN32NATIVE +#else // WIN32 /* taken (modified) from avrdude usbasp.c */ static int usb_open_device(struct usb_dev_handle **device, int vendor, int product) { @@ -1184,7 +1184,7 @@ static int usb_open_device(struct usb_dev_handle **device, int vendor, int produ static int pickit2_write_report(PROGRAMMER * pgm, const unsigned char report[65]) { // endpoint 1 OUT?? - return usb_interrupt_write(PDATA(pgm)->usb_handle, USB_ENDPOINT_OUT | 1, (const char*)(report+1), 64, PDATA(pgm)->transaction_timeout); + return usb_interrupt_write(PDATA(pgm)->usb_handle, USB_ENDPOINT_OUT | 1, (char*)(report+1), 64, PDATA(pgm)->transaction_timeout); } static int pickit2_read_report(PROGRAMMER * pgm, unsigned char report[65]) @@ -1192,7 +1192,7 @@ static int pickit2_read_report(PROGRAMMER * pgm, unsigned char report[65]) // endpoint 1 IN?? return usb_interrupt_read(PDATA(pgm)->usb_handle, USB_ENDPOINT_IN | 1, (char*)(report+1), 64, PDATA(pgm)->transaction_timeout); } -#endif // WIN323NATIVE +#endif // WIN32 static int pickit2_parseextparams(struct programmer_t * pgm, LISTID extparms) { @@ -1310,7 +1310,7 @@ void pickit2_initpgm (PROGRAMMER * pgm) #else static int pickit2_nousb_open (struct programmer_t *pgm, char * name) { avrdude_message(MSG_INFO, -#ifdef WIN32NATIVE +#ifdef WIN32 "%s: error: no usb or hid support. Please compile again with libusb or HID support from Win32 DDK installed.\n", #else "%s: error: no usb support. Please compile again with libusb installed.\n", @@ -1332,7 +1332,7 @@ void pickit2_initpgm (PROGRAMMER * pgm) strncpy(pgm->type, "pickit2", sizeof(pgm->type)); } -#endif /* defined(HAVE_LIBUSB) || (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) */ +#endif /* defined(HAVE_LIBUSB) || (defined(WIN32) && defined(HAVE_LIBHID)) */ const char pickit2_desc[] = "Microchip's PICkit2 Programmer"; diff --git a/src/ppi.c b/src/ppi.c index 2706b850..4478115f 100644 --- a/src/ppi.c +++ b/src/ppi.c @@ -19,7 +19,7 @@ /* $Id$ */ -#if !defined(WIN32NATIVE) +#if !defined(WIN32) #include "ac_cfg.h" @@ -233,4 +233,4 @@ void ppi_close(union filedescriptor *fdp) #endif /* HAVE_PARPORT */ -#endif /* !WIN32NATIVE */ +#endif /* !WIN32 */ diff --git a/src/ppiwin.c b/src/ppiwin.c index 15017277..71ec0a9f 100644 --- a/src/ppiwin.c +++ b/src/ppiwin.c @@ -32,8 +32,9 @@ reg = register as defined in an enum in ppi.h. This must be converted #include "ac_cfg.h" -#if defined(HAVE_PARPORT) && defined(WIN32NATIVE) +#if defined(HAVE_PARPORT) && defined(WIN32) +#define WIN32_LEAN_AND_MEAN #include #include #include @@ -336,82 +337,4 @@ static void outb(unsigned char value, unsigned short port) return; } -#if !defined(HAVE_GETTIMEOFDAY) -struct timezone; -int gettimeofday(struct timeval *tv, struct timezone *unused){ -// i've found only ms resolution, avrdude expects us - - SYSTEMTIME st; - GetSystemTime(&st); - - tv->tv_sec=(long)(st.wSecond+st.wMinute*60+st.wHour*3600); - tv->tv_usec=(long)(st.wMilliseconds*1000); - - return 0; -} -#endif /* HAVE_GETTIMEOFDAY */ - -// #define W32USLEEPDBG - -#ifdef W32USLEEPDBG - -# define DEBUG_QueryPerformanceCounter(arg) QueryPerformanceCounter(arg) -# define DEBUG_DisplayTimingInfo(start, stop, freq, us, has_highperf) \ - do { \ - unsigned long dt; \ - dt = (unsigned long)((stop.QuadPart - start.QuadPart) * 1000 * 1000 \ - / freq.QuadPart); \ - avrdude_message(MSG_INFO, \ - "hpt:%i usleep usec:%lu sleep msec:%lu timed usec:%lu\n", \ - has_highperf, us, ((us + 999) / 1000), dt); \ - } while (0) - -#else - -# define DEBUG_QueryPerformanceCounter(arg) -# define DEBUG_DisplayTimingInfo(start, stop, freq, us, has_highperf) - #endif - -#if !defined(HAVE_USLEEP) -int usleep(unsigned int us) -{ - int has_highperf; - LARGE_INTEGER freq,start,stop,loopend; - - // workaround: although usleep is very precise if using - // high-performance-timers there are sometimes problems with - // verify - increasing the delay helps sometimes but not - // realiably. There must be some other problem. Maybe just - // with my test-hardware maybe in the code-base. - //// us=(unsigned long) (us*1.5); - - has_highperf=QueryPerformanceFrequency(&freq); - - //has_highperf=0; // debug - - if (has_highperf) { - QueryPerformanceCounter(&start); - loopend.QuadPart=start.QuadPart+freq.QuadPart*us/(1000*1000); - do { - QueryPerformanceCounter(&stop); - } while (stop.QuadPart<=loopend.QuadPart); - } - else { - DEBUG_QueryPerformanceCounter(&start); - - Sleep(1); - Sleep( (DWORD)((us+999)/1000) ); - - DEBUG_QueryPerformanceCounter(&stop); - } - - DEBUG_DisplayTimingInfo(start, stop, freq, us, has_highperf); - - return 0; -} -#endif /* !HAVE_USLEEP */ - -#endif - - diff --git a/src/ser_avrdoper.c b/src/ser_avrdoper.c index c834411b..2e90f0eb 100644 --- a/src/ser_avrdoper.c +++ b/src/ser_avrdoper.c @@ -26,7 +26,7 @@ #include "ac_cfg.h" -#if defined(HAVE_LIBHIDAPI) || (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) +#if defined(HAVE_LIBHIDAPI) || (defined(WIN32) && defined(HAVE_LIBHID)) #include #include @@ -161,6 +161,7 @@ static int usbGetReport(union filedescriptor *fdp, int reportType, int reportNum /* ------------------------------------------------------------------------ */ +#define WIN32_LEAN_AND_MEAN #include #include #include @@ -327,7 +328,7 @@ static int usbGetReport(union filedescriptor *fdp, int reportType, int reportNum return rval == 0 ? USB_ERROR_IO : 0; } -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ /* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */ @@ -550,4 +551,4 @@ struct serial_device avrdoper_serdev = .flags = SERDEV_FL_NONE, }; -#endif /* defined(HAVE_LIBHIDAPI) || (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) */ +#endif /* defined(HAVE_LIBHIDAPI) || (defined(WIN32) && defined(HAVE_LIBHID)) */ diff --git a/src/ser_posix.c b/src/ser_posix.c index 3d8e15a1..96d665f0 100644 --- a/src/ser_posix.c +++ b/src/ser_posix.c @@ -23,7 +23,7 @@ * Posix serial interface for avrdude. */ -#if !defined(WIN32NATIVE) +#if !defined(WIN32) #include "ac_cfg.h" @@ -174,7 +174,6 @@ static int ser_setparams(union filedescriptor *fd, long baud, unsigned long cfla static int net_open(const char *port, union filedescriptor *fdp) { -#ifdef HAVE_GETADDRINFO char *hp, *hstr, *pstr; int s, fd, ret = -1; struct addrinfo hints; @@ -247,12 +246,6 @@ net_open(const char *port, union filedescriptor *fdp) error: free(hp); return ret; -#else - avrdude_message(MSG_INFO, - "%s: Networking is not supported on your platform.\n" - "If you need it, please open a bug report.\n", progname); - return -1; -#endif /* HAVE_GETADDRINFO */ } @@ -526,4 +519,4 @@ struct serial_device serial_serdev = struct serial_device *serdev = &serial_serdev; -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ diff --git a/src/ser_win32.c b/src/ser_win32.c index 25412cf0..fa4d7aba 100644 --- a/src/ser_win32.c +++ b/src/ser_win32.c @@ -17,22 +17,18 @@ * along with this program. If not, see . */ -/* $Id$ */ - /* * Native Win32 serial interface for avrdude. */ #include "ac_cfg.h" -#if defined(WIN32NATIVE) - -#ifdef HAVE_LIBWS2_32 -/* winsock2.h must be included before windows.h from avrdude.h... */ -# include -#endif +#if defined(WIN32) +#define WIN32_LEAN_AND_MEAN #include +#include +#include #include #include /* for isprint */ #include /* ENOTTY */ @@ -154,7 +150,6 @@ static int ser_setparams(union filedescriptor *fd, long baud, unsigned long cfla } } -#ifdef HAVE_LIBWS2_32 static int net_open(const char *port, union filedescriptor *fdp) { @@ -246,7 +241,6 @@ net_open(const char *port, union filedescriptor *fdp) serial_over_ethernet = 1; return 0; } -#endif static int ser_open(char * port, union pinfo pinfo, union filedescriptor *fdp) @@ -260,14 +254,7 @@ static int ser_open(char * port, union pinfo pinfo, union filedescriptor *fdp) * handle it as a TCP connection to a terminal server. */ if (strncmp(port, "net:", strlen("net:")) == 0) { -#ifdef HAVE_LIBWS2_32 return net_open(port + strlen("net:"), fdp); -#else - avrdude_message(MSG_INFO, "%s: ser_open(): " - "not configured for TCP connections\n", - progname); - return -1; -#endif } if (strncasecmp(port, "com", strlen("com")) == 0) { @@ -370,7 +357,6 @@ static int ser_set_dtr_rts(union filedescriptor *fd, int is_on) } } -#ifdef HAVE_LIBWS2_32 static int net_send(union filedescriptor *fd, const unsigned char * buf, size_t buflen) { LPVOID lpMsgBuf; @@ -429,16 +415,13 @@ static int net_send(union filedescriptor *fd, const unsigned char * buf, size_t return 0; } -#endif static int ser_send(union filedescriptor *fd, const unsigned char * buf, size_t buflen) { -#ifdef HAVE_LIBWS2_32 if (serial_over_ethernet) { return net_send(fd, buf, buflen); } -#endif size_t len = buflen; unsigned char c='\0'; @@ -493,7 +476,6 @@ static int ser_send(union filedescriptor *fd, const unsigned char * buf, size_t } -#ifdef HAVE_LIBWS2_32 static int net_recv(union filedescriptor *fd, unsigned char * buf, size_t buflen) { LPVOID lpMsgBuf; @@ -587,15 +569,12 @@ reselect: return 0; } -#endif static int ser_recv(union filedescriptor *fd, unsigned char * buf, size_t buflen) { -#ifdef HAVE_LIBWS2_32 if (serial_over_ethernet) { return net_recv(fd, buf, buflen); } -#endif unsigned char c; unsigned char * p = buf; @@ -660,7 +639,6 @@ static int ser_recv(union filedescriptor *fd, unsigned char * buf, size_t buflen return 0; } -#ifdef HAVE_LIBWS2_32 static int net_drain(union filedescriptor *fd, int display) { LPVOID lpMsgBuf; @@ -739,15 +717,12 @@ static int net_drain(union filedescriptor *fd, int display) return 0; } -#endif static int ser_drain(union filedescriptor *fd, int display) { -#ifdef HAVE_LIBWS2_32 if (serial_over_ethernet) { return net_drain(fd, display); } -#endif // int rc; unsigned char buf[10]; @@ -813,4 +788,4 @@ struct serial_device serial_serdev = struct serial_device *serdev = &serial_serdev; -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ diff --git a/src/serbb_posix.c b/src/serbb_posix.c index a7dd0997..9f10dccf 100644 --- a/src/serbb_posix.c +++ b/src/serbb_posix.c @@ -23,7 +23,7 @@ * Posix serial bitbanging interface for avrdude. */ -#if !defined(WIN32NATIVE) +#if !defined(WIN32) #include "ac_cfg.h" @@ -318,4 +318,4 @@ void serbb_initpgm(PROGRAMMER *pgm) pgm->write_byte = avr_write_byte_default; } -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ diff --git a/src/serbb_win32.c b/src/serbb_win32.c index ff087c4e..9a58be10 100644 --- a/src/serbb_win32.c +++ b/src/serbb_win32.c @@ -25,11 +25,12 @@ #include "avrdude.h" -#if defined(WIN32NATIVE) +#if defined(WIN32) #include "ac_cfg.h" +#define WIN32_LEAN_AND_MEAN #include #include @@ -363,4 +364,4 @@ void serbb_initpgm(PROGRAMMER *pgm) pgm->write_byte = avr_write_byte_default; } -#endif /* WIN32NATIVE */ +#endif /* WIN32 */ diff --git a/src/stk500v2.c b/src/stk500v2.c index f6c5b1ca..11aa9a94 100644 --- a/src/stk500v2.c +++ b/src/stk500v2.c @@ -1613,7 +1613,7 @@ static int stk500v2_open(PROGRAMMER * pgm, char * port) PDATA(pgm)->pgmtype = PGMTYPE_UNKNOWN; if(strcasecmp(port, "avrdoper") == 0){ -#if defined(HAVE_LIBHIDAPI) || (defined(WIN32NATIVE) && defined(HAVE_LIBHID)) +#if defined(HAVE_LIBHIDAPI) || (defined(WIN32) && defined(HAVE_LIBHID)) serdev = &avrdoper_serdev; PDATA(pgm)->pgmtype = PGMTYPE_STK500; #else diff --git a/src/term.c b/src/term.c index 11acb59d..96bf2bce 100644 --- a/src/term.c +++ b/src/term.c @@ -27,11 +27,9 @@ #include #if defined(HAVE_LIBREADLINE) -#if !defined(WIN32NATIVE) # include # include #endif -#endif #include "avrdude.h" #include "term.h" @@ -919,7 +917,7 @@ static int do_cmd(PROGRAMMER * pgm, struct avrpart * p, char * terminal_get_input(const char *prompt) { -#if defined(HAVE_LIBREADLINE) && !defined(WIN32NATIVE) +#if defined(HAVE_LIBREADLINE) && !defined(WIN32) char *input; input = readline(prompt); if ((input != NULL) && (strlen(input) >= 1)) diff --git a/src/updi_link.c b/src/updi_link.c index b1af2b87..157c81b2 100644 --- a/src/updi_link.c +++ b/src/updi_link.c @@ -39,14 +39,9 @@ #include "updi_constants.h" #include "updi_state.h" -#include - -void msleep(int tms) +static void msleep(int tms) { - struct timeval tv; - tv.tv_sec = tms / 1000; - tv.tv_usec = (tms % 1000) * 1000; - select (0, NULL, NULL, NULL, &tv); + usleep(tms * 1000); } static int updi_physical_open(PROGRAMMER* pgm, int baudrate, unsigned long cflags) diff --git a/src/usb_hidapi.c b/src/usb_hidapi.c index 81e9c4ab..d23c628e 100644 --- a/src/usb_hidapi.c +++ b/src/usb_hidapi.c @@ -42,11 +42,6 @@ #include "usbdevs.h" -#if defined(WIN32NATIVE) -/* someone has defined "interface" to "struct" in Cygwin */ -# undef interface -#endif - /* * The "baud" parameter is meaningless for USB devices, so we reuse it * to pass the desired USB device ID. diff --git a/src/usb_libusb.c b/src/usb_libusb.c index 235e330a..0d9ad440 100644 --- a/src/usb_libusb.c +++ b/src/usb_libusb.c @@ -48,7 +48,7 @@ #include "usbdevs.h" -#if defined(WIN32NATIVE) +#if defined(WIN32) /* someone has defined "interface" to "struct" in Cygwin */ # undef interface #endif diff --git a/src/usbtiny.c b/src/usbtiny.c index 0360d68f..68886aab 100644 --- a/src/usbtiny.c +++ b/src/usbtiny.c @@ -52,13 +52,7 @@ #define TPIPCR_GT_0b 0x07 #define TPI_STOP_BITS 0x03 -#ifdef HAVE_NETINET_IN_H -# include -# define LITTLE_TO_BIG_16(x) (htons(x)) -#else -// WIN32 -# define LITTLE_TO_BIG_16(x) ((((x) << 8) & 0xFF00) | (((x) >> 8) & 0x00FF)) -#endif +#define LITTLE_TO_BIG_16(x) ((((x) << 8) & 0xFF00) | (((x) >> 8) & 0x00FF)) #ifndef HAVE_UINT_T typedef unsigned int uint_t;