diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index 86973e3c..48201bfd 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -1,3 +1,11 @@ +2010-01-08 Kolja Waschk + + * src/tap/cable.c, src/tap/cable/generic_usbconn.c, src/tap/cable/ft2232.c: + Added support for FT2232H in gnICE+ and ARM-USB-TINY-H cable. Written by + Michael Hennerich, adapted and submitted by Adam Megacz. + + * po/fr.po, po/rw.po, po/sk.po: updated + 2009-12-30 Arnim Laeuger * src/flash/jedec.c: [ 2831030 ] added support for flashes AM29LV400BB, diff --git a/urjtag/THANKS b/urjtag/THANKS index 326c246d..e4e3fb1c 100644 --- a/urjtag/THANKS +++ b/urjtag/THANKS @@ -30,6 +30,7 @@ Thomas Fröhlich Mike Frysinger Robin Getz Christophe Grenier +Michael Hennerich Uwe Hermann Sebastian Hesselbarth Jiun-Shian Ho @@ -53,6 +54,7 @@ Lesly A. M Raphael Mack Trevor Man Detrick Martin +Adam Megacz Andreas Mohr Jani Monoses Masaki Muranaka diff --git a/urjtag/po/fr.po b/urjtag/po/fr.po index 33ca1039..628284b7 100644 --- a/urjtag/po/fr.po +++ b/urjtag/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU jtag 0.5.1\n" "Report-Msgid-Bugs-To: marcel@telka.sk\n" -"POT-Creation-Date: 2009-05-28 14:35+0200\n" +"POT-Creation-Date: 2010-01-08 18:03+0100\n" "PO-Revision-Date: 2004-05-10 08:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -242,19 +242,19 @@ msgstr "ne peut ouvrir %s\n" msgid "No IDCODE specification found.\n" msgstr "" -#: src/bsdl/bsdl_sem.c:649 +#: src/bsdl/bsdl_sem.c:662 msgid "IDCODE matched\n" msgstr "" -#: src/bsdl/bsdl_sem.c:651 +#: src/bsdl/bsdl_sem.c:664 msgid "IDCODE mismatch\n" msgstr "" -#: src/bsdl/bsdl_sem.c:699 +#: src/bsdl/bsdl_sem.c:712 msgid "BSDL stage reported errors, aborting.\n" msgstr "" -#: src/bsdl/bsdl_sem.c:706 +#: src/bsdl/bsdl_sem.c:719 #, c-format msgid "Got IDCODE: %s\n" msgstr "" @@ -369,6 +369,48 @@ msgstr "" msgid "Too many errors" msgstr "" +#: src/bus/arm9tdmi.c:89 +#, fuzzy, c-format +msgid "ARM9TDMI compatible bus driver (JTAG part No. %d)\n" +msgstr "pilote de bus compatible Intel SA-1110 via BSR (JTAG no de pice %d)\n" + +#: src/bus/arm9tdmi.c:371 +#, fuzzy +msgid "SCANN register" +msgstr "Registre" + +#: src/bus/arm9tdmi.c:377 +#, fuzzy +msgid "SCAN1 register" +msgstr "Registre" + +#: src/bus/arm9tdmi.c:383 +#, fuzzy +msgid "SCAN2 register" +msgstr "Registre" + +#: src/bus/arm9tdmi.c:423 src/bus/ejtag.c:546 +#, c-format +msgid "Failed to enter debug mode, ctrl=%s" +msgstr "" + +#: src/bus/arm9tdmi.c:429 +msgid "The target is halted in " +msgstr "" + +#: src/bus/arm9tdmi.c:431 +msgid "THUMB mode.\n" +msgstr "" + +#: src/bus/arm9tdmi.c:433 +msgid "ARM mode.\n" +msgstr "" + +#: src/bus/arm9tdmi.c:558 +#, fuzzy +msgid "ARM9TDMI compatible bus driver" +msgstr "pilote de bus compatible Intel PXA2x0 via BSR" + #: src/bus/au1500.c:124 #, fuzzy, c-format msgid "AU1500 compatible bus driver via BSR (JTAG part No. %d)\n" @@ -474,7 +516,7 @@ msgid "Blackfin BF533 compatible bus driver via BSR (JTAG part No. %d)\n" msgstr "" "Pilote de bus compatible Broadcom BCM1250 via BSR (JTAG No de pice %d)\n" -#: src/bus/bf533_stamp.c:332 +#: src/bus/bf533_stamp.c:339 msgid "Blackfin BF533 Stamp board bus driver" msgstr "" @@ -549,17 +591,17 @@ msgid "" "BSR" msgstr "" -#: src/bus/buses.c:182 src/bus/buses.c:219 +#: src/bus/buses.c:191 src/bus/buses.c:228 #, c-format msgid "realloc(%s,%zd) fails" msgstr "" -#: src/bus/buses.c:242 +#: src/bus/buses.c:251 #, fuzzy msgid "invalid bus number" msgstr "%s: numro de bus invalide\n" -#: src/bus/buses.c:284 +#: src/bus/buses.c:293 #, fuzzy, c-format msgid "Initialized bus %d, active bus %d\n" msgstr "initialiser le pilote du bus pour la pice active." @@ -602,11 +644,6 @@ msgstr "" msgid "EJCONTROL or EJIMPCODE register not found" msgstr "" -#: src/bus/ejtag.c:546 -#, c-format -msgid "Failed to enter debug mode, ctrl=%s" -msgstr "" - #: src/bus/ejtag.c:761 #, fuzzy msgid "EJTAG compatible bus driver via PrAcc" @@ -686,64 +723,64 @@ msgstr "" msgid "Freescale MPC5200 compatible bus driver via BSR, parameter: [mux]" msgstr "pilote de bus compatible Intel PXA2x0 via BSR" -#: src/bus/mpc824x.c:112 +#: src/bus/mpc824x.c:116 msgid "" " Bus width 64 exists in mpc824x, but not supported by UrJTAG currently" msgstr "" -#: src/bus/mpc824x.c:117 -msgid " Only 8,32 and 64 bus width are supported for Banks 0 and 1" +#: src/bus/mpc824x.c:121 +msgid " Only 8, 16, 32 and 64 bus width are supported for Banks 0 and 1" msgstr "" -#: src/bus/mpc824x.c:129 +#: src/bus/mpc824x.c:133 msgid "" "Usage: initbus mpc824x [width=WIDTH] [revbits] [dbgAddr] [dbgData]\n" "\n" -" WIDTH data bus width - 8, 32, 64 (default 8)\n" +" WIDTH data bus width - 8, 16, 32, 64 (default 8)\n" " revbits reverse bits in data bus (default - no)\n" " dbgAddr display address bus state (default - no)\n" " dbgData display data bus state (default - no)\n" msgstr "" -#: src/bus/mpc824x.c:155 +#: src/bus/mpc824x.c:159 #, c-format msgid " Using default bus width %d\n" msgstr "" -#: src/bus/mpc824x.c:244 +#: src/bus/mpc824x.c:248 #, fuzzy, c-format msgid "Motorola MPC824x compatible bus driver via BSR (JTAG part No. %d)\n" msgstr "pilote de bus compatible Intel PXA2x0 via BSR (JTAG No de pice %d)\n" -#: src/bus/mpc824x.c:268 +#: src/bus/mpc824x.c:272 msgid "Base ROM Interface (Bank 1)" msgstr "" -#: src/bus/mpc824x.c:278 src/bus/mpc824x.c:297 +#: src/bus/mpc824x.c:282 src/bus/mpc824x.c:301 msgid "Base ROM Interface (Bank 0)" msgstr "" -#: src/bus/mpc824x.c:327 +#: src/bus/mpc824x.c:335 #, c-format msgid "Warning: unhandled bus width: %i" msgstr "" -#: src/bus/mpc824x.c:350 +#: src/bus/mpc824x.c:361 #, c-format msgid "Addr [%2d:0]: %06lX " msgstr "" -#: src/bus/mpc824x.c:400 +#: src/bus/mpc824x.c:411 #, c-format msgid "Data WR [%d:0]: %08lX " msgstr "" -#: src/bus/mpc824x.c:446 +#: src/bus/mpc824x.c:459 #, c-format msgid "Data RD [%d:0]: %08lX " msgstr "" -#: src/bus/mpc824x.c:566 +#: src/bus/mpc824x.c:581 #, fuzzy msgid "Motorola MPC824x compatible bus driver via BSR" msgstr "pilote de bus compatible Intel PXA2x0 via BSR" @@ -2107,8 +2144,8 @@ msgstr "" "Module: AMD Flash\n" "\tManufacturier: " -#: src/flash/amd.c:316 src/flash/amd.c:345 src/flash/amd.c:361 -#: src/flash/amd.c:380 src/flash/amd.c:396 src/flash/amd_flash.c:266 +#: src/flash/amd.c:316 src/flash/amd.c:345 src/flash/amd.c:367 +#: src/flash/amd.c:386 src/flash/amd.c:402 src/flash/amd_flash.c:266 msgid "" "\n" "\tChip: " @@ -2116,18 +2153,18 @@ msgstr "" "\n" "\tModule: " -#: src/flash/amd.c:339 src/flash/amd.c:355 src/flash/amd.c:374 -#: src/flash/amd.c:390 src/flash/amd.c:403 src/flash/amd_flash.c:278 +#: src/flash/amd.c:339 src/flash/amd.c:361 src/flash/amd.c:380 +#: src/flash/amd.c:396 src/flash/amd.c:409 src/flash/amd_flash.c:278 #, c-format msgid "Unknown (ID 0x%04x)" msgstr "Inconnu (ID 0x%04x)" -#: src/flash/amd.c:408 +#: src/flash/amd.c:414 #, fuzzy, c-format msgid "Unknown manufacturer (ID 0x%04x) Chip (ID 0x%04x)" msgstr "Manufacturier inconnu (ID 0x%04x)" -#: src/flash/amd.c:412 src/flash/amd_flash.c:281 +#: src/flash/amd.c:418 src/flash/amd_flash.c:281 #, c-format msgid "" "\n" @@ -2136,21 +2173,21 @@ msgstr "" "\n" "\tProtg: %04x\n" -#: src/flash/amd.c:635 src/flash/amd.c:647 src/flash/amd.c:659 +#: src/flash/amd.c:647 src/flash/amd.c:659 src/flash/amd.c:671 #: src/flash/detectflash.c:117 src/flash/detectflash.c:149 msgid "AMD/Fujitsu Standard Command Set" msgstr "AMD/Fujitsu Jeu standard de commandes" -#: src/flash/amd.c:636 +#: src/flash/amd.c:648 msgid "supported: AMD 29LV640D, 29LV641D, 29LV642D; 2x16 Bit" msgstr "supports: AMD 29LV640D, 29LV641D, 29LV642D; 2x16 Bit" -#: src/flash/amd.c:648 +#: src/flash/amd.c:660 #, fuzzy msgid "supported: AMD 29LV800B, S29GLxxxN; MX29LV640B, W19B320AT/B; 1x16 Bit" msgstr "supports: AMD 29LV800B; 1x16 Bit" -#: src/flash/amd.c:660 +#: src/flash/amd.c:672 #, fuzzy msgid "" "supported: AMD 29LV160, AMD 29LV065D, AMD 29LV040B, S29GLxxxN, W19B320AT/B; " @@ -2941,188 +2978,188 @@ msgstr "Instruction '%s' est d msgid "unknown data register '%s'" msgstr "registre de donnes inconnu '%s'\n" -#: src/svf/svf.c:470 +#: src/svf/svf.c:478 #, c-format msgid "Error %s: mismatch at position %d for TDO\n" msgstr "" -#: src/svf/svf.c:550 +#: src/svf/svf.c:558 #, c-format msgid "calloc(%zd,%zd) fails" msgstr "" -#: src/svf/svf.c:624 src/svf/svf.c:1081 +#: src/svf/svf.c:632 src/svf/svf.c:1089 #, c-format msgid "command %s not implemented\n" msgstr "" -#: src/svf/svf.c:661 +#: src/svf/svf.c:669 #, c-format msgid "Error %s: only TCK is supported for RUNTEST" msgstr "" -#: src/svf/svf.c:668 +#: src/svf/svf.c:676 #, c-format msgid "Error %s: maximum time must be larger or equal to minimum time" msgstr "" -#: src/svf/svf.c:676 +#: src/svf/svf.c:684 msgid "maximum time for RUNTEST not guaranteed.\n" msgstr "" -#: src/svf/svf.c:677 +#: src/svf/svf.c:685 msgid " This message is only displayed once.\n" msgstr "" -#: src/svf/svf.c:710 +#: src/svf/svf.c:718 #, c-format msgid "Error %s: Maximum cable clock frequency required for RUNTEST" msgstr "" -#: src/svf/svf.c:713 +#: src/svf/svf.c:721 msgid " Set the cable frequency with 'FREQUENCY '.\n" msgstr "" -#: src/svf/svf.c:878 +#: src/svf/svf.c:886 #, c-format msgid "Error %s: first %s command after length change must have a TDI value.\n" msgstr "" -#: src/svf/svf.c:906 +#: src/svf/svf.c:914 #, c-format msgid "Error %s: SIR command length inconsistent.\n" msgstr "" -#: src/svf/svf.c:910 +#: src/svf/svf.c:918 #, c-format msgid " in input file between line %d col %d and line %d col %d\n" msgstr "" -#: src/svf/svf.c:1011 +#: src/svf/svf.c:1019 #, c-format msgid "Error %s: no further TRST command allowed after mode ABSENT" msgstr "" -#: src/svf/svf.c:1034 +#: src/svf/svf.c:1042 #, c-format msgid "Error %s: TRST ABSENT must not be issued after a STATE command" msgstr "" -#: src/svf/svf.c:1042 +#: src/svf/svf.c:1050 #, c-format msgid "Error %s: TRST ABSENT must not be issued after an SIR or SDR command" msgstr "" -#: src/svf/svf.c:1052 +#: src/svf/svf.c:1060 #, c-format msgid "unimplemented mode '%s' for TRST\n" msgstr "" -#: src/svf/svf.c:1140 +#: src/svf/svf.c:1148 #, fuzzy, c-format msgid "%s: no JTAG chain available" msgstr "ERREUR: incapable de dtecter la fin de la chane JTAG!\n" -#: src/svf/svf.c:1147 +#: src/svf/svf.c:1155 #, c-format msgid "%s: chain without any parts" msgstr "" -#: src/svf/svf.c:1163 +#: src/svf/svf.c:1171 #, c-format msgid "%s: could not establish SDR register" msgstr "" -#: src/svf/svf.c:1203 +#: src/svf/svf.c:1211 #, c-format msgid "%s: could not establish SIR instruction" msgstr "" -#: src/svf/svf.c:1240 +#: src/svf/svf.c:1248 msgid "" "Mismatches occurred between scanned device output and expected TDO values.\n" msgstr "" -#: src/svf/svf.c:1243 +#: src/svf/svf.c:1251 msgid "Scanned device output matched expected TDO values.\n" msgstr "" -#: svf_flex.l:367 +#: svf_flex.l:397 #, c-format msgid "Parsing %6d/%d (%3.0d%%)" msgstr "" -#: svf_flex.l:387 src/tap/cable/ft2232.c:1741 -#: src/tap/cable/generic_parport.c:89 src/tap/cable/generic_usbconn.c:236 -#: src/tap/cable/jim.c:71 src/tap/cable/ts7800.c:171 +#: svf_flex.l:417 src/tap/cable/ft2232.c:1787 +#: src/tap/cable/generic_parport.c:89 src/tap/cable/generic_usbconn.c:244 +#: src/tap/cable/jim.c:71 src/tap/cable/ts7800.c:170 #: src/tap/cable/usbblaster.c:80 src/tap/cable/vision_ep9307.c:214 #: src/tap/cable/wiggler.c:226 #, c-format msgid "malloc(%zd) fails" msgstr "" -#: src/tap/cable/arcom.c:137 +#: src/tap/cable/arcom.c:143 msgid "Arcom JTAG Cable" msgstr "Cable JTAG Arcom" -#: src/tap/cable/byteblaster.c:159 +#: src/tap/cable/byteblaster.c:182 msgid "" "Altera ByteBlaster/ByteBlaster II/ByteBlasterMV Parallel Port Download Cable" msgstr "" "Cable du port parallle de chargement Altera ByteBlaster/ByteBlaster II/" "ByteBlasterMV" -#: src/tap/cable.c:185 src/tap/usbconn/libusb.c:169 +#: src/tap/cable.c:188 src/tap/usbconn/libusb.c:169 #, c-format msgid "malloc(%zd)/malloc(%zd) fails" msgstr "" -#: src/tap/cable.c:239 +#: src/tap/cable.c:242 #, c-format msgid "(Resized JTAG activity queue to hold max %d items)\n" msgstr "" -#: src/tap/cable.c:426 src/tap/cable.c:487 +#: src/tap/cable.c:429 src/tap/cable.c:490 #, c-format msgid "Internal error: Got wrong type of result from queue (%d? %p.%d)\n" msgstr "" -#: src/tap/cable.c:494 +#: src/tap/cable.c:497 #, c-format msgid "Internal error: Got wrong signal's value from queue (%d? %p.%d)\n" msgstr "" -#: src/tap/cable.c:551 +#: src/tap/cable.c:554 #, c-format msgid "Internal error: Got wrong type of result from queue (#%d %p.%d)\n" msgstr "" -#: src/tap/cable.c:558 +#: src/tap/cable.c:561 msgid "Internal error: Wanted transfer result but none was queued\n" msgstr "" -#: src/tap/cable/dlc5.c:131 +#: src/tap/cable/dlc5.c:137 msgid "Xilinx DLC5 JTAG Parallel Cable III" msgstr "Cable parallle JTAG Xilinx DLC5 III" -#: src/tap/cable/ea253.c:137 +#: src/tap/cable/ea253.c:143 msgid "ETC EA253 JTAG Cable" msgstr "Cable JATB ETC EA253" -#: src/tap/cable/ei012.c:139 +#: src/tap/cable/ei012.c:145 msgid "ETC EI012 JTAG Cable" msgstr "Cable JTAG ETC EI012" -#: src/tap/cable/ft2232.c:251 +#: src/tap/cable/ft2232.c:268 #, c-format -msgid "Setting lowest supported frequency for FT2232: %d\n" +msgid "Warning: Setting lowest supported frequency for FT2232%s: %d\n" msgstr "" -#: src/tap/cable/ft2232.c:739 +#: src/tap/cable/ft2232.c:785 msgid "Please power on the TARGET board and connect VCC signal" msgstr "" -#: src/tap/cable/ft2232.c:1824 +#: src/tap/cable/ft2232.c:1874 #, c-format msgid "" "Usage: cable %s [vid=VID] [pid=PID] [desc=DESC] [driver=DRIVER]\n" @@ -3135,43 +3172,51 @@ msgid "" "\n" msgstr "" -#: src/tap/cable/ft2232.c:1836 +#: src/tap/cable/ft2232.c:1886 msgid "Generic FTDI FT2232 Cable" msgstr "" -#: src/tap/cable/ft2232.c:1869 +#: src/tap/cable/ft2232.c:1919 msgid "Olimex ARM-USB-OCD[-TINY] (FT2232) Cable" msgstr "" -#: src/tap/cable/ft2232.c:1916 +#: src/tap/cable/ft2232.c:1966 +msgid "Olimex ARM-USB-TINY-H (FT2232H) Cable" +msgstr "" + +#: src/tap/cable/ft2232.c:1999 msgid "Analog Devices Blackfin gnICE (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:1949 +#: src/tap/cable/ft2232.c:2033 +msgid "Analog Devices Blackfin gnICE+ (FT2232H) Cable (EXPERIMENTAL)" +msgstr "" + +#: src/tap/cable/ft2232.c:2067 msgid "Amontec JTAGkey (FT2232) Cable" msgstr "" -#: src/tap/cable/ft2232.c:1982 +#: src/tap/cable/ft2232.c:2100 msgid "OOCDLink-s (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2015 +#: src/tap/cable/ft2232.c:2133 msgid "Turtelizer 2 Rev. B (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2048 +#: src/tap/cable/ft2232.c:2166 msgid "USB to JTAG Interface (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2081 +#: src/tap/cable/ft2232.c:2199 msgid "Xverve DT-USB-ST Signalyzer Tool (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2114 +#: src/tap/cable/ft2232.c:2232 msgid "TinCanTools Flyswatter (FT2232) Cable" msgstr "" -#: src/tap/cable/ft2232.c:2147 +#: src/tap/cable/ft2232.c:2265 msgid "KrisTech usbScarabeus2 (FT2232) Cable" msgstr "" @@ -3205,11 +3250,11 @@ msgid "" "\n" msgstr "" -#: src/tap/cable/generic_usbconn.c:229 +#: src/tap/cable/generic_usbconn.c:237 msgid "Couldn't connect to suitable USB device.\n" msgstr "" -#: src/tap/cable/generic_usbconn.c:267 +#: src/tap/cable/generic_usbconn.c:275 #, c-format msgid "" "Usage: cable %s [vid=VID] [pid=PID] [desc=DESC] [...]\n" @@ -3221,7 +3266,7 @@ msgid "" msgstr "" #: src/tap/cable/jim.c:55 -msgid "not enough arguments" +msgid "too many arguments" msgstr "" #: src/tap/cable/jim.c:59 @@ -3237,24 +3282,24 @@ msgstr "" msgid "JTAG target simulator JIM" msgstr "" -#: src/tap/cable/jlink.c:590 +#: src/tap/cable/jlink.c:594 msgid "Segger/IAR J-Link, Atmel SAM-ICE and others." msgstr "" -#: src/tap/cable/keithkoep.c:148 +#: src/tap/cable/keithkoep.c:153 msgid "Keith & Koep JTAG cable" msgstr "Cable JTAG Keith & Koep" -#: src/tap/cable/lattice.c:140 +#: src/tap/cable/lattice.c:145 #, fuzzy msgid "Lattice Parallel Port JTAG Cable" msgstr "Cable JTAG Macraigor Wiggler" -#: src/tap/cable/mpcbdm.c:146 +#: src/tap/cable/mpcbdm.c:152 msgid "Mpcbdm JTAG cable" msgstr "Cable JTAG Mpcbdm" -#: src/tap/cable/triton.c:150 +#: src/tap/cable/triton.c:155 msgid "Ka-Ro TRITON Starterkit II (PXA255/250) JTAG Cable" msgstr "Cable JTAG Ka-Ro TRITON Starterkit II (PXA255/250)" @@ -3273,22 +3318,22 @@ msgstr "ERREUR: incapable de d msgid "unable to munmap the GPIO registers" msgstr "ERREUR: incapable de dtecter la fin de la chane JTAG!\n" -#: src/tap/cable/ts7800.c:161 src/tap/cable/vision_ep9307.c:204 +#: src/tap/cable/ts7800.c:160 src/tap/cable/vision_ep9307.c:204 msgid "This cable type does not accept parameters" msgstr "" -#: src/tap/cable/ts7800.c:166 +#: src/tap/cable/ts7800.c:165 msgid "Initializing TS-7800 Built-in JTAG Chain\n" msgstr "" -#: src/tap/cable/ts7800.c:298 src/tap/cable/vision_ep9307.c:339 +#: src/tap/cable/ts7800.c:292 src/tap/cable/vision_ep9307.c:342 #, c-format msgid "" "Usage: cable %s\n" "\n" msgstr "" -#: src/tap/cable/ts7800.c:303 +#: src/tap/cable/ts7800.c:297 msgid "TS-7800 Built-in JTAG Chain" msgstr "" @@ -3326,11 +3371,11 @@ msgstr "" msgid "Initializing Vision EP9307 SoM GPIO JTAG Cable\n" msgstr "" -#: src/tap/cable/vision_ep9307.c:344 +#: src/tap/cable/vision_ep9307.c:347 msgid "Vision EP9307 SoM GPIO JTAG Cable" msgstr "" -#: src/tap/cable/wiggler2.c:159 +#: src/tap/cable/wiggler2.c:164 msgid "Modified (with CPU Reset) WIGGLER JTAG Cable" msgstr "" @@ -3338,7 +3383,7 @@ msgstr "" msgid "Pin mapping failed\n" msgstr "" -#: src/tap/cable/wiggler.c:388 +#: src/tap/cable/wiggler.c:393 #, c-format msgid "" "Usage: cable %s parallel PORTADDR [TDO,TRST,TDI,TCK,TMS,SRESET]\n" @@ -3353,11 +3398,11 @@ msgid "" "\n" msgstr "" -#: src/tap/cable/wiggler.c:415 +#: src/tap/cable/wiggler.c:420 msgid "Macraigor Wiggler JTAG Cable" msgstr "Cable JTAG Macraigor Wiggler" -#: src/tap/cable/wiggler.c:434 +#: src/tap/cable/wiggler.c:439 #, fuzzy msgid "Excelpoint IGLOO JTAG Cable" msgstr "Cable JTAG Arcom" diff --git a/urjtag/po/rw.po b/urjtag/po/rw.po index 09fcc21f..df5b9b28 100644 --- a/urjtag/po/rw.po +++ b/urjtag/po/rw.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: jtag 0.5.1\n" "Report-Msgid-Bugs-To: marcel@telka.sk\n" -"POT-Creation-Date: 2009-05-28 14:35+0200\n" +"POT-Creation-Date: 2010-01-08 18:03+0100\n" "PO-Revision-Date: 2005-04-04 10:55-0700\n" "Last-Translator: Steven Michael Murphy \n" "Language-Team: Kinyarwanda \n" @@ -232,19 +232,19 @@ msgstr "Gufungura" msgid "No IDCODE specification found.\n" msgstr "" -#: src/bsdl/bsdl_sem.c:649 +#: src/bsdl/bsdl_sem.c:662 msgid "IDCODE matched\n" msgstr "" -#: src/bsdl/bsdl_sem.c:651 +#: src/bsdl/bsdl_sem.c:664 msgid "IDCODE mismatch\n" msgstr "" -#: src/bsdl/bsdl_sem.c:699 +#: src/bsdl/bsdl_sem.c:712 msgid "BSDL stage reported errors, aborting.\n" msgstr "" -#: src/bsdl/bsdl_sem.c:706 +#: src/bsdl/bsdl_sem.c:719 #, c-format msgid "Got IDCODE: %s\n" msgstr "" @@ -359,6 +359,48 @@ msgstr "" msgid "Too many errors" msgstr "" +#: src/bus/arm9tdmi.c:89 +#, fuzzy, c-format +msgid "ARM9TDMI compatible bus driver (JTAG part No. %d)\n" +msgstr "Musomyi: Biturutse" + +#: src/bus/arm9tdmi.c:371 +#, fuzzy +msgid "SCANN register" +msgstr "Kwiyandikisha" + +#: src/bus/arm9tdmi.c:377 +#, fuzzy +msgid "SCAN1 register" +msgstr "Kwiyandikisha" + +#: src/bus/arm9tdmi.c:383 +#, fuzzy +msgid "SCAN2 register" +msgstr "Kwiyandikisha" + +#: src/bus/arm9tdmi.c:423 src/bus/ejtag.c:546 +#, c-format +msgid "Failed to enter debug mode, ctrl=%s" +msgstr "" + +#: src/bus/arm9tdmi.c:429 +msgid "The target is halted in " +msgstr "" + +#: src/bus/arm9tdmi.c:431 +msgid "THUMB mode.\n" +msgstr "" + +#: src/bus/arm9tdmi.c:433 +msgid "ARM mode.\n" +msgstr "" + +#: src/bus/arm9tdmi.c:558 +#, fuzzy +msgid "ARM9TDMI compatible bus driver" +msgstr "Musomyi: Biturutse" + #: src/bus/au1500.c:124 #, fuzzy, c-format msgid "AU1500 compatible bus driver via BSR (JTAG part No. %d)\n" @@ -474,7 +516,7 @@ msgstr "" msgid "Blackfin BF533 compatible bus driver via BSR (JTAG part No. %d)\n" msgstr "Musomyi: Biturutse" -#: src/bus/bf533_stamp.c:332 +#: src/bus/bf533_stamp.c:339 msgid "Blackfin BF533 Stamp board bus driver" msgstr "" @@ -541,17 +583,17 @@ msgid "" "BSR" msgstr "" -#: src/bus/buses.c:182 src/bus/buses.c:219 +#: src/bus/buses.c:191 src/bus/buses.c:228 #, c-format msgid "realloc(%s,%zd) fails" msgstr "" -#: src/bus/buses.c:242 +#: src/bus/buses.c:251 #, fuzzy msgid "invalid bus number" msgstr "%s:Sibyo" -#: src/bus/buses.c:284 +#: src/bus/buses.c:293 #, fuzzy, c-format msgid "Initialized bus %d, active bus %d\n" msgstr "gutangiza Musomyi: kugirango Gikora" @@ -594,11 +636,6 @@ msgstr "" msgid "EJCONTROL or EJIMPCODE register not found" msgstr "" -#: src/bus/ejtag.c:546 -#, c-format -msgid "Failed to enter debug mode, ctrl=%s" -msgstr "" - #: src/bus/ejtag.c:761 #, fuzzy msgid "EJTAG compatible bus driver via PrAcc" @@ -676,64 +713,64 @@ msgstr "" msgid "Freescale MPC5200 compatible bus driver via BSR, parameter: [mux]" msgstr "Musomyi: Biturutse" -#: src/bus/mpc824x.c:112 +#: src/bus/mpc824x.c:116 msgid "" " Bus width 64 exists in mpc824x, but not supported by UrJTAG currently" msgstr "" -#: src/bus/mpc824x.c:117 -msgid " Only 8,32 and 64 bus width are supported for Banks 0 and 1" +#: src/bus/mpc824x.c:121 +msgid " Only 8, 16, 32 and 64 bus width are supported for Banks 0 and 1" msgstr "" -#: src/bus/mpc824x.c:129 +#: src/bus/mpc824x.c:133 msgid "" "Usage: initbus mpc824x [width=WIDTH] [revbits] [dbgAddr] [dbgData]\n" "\n" -" WIDTH data bus width - 8, 32, 64 (default 8)\n" +" WIDTH data bus width - 8, 16, 32, 64 (default 8)\n" " revbits reverse bits in data bus (default - no)\n" " dbgAddr display address bus state (default - no)\n" " dbgData display data bus state (default - no)\n" msgstr "" -#: src/bus/mpc824x.c:155 +#: src/bus/mpc824x.c:159 #, c-format msgid " Using default bus width %d\n" msgstr "" -#: src/bus/mpc824x.c:244 +#: src/bus/mpc824x.c:248 #, fuzzy, c-format msgid "Motorola MPC824x compatible bus driver via BSR (JTAG part No. %d)\n" msgstr "Musomyi: Biturutse" -#: src/bus/mpc824x.c:268 +#: src/bus/mpc824x.c:272 msgid "Base ROM Interface (Bank 1)" msgstr "" -#: src/bus/mpc824x.c:278 src/bus/mpc824x.c:297 +#: src/bus/mpc824x.c:282 src/bus/mpc824x.c:301 msgid "Base ROM Interface (Bank 0)" msgstr "" -#: src/bus/mpc824x.c:327 +#: src/bus/mpc824x.c:335 #, c-format msgid "Warning: unhandled bus width: %i" msgstr "" -#: src/bus/mpc824x.c:350 +#: src/bus/mpc824x.c:361 #, c-format msgid "Addr [%2d:0]: %06lX " msgstr "" -#: src/bus/mpc824x.c:400 +#: src/bus/mpc824x.c:411 #, c-format msgid "Data WR [%d:0]: %08lX " msgstr "" -#: src/bus/mpc824x.c:446 +#: src/bus/mpc824x.c:459 #, c-format msgid "Data RD [%d:0]: %08lX " msgstr "" -#: src/bus/mpc824x.c:566 +#: src/bus/mpc824x.c:581 #, fuzzy msgid "Motorola MPC824x compatible bus driver via BSR" msgstr "Musomyi: Biturutse" @@ -1978,46 +2015,46 @@ msgid "" "\tManufacturer: " msgstr "" -#: src/flash/amd.c:316 src/flash/amd.c:345 src/flash/amd.c:361 -#: src/flash/amd.c:380 src/flash/amd.c:396 src/flash/amd_flash.c:266 +#: src/flash/amd.c:316 src/flash/amd.c:345 src/flash/amd.c:367 +#: src/flash/amd.c:386 src/flash/amd.c:402 src/flash/amd_flash.c:266 msgid "" "\n" "\tChip: " msgstr "" -#: src/flash/amd.c:339 src/flash/amd.c:355 src/flash/amd.c:374 -#: src/flash/amd.c:390 src/flash/amd.c:403 src/flash/amd_flash.c:278 +#: src/flash/amd.c:339 src/flash/amd.c:361 src/flash/amd.c:380 +#: src/flash/amd.c:396 src/flash/amd.c:409 src/flash/amd_flash.c:278 #, c-format msgid "Unknown (ID 0x%04x)" msgstr "" -#: src/flash/amd.c:408 +#: src/flash/amd.c:414 #, fuzzy, c-format msgid "Unknown manufacturer (ID 0x%04x) Chip (ID 0x%04x)" msgstr "Ukora mu nganda" # sc/source\ui\src\attrdlg.src:RID_SCPAGE_PROTECTION.BTN_PROTECTED.text -#: src/flash/amd.c:412 src/flash/amd_flash.c:281 +#: src/flash/amd.c:418 src/flash/amd_flash.c:281 #, fuzzy, c-format msgid "" "\n" "\tProtected: %04x\n" msgstr "Birinzwe" -#: src/flash/amd.c:635 src/flash/amd.c:647 src/flash/amd.c:659 +#: src/flash/amd.c:647 src/flash/amd.c:659 src/flash/amd.c:671 #: src/flash/detectflash.c:117 src/flash/detectflash.c:149 msgid "AMD/Fujitsu Standard Command Set" msgstr "" -#: src/flash/amd.c:636 +#: src/flash/amd.c:648 msgid "supported: AMD 29LV640D, 29LV641D, 29LV642D; 2x16 Bit" msgstr "" -#: src/flash/amd.c:648 +#: src/flash/amd.c:660 msgid "supported: AMD 29LV800B, S29GLxxxN; MX29LV640B, W19B320AT/B; 1x16 Bit" msgstr "" -#: src/flash/amd.c:660 +#: src/flash/amd.c:672 msgid "" "supported: AMD 29LV160, AMD 29LV065D, AMD 29LV040B, S29GLxxxN, W19B320AT/B; " "1x8 Bit" @@ -2787,186 +2824,186 @@ msgstr "Kwiyandikisha" msgid "unknown data register '%s'" msgstr "Kitazwi Ibyatanzwe Kwiyandikisha" -#: src/svf/svf.c:470 +#: src/svf/svf.c:478 #, c-format msgid "Error %s: mismatch at position %d for TDO\n" msgstr "" -#: src/svf/svf.c:550 +#: src/svf/svf.c:558 #, c-format msgid "calloc(%zd,%zd) fails" msgstr "" -#: src/svf/svf.c:624 src/svf/svf.c:1081 +#: src/svf/svf.c:632 src/svf/svf.c:1089 #, c-format msgid "command %s not implemented\n" msgstr "" -#: src/svf/svf.c:661 +#: src/svf/svf.c:669 #, c-format msgid "Error %s: only TCK is supported for RUNTEST" msgstr "" -#: src/svf/svf.c:668 +#: src/svf/svf.c:676 #, c-format msgid "Error %s: maximum time must be larger or equal to minimum time" msgstr "" -#: src/svf/svf.c:676 +#: src/svf/svf.c:684 msgid "maximum time for RUNTEST not guaranteed.\n" msgstr "" -#: src/svf/svf.c:677 +#: src/svf/svf.c:685 msgid " This message is only displayed once.\n" msgstr "" -#: src/svf/svf.c:710 +#: src/svf/svf.c:718 #, c-format msgid "Error %s: Maximum cable clock frequency required for RUNTEST" msgstr "" -#: src/svf/svf.c:713 +#: src/svf/svf.c:721 msgid " Set the cable frequency with 'FREQUENCY '.\n" msgstr "" -#: src/svf/svf.c:878 +#: src/svf/svf.c:886 #, c-format msgid "Error %s: first %s command after length change must have a TDI value.\n" msgstr "" -#: src/svf/svf.c:906 +#: src/svf/svf.c:914 #, c-format msgid "Error %s: SIR command length inconsistent.\n" msgstr "" -#: src/svf/svf.c:910 +#: src/svf/svf.c:918 #, c-format msgid " in input file between line %d col %d and line %d col %d\n" msgstr "" -#: src/svf/svf.c:1011 +#: src/svf/svf.c:1019 #, c-format msgid "Error %s: no further TRST command allowed after mode ABSENT" msgstr "" -#: src/svf/svf.c:1034 +#: src/svf/svf.c:1042 #, c-format msgid "Error %s: TRST ABSENT must not be issued after a STATE command" msgstr "" -#: src/svf/svf.c:1042 +#: src/svf/svf.c:1050 #, c-format msgid "Error %s: TRST ABSENT must not be issued after an SIR or SDR command" msgstr "" -#: src/svf/svf.c:1052 +#: src/svf/svf.c:1060 #, c-format msgid "unimplemented mode '%s' for TRST\n" msgstr "" -#: src/svf/svf.c:1140 +#: src/svf/svf.c:1148 #, fuzzy, c-format msgid "%s: no JTAG chain available" msgstr "Kuri Impera" -#: src/svf/svf.c:1147 +#: src/svf/svf.c:1155 #, c-format msgid "%s: chain without any parts" msgstr "" -#: src/svf/svf.c:1163 +#: src/svf/svf.c:1171 #, c-format msgid "%s: could not establish SDR register" msgstr "" -#: src/svf/svf.c:1203 +#: src/svf/svf.c:1211 #, c-format msgid "%s: could not establish SIR instruction" msgstr "" -#: src/svf/svf.c:1240 +#: src/svf/svf.c:1248 msgid "" "Mismatches occurred between scanned device output and expected TDO values.\n" msgstr "" -#: src/svf/svf.c:1243 +#: src/svf/svf.c:1251 msgid "Scanned device output matched expected TDO values.\n" msgstr "" -#: svf_flex.l:367 +#: svf_flex.l:397 #, c-format msgid "Parsing %6d/%d (%3.0d%%)" msgstr "" -#: svf_flex.l:387 src/tap/cable/ft2232.c:1741 -#: src/tap/cable/generic_parport.c:89 src/tap/cable/generic_usbconn.c:236 -#: src/tap/cable/jim.c:71 src/tap/cable/ts7800.c:171 +#: svf_flex.l:417 src/tap/cable/ft2232.c:1787 +#: src/tap/cable/generic_parport.c:89 src/tap/cable/generic_usbconn.c:244 +#: src/tap/cable/jim.c:71 src/tap/cable/ts7800.c:170 #: src/tap/cable/usbblaster.c:80 src/tap/cable/vision_ep9307.c:214 #: src/tap/cable/wiggler.c:226 #, c-format msgid "malloc(%zd) fails" msgstr "" -#: src/tap/cable/arcom.c:137 +#: src/tap/cable/arcom.c:143 msgid "Arcom JTAG Cable" msgstr "" -#: src/tap/cable/byteblaster.c:159 +#: src/tap/cable/byteblaster.c:182 msgid "" "Altera ByteBlaster/ByteBlaster II/ByteBlasterMV Parallel Port Download Cable" msgstr "" -#: src/tap/cable.c:185 src/tap/usbconn/libusb.c:169 +#: src/tap/cable.c:188 src/tap/usbconn/libusb.c:169 #, c-format msgid "malloc(%zd)/malloc(%zd) fails" msgstr "" -#: src/tap/cable.c:239 +#: src/tap/cable.c:242 #, c-format msgid "(Resized JTAG activity queue to hold max %d items)\n" msgstr "" -#: src/tap/cable.c:426 src/tap/cable.c:487 +#: src/tap/cable.c:429 src/tap/cable.c:490 #, c-format msgid "Internal error: Got wrong type of result from queue (%d? %p.%d)\n" msgstr "" -#: src/tap/cable.c:494 +#: src/tap/cable.c:497 #, c-format msgid "Internal error: Got wrong signal's value from queue (%d? %p.%d)\n" msgstr "" -#: src/tap/cable.c:551 +#: src/tap/cable.c:554 #, c-format msgid "Internal error: Got wrong type of result from queue (#%d %p.%d)\n" msgstr "" -#: src/tap/cable.c:558 +#: src/tap/cable.c:561 msgid "Internal error: Wanted transfer result but none was queued\n" msgstr "" -#: src/tap/cable/dlc5.c:131 +#: src/tap/cable/dlc5.c:137 msgid "Xilinx DLC5 JTAG Parallel Cable III" msgstr "" -#: src/tap/cable/ea253.c:137 +#: src/tap/cable/ea253.c:143 msgid "ETC EA253 JTAG Cable" msgstr "" -#: src/tap/cable/ei012.c:139 +#: src/tap/cable/ei012.c:145 msgid "ETC EI012 JTAG Cable" msgstr "" -#: src/tap/cable/ft2232.c:251 +#: src/tap/cable/ft2232.c:268 #, c-format -msgid "Setting lowest supported frequency for FT2232: %d\n" +msgid "Warning: Setting lowest supported frequency for FT2232%s: %d\n" msgstr "" -#: src/tap/cable/ft2232.c:739 +#: src/tap/cable/ft2232.c:785 msgid "Please power on the TARGET board and connect VCC signal" msgstr "" -#: src/tap/cable/ft2232.c:1824 +#: src/tap/cable/ft2232.c:1874 #, c-format msgid "" "Usage: cable %s [vid=VID] [pid=PID] [desc=DESC] [driver=DRIVER]\n" @@ -2979,43 +3016,51 @@ msgid "" "\n" msgstr "" -#: src/tap/cable/ft2232.c:1836 +#: src/tap/cable/ft2232.c:1886 msgid "Generic FTDI FT2232 Cable" msgstr "" -#: src/tap/cable/ft2232.c:1869 +#: src/tap/cable/ft2232.c:1919 msgid "Olimex ARM-USB-OCD[-TINY] (FT2232) Cable" msgstr "" -#: src/tap/cable/ft2232.c:1916 +#: src/tap/cable/ft2232.c:1966 +msgid "Olimex ARM-USB-TINY-H (FT2232H) Cable" +msgstr "" + +#: src/tap/cable/ft2232.c:1999 msgid "Analog Devices Blackfin gnICE (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:1949 +#: src/tap/cable/ft2232.c:2033 +msgid "Analog Devices Blackfin gnICE+ (FT2232H) Cable (EXPERIMENTAL)" +msgstr "" + +#: src/tap/cable/ft2232.c:2067 msgid "Amontec JTAGkey (FT2232) Cable" msgstr "" -#: src/tap/cable/ft2232.c:1982 +#: src/tap/cable/ft2232.c:2100 msgid "OOCDLink-s (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2015 +#: src/tap/cable/ft2232.c:2133 msgid "Turtelizer 2 Rev. B (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2048 +#: src/tap/cable/ft2232.c:2166 msgid "USB to JTAG Interface (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2081 +#: src/tap/cable/ft2232.c:2199 msgid "Xverve DT-USB-ST Signalyzer Tool (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2114 +#: src/tap/cable/ft2232.c:2232 msgid "TinCanTools Flyswatter (FT2232) Cable" msgstr "" -#: src/tap/cable/ft2232.c:2147 +#: src/tap/cable/ft2232.c:2265 msgid "KrisTech usbScarabeus2 (FT2232) Cable" msgstr "" @@ -3049,11 +3094,11 @@ msgid "" "\n" msgstr "" -#: src/tap/cable/generic_usbconn.c:229 +#: src/tap/cable/generic_usbconn.c:237 msgid "Couldn't connect to suitable USB device.\n" msgstr "" -#: src/tap/cable/generic_usbconn.c:267 +#: src/tap/cable/generic_usbconn.c:275 #, c-format msgid "" "Usage: cable %s [vid=VID] [pid=PID] [desc=DESC] [...]\n" @@ -3065,7 +3110,7 @@ msgid "" msgstr "" #: src/tap/cable/jim.c:55 -msgid "not enough arguments" +msgid "too many arguments" msgstr "" #: src/tap/cable/jim.c:59 @@ -3081,23 +3126,23 @@ msgstr "" msgid "JTAG target simulator JIM" msgstr "" -#: src/tap/cable/jlink.c:590 +#: src/tap/cable/jlink.c:594 msgid "Segger/IAR J-Link, Atmel SAM-ICE and others." msgstr "" -#: src/tap/cable/keithkoep.c:148 +#: src/tap/cable/keithkoep.c:153 msgid "Keith & Koep JTAG cable" msgstr "" -#: src/tap/cable/lattice.c:140 +#: src/tap/cable/lattice.c:145 msgid "Lattice Parallel Port JTAG Cable" msgstr "" -#: src/tap/cable/mpcbdm.c:146 +#: src/tap/cable/mpcbdm.c:152 msgid "Mpcbdm JTAG cable" msgstr "" -#: src/tap/cable/triton.c:150 +#: src/tap/cable/triton.c:155 msgid "Ka-Ro TRITON Starterkit II (PXA255/250) JTAG Cable" msgstr "" @@ -3116,22 +3161,22 @@ msgstr "Kuri Impera" msgid "unable to munmap the GPIO registers" msgstr "Kuri Impera" -#: src/tap/cable/ts7800.c:161 src/tap/cable/vision_ep9307.c:204 +#: src/tap/cable/ts7800.c:160 src/tap/cable/vision_ep9307.c:204 msgid "This cable type does not accept parameters" msgstr "" -#: src/tap/cable/ts7800.c:166 +#: src/tap/cable/ts7800.c:165 msgid "Initializing TS-7800 Built-in JTAG Chain\n" msgstr "" -#: src/tap/cable/ts7800.c:298 src/tap/cable/vision_ep9307.c:339 +#: src/tap/cable/ts7800.c:292 src/tap/cable/vision_ep9307.c:342 #, c-format msgid "" "Usage: cable %s\n" "\n" msgstr "" -#: src/tap/cable/ts7800.c:303 +#: src/tap/cable/ts7800.c:297 msgid "TS-7800 Built-in JTAG Chain" msgstr "" @@ -3169,11 +3214,11 @@ msgstr "" msgid "Initializing Vision EP9307 SoM GPIO JTAG Cable\n" msgstr "" -#: src/tap/cable/vision_ep9307.c:344 +#: src/tap/cable/vision_ep9307.c:347 msgid "Vision EP9307 SoM GPIO JTAG Cable" msgstr "" -#: src/tap/cable/wiggler2.c:159 +#: src/tap/cable/wiggler2.c:164 msgid "Modified (with CPU Reset) WIGGLER JTAG Cable" msgstr "" @@ -3181,7 +3226,7 @@ msgstr "" msgid "Pin mapping failed\n" msgstr "" -#: src/tap/cable/wiggler.c:388 +#: src/tap/cable/wiggler.c:393 #, c-format msgid "" "Usage: cable %s parallel PORTADDR [TDO,TRST,TDI,TCK,TMS,SRESET]\n" @@ -3196,11 +3241,11 @@ msgid "" "\n" msgstr "" -#: src/tap/cable/wiggler.c:415 +#: src/tap/cable/wiggler.c:420 msgid "Macraigor Wiggler JTAG Cable" msgstr "" -#: src/tap/cable/wiggler.c:434 +#: src/tap/cable/wiggler.c:439 msgid "Excelpoint IGLOO JTAG Cable" msgstr "" diff --git a/urjtag/po/sk.po b/urjtag/po/sk.po index b578d53d..fd8136e2 100644 --- a/urjtag/po/sk.po +++ b/urjtag/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: jtag 0.5.1\n" "Report-Msgid-Bugs-To: marcel@telka.sk\n" -"POT-Creation-Date: 2009-05-28 14:35+0200\n" +"POT-Creation-Date: 2010-01-08 18:03+0100\n" "PO-Revision-Date: 2003-10-08 21:25+0200\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" @@ -230,19 +230,19 @@ msgstr "Nepodarilo sa otvoriť %s\n" msgid "No IDCODE specification found.\n" msgstr "" -#: src/bsdl/bsdl_sem.c:649 +#: src/bsdl/bsdl_sem.c:662 msgid "IDCODE matched\n" msgstr "" -#: src/bsdl/bsdl_sem.c:651 +#: src/bsdl/bsdl_sem.c:664 msgid "IDCODE mismatch\n" msgstr "" -#: src/bsdl/bsdl_sem.c:699 +#: src/bsdl/bsdl_sem.c:712 msgid "BSDL stage reported errors, aborting.\n" msgstr "" -#: src/bsdl/bsdl_sem.c:706 +#: src/bsdl/bsdl_sem.c:719 #, c-format msgid "Got IDCODE: %s\n" msgstr "" @@ -357,6 +357,49 @@ msgstr "" msgid "Too many errors" msgstr "" +#: src/bus/arm9tdmi.c:89 +#, fuzzy, c-format +msgid "ARM9TDMI compatible bus driver (JTAG part No. %d)\n" +msgstr "" +"Intel SA-1110 kompatibilný ovládač zbernice cez BSR (JTAG súčiastka č. %d)\n" + +#: src/bus/arm9tdmi.c:371 +#, fuzzy +msgid "SCANN register" +msgstr "Register" + +#: src/bus/arm9tdmi.c:377 +#, fuzzy +msgid "SCAN1 register" +msgstr "Register" + +#: src/bus/arm9tdmi.c:383 +#, fuzzy +msgid "SCAN2 register" +msgstr "Register" + +#: src/bus/arm9tdmi.c:423 src/bus/ejtag.c:546 +#, c-format +msgid "Failed to enter debug mode, ctrl=%s" +msgstr "" + +#: src/bus/arm9tdmi.c:429 +msgid "The target is halted in " +msgstr "" + +#: src/bus/arm9tdmi.c:431 +msgid "THUMB mode.\n" +msgstr "" + +#: src/bus/arm9tdmi.c:433 +msgid "ARM mode.\n" +msgstr "" + +#: src/bus/arm9tdmi.c:558 +#, fuzzy +msgid "ARM9TDMI compatible bus driver" +msgstr "Intel PXA2x0 kompatibilný ovládač zbernice cez BSR" + #: src/bus/au1500.c:124 #, fuzzy, c-format msgid "AU1500 compatible bus driver via BSR (JTAG part No. %d)\n" @@ -467,7 +510,7 @@ msgstr "" "Broadcom BCM1250 kompatibilný ovládač zbernice cez BSR (JTAG súčiastka č. %" "d)\n" -#: src/bus/bf533_stamp.c:332 +#: src/bus/bf533_stamp.c:339 msgid "Blackfin BF533 Stamp board bus driver" msgstr "" @@ -550,17 +593,17 @@ msgid "" "BSR" msgstr "" -#: src/bus/buses.c:182 src/bus/buses.c:219 +#: src/bus/buses.c:191 src/bus/buses.c:228 #, c-format msgid "realloc(%s,%zd) fails" msgstr "" -#: src/bus/buses.c:242 +#: src/bus/buses.c:251 #, fuzzy msgid "invalid bus number" msgstr "%s: neplatné číslo zbernice\n" -#: src/bus/buses.c:284 +#: src/bus/buses.c:293 #, fuzzy, c-format msgid "Initialized bus %d, active bus %d\n" msgstr "inicializovať ovládač zbernice pre aktívnu súčiastku" @@ -604,11 +647,6 @@ msgstr "" msgid "EJCONTROL or EJIMPCODE register not found" msgstr "" -#: src/bus/ejtag.c:546 -#, c-format -msgid "Failed to enter debug mode, ctrl=%s" -msgstr "" - #: src/bus/ejtag.c:761 #, fuzzy msgid "EJTAG compatible bus driver via PrAcc" @@ -694,65 +732,65 @@ msgstr "" msgid "Freescale MPC5200 compatible bus driver via BSR, parameter: [mux]" msgstr "Intel PXA2x0 kompatibilný ovládač zbernice cez BSR" -#: src/bus/mpc824x.c:112 +#: src/bus/mpc824x.c:116 msgid "" " Bus width 64 exists in mpc824x, but not supported by UrJTAG currently" msgstr "" -#: src/bus/mpc824x.c:117 -msgid " Only 8,32 and 64 bus width are supported for Banks 0 and 1" +#: src/bus/mpc824x.c:121 +msgid " Only 8, 16, 32 and 64 bus width are supported for Banks 0 and 1" msgstr "" -#: src/bus/mpc824x.c:129 +#: src/bus/mpc824x.c:133 msgid "" "Usage: initbus mpc824x [width=WIDTH] [revbits] [dbgAddr] [dbgData]\n" "\n" -" WIDTH data bus width - 8, 32, 64 (default 8)\n" +" WIDTH data bus width - 8, 16, 32, 64 (default 8)\n" " revbits reverse bits in data bus (default - no)\n" " dbgAddr display address bus state (default - no)\n" " dbgData display data bus state (default - no)\n" msgstr "" -#: src/bus/mpc824x.c:155 +#: src/bus/mpc824x.c:159 #, c-format msgid " Using default bus width %d\n" msgstr "" -#: src/bus/mpc824x.c:244 +#: src/bus/mpc824x.c:248 #, fuzzy, c-format msgid "Motorola MPC824x compatible bus driver via BSR (JTAG part No. %d)\n" msgstr "" "Intel PXA2x0 kompatibilný ovládač zbernice cez BSR (JTAG súčiastka č. %d)\n" -#: src/bus/mpc824x.c:268 +#: src/bus/mpc824x.c:272 msgid "Base ROM Interface (Bank 1)" msgstr "" -#: src/bus/mpc824x.c:278 src/bus/mpc824x.c:297 +#: src/bus/mpc824x.c:282 src/bus/mpc824x.c:301 msgid "Base ROM Interface (Bank 0)" msgstr "" -#: src/bus/mpc824x.c:327 +#: src/bus/mpc824x.c:335 #, c-format msgid "Warning: unhandled bus width: %i" msgstr "" -#: src/bus/mpc824x.c:350 +#: src/bus/mpc824x.c:361 #, c-format msgid "Addr [%2d:0]: %06lX " msgstr "" -#: src/bus/mpc824x.c:400 +#: src/bus/mpc824x.c:411 #, c-format msgid "Data WR [%d:0]: %08lX " msgstr "" -#: src/bus/mpc824x.c:446 +#: src/bus/mpc824x.c:459 #, c-format msgid "Data RD [%d:0]: %08lX " msgstr "" -#: src/bus/mpc824x.c:566 +#: src/bus/mpc824x.c:581 #, fuzzy msgid "Motorola MPC824x compatible bus driver via BSR" msgstr "Intel PXA2x0 kompatibilný ovládač zbernice cez BSR" @@ -2112,8 +2150,8 @@ msgstr "" "Čip: AMD Flash\n" "\tVýrobca: " -#: src/flash/amd.c:316 src/flash/amd.c:345 src/flash/amd.c:361 -#: src/flash/amd.c:380 src/flash/amd.c:396 src/flash/amd_flash.c:266 +#: src/flash/amd.c:316 src/flash/amd.c:345 src/flash/amd.c:367 +#: src/flash/amd.c:386 src/flash/amd.c:402 src/flash/amd_flash.c:266 msgid "" "\n" "\tChip: " @@ -2121,18 +2159,18 @@ msgstr "" "\n" "\tČip: " -#: src/flash/amd.c:339 src/flash/amd.c:355 src/flash/amd.c:374 -#: src/flash/amd.c:390 src/flash/amd.c:403 src/flash/amd_flash.c:278 +#: src/flash/amd.c:339 src/flash/amd.c:361 src/flash/amd.c:380 +#: src/flash/amd.c:396 src/flash/amd.c:409 src/flash/amd_flash.c:278 #, c-format msgid "Unknown (ID 0x%04x)" msgstr "Neznámy (ID 0x%04x)" -#: src/flash/amd.c:408 +#: src/flash/amd.c:414 #, fuzzy, c-format msgid "Unknown manufacturer (ID 0x%04x) Chip (ID 0x%04x)" msgstr "Neznámy výrobca (ID 0x%04x)" -#: src/flash/amd.c:412 src/flash/amd_flash.c:281 +#: src/flash/amd.c:418 src/flash/amd_flash.c:281 #, c-format msgid "" "\n" @@ -2141,21 +2179,21 @@ msgstr "" "\n" "\tChránené: %04x\n" -#: src/flash/amd.c:635 src/flash/amd.c:647 src/flash/amd.c:659 +#: src/flash/amd.c:647 src/flash/amd.c:659 src/flash/amd.c:671 #: src/flash/detectflash.c:117 src/flash/detectflash.c:149 msgid "AMD/Fujitsu Standard Command Set" msgstr "Štandardná množina príkazov AMD/Fujitsu" -#: src/flash/amd.c:636 +#: src/flash/amd.c:648 msgid "supported: AMD 29LV640D, 29LV641D, 29LV642D; 2x16 Bit" msgstr "podporované: AMD 29LV640D, 29LV641D, 29LV642D; 2x16 bitov" -#: src/flash/amd.c:648 +#: src/flash/amd.c:660 #, fuzzy msgid "supported: AMD 29LV800B, S29GLxxxN; MX29LV640B, W19B320AT/B; 1x16 Bit" msgstr "podporované: AMD 29LV800B; 1x16 bitov" -#: src/flash/amd.c:660 +#: src/flash/amd.c:672 #, fuzzy msgid "" "supported: AMD 29LV160, AMD 29LV065D, AMD 29LV040B, S29GLxxxN, W19B320AT/B; " @@ -2945,187 +2983,187 @@ msgstr "Inštrukcia '%s' je už definovaná\n" msgid "unknown data register '%s'" msgstr "neznámy dátový register '%s'\n" -#: src/svf/svf.c:470 +#: src/svf/svf.c:478 #, c-format msgid "Error %s: mismatch at position %d for TDO\n" msgstr "" -#: src/svf/svf.c:550 +#: src/svf/svf.c:558 #, c-format msgid "calloc(%zd,%zd) fails" msgstr "" -#: src/svf/svf.c:624 src/svf/svf.c:1081 +#: src/svf/svf.c:632 src/svf/svf.c:1089 #, c-format msgid "command %s not implemented\n" msgstr "" -#: src/svf/svf.c:661 +#: src/svf/svf.c:669 #, c-format msgid "Error %s: only TCK is supported for RUNTEST" msgstr "" -#: src/svf/svf.c:668 +#: src/svf/svf.c:676 #, c-format msgid "Error %s: maximum time must be larger or equal to minimum time" msgstr "" -#: src/svf/svf.c:676 +#: src/svf/svf.c:684 msgid "maximum time for RUNTEST not guaranteed.\n" msgstr "" -#: src/svf/svf.c:677 +#: src/svf/svf.c:685 msgid " This message is only displayed once.\n" msgstr "" -#: src/svf/svf.c:710 +#: src/svf/svf.c:718 #, c-format msgid "Error %s: Maximum cable clock frequency required for RUNTEST" msgstr "" -#: src/svf/svf.c:713 +#: src/svf/svf.c:721 msgid " Set the cable frequency with 'FREQUENCY '.\n" msgstr "" -#: src/svf/svf.c:878 +#: src/svf/svf.c:886 #, c-format msgid "Error %s: first %s command after length change must have a TDI value.\n" msgstr "" -#: src/svf/svf.c:906 +#: src/svf/svf.c:914 #, c-format msgid "Error %s: SIR command length inconsistent.\n" msgstr "" -#: src/svf/svf.c:910 +#: src/svf/svf.c:918 #, c-format msgid " in input file between line %d col %d and line %d col %d\n" msgstr "" -#: src/svf/svf.c:1011 +#: src/svf/svf.c:1019 #, c-format msgid "Error %s: no further TRST command allowed after mode ABSENT" msgstr "" -#: src/svf/svf.c:1034 +#: src/svf/svf.c:1042 #, c-format msgid "Error %s: TRST ABSENT must not be issued after a STATE command" msgstr "" -#: src/svf/svf.c:1042 +#: src/svf/svf.c:1050 #, c-format msgid "Error %s: TRST ABSENT must not be issued after an SIR or SDR command" msgstr "" -#: src/svf/svf.c:1052 +#: src/svf/svf.c:1060 #, c-format msgid "unimplemented mode '%s' for TRST\n" msgstr "" -#: src/svf/svf.c:1140 +#: src/svf/svf.c:1148 #, fuzzy, c-format msgid "%s: no JTAG chain available" msgstr "Chyba: Nepodarilo sa zdetekovať koniec JTAG reťazca!\n" -#: src/svf/svf.c:1147 +#: src/svf/svf.c:1155 #, c-format msgid "%s: chain without any parts" msgstr "" -#: src/svf/svf.c:1163 +#: src/svf/svf.c:1171 #, c-format msgid "%s: could not establish SDR register" msgstr "" -#: src/svf/svf.c:1203 +#: src/svf/svf.c:1211 #, c-format msgid "%s: could not establish SIR instruction" msgstr "" -#: src/svf/svf.c:1240 +#: src/svf/svf.c:1248 msgid "" "Mismatches occurred between scanned device output and expected TDO values.\n" msgstr "" -#: src/svf/svf.c:1243 +#: src/svf/svf.c:1251 msgid "Scanned device output matched expected TDO values.\n" msgstr "" -#: svf_flex.l:367 +#: svf_flex.l:397 #, c-format msgid "Parsing %6d/%d (%3.0d%%)" msgstr "" -#: svf_flex.l:387 src/tap/cable/ft2232.c:1741 -#: src/tap/cable/generic_parport.c:89 src/tap/cable/generic_usbconn.c:236 -#: src/tap/cable/jim.c:71 src/tap/cable/ts7800.c:171 +#: svf_flex.l:417 src/tap/cable/ft2232.c:1787 +#: src/tap/cable/generic_parport.c:89 src/tap/cable/generic_usbconn.c:244 +#: src/tap/cable/jim.c:71 src/tap/cable/ts7800.c:170 #: src/tap/cable/usbblaster.c:80 src/tap/cable/vision_ep9307.c:214 #: src/tap/cable/wiggler.c:226 #, c-format msgid "malloc(%zd) fails" msgstr "" -#: src/tap/cable/arcom.c:137 +#: src/tap/cable/arcom.c:143 msgid "Arcom JTAG Cable" msgstr "JTAG kábel Arcom" -#: src/tap/cable/byteblaster.c:159 +#: src/tap/cable/byteblaster.c:182 msgid "" "Altera ByteBlaster/ByteBlaster II/ByteBlasterMV Parallel Port Download Cable" msgstr "" "JTAG kábel Altera ByteBlaster/ByteBlaster II/ByteBlasterMV pre paralelný port" -#: src/tap/cable.c:185 src/tap/usbconn/libusb.c:169 +#: src/tap/cable.c:188 src/tap/usbconn/libusb.c:169 #, c-format msgid "malloc(%zd)/malloc(%zd) fails" msgstr "" -#: src/tap/cable.c:239 +#: src/tap/cable.c:242 #, c-format msgid "(Resized JTAG activity queue to hold max %d items)\n" msgstr "" -#: src/tap/cable.c:426 src/tap/cable.c:487 +#: src/tap/cable.c:429 src/tap/cable.c:490 #, c-format msgid "Internal error: Got wrong type of result from queue (%d? %p.%d)\n" msgstr "" -#: src/tap/cable.c:494 +#: src/tap/cable.c:497 #, c-format msgid "Internal error: Got wrong signal's value from queue (%d? %p.%d)\n" msgstr "" -#: src/tap/cable.c:551 +#: src/tap/cable.c:554 #, c-format msgid "Internal error: Got wrong type of result from queue (#%d %p.%d)\n" msgstr "" -#: src/tap/cable.c:558 +#: src/tap/cable.c:561 msgid "Internal error: Wanted transfer result but none was queued\n" msgstr "" -#: src/tap/cable/dlc5.c:131 +#: src/tap/cable/dlc5.c:137 msgid "Xilinx DLC5 JTAG Parallel Cable III" msgstr "Xilinx DLC5 JTAG paralelný kábel III" -#: src/tap/cable/ea253.c:137 +#: src/tap/cable/ea253.c:143 msgid "ETC EA253 JTAG Cable" msgstr "JTAG kábel ETC EA253" -#: src/tap/cable/ei012.c:139 +#: src/tap/cable/ei012.c:145 msgid "ETC EI012 JTAG Cable" msgstr "JTAG kábel ETC EI012" -#: src/tap/cable/ft2232.c:251 +#: src/tap/cable/ft2232.c:268 #, c-format -msgid "Setting lowest supported frequency for FT2232: %d\n" +msgid "Warning: Setting lowest supported frequency for FT2232%s: %d\n" msgstr "" -#: src/tap/cable/ft2232.c:739 +#: src/tap/cable/ft2232.c:785 msgid "Please power on the TARGET board and connect VCC signal" msgstr "" -#: src/tap/cable/ft2232.c:1824 +#: src/tap/cable/ft2232.c:1874 #, c-format msgid "" "Usage: cable %s [vid=VID] [pid=PID] [desc=DESC] [driver=DRIVER]\n" @@ -3138,43 +3176,51 @@ msgid "" "\n" msgstr "" -#: src/tap/cable/ft2232.c:1836 +#: src/tap/cable/ft2232.c:1886 msgid "Generic FTDI FT2232 Cable" msgstr "" -#: src/tap/cable/ft2232.c:1869 +#: src/tap/cable/ft2232.c:1919 msgid "Olimex ARM-USB-OCD[-TINY] (FT2232) Cable" msgstr "" -#: src/tap/cable/ft2232.c:1916 +#: src/tap/cable/ft2232.c:1966 +msgid "Olimex ARM-USB-TINY-H (FT2232H) Cable" +msgstr "" + +#: src/tap/cable/ft2232.c:1999 msgid "Analog Devices Blackfin gnICE (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:1949 +#: src/tap/cable/ft2232.c:2033 +msgid "Analog Devices Blackfin gnICE+ (FT2232H) Cable (EXPERIMENTAL)" +msgstr "" + +#: src/tap/cable/ft2232.c:2067 msgid "Amontec JTAGkey (FT2232) Cable" msgstr "" -#: src/tap/cable/ft2232.c:1982 +#: src/tap/cable/ft2232.c:2100 msgid "OOCDLink-s (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2015 +#: src/tap/cable/ft2232.c:2133 msgid "Turtelizer 2 Rev. B (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2048 +#: src/tap/cable/ft2232.c:2166 msgid "USB to JTAG Interface (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2081 +#: src/tap/cable/ft2232.c:2199 msgid "Xverve DT-USB-ST Signalyzer Tool (FT2232) Cable (EXPERIMENTAL)" msgstr "" -#: src/tap/cable/ft2232.c:2114 +#: src/tap/cable/ft2232.c:2232 msgid "TinCanTools Flyswatter (FT2232) Cable" msgstr "" -#: src/tap/cable/ft2232.c:2147 +#: src/tap/cable/ft2232.c:2265 msgid "KrisTech usbScarabeus2 (FT2232) Cable" msgstr "" @@ -3208,11 +3254,11 @@ msgid "" "\n" msgstr "" -#: src/tap/cable/generic_usbconn.c:229 +#: src/tap/cable/generic_usbconn.c:237 msgid "Couldn't connect to suitable USB device.\n" msgstr "" -#: src/tap/cable/generic_usbconn.c:267 +#: src/tap/cable/generic_usbconn.c:275 #, c-format msgid "" "Usage: cable %s [vid=VID] [pid=PID] [desc=DESC] [...]\n" @@ -3224,7 +3270,7 @@ msgid "" msgstr "" #: src/tap/cable/jim.c:55 -msgid "not enough arguments" +msgid "too many arguments" msgstr "" #: src/tap/cable/jim.c:59 @@ -3240,24 +3286,24 @@ msgstr "" msgid "JTAG target simulator JIM" msgstr "" -#: src/tap/cable/jlink.c:590 +#: src/tap/cable/jlink.c:594 msgid "Segger/IAR J-Link, Atmel SAM-ICE and others." msgstr "" -#: src/tap/cable/keithkoep.c:148 +#: src/tap/cable/keithkoep.c:153 msgid "Keith & Koep JTAG cable" msgstr "JTAG kábel Keith & Koep" -#: src/tap/cable/lattice.c:140 +#: src/tap/cable/lattice.c:145 #, fuzzy msgid "Lattice Parallel Port JTAG Cable" msgstr "JTAG kábel Macraigor Wiggler" -#: src/tap/cable/mpcbdm.c:146 +#: src/tap/cable/mpcbdm.c:152 msgid "Mpcbdm JTAG cable" msgstr "JTAG kábel Mpcbdm" -#: src/tap/cable/triton.c:150 +#: src/tap/cable/triton.c:155 msgid "Ka-Ro TRITON Starterkit II (PXA255/250) JTAG Cable" msgstr "JTAG kábel pre Ka-Ro TRITON Starterkit II (PXA255/250)" @@ -3276,22 +3322,22 @@ msgstr "Chyba: Nepodarilo sa zdetekovať koniec JTAG reťazca!\n" msgid "unable to munmap the GPIO registers" msgstr "Chyba: Nepodarilo sa zdetekovať koniec JTAG reťazca!\n" -#: src/tap/cable/ts7800.c:161 src/tap/cable/vision_ep9307.c:204 +#: src/tap/cable/ts7800.c:160 src/tap/cable/vision_ep9307.c:204 msgid "This cable type does not accept parameters" msgstr "" -#: src/tap/cable/ts7800.c:166 +#: src/tap/cable/ts7800.c:165 msgid "Initializing TS-7800 Built-in JTAG Chain\n" msgstr "" -#: src/tap/cable/ts7800.c:298 src/tap/cable/vision_ep9307.c:339 +#: src/tap/cable/ts7800.c:292 src/tap/cable/vision_ep9307.c:342 #, c-format msgid "" "Usage: cable %s\n" "\n" msgstr "" -#: src/tap/cable/ts7800.c:303 +#: src/tap/cable/ts7800.c:297 msgid "TS-7800 Built-in JTAG Chain" msgstr "" @@ -3329,11 +3375,11 @@ msgstr "" msgid "Initializing Vision EP9307 SoM GPIO JTAG Cable\n" msgstr "" -#: src/tap/cable/vision_ep9307.c:344 +#: src/tap/cable/vision_ep9307.c:347 msgid "Vision EP9307 SoM GPIO JTAG Cable" msgstr "" -#: src/tap/cable/wiggler2.c:159 +#: src/tap/cable/wiggler2.c:164 msgid "Modified (with CPU Reset) WIGGLER JTAG Cable" msgstr "" @@ -3341,7 +3387,7 @@ msgstr "" msgid "Pin mapping failed\n" msgstr "" -#: src/tap/cable/wiggler.c:388 +#: src/tap/cable/wiggler.c:393 #, c-format msgid "" "Usage: cable %s parallel PORTADDR [TDO,TRST,TDI,TCK,TMS,SRESET]\n" @@ -3356,11 +3402,11 @@ msgid "" "\n" msgstr "" -#: src/tap/cable/wiggler.c:415 +#: src/tap/cable/wiggler.c:420 msgid "Macraigor Wiggler JTAG Cable" msgstr "JTAG kábel Macraigor Wiggler" -#: src/tap/cable/wiggler.c:434 +#: src/tap/cable/wiggler.c:439 #, fuzzy msgid "Excelpoint IGLOO JTAG Cable" msgstr "JTAG kábel Arcom" diff --git a/urjtag/src/tap/cable.c b/urjtag/src/tap/cable.c index f7c95148..4e2e7e6c 100644 --- a/urjtag/src/tap/cable.c +++ b/urjtag/src/tap/cable.c @@ -50,7 +50,9 @@ extern urj_cable_driver_t urj_tap_cable_usbblaster_driver; extern urj_cable_driver_t urj_tap_cable_ft2232_driver; extern urj_cable_driver_t urj_tap_cable_ft2232_jtagkey_driver; extern urj_cable_driver_t urj_tap_cable_ft2232_armusbocd_driver; +extern urj_cable_driver_t urj_tap_cable_ft2232_armusbtiny_h_driver; extern urj_cable_driver_t urj_tap_cable_ft2232_gnice_driver; +extern urj_cable_driver_t urj_tap_cable_ft2232_gniceplus_driver; extern urj_cable_driver_t urj_tap_cable_ft2232_oocdlinks_driver; extern urj_cable_driver_t urj_tap_cable_ft2232_signalyzer_driver; extern urj_cable_driver_t urj_tap_cable_ft2232_turtelizer2_driver; @@ -91,7 +93,9 @@ urj_cable_driver_t *urj_tap_cable_drivers[] = { &urj_tap_cable_ft2232_driver, &urj_tap_cable_ft2232_jtagkey_driver, &urj_tap_cable_ft2232_armusbocd_driver, + &urj_tap_cable_ft2232_armusbtiny_h_driver, &urj_tap_cable_ft2232_gnice_driver, + &urj_tap_cable_ft2232_gniceplus_driver, &urj_tap_cable_ft2232_oocdlinks_driver, &urj_tap_cable_ft2232_signalyzer_driver, &urj_tap_cable_ft2232_turtelizer2_driver, diff --git a/urjtag/src/tap/cable/ft2232.c b/urjtag/src/tap/cable/ft2232.c index b211ebd1..fcddc018 100644 --- a/urjtag/src/tap/cable/ft2232.c +++ b/urjtag/src/tap/cable/ft2232.c @@ -21,6 +21,8 @@ * * Written by Arnim Laeuger, 2007-2008. * Support for JTAGkey submitted by Laurent Gauch, 2008. + * Support for FT2232H written by Michael Hennerich, 2009; adapted + * for urjtag codebase and submitted by Adam Megacz, 2010. * */ @@ -45,6 +47,9 @@ /* Maximum TCK frequency of FT2232 */ #define FT2232_MAX_TCK_FREQ 6000000 +/* Maximum TCK frequency of FT2232H / FT4232H */ +#define FT2232H_MAX_TCK_FREQ 30000000 + /* The default driver if not specified otherwise during connect */ #ifdef ENABLE_LOWLEVEL_FTD2XX #define DEFAULT_DRIVER "ftd2xx-mpsse" @@ -79,6 +84,9 @@ #define TCK_DIVISOR 0x86 #define SEND_IMMEDIATE 0x87 +/* FT2232H / FT4232H only commands */ +#define DISABLE_CLOCKDIV 0x8A /* Disables the clk divide by 5 to allow for a 60MHz master clock */ +#define ENABLE_CLOCKDIV 0x8B /* Enables the clk divide by 5 to allow for backward compatibility with FT2232D */ /* bit and bitmask definitions for GPIO commands */ #define BIT_TCK 0 @@ -227,30 +235,43 @@ static const urj_tap_cable_cx_cmd_t imm_cmd = static void -ft2232_set_frequency (urj_cable_t *cable, uint32_t new_frequency) +ft2232h_disable_clockdiv_by5 (urj_cable_t *cable) +{ + params_t *params = (params_t *)cable->params; + urj_tap_cable_cx_cmd_root_t *cmd_root = &(params->cmd_root); + + urj_tap_cable_cx_cmd_queue( cmd_root, 0 ); + urj_tap_cable_cx_cmd_push( cmd_root, DISABLE_CLOCKDIV ); +} + +static void +ft2232_set_frequency_common (urj_cable_t *cable, uint32_t new_frequency, uint32_t max_frequency) { params_t *params = (params_t *) cable->params; urj_tap_cable_cx_cmd_root_t *cmd_root = &(params->cmd_root); - if (!new_frequency || new_frequency > FT2232_MAX_TCK_FREQ) - new_frequency = FT2232_MAX_TCK_FREQ; + if (!new_frequency || new_frequency > max_frequency) + new_frequency = max_frequency; /* update ft2232 frequency if cable setting changed */ if (new_frequency != params->mpsse_frequency) { uint32_t div; - div = FT2232_MAX_TCK_FREQ / new_frequency; - if (FT2232_MAX_TCK_FREQ % new_frequency) + div = max_frequency / new_frequency; + if (max_frequency % new_frequency) div++; if (div >= (1 << 16)) { div = (1 << 16) - 1; - urj_warning (_("Setting lowest supported frequency for FT2232: %d\n"), - FT2232_MAX_TCK_FREQ / div); + urj_warning( _("Warning: Setting lowest supported frequency for FT2232%s: %d\n"), + max_frequency == FT2232H_MAX_TCK_FREQ ? "H" : "", max_frequency/div ); } + if (max_frequency == FT2232H_MAX_TCK_FREQ) + ft2232h_disable_clockdiv_by5( cable ); + /* send new divisor to device */ div -= 1; urj_tap_cable_cx_cmd_queue (cmd_root, 0); @@ -261,12 +282,24 @@ ft2232_set_frequency (urj_cable_t *cable, uint32_t new_frequency) urj_tap_cable_cx_xfer (cmd_root, &imm_cmd, cable, URJ_TAP_CABLE_COMPLETELY); - params->mpsse_frequency = FT2232_MAX_TCK_FREQ / (div + 1); + params->mpsse_frequency = max_frequency / (div + 1); cable->frequency = params->mpsse_frequency; } } +static void +ft2232_set_frequency (urj_cable_t *cable, uint32_t new_frequency) +{ + ft2232_set_frequency_common( cable, new_frequency, FT2232_MAX_TCK_FREQ); +} + +static void +ft2232h_set_frequency (urj_cable_t *cable, uint32_t new_frequency) +{ + ft2232_set_frequency_common( cable, new_frequency, FT2232H_MAX_TCK_FREQ); +} + static int ft2232_generic_init (urj_cable_t *cable) { @@ -364,7 +397,7 @@ ft2232_jtagkey_init (urj_cable_t *cable) static int -ft2232_armusbocd_init (urj_cable_t *cable) +ft2232_armusbocd_init_common (urj_cable_t *cable, uint32_t frequency) { params_t *params = (params_t *) cable->params; urj_tap_cable_cx_cmd_root_t *cmd_root = &(params->cmd_root); @@ -405,7 +438,7 @@ ft2232_armusbocd_init (urj_cable_t *cable) urj_tap_cable_cx_cmd_push (cmd_root, params->high_byte_value); urj_tap_cable_cx_cmd_push (cmd_root, params->high_byte_dir); - ft2232_set_frequency (cable, FT2232_MAX_TCK_FREQ); + ft2232_set_frequency (cable, frequency); params->bit_trst = BIT_ARMUSBOCD_nTRST + 8; /* member of HIGH byte */ params->bit_reset = BIT_ARMUSBOCD_nTSRST + 8; /* member of HIGH byte */ @@ -416,9 +449,21 @@ ft2232_armusbocd_init (urj_cable_t *cable) return URJ_STATUS_OK; } +static int +ft2232_armusbocd_init (urj_cable_t *cable) +{ + return ft2232_armusbocd_init_common (cable, FT2232_MAX_TCK_FREQ); +} static int -ft2232_gnice_init (urj_cable_t *cable) +ft2232_armusbtiny_h_init (urj_cable_t *cable) +{ + return ft2232_armusbocd_init_common (cable, FT2232H_MAX_TCK_FREQ); +} + + +static int +ft2232_gnice_init_common (urj_cable_t *cable, uint32_t frequency) { params_t *params = (params_t *) cable->params; urj_tap_cable_cx_cmd_root_t *cmd_root = &(params->cmd_root); @@ -450,7 +495,7 @@ ft2232_gnice_init (urj_cable_t *cable) urj_tap_cable_cx_cmd_push (cmd_root, params->high_byte_value); urj_tap_cable_cx_cmd_push (cmd_root, params->high_byte_dir); - ft2232_set_frequency (cable, FT2232_MAX_TCK_FREQ); + ft2232_set_frequency (cable, frequency); params->bit_trst = BIT_GNICE_nTRST + 8; /* member of HIGH byte */ params->bit_reset = -1; /* not used */ @@ -461,6 +506,17 @@ ft2232_gnice_init (urj_cable_t *cable) return URJ_STATUS_OK; } +static int +ft2232_gnice_init (urj_cable_t *cable) +{ + return ft2232_gnice_init_common (cable, FT2232_MAX_TCK_FREQ); +} + +static int +ft2232_gniceplus_init (urj_cable_t *cable) +{ + return ft2232_gnice_init_common (cable, FT2232H_MAX_TCK_FREQ); +} static int ft2232_oocdlinks_init (urj_cable_t *cable) @@ -1766,6 +1822,7 @@ ft2232_cable_free (urj_cable_t *cable) urj_usbconn_cable_t urj_tap_cable_usbconn_ft2232_ftdi; urj_usbconn_cable_t urj_tap_cable_usbconn_armusbocd_ftdi; urj_usbconn_cable_t urj_tap_cable_usbconn_gnice_ftdi; +urj_usbconn_cable_t urj_tap_cable_usbconn_gniceplus_ftdi; urj_usbconn_cable_t urj_tap_cable_usbconn_jtagkey_ftdi; urj_usbconn_cable_t urj_tap_cable_usbconn_oocdlinks_ftdi; urj_usbconn_cable_t urj_tap_cable_usbconn_turtelizer2_ftdi; @@ -1786,6 +1843,9 @@ ft2232_usbcable_help (urj_log_level_t ll, const char *cablename) conn = &urj_tap_cable_usbconn_gnice_ftdi; if (strcasecmp (conn->name, cablename) == 0) goto found; + conn = &urj_tap_cable_usbconn_gniceplus_ftdi; + if (strcasecmp( conn->name, cablename ) == 0) + goto found; conn = &urj_tap_cable_usbconn_jtagkey_ftdi; if (strcasecmp (conn->name, cablename) == 0) goto found; @@ -1901,6 +1961,39 @@ urj_usbconn_cable_t urj_tap_cable_usbconn_armusbocdtiny_ftd2xx = { 0x0004 /* PID */ }; +urj_cable_driver_t urj_tap_cable_ft2232_armusbtiny_h_driver = { + "ARM-USB-OCD-H", + N_("Olimex ARM-USB-TINY-H (FT2232H) Cable"), + URJ_CABLE_DEVICE_USB, + { .usb = ft2232_connect, }, + urj_tap_cable_generic_disconnect, + ft2232_cable_free, + ft2232_armusbtiny_h_init, + ft2232_armusbocd_done, + ft2232_set_frequency, + ft2232_clock, + ft2232_get_tdo, + ft2232_transfer, + ft2232_set_signal, + urj_tap_cable_generic_get_signal, + ft2232_flush, + ft2232_usbcable_help +}; +urj_usbconn_cable_t urj_tap_cable_usbconn_armusbtiny_h_ftdi = { + "ARM-USB-TINY-H", /* cable name */ + NULL, /* string pattern, not used */ + "ftdi-mpsse", /* default usbconn driver */ + 0x15BA, /* VID */ + 0x002A /* PID */ +}; +urj_usbconn_cable_t urj_tap_cable_usbconn_armusbtiny_h_ftd2xx = { + "ARM-USB-TINY-H", /* cable name */ + NULL, /* string pattern, not used */ + "ftd2xx-mpsse", /* default usbconn driver */ + 0x15BA, /* VID */ + 0x002A /* PID */ +}; + urj_cable_driver_t urj_tap_cable_ft2232_gnice_driver = { "gnICE", N_("Analog Devices Blackfin gnICE (FT2232) Cable (EXPERIMENTAL)"), @@ -1919,6 +2012,7 @@ urj_cable_driver_t urj_tap_cable_ft2232_gnice_driver = { ft2232_flush, ft2232_usbcable_help }; + urj_usbconn_cable_t urj_tap_cable_usbconn_gnice_ftdi = { "gnICE", /* cable name */ NULL, /* string pattern, not used */ @@ -1934,6 +2028,40 @@ urj_usbconn_cable_t urj_tap_cable_usbconn_gnice_ftd2xx = { 0xF000 /* PID */ }; +urj_cable_driver_t urj_tap_cable_ft2232_gniceplus_driver = { + "gnICE+", + N_("Analog Devices Blackfin gnICE+ (FT2232H) Cable (EXPERIMENTAL)"), + URJ_CABLE_DEVICE_USB, + { .usb = ft2232_connect, }, + urj_tap_cable_generic_disconnect, + ft2232_cable_free, + ft2232_gniceplus_init, + ft2232_gnice_done, + ft2232h_set_frequency, + ft2232_clock, + ft2232_get_tdo, + ft2232_transfer, + ft2232_set_signal, + urj_tap_cable_generic_get_signal, + ft2232_flush, + ft2232_usbcable_help +}; + +urj_usbconn_cable_t urj_tap_cable_usbconn_gniceplus_ftdi = { + "gnICE+", /* cable name */ + NULL, /* string pattern, not used */ + "ftdi-mpsse", /* default usbconn driver */ + 0x0456, /* VID */ + 0xF001 /* PID */ +}; +urj_usbconn_cable_t urj_tap_cable_usbconn_gniceplus_ftd2xx = { + "gnICE+", /* cable name */ + NULL, /* string pattern, not used */ + "ftd2xx-mpsse", /* default usbconn driver */ + 0x0456, /* VID */ + 0xF001 /* PID */ +}; + urj_cable_driver_t urj_tap_cable_ft2232_jtagkey_driver = { "JTAGkey", N_("Amontec JTAGkey (FT2232) Cable"), diff --git a/urjtag/src/tap/cable/generic_usbconn.c b/urjtag/src/tap/cable/generic_usbconn.c index 21313299..421237e6 100644 --- a/urjtag/src/tap/cable/generic_usbconn.c +++ b/urjtag/src/tap/cable/generic_usbconn.c @@ -48,7 +48,9 @@ extern urj_usbconn_cable_t urj_tap_cable_usbconn_jlink; extern urj_usbconn_cable_t urj_tap_cable_usbconn_ft2232_ftd2xx; extern urj_usbconn_cable_t urj_tap_cable_usbconn_armusbocd_ftd2xx; extern urj_usbconn_cable_t urj_tap_cable_usbconn_armusbocdtiny_ftd2xx; +extern urj_usbconn_cable_t urj_tap_cable_usbconn_armusbtiny_h_ftd2xx; extern urj_usbconn_cable_t urj_tap_cable_usbconn_gnice_ftd2xx; +extern urj_usbconn_cable_t urj_tap_cable_usbconn_gniceplus_ftd2xx; extern urj_usbconn_cable_t urj_tap_cable_usbconn_jtagkey_ftd2xx; extern urj_usbconn_cable_t urj_tap_cable_usbconn_oocdlinks_ftd2xx; extern urj_usbconn_cable_t urj_tap_cable_usbconn_turtelizer2_ftd2xx; @@ -61,7 +63,9 @@ extern urj_usbconn_cable_t urj_tap_cable_usbconn_usbscarab2_ftd2xx; extern urj_usbconn_cable_t urj_tap_cable_usbconn_ft2232_ftdi; extern urj_usbconn_cable_t urj_tap_cable_usbconn_armusbocd_ftdi; extern urj_usbconn_cable_t urj_tap_cable_usbconn_armusbocdtiny_ftdi; +extern urj_usbconn_cable_t urj_tap_cable_usbconn_armusbtiny_h_ftdi; extern urj_usbconn_cable_t urj_tap_cable_usbconn_gnice_ftdi; +extern urj_usbconn_cable_t urj_tap_cable_usbconn_gniceplus_ftdi; extern urj_usbconn_cable_t urj_tap_cable_usbconn_jtagkey_ftdi; extern urj_usbconn_cable_t urj_tap_cable_usbconn_oocdlinks_ftdi; extern urj_usbconn_cable_t urj_tap_cable_usbconn_turtelizer2_ftdi; @@ -99,7 +103,9 @@ urj_usbconn_cable_t *urj_tap_cable_usbconn_cables[] = { &urj_tap_cable_usbconn_ft2232_ftd2xx, &urj_tap_cable_usbconn_armusbocd_ftd2xx, &urj_tap_cable_usbconn_armusbocdtiny_ftd2xx, + &urj_tap_cable_usbconn_armusbtiny_h_ftd2xx, &urj_tap_cable_usbconn_gnice_ftd2xx, + &urj_tap_cable_usbconn_gniceplus_ftd2xx, &urj_tap_cable_usbconn_jtagkey_ftd2xx, &urj_tap_cable_usbconn_oocdlinks_ftd2xx, &urj_tap_cable_usbconn_turtelizer2_ftd2xx, @@ -112,7 +118,9 @@ urj_usbconn_cable_t *urj_tap_cable_usbconn_cables[] = { &urj_tap_cable_usbconn_ft2232_ftdi, &urj_tap_cable_usbconn_armusbocd_ftdi, &urj_tap_cable_usbconn_armusbocdtiny_ftdi, + &urj_tap_cable_usbconn_armusbtiny_h_ftdi, &urj_tap_cable_usbconn_gnice_ftdi, + &urj_tap_cable_usbconn_gniceplus_ftdi, &urj_tap_cable_usbconn_jtagkey_ftdi, &urj_tap_cable_usbconn_oocdlinks_ftdi, &urj_tap_cable_usbconn_turtelizer2_ftdi,