From cf07755f50c60d12636c950665d5e736e82d8398 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Mon, 14 Aug 2006 21:30:04 +0000 Subject: [PATCH] Submitted by : * stk500v2.c (stk500v2_open): patch #5273: Emit error message if user requests usb and no libusb support git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@608 81a1dc3b-b13d-400b-aceb-764788c761c2 --- avrdude/ChangeLog | 6 ++++++ avrdude/stk500v2.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog index d519ca25..c06ee077 100644 --- a/avrdude/ChangeLog +++ b/avrdude/ChangeLog @@ -1,3 +1,9 @@ +2006-08-14 Joerg Wunsch + + Submitted by : + * stk500v2.c (stk500v2_open): patch #5273: Emit error message + if user requests usb and no libusb support + 2006-08-14 Joerg Wunsch * avrdude.conf.in: Add HVSP/PP mode parameters for all AVRs. diff --git a/avrdude/stk500v2.c b/avrdude/stk500v2.c index 70157c70..653e0a1d 100644 --- a/avrdude/stk500v2.c +++ b/avrdude/stk500v2.c @@ -732,7 +732,6 @@ static int stk500v2_open(PROGRAMMER * pgm, char * port) if (pgm->baudrate) baud = pgm->baudrate; -#if defined(HAVE_LIBUSB) /* * If the port name starts with "usb", divert the serial routines * to the USB ones. The serial_open() function for USB overrides @@ -740,12 +739,16 @@ static int stk500v2_open(PROGRAMMER * pgm, char * port) * search for. */ if (strncmp(port, "usb", 3) == 0) { +#if defined(HAVE_LIBUSB) serdev = &usb_serdev_frame; baud = USB_DEVICE_AVRISPMKII; is_mk2 = 1; pgm->set_sck_period = stk500v2_set_sck_period_mk2; - } +#else + fprintf(stderr, "avrdude was compiled without usb support.\n"); + return -1; #endif + } strcpy(pgm->port, port); pgm->fd = serial_open(port, baud);