software/avrdude_usbasp.2005-11-14.patch

   1 diff -Naur avrdude-5.0/Makefile.am avrdude-5.0-usbasp/Makefile.am
   2 --- avrdude-5.0/Makefile.am     Sun Sep 18 22:12:23 2005
   3 +++ avrdude-5.0-usbasp/Makefile.am      Mon Nov 14 20:57:20 2005
   4 @@ -98,6 +98,8 @@
   5         stk500v2.c \
   6         stk500v2.h \
   7         stk500v2_private.h \
   8 +       usbasp.c \
   9 +       usbasp.h \
  10         term.c \
  11         term.h \
  12         usb_libusb.c
  13 diff -Naur avrdude-5.0/avrdude.conf.in avrdude-5.0-usbasp/avrdude.conf.in
  14 --- avrdude-5.0/avrdude.conf.in Sun Sep 18 02:44:20 2005
  15 +++ avrdude-5.0-usbasp/avrdude.conf.in  Mon Nov 14 20:57:33 2005
  16 @@ -262,6 +262,12 @@
  17  ;
  18
  19  programmer
  20 +  id    = "usbasp";
  21 +  desc  = "usbasp";
  22 +  type  = usbasp;
  23 +;
  24 +
  25 +programmer
  26    id    = "butterfly";
  27    desc  = "Atmel Butterfly Development Board";
  28    type  = butterfly;
  29 diff -Naur avrdude-5.0/config_gram.y avrdude-5.0-usbasp/config_gram.y
  30 --- avrdude-5.0/config_gram.y   Sun Sep 18 22:12:23 2005
  31 +++ avrdude-5.0-usbasp/config_gram.y    Mon Nov 14 20:57:50 2005
  32 @@ -37,6 +37,7 @@
  33  #include "stk500v2.h"
  34  #include "avr910.h"
  35  #include "butterfly.h"
  36 +#include "usbasp.h"
  37  #include "avr.h"
  38  #include "jtagmkII.h"
  39
  40 @@ -118,6 +119,7 @@
  41  %token K_STK500
  42  %token K_STK500V2
  43  %token K_AVR910
  44 +%token K_USBASP
  45  %token K_BUTTERFLY
  46  %token K_TYPE
  47  %token K_VCC
  48 @@ -349,6 +351,12 @@
  49    K_TYPE TKN_EQUAL K_AVR910 {
  50      {
  51        avr910_initpgm(current_prog);
  52 +    }
  53 +  } |
  54 +
  55 +  K_TYPE TKN_EQUAL K_USBASP {
  56 +    {
  57 +      usbasp_initpgm(current_prog);
  58      }
  59    } |
  60
  61 diff -Naur avrdude-5.0/configure.ac avrdude-5.0-usbasp/configure.ac
  62 --- avrdude-5.0/configure.ac    Wed Sep 21 03:37:02 2005
  63 +++ avrdude-5.0-usbasp/configure.ac     Mon Nov 14 20:58:07 2005
  64 @@ -46,7 +46,24 @@
  65  AC_CHECK_LIB([readline], [readline])
  66  # usb_get_string_simple is only available in recent enough
  67  # versions of libusb, so use that as a decision base.
  68 -AC_CHECK_LIB([usb], [usb_get_string_simple])
  69 +#AC_CHECK_LIB([usb], [usb_get_string_simple])
  70 +
  71 +AH_TEMPLATE([HAVE_LIBUSB],
  72 +                   [Define if USB support is enabled via libusb])
  73 +AC_CHECK_LIB(usb, main, have_libusb=yes)
  74 +if test x$have_libusb = xyes; then
  75 +   case $target in
  76 +       *-*-darwin*)
  77 +               LIBS="$LIBS -lusb -framework CoreFoundation -framework IOKit"
  78 +               ;;
  79 +       *)
  80 +               LIBS="$LIBS -lusb"
  81 +;;
  82 +   esac
  83 +   AC_DEFINE([HAVE_LIBUSB])
  84 +fi
  85 +
  86 +
  87
  88  # Checks for header files.
  89  AC_HEADER_STDC
  90 diff -Naur avrdude-5.0/lexer.l avrdude-5.0-usbasp/lexer.l
  91 --- avrdude-5.0/lexer.l Sun Sep 18 22:12:23 2005
  92 +++ avrdude-5.0-usbasp/lexer.l  Mon Nov 14 20:58:24 2005
  93 @@ -118,6 +118,7 @@
  94  allowfullpagebitstream { yylval=NULL; return K_ALLOWFULLPAGEBITSTREAM; }
  95  avr910           { yylval=NULL; return K_AVR910; }
  96  avr910_devcode   { yylval=NULL; return K_AVR910_DEVCODE; }
  97 +usbasp           { yylval=NULL; return K_USBASP; }
  98  bank_size        { yylval=NULL; return K_PAGE_SIZE; }
  99  banked           { yylval=NULL; return K_PAGED; }
 100  baudrate         { yylval=NULL; return K_BAUDRATE; }