qi-hardware/ben-blinkenlights
1
0
Fork 0
mirror of git://projects.qi-hardware.com/ben-blinkenlights.git synced 2024-11-27 18:18:27 +02:00
Code

avrdude/patches/nanonote.patch: fix pin inversion in nanonote.c:nanonote_getpin

Browse Source
This commit is contained in:
Werner Almesberger 2012-07-22 09:52:55 -03:00
parent b0e83a9202
commit 2f65672dfc
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
avrdude/patches/nanonote.patch
View File

@ -1,7 +1,7 @@
Index: avrdude/Makefile.am Index: avrdude-5.10/Makefile.am
=================================================================== ===================================================================
--- avrdude.orig/Makefile.am 2011-03-07 16:50:03.000000000 -0300 --- avrdude-5.10.orig/Makefile.am 2012-07-22 02:37:03.193005002 -0300
+++ avrdude/Makefile.am 2011-03-07 16:50:06.000000000 -0300 +++ avrdude-5.10/Makefile.am 2012-07-22 09:49:49.796758405 -0300
@@ -111,6 +111,8 @@ @@ -111,6 +111,8 @@
lists.c \ lists.c \
lists.h \ lists.h \
@ -11,10 +11,10 @@ Index: avrdude/Makefile.am
par.c \ par.c \
par.h \ par.h \
pgm.c \ pgm.c \
Index: avrdude/config_gram.y Index: avrdude-5.10/config_gram.y
=================================================================== ===================================================================
--- avrdude.orig/config_gram.y 2011-03-07 16:50:03.000000000 -0300 --- avrdude-5.10.orig/config_gram.y 2012-07-22 09:49:49.768757480 -0300
+++ avrdude/config_gram.y 2011-03-07 16:50:06.000000000 -0300 +++ avrdude-5.10/config_gram.y 2012-07-22 09:49:49.796758405 -0300
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
#include "avr.h" #include "avr.h"
#include "jtagmkI.h" #include "jtagmkI.h"
@ -44,10 +44,10 @@ Index: avrdude/config_gram.y
K_DESC TKN_EQUAL TKN_STRING { K_DESC TKN_EQUAL TKN_STRING {
strncpy(current_prog->desc, $3->value.string, PGM_DESCLEN); strncpy(current_prog->desc, $3->value.string, PGM_DESCLEN);
current_prog->desc[PGM_DESCLEN-1] = 0; current_prog->desc[PGM_DESCLEN-1] = 0;
Index: avrdude/lexer.l Index: avrdude-5.10/lexer.l
=================================================================== ===================================================================
--- avrdude.orig/lexer.l 2011-03-07 16:50:03.000000000 -0300 --- avrdude-5.10.orig/lexer.l 2012-07-22 02:37:03.181004582 -0300
+++ avrdude/lexer.l 2011-03-07 16:50:06.000000000 -0300 +++ avrdude-5.10/lexer.l 2012-07-22 09:49:49.796758405 -0300
@@ -164,6 +164,7 @@ @@ -164,6 +164,7 @@
min_write_delay { yylval=NULL; return K_MIN_WRITE_DELAY; } min_write_delay { yylval=NULL; return K_MIN_WRITE_DELAY; }
miso { yylval=NULL; return K_MISO; } miso { yylval=NULL; return K_MISO; }
@ -56,10 +56,10 @@ Index: avrdude/lexer.l
num_banks { yylval=NULL; return K_NUM_PAGES; } num_banks { yylval=NULL; return K_NUM_PAGES; }
num_pages { yylval=NULL; return K_NUM_PAGES; } num_pages { yylval=NULL; return K_NUM_PAGES; }
nvm_base { yylval=NULL; return K_NVM_BASE; } nvm_base { yylval=NULL; return K_NVM_BASE; }
Index: avrdude/nanonote.c Index: avrdude-5.10/nanonote.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ avrdude/nanonote.c 2011-03-07 17:07:16.000000000 -0300 +++ avrdude-5.10/nanonote.c 2012-07-22 09:50:12.621513588 -0300
@@ -0,0 +1,374 @@ @@ -0,0 +1,374 @@
+/* +/*
+ * avrdude - A Downloader/Uploader for AVR device programmers + * avrdude - A Downloader/Uploader for AVR device programmers
@ -258,7 +258,7 @@ Index: avrdude/nanonote.c
+fprintf(stderr, "pin %d (%u, %u): %d\n", +fprintf(stderr, "pin %d (%u, %u): %d\n",
+pin, pin_map[pin].port, pin_map[pin].bit, v); +pin, pin_map[pin].port, pin_map[pin].bit, v);
+#endif +#endif
+ return pin & PIN_INVERSE ? !v : v; + return invert ? !v : v;
+} +}
+ +
+ +
@ -435,10 +435,10 @@ Index: avrdude/nanonote.c
+ } + }
+ PDATA(pgm)->clk = 0; + PDATA(pgm)->clk = 0;
+} +}
Index: avrdude/nanonote.h Index: avrdude-5.10/nanonote.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ avrdude/nanonote.h 2011-03-07 16:50:06.000000000 -0300 +++ avrdude-5.10/nanonote.h 2012-07-22 09:49:49.796758405 -0300
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+#ifndef nanonote_h +#ifndef nanonote_h
+#define nanonote_h +#define nanonote_h