Hi all:
I'm trying to figure out which of the patches listed here:
"http://sourceforge.net/tracker/?atid=425409&group_id=39505&func=browse
"
to apply to the current Avarice 2.10.
I also have another patch listed by the people on AVR freaks which is
from "Debian" for Avarice called: FTBFS: jtag2usb.cc:98: error:
invalid conversion from 'const char*' to 'char*'
the file is called "avarice_210.patch".
In all there are currently 6 patches in the wild. However if you
apply patch "avarice-fuses-segfault-fix.patch" then the file
"jtag2prog.cc" is messed up so the patch "avarice-elf-fuses-
lock.patch" barfs on the 1st hunk of the patch to "jtag2prog.cc".
I eliminated the patch "avarice-fuses-segfault-fix.patch" from my list
of patches to fix this problem.
Now I'm down to 5 possible patches, but when I apply the patch file
"avarice-elf-fuses-lock.patch" it now barfs on hunk 75 of 76 working
on file "devdescr.cc". When looking at the patch file I see the
second to the last hunk (75 of 76) looks like this:
@@ -4482,6 +4630,8 @@
0xA701,
256, 512, // 131072 bytes flash
8, 512, // 4096 bytes EEPROM
+ 3, 1, // 3 bytes FUSES
+ 1, 1, // 1 byte LOCKBITS (TODO)
72 * 4, // 72 interrupt vectors
DEVFL_MKII_ONLY,
NULL, // registers not yet defined
which seems OK, but the original file at line 4482 looks like this:
0xA701,
256, 512, // 131072 bytes flash
8, 512, // 4096 bytes EEPROM
71 * 4, // 71 interrupt vectors
DEVFL_MKII_ONLY,
NULL, // registers not yet defined
It appears that the patch program does not like the fact that the
patch shows line 4485 is: " 72 * 4, // 72 interrupt vectors",
and the line in the original file is not the same. ( 71 * 4, // 71
interrupt vectors).
I really don't know much about the patching stuff and I would sure
like some sage advice on what to do next.
TIA,
Ed
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
avarice-user mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/avarice-user
