avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-19 11:36:24 +00:00
Code Issues Projects Releases Wiki Activity

Add a connection_type attribute to each programmer, rather than

Browse Source 
trying to hard-code the default port name in main.c.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1047 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch
2012-01-30 17:08:48 +00:00
parent cfe513363f
commit a86aff7232
8 changed files with 130 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
avrdude.conf.in
View File

@@ -23,6 +23,7 @@
# jtagmkII_avr32 | jtagmkii_pdi |
# dragon_dw | dragon_jtag | dragon_isp | dragon_pp |
# dragon_hvsp | dragon_pdi | arduino | wiring; # programmer type
# connection_type = parallel | serial | usb
# baudrate = <num> ; # baudrate for avr910-programmer
# vcc = <num1> [, <num2> ... ] ; # pin number(s)
# buff = <num1> [, <num2> ... ] ; # pin number(s)
@@ -344,12 +345,14 @@ programmer
id = "wiring";
desc = "Wiring";
type = wiring;
connection_type = serial;
;
programmer
id = "arduino";
desc = "Arduino";
type = arduino;
connection_type = serial;
;
# this will interface with the chips on these programmers:
#
@@ -370,6 +373,7 @@ programmer
id = "avrftdi";
desc = "FT2232D based generic programmer";
type = avrftdi;
connection_type = usb;
usbvid = 0x0403;
usbpid = 0x6010;
usbvendor = "";
@@ -397,6 +401,7 @@ programmer
id = "2232HIO";
desc = "FT2232H based generic programmer";
type = avrftdi;
connection_type = usb;
usbvid = 0x0403;
# Note: This PID is reserved for generic H devices and
# should be programmed into the EEPROM
@@ -423,6 +428,7 @@ programmer
id = "jtagkey";
desc = "Amontec JTAGKey, JTAGKey-Tiny and JTAGKey2";
type = avrftdi;
connection_type = usb;
usbvid = 0x0403;
# Note: This PID is used in all JTAGKey variants
usbpid = 0xCFF8;
@@ -468,18 +474,21 @@ programmer
id = "avrisp";
desc = "Atmel AVR ISP";
type = stk500;
connection_type = serial;
;
programmer
id = "avrispv2";
desc = "Atmel AVR ISP V2";
type = stk500v2;
connection_type = serial;
;
programmer
id = "avrispmkII";
desc = "Atmel AVR ISP mkII";
type = stk500v2;
connection_type = usb;
;
programmer parent "avrispmkII"
@@ -490,6 +499,7 @@ programmer
id = "buspirate";
desc = "The Bus Pirate";
type = buspirate;
connection_type = serial;
;
# This is supposed to be the "default" STK500 entry.
@@ -500,66 +510,77 @@ programmer
id = "stk500";
desc = "Atmel STK500";
type = stk500generic;
connection_type = serial;
;
programmer
id = "stk500v1";
desc = "Atmel STK500 Version 1.x firmware";
type = stk500;
connection_type = serial;
;
programmer
id = "mib510";
desc = "Crossbow MIB510 programming board";
type = stk500;
connection_type = serial;
;
programmer
id = "stk500v2";
desc = "Atmel STK500 Version 2.x firmware";
type = stk500v2;
connection_type = serial;
;
programmer
id = "stk500pp";
desc = "Atmel STK500 V2 in parallel programming mode";
type = stk500pp;
connection_type = serial;
;
programmer
id = "stk500hvsp";
desc = "Atmel STK500 V2 in high-voltage serial programming mode";
type = stk500hvsp;
connection_type = serial;
;
programmer
id = "stk600";
desc = "Atmel STK600";
type = stk600;
connection_type = usb;
;
programmer
id = "stk600pp";
desc = "Atmel STK600 in parallel programming mode";
type = stk600pp;
connection_type = usb;
;
programmer
id = "stk600hvsp";
desc = "Atmel STK600 in high-voltage serial programming mode";
type = stk600hvsp;
connection_type = usb;
;
programmer
id = "avr910";
desc = "Atmel Low Cost Serial Programmer";
type = avr910;
connection_type = serial;
;
programmer
id = "usbasp";
desc = "USBasp, http://www.fischl.de/usbasp/";
type = usbasp;
connection_type = usb;
usbvid = 0x16C0; # VOTI
usbpid = 0x05DC; # Obdev's free shared PID
usbvendor = "www.fischl.de";
@@ -584,6 +605,7 @@ programmer
id = "nibobee";
desc = "NIBObee";
type = usbasp;
connection_type = usb;
usbvid = 0x16C0; # VOTI
usbpid = 0x092F; # NIBObee PID
usbvendor = "www.nicai-systems.com";
@@ -594,6 +616,7 @@ programmer
id = "usbasp-clone";
desc = "Any usbasp clone with correct VID/PID";
type = usbasp;
connection_type = usb;
usbvid = 0x16C0; # VOTI
usbpid = 0x05DC; # Obdev's free shared PID
#usbvendor = "";
@@ -604,24 +627,28 @@ programmer
id = "usbtiny";
desc = "USBtiny simple USB programmer, http://www.ladyada.net/make/usbtinyisp/";
type = usbtiny;
connection_type = usb;
;
programmer
id = "butterfly";
desc = "Atmel Butterfly Development Board";
type = butterfly;
connection_type = serial;
;
programmer
id = "avr109";
desc = "Atmel AppNote AVR109 Boot Loader";
type = butterfly;
connection_type = serial;
;
programmer
id = "avr911";
desc = "Atmel AppNote AVR911 AVROSP";
type = butterfly;
connection_type = serial;
;
# suggested in http://forum.mikrokopter.de/topic-post48317.html
@@ -629,6 +656,7 @@ programmer
id = "mkbutterfly";
desc = "Mikrokopter.de Butterfly";
type = butterfly_mk;
connection_type = serial;
;
programmer parent "mkbutterfly"
@@ -640,6 +668,7 @@ programmer
desc = "Atmel JTAG ICE (mkI)";
baudrate = 115200; # default is 115200
type = jtagmki;
connection_type = serial;
;
# easier to type
@@ -653,11 +682,17 @@ programmer parent "jtag1"
baudrate = 19200;
;
# The JTAG ICE mkII has both, serial and USB connectivity. As it is
# mostly used through USB these days (AVR Studio 5 only supporting it
# that way), we make connection_type = usb the default. Users are
# still free to use a serial port with the -P option.
programmer
id = "jtagmkII";
desc = "Atmel JTAG ICE mkII";
baudrate = 19200; # default is 19200
type = jtagmkii;
connection_type = usb;
;
# easier to type
@@ -682,6 +717,7 @@ programmer
desc = "Atmel JTAG ICE mkII in ISP mode";
baudrate = 115200;
type = jtagmkii_isp;
connection_type = usb;
;
# JTAG ICE mkII in debugWire mode
@@ -690,6 +726,7 @@ programmer
desc = "Atmel JTAG ICE mkII in debugWire mode";
baudrate = 115200;
type = jtagmkii_dw;
connection_type = usb;
;
# JTAG ICE mkII in AVR32 mode
@@ -698,6 +735,7 @@ programmer
desc = "Atmel JTAG ICE mkII im AVR32 mode";
baudrate = 115200;
type = jtagmkii_avr32;
connection_type = usb;
;
# JTAG ICE mkII in AVR32 mode
@@ -706,6 +744,7 @@ programmer
desc = "Atmel JTAG ICE mkII im AVR32 mode";
baudrate = 115200;
type = jtagmkii_avr32;
connection_type = usb;
;
# JTAG ICE mkII in PDI mode
@@ -714,6 +753,7 @@ programmer
desc = "Atmel JTAG ICE mkII PDI mode";
baudrate = 115200;
type = jtagmkii_pdi;
connection_type = usb;
;
# AVR Dragon in JTAG mode
@@ -722,6 +762,7 @@ programmer
desc = "Atmel AVR Dragon in JTAG mode";
baudrate = 115200;
type = dragon_jtag;
connection_type = usb;
;
# AVR Dragon in ISP mode
@@ -730,6 +771,7 @@ programmer
desc = "Atmel AVR Dragon in ISP mode";
baudrate = 115200;
type = dragon_isp;
connection_type = usb;
;
# AVR Dragon in PP mode
@@ -738,6 +780,7 @@ programmer
desc = "Atmel AVR Dragon in PP mode";
baudrate = 115200;
type = dragon_pp;
connection_type = usb;
;
# AVR Dragon in HVSP mode
@@ -746,6 +789,7 @@ programmer
desc = "Atmel AVR Dragon in HVSP mode";
baudrate = 115200;
type = dragon_hvsp;
connection_type = usb;
;
# AVR Dragon in debugWire mode
@@ -754,6 +798,7 @@ programmer
desc = "Atmel AVR Dragon in debugWire mode";
baudrate = 115200;
type = dragon_dw;
connection_type = usb;
;
# AVR Dragon in PDI mode
@@ -762,12 +807,14 @@ programmer
desc = "Atmel AVR Dragon in PDI mode";
baudrate = 115200;
type = dragon_pdi;
connection_type = usb;
;
programmer
id = "pavr";
desc = "Jason Kyle's pAVR Serial Programmer";
type = avr910;
connection_type = serial;
;
@HAVE_PARPORT_BEGIN@ Inclusion of the following depends on --enable-parport
@@ -777,6 +824,7 @@ programmer
id = "bsd";
desc = "Brian Dean's Programmer, http://www.bsdhome.com/avrdude/";
type = par;
connection_type = parallel;
vcc = 2, 3, 4, 5;
reset = 7;
sck = 8;
@@ -788,6 +836,7 @@ programmer
id = "stk200";
desc = "STK200";
type = par;
connection_type = parallel;
buff = 4, 5;
sck = 6;
mosi = 7;
@@ -810,6 +859,7 @@ programmer
id = "dt006";
desc = "Dontronics DT006";
type = par;
connection_type = parallel;
reset = 4;
sck = 5;
mosi = 2;
@@ -825,6 +875,7 @@ programmer
id = "alf";
desc = "Nightshade ALF-PgmAVR, http://nightshade.homeip.net/";
type = par;
connection_type = parallel;
vcc = 2, 3, 4, 5;
buff = 6;
reset = 7;
@@ -841,6 +892,7 @@ programmer
id = "sp12";
desc = "Steve Bolt's Programmer";
type = par;
connection_type = parallel;
vcc = 4,5,6,7,8;
reset = 3;
sck = 2;
@@ -852,6 +904,7 @@ programmer
id = "picoweb";
desc = "Picoweb Programming Cable, http://www.picoweb.net/";
type = par;
connection_type = parallel;
reset = 2;
sck = 3;
mosi = 4;
@@ -862,6 +915,7 @@ programmer
id = "abcmini";
desc = "ABCmini Board, aka Dick Smith HOTCHIP";
type = par;
connection_type = parallel;
reset = 4;
sck = 3;
mosi = 2;
@@ -872,6 +926,7 @@ programmer
id = "futurlec";
desc = "Futurlec.com programming cable.";
type = par;
connection_type = parallel;
reset = 3;
sck = 2;
mosi = 1;
@@ -890,6 +945,7 @@ programmer
id = "xil";
desc = "Xilinx JTAG cable";
type = par;
connection_type = parallel;
mosi = 2;
sck = 3;
reset = 4;
@@ -903,6 +959,7 @@ programmer
id = "dapa";
desc = "Direct AVR Parallel Access cable";
type = par;
connection_type = parallel;
vcc = 3;
reset = 16;
sck = 1;
@@ -914,6 +971,7 @@ programmer
id = "atisp";
desc = "AT-ISP V1.1 programming cable for AVR-SDK1 from <http://micro-research.co.th/> micro-research.co.th";
type = par;
connection_type = parallel;
reset = ~6;
sck = ~8;
mosi = ~7;
@@ -924,6 +982,7 @@ programmer
id = "ere-isp-avr";
desc = "ERE ISP-AVR <http://www.ere.co.th/download/sch050713.pdf>";
type = par;
connection_type = parallel;
reset = ~4;
sck = 3;
mosi = 2;
@@ -934,6 +993,7 @@ programmer
id = "blaster";
desc = "Altera ByteBlaster";
type = par;
connection_type = parallel;
sck = 2;
miso = 11;
reset = 3;
@@ -953,13 +1013,14 @@ programmer parent "pony-stk200"
# The AT98ISP Cable is a simple parallel dongle for AT89 family.
# http://www.atmel.com/dyn/products/tools_card.asp?tool_id=2877
programmer
id = "89isp";
desc = "Atmel at89isp cable";
type = par;
reset = 17;
sck = 1;
mosi = 2;
miso = 10;
id = "89isp";
desc = "Atmel at89isp cable";
type = par;
connection_type = parallel;
reset = 17;
sck = 1;
mosi = 2;
miso = 10;
;
@HAVE_PARPORT_END@
@@ -990,6 +1051,7 @@ programmer
id = "ponyser";
desc = "design ponyprog serial, reset=!txd sck=rts mosi=dtr miso=cts";
type = serbb;
connection_type = serial;
reset = ~3;
sck = 7;
mosi = 4;
@@ -1011,6 +1073,7 @@ programmer
id = "dasa";
desc = "serial port banging, reset=rts sck=dtr mosi=txd miso=cts";
type = serbb;
connection_type = serial;
reset = 7;
sck = 4;
mosi = 3;
@@ -1024,6 +1087,7 @@ programmer
id = "dasa3";
desc = "serial port banging, reset=!dtr sck=rts mosi=txd miso=cts";
type = serbb;
connection_type = serial;
reset = ~4;
sck = 7;
mosi = 3;
@@ -1037,6 +1101,7 @@ programmer
id = "c2n232i";
desc = "serial port banging, reset=dtr sck=!rts mosi=!txd miso=!cts";
type = serbb;
connection_type = serial;
reset = 4;
sck = ~7;
mosi = ~3;