From 51012e9af86585280f9ff99a59cf86cc5c6bdaec Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Tue, 12 Sep 2006 12:01:34 +0000 Subject: [PATCH] Convert some of the tables to multitables in order to beautify the result. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@657 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 5 + doc/avrdude.texi | 325 +++++++++++++++-------------------------------- 2 files changed, 105 insertions(+), 225 deletions(-) diff --git a/ChangeLog b/ChangeLog index 592f95dc..7c3ebc0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-12 Joerg Wunsch + + * doc/avrdude.texi: Convert some of the tables to multitables + in order to beautify the result. + 2006-09-10 Joerg Wunsch Contributed by Thomas Fischl: add support for USBasp. diff --git a/doc/avrdude.texi b/doc/avrdude.texi index 8a1e5baa..1dff1295 100644 --- a/doc/avrdude.texi +++ b/doc/avrdude.texi @@ -262,146 +262,54 @@ but it can be added to the configuration file if you have the Atmel datasheet so that you can enter the programming specifications. Currently, the following MCU types are understood: -@table @code -@itemx c128 -AT90CAN128 - -@itemx pwm2 -AT90PWM2 - -@itemx pwm3 -AT90PWM3 - -@itemx 1200 -AT90S1200 - -@itemx 2313 -AT90S2313 - -@itemx 2333 -AT90S2333 - -@itemx 2343 -AT90S2343 (*) - -@itemx 4414 -AT90S4414 - -@itemx 4433 -AT90S4433 - -@itemx 4434 -AT90S4434 - -@itemx 8515 -AT90S8515 - -@itemx 8535 -AT90S8535 - -@itemx m103 -ATmega103 - -@itemx m128 -ATmega128 - -@itemx m1280 -ATmega1280 - -@itemx m1281 -ATmega1281 - -@itemx m16 -ATmega16 - -@itemx m161 -ATmega161 - -@itemx m162 -ATmega162 - -@itemx m163 -ATmega163 - -@itemx m164 -ATmega164 - -@itemx m169 -ATmega169 - -@itemx m2560 -ATmega2560 (**) - -@itemx m2561 -ATmega2561 (**) - -@itemx m32 -ATmega32 - -@itemx m324 -ATmega324 - -@itemx m329 -ATmega329 - -@itemx m3290 -ATmega3290 - -@itemx m48 -ATmega48 - -@itemx m64 -ATmega64 - -@itemx m640 -ATmega640 - -@itemx m644 -ATmega644 - -@itemx m649 -ATmega649 - -@itemx m6490 -ATmega6490 - -@itemx m8 -ATmega8 - -@itemx m8515 -ATmega8515 - -@itemx m8535 -ATmega8535 - -@itemx m88 -ATmega88 - -@itemx t12 -ATtiny12 - -@itemx t13 -ATtiny13 - -@itemx t15 -ATtiny15 - -@itemx t2313 -ATtiny2313 - -@itemx t25 -ATtiny25 - -@itemx t26 -ATtiny26 - -@itemx t45 -ATtiny45 - -@itemx t85 -ATtiny85 - -@end table +@multitable @columnfractions .15 .3 +@item @code{c128} @tab AT90CAN128 +@item @code{pwm2} @tab AT90PWM2 +@item @code{pwm3} @tab AT90PWM3 +@item @code{1200} @tab AT90S1200 +@item @code{2313} @tab AT90S2313 +@item @code{2333} @tab AT90S2333 +@item @code{2343} @tab AT90S2343 (*) +@item @code{4414} @tab AT90S4414 +@item @code{4433} @tab AT90S4433 +@item @code{4434} @tab AT90S4434 +@item @code{8515} @tab AT90S8515 +@item @code{8535} @tab AT90S8535 +@item @code{m103} @tab ATmega103 +@item @code{m128} @tab ATmega128 +@item @code{m1280} @tab ATmega1280 +@item @code{m1281} @tab ATmega1281 +@item @code{m16} @tab ATmega16 +@item @code{m161} @tab ATmega161 +@item @code{m162} @tab ATmega162 +@item @code{m163} @tab ATmega163 +@item @code{m164} @tab ATmega164 +@item @code{m169} @tab ATmega169 +@item @code{m2560} @tab ATmega2560 (**) +@item @code{m2561} @tab ATmega2561 (**) +@item @code{m32} @tab ATmega32 +@item @code{m324} @tab ATmega324 +@item @code{m329} @tab ATmega329 +@item @code{m3290} @tab ATmega3290 +@item @code{m48} @tab ATmega48 +@item @code{m64} @tab ATmega64 +@item @code{m640} @tab ATmega640 +@item @code{m644} @tab ATmega644 +@item @code{m649} @tab ATmega649 +@item @code{m6490} @tab ATmega6490 +@item @code{m8} @tab ATmega8 +@item @code{m8515} @tab ATmega8515 +@item @code{m8535} @tab ATmega8535 +@item @code{m88} @tab ATmega88 +@item @code{t12} @tab ATtiny12 +@item @code{t13} @tab ATtiny13 +@item @code{t15} @tab ATtiny15 +@item @code{t2313} @tab ATtiny2313 +@item @code{t25} @tab ATtiny25 +@item @code{t26} @tab ATtiny26 +@item @code{t45} @tab ATtiny45 +@item @code{t85} @tab ATtiny85 +@end multitable (*) The AT90S2323 and ATtiny22 use the same algorithm. @@ -436,97 +344,71 @@ file without any code changes to AVRDUDE. Simply copy an existing entry and change the pin definitions to match that of the unknown programmer. Currently, the following programmer ids are understood and supported: -@table @code - -@itemx abcmini +@multitable @columnfractions .2 .6 +@item @code{abcmini} @tab ABCmini Board, aka Dick Smith HOTCHIP - -@itemx alf -Nightshade ALF-PgmAVR, http://nightshade.homeip.net/ - -@itemx avr109 +@item @code{alf} @tab +Nightshade ALF-PgmAVR,@* +@indicateurl{http://nightshade.homeip.net/} +@item @code{avr109} @tab Atmel AppNote AVR109 Boot Loader - -@itemx avr910 +@item @code{avr910} @tab Atmel Low Cost Serial Programmer - -@itemx avr911 +@item @code{avr911} @tab Atmel AppNote AVR911 AVROSP (an alias for avr109) - -@itemx avrisp +@item @code{avrisp} @tab Atmel AVR ISP (an alias for stk500) - -@itemx avrispv2 +@item @code{avrispv2} @tab Atmel AVR ISP, running a version 2.x firmware (an alias for stk500v2) - -@itemx avrispmkII +@item @code{avrispmkII} @tab Atmel AVR ISP mkII (alias for stk500v2) - -@itemx avrispmk2 +@item @code{avrispmk2} @tab Atmel AVR ISP mkII (alias for stk500v2) - -@itemx bascom +@item @code{bascom} @tab Bascom SAMPLE programming cable - -@itemx bsd -Brian Dean's Programmer, http://www.bsdhome.com/avrdude/ - -@itemx butterfly +@item @code{bsd} @tab +Brian Dean's Programmer,@* +@indicateurl{http://www.bsdhome.com/avrdude/} +@item @code{butterfly} @tab Atmel Butterfly Development Board - -@itemx dt006 +@item @code{dt006} @tab Dontronics DT006 - -@item jtagmkI -@itemx jtag1 +@item @code{jtagmkI} @tab Atmel JTAG ICE mkI, running at 115200 Bd - -@itemx jtag1slow +@item @code{jtag1} @tab +@emph{Same as before.} +@item @code{jtag1slow} @tab Atmel JTAG ICE mkI, running at 19200 Bd - -@item jtagmkII -@itemx jtag2slow +@item @code{jtagmkII} @tab Atmel JTAG ICE mkII (default speed 19200 Bd) - -@itemx jtag2fast +@item @code{jtag2slow} @tab +@emph{Same as before.} +@item @code{jtag2fast} @tab Atmel JTAG ICE mkII, running at 115200 Bd - -@itemx jtag2 -Same as before. - -@itemx jtag2isp +@item @code{jtag2} @tab +@emph{Same as before.} +@item @code{jtag2isp} @tab Atmel JTAG ICE mkII in ISP mode. - -@itemx pavr +@item @code{pavr} @tab Jason Kyle's pAVR Serial Programmer - -@itemx picoweb -Picoweb Programming Cable, http://www.picoweb.net/ - -@itemx pony-stk200 +@item @code{picoweb} @tab +Picoweb Programming Cable,@* +@indicateurl{http://www.picoweb.net/} +@item @code{pony-stk200} @tab Pony Prog STK200 - -@itemx sp12 +@item @code{sp12} @tab Steve Bolt's Programmer - -@itemx stk200 +@item @code{stk200} @tab STK200 - -@itemx stk500 +@item @code{stk500} @tab Atmel STK500 - -@itemx stk500hvsp -Atmel STK500 in high-voltage serial programming mode -(version 2.x firmware only) - -@itemx stk500pp -Atmel STK500 in parallel programming mode (version 2.x -firmware only) - -@itemx stk500v2 +@item @code{stk500hvsp} @tab +Atmel STK500 in high-voltage serial programming mode(version 2.x firmware only) +@item @code{stk500pp} @tab +Atmel STK500 in parallel programming mode (version 2.xfirmware only) +@item @code{stk500v2} @tab Atmel STK500, running a version 2.x firmware - -@end table +@end multitable @@ -1998,22 +1880,15 @@ communication can work, so the @var{DWEN} fuse can be cleared. The pin mapping for the JTAG-to-ISP adapter is: -@table @code -@item JTAG pin -ISP pin -@item 1 -@code{3} -@item 2 -@code{6} -@item 3 -@code{1} -@item 4 -@code{2} -@item 6 -@code{5} -@item 9 -@code{4} -@end table +@multitable @columnfractions .15 .15 +@headitem JTAG pin @tab ISP pin +@item 1 @tab 3 +@item 2 @tab 6 +@item 3 @tab 1 +@item 4 @tab 2 +@item 6 @tab 5 +@item 9 @tab 4 +@end multitable @item Problem: Multiple USBasp programmers connected simultaneously are not