Backout larger part of last commit that prematurely got into the

tree (FTDI bit-bang support, not yet fully done).



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@938 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch 2010-02-11 16:20:11 +00:00
parent 0ae1b3957e
commit c891cb15c8
6 changed files with 1 additions and 70 deletions

View File

@ -56,7 +56,7 @@ avrdude_CFLAGS = @ENABLE_WARNINGS@
libavrdude_a_CFLAGS = @ENABLE_WARNINGS@ libavrdude_a_CFLAGS = @ENABLE_WARNINGS@
avrdude_LDADD = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB@ @LIBFTDI@ @LIBHID@ -lm avrdude_LDADD = $(top_builddir)/$(noinst_LIBRARIES) @LIBUSB@ @LIBHID@ -lm
bin_PROGRAMS = avrdude bin_PROGRAMS = avrdude
@ -87,8 +87,6 @@ libavrdude_a_SOURCES = \
avr910.c \ avr910.c \
avr910.h \ avr910.h \
avrdude.h \ avrdude.h \
avrftdi.c \
avrftdi.h \
avrpart.c \ avrpart.c \
avrpart.h \ avrpart.h \
bitbang.c \ bitbang.c \

View File

@ -320,16 +320,6 @@ programmer
type = arduino; type = arduino;
; ;
programmer
id = "avrftdi";
desc = "FT2232D based generic programmer";
type = avrftdi;
usbvid = 0x0403;
usbpid = 0x6010;
usbvendor = "";
usbproduct = "";
;
programmer programmer
id = "avrisp"; id = "avrisp";
desc = "Atmel AVR ISP"; desc = "Atmel AVR ISP";

View File

@ -82,7 +82,6 @@ static int parse_cmdbits(OPCODE * op);
%token K_PAGED %token K_PAGED
%token K_ARDUINO %token K_ARDUINO
%token K_AVRFTDI
%token K_BAUDRATE %token K_BAUDRATE
%token K_BS2 %token K_BS2
%token K_BUFF %token K_BUFF
@ -151,10 +150,6 @@ static int parse_cmdbits(OPCODE * op);
%token K_AVR910 %token K_AVR910
%token K_USBASP %token K_USBASP
%token K_USBTINY %token K_USBTINY
%token K_USBPID
%token K_USBPRODUCT
%token K_USBVENDOR
%token K_USBVID
%token K_BUTTERFLY %token K_BUTTERFLY
%token K_TYPE %token K_TYPE
%token K_VCC %token K_VCC
@ -437,12 +432,6 @@ prog_parm :
} }
} | } |
K_TYPE TKN_EQUAL K_AVRFTDI {
{
avrftdi_initpgm(current_prog);
}
} |
K_TYPE TKN_EQUAL K_BUSPIRATE { K_TYPE TKN_EQUAL K_BUSPIRATE {
{ {
buspirate_initpgm(current_prog); buspirate_initpgm(current_prog);
@ -602,34 +591,6 @@ prog_parm :
} }
} | } |
K_USBVID TKN_EQUAL TKN_NUMBER {
{
current_prog->usbvid = $3->value.number;
}
} |
K_USBPID TKN_EQUAL TKN_NUMBER {
{
current_prog->usbpid = $3->value.number;
}
} |
K_USBVENDOR TKN_EQUAL TKN_STRING {
{
strncpy(current_prog->usbvendor, $3->value.string, PGM_USBSTRINGLEN);
current_prog->usbvendor[PGM_USBSTRINGLEN-1] = 0;
free_token($3);
}
} |
K_USBPRODUCT TKN_EQUAL TKN_STRING {
{
strncpy(current_prog->usbproduct, $3->value.string, PGM_USBSTRINGLEN);
current_prog->usbproduct[PGM_USBSTRINGLEN-1] = 0;
free_token($3);
}
} |
K_BAUDRATE TKN_EQUAL TKN_NUMBER { K_BAUDRATE TKN_EQUAL TKN_NUMBER {
{ {
current_prog->baudrate = $3->value.number; current_prog->baudrate = $3->value.number;

View File

@ -66,16 +66,6 @@ if test x$have_libusb = xyes; then
fi fi
AC_SUBST(LIBUSB, $LIBUSB) AC_SUBST(LIBUSB, $LIBUSB)
AH_TEMPLATE([HAVE_LIBFTDI],
[Define if FTDI support is enabled via libftdi])
AC_CHECK_LIB([ftdi], [ftdi_init], [have_libftdi=yes])
if test x$have_libftdi = xyes; then
LIBFTDI="-lftdi"
AC_DEFINE([HAVE_LIBFTDI])
fi
AC_SUBST(LIBFTDI, $LIBFTDI)
# Checks for header files. # Checks for header files.
AC_CHECK_HEADERS([limits.h stdlib.h string.h]) AC_CHECK_HEADERS([limits.h stdlib.h string.h])
AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/time.h termios.h unistd.h]) AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/time.h termios.h unistd.h])

View File

@ -120,7 +120,6 @@ allowfullpagebitstream { yylval=NULL; return K_ALLOWFULLPAGEBITSTREAM; }
arduino { yylval=NULL; return K_ARDUINO; } arduino { yylval=NULL; return K_ARDUINO; }
avr910 { yylval=NULL; return K_AVR910; } avr910 { yylval=NULL; return K_AVR910; }
avr910_devcode { yylval=NULL; return K_AVR910_DEVCODE; } avr910_devcode { yylval=NULL; return K_AVR910_DEVCODE; }
avrftdi { yylval=NULL; return K_AVRFTDI; }
usbasp { yylval=NULL; return K_USBASP; } usbasp { yylval=NULL; return K_USBASP; }
usbtiny { yylval=NULL; return K_USBTINY; } usbtiny { yylval=NULL; return K_USBTINY; }
bank_size { yylval=NULL; return K_PAGE_SIZE; } bank_size { yylval=NULL; return K_PAGE_SIZE; }
@ -198,10 +197,6 @@ stk600 { yylval=NULL; return K_STK600; }
stk600hvsp { yylval=NULL; return K_STK600HVSP; } stk600hvsp { yylval=NULL; return K_STK600HVSP; }
stk600pp { yylval=NULL; return K_STK600PP; } stk600pp { yylval=NULL; return K_STK600PP; }
type { yylval=NULL; return K_TYPE; } type { yylval=NULL; return K_TYPE; }
usbpid { yylval=NULL; return K_USBPID; }
usbproduct { yylval=NULL; return K_USBPRODUCT; }
usbvendor { yylval=NULL; return K_USBVENDOR; }
usbvid { yylval=NULL; return K_USBVID; }
vcc { yylval=NULL; return K_VCC; } vcc { yylval=NULL; return K_VCC; }
vfyled { yylval=NULL; return K_VFYLED; } vfyled { yylval=NULL; return K_VFYLED; }

3
pgm.h
View File

@ -36,7 +36,6 @@
#define PGM_DESCLEN 80 #define PGM_DESCLEN 80
#define PGM_PORTLEN PATH_MAX #define PGM_PORTLEN PATH_MAX
#define PGM_TYPELEN 32 #define PGM_TYPELEN 32
#define PGM_USBSTRINGLEN 256
typedef enum { typedef enum {
EXIT_VCC_UNSPEC, EXIT_VCC_UNSPEC,
@ -61,8 +60,6 @@ typedef struct programmer_t {
int ppidata; int ppidata;
int ppictrl; int ppictrl;
int baudrate; int baudrate;
int usbvid, usbpid;
char usbvendor[PGM_USBSTRINGLEN], usbproduct[PGM_USBSTRINGLEN];
double bitclock; /* JTAG ICE clock period in microseconds */ double bitclock; /* JTAG ICE clock period in microseconds */
int ispdelay; /* ISP clock delay */ int ispdelay; /* ISP clock delay */
union filedescriptor fd; union filedescriptor fd;