From 9f184ab5da8be4a0d11e28a9e5fc78ed64bf678f Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 2 Aug 2019 14:02:40 -0700 Subject: Fix the LUFA lib to use a submodule instead of just files (#6245) * Remove LUFA files * Update descriptions for newer version of LUFA * Create PR6245.md * Fix CDC(Serial) type errors * Fix missed merge conflict for AUDIO_DTYPE_CSInterface --- lib/lufa/Bootloaders/HID/HostLoaderApp/.gitignore | 1 - lib/lufa/Bootloaders/HID/HostLoaderApp/Makefile | 40 - .../Bootloaders/HID/HostLoaderApp/Makefile.bsd | 21 - lib/lufa/Bootloaders/HID/HostLoaderApp/gpl3.txt | 674 ------------- .../HID/HostLoaderApp/hid_bootloader_cli.c | 1013 -------------------- 5 files changed, 1749 deletions(-) delete mode 100644 lib/lufa/Bootloaders/HID/HostLoaderApp/.gitignore delete mode 100644 lib/lufa/Bootloaders/HID/HostLoaderApp/Makefile delete mode 100644 lib/lufa/Bootloaders/HID/HostLoaderApp/Makefile.bsd delete mode 100644 lib/lufa/Bootloaders/HID/HostLoaderApp/gpl3.txt delete mode 100644 lib/lufa/Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c (limited to 'lib/lufa/Bootloaders/HID/HostLoaderApp') diff --git a/lib/lufa/Bootloaders/HID/HostLoaderApp/.gitignore b/lib/lufa/Bootloaders/HID/HostLoaderApp/.gitignore deleted file mode 100644 index 4e73d1ec5b..0000000000 --- a/lib/lufa/Bootloaders/HID/HostLoaderApp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -hid_bootloader_cli diff --git a/lib/lufa/Bootloaders/HID/HostLoaderApp/Makefile b/lib/lufa/Bootloaders/HID/HostLoaderApp/Makefile deleted file mode 100644 index d7d6458a5c..0000000000 --- a/lib/lufa/Bootloaders/HID/HostLoaderApp/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -OS ?= LINUX -#OS ?= WINDOWS -#OS ?= MACOSX -#OS ?= BSD - -ifeq ($(OS), LINUX) # also works on FreeBSD -CC ?= gcc -CFLAGS ?= -O2 -Wall -hid_bootloader_cli: hid_bootloader_cli.c - $(CC) $(CFLAGS) -s -DUSE_LIBUSB -o hid_bootloader_cli hid_bootloader_cli.c -lusb - - -else ifeq ($(OS), WINDOWS) -CC = i586-mingw32msvc-gcc -CFLAGS ?= -O2 -Wall -LDLIB = -lsetupapi -lhid -hid_bootloader_cli.exe: hid_bootloader_cli.c - $(CC) $(CFLAGS) -s -DUSE_WIN32 -o hid_bootloader_cli.exe hid_bootloader_cli.c $(LDLIB) - - -else ifeq ($(OS), MACOSX) -CC ?= gcc -SDK ?= /Developer/SDKs/MacOSX10.5.sdk -CFLAGS ?= -O2 -Wall -hid_bootloader_cli: hid_bootloader_cli.c - $(CC) $(CFLAGS) -DUSE_APPLE_IOKIT -isysroot $(SDK) -o hid_bootloader_cli hid_bootloader_cli.c -Wl,-syslibroot,$(SDK) -framework IOKit -framework CoreFoundation - - -else ifeq ($(OS), BSD) # works on NetBSD and OpenBSD -CC ?= gcct -CFLAGS ?= -O2 -Wall -hid_bootloader_cli: hid_bootloader_cli.c - $(CC) $(CFLAGS) -s -DUSE_UHID -o hid_bootloader_cli hid_bootloader_cli.c - - -endif - - -clean: - rm -f hid_bootloader_cli hid_bootloader_cli.exe diff --git a/lib/lufa/Bootloaders/HID/HostLoaderApp/Makefile.bsd b/lib/lufa/Bootloaders/HID/HostLoaderApp/Makefile.bsd deleted file mode 100644 index a15a664053..0000000000 --- a/lib/lufa/Bootloaders/HID/HostLoaderApp/Makefile.bsd +++ /dev/null @@ -1,21 +0,0 @@ -OS ?= FreeBSD -#OS ?= NetBSD -#OS ?= OpenBSD - -CFLAGS ?= -O2 -Wall -CC ?= gcc - -.if $(OS) == "FreeBSD" -CFLAGS += -DUSE_LIBUSB -LIBS = -lusb -.elif $(OS) == "NetBSD" || $(OS) == "OpenBSD" -CFLAGS += -DUSE_UHID -LIBS = -.endif - - -hid_bootloader_cli: hid_bootloader_cli.c - $(CC) $(CFLAGS) -s -o hid_bootloader_cli hid_bootloader_cli.c $(LIBS) - -clean: - rm -f hid_bootloader_cli diff --git a/lib/lufa/Bootloaders/HID/HostLoaderApp/gpl3.txt b/lib/lufa/Bootloaders/HID/HostLoaderApp/gpl3.txt deleted file mode 100644 index 94a9ed024d..0000000000 --- a/lib/lufa/Bootloaders/HID/HostLoaderApp/gpl3.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/lib/lufa/Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c b/lib/lufa/Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c deleted file mode 100644 index b54f943b1c..0000000000 --- a/lib/lufa/Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c +++ /dev/null @@ -1,1013 +0,0 @@ -/* Modified for the LUFA HID Bootloader by Dean Camera - * http://www.lufa-lib.org - * - * THIS MODIFIED VERSION IS UNSUPPORTED BY PJRC. - */ - -/* Teensy Loader, Command Line Interface - * Program and Reboot Teensy Board with HalfKay Bootloader - * http://www.pjrc.com/teensy/loader_cli.html - * Copyright 2008-2010, PJRC.COM, LLC - * - * - * You may redistribute this program and/or modify it under the terms - * of the GNU General Public License as published by the Free Software - * Foundation, version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/ - */ - -/* Want to incorporate this code into a proprietary application?? - * Just email paul@pjrc.com to ask. Usually it's not a problem, - * but you do need to ask to use this code in any way other than - * those permitted by the GNU General Public License, version 3 */ - -/* For non-root permissions on ubuntu or similar udev-based linux - * http://www.pjrc.com/teensy/49-teensy.rules - */ - -#include -#include -#include -#include -#include -#include - -void usage(void) -{ - fprintf(stderr, "Usage: hid_bootloader_cli -mmcu= [-w] [-h] [-n] [-v] \n"); - fprintf(stderr, "\t-w : Wait for device to appear\n"); - fprintf(stderr, "\t-r : Use hard reboot if device not online\n"); - fprintf(stderr, "\t-n : No reboot after programming\n"); - fprintf(stderr, "\t-v : Verbose output\n"); - fprintf(stderr, "\n = atmegaXXuY or at90usbXXXY"); - - fprintf(stderr, "\nFor support and more information, please visit:\n"); - fprintf(stderr, "http://www.lufa-lib.org\n"); - - fprintf(stderr, "\nBased on the TeensyHID command line programmer software:\n"); - fprintf(stderr, "http://www.pjrc.com/teensy/loader_cli.html\n"); - exit(1); -} - -// USB Access Functions -int teensy_open(void); -int teensy_write(void *buf, int len, double timeout); -void teensy_close(void); -int hard_reboot(void); - -// Intel Hex File Functions -int read_intel_hex(const char *filename); -int ihex_bytes_within_range(int begin, int end); -void ihex_get_data(int addr, int len, unsigned char *bytes); - -// Misc stuff -int printf_verbose(const char *format, ...); -void delay(double seconds); -void die(const char *str, ...); -void parse_options(int argc, char **argv); - -// options (from user via command line args) -int wait_for_device_to_appear = 0; -int hard_reboot_device = 0; -int reboot_after_programming = 1; -int verbose = 0; -int code_size = 0, block_size = 0; -const char *filename=NULL; - - -/****************************************************************/ -/* */ -/* Main Program */ -/* */ -/****************************************************************/ - -int main(int argc, char **argv) -{ - unsigned char buf[260]; - int num, addr, r, first_block=1, waited=0; - - // parse command line arguments - parse_options(argc, argv); - if (!filename) { - fprintf(stderr, "Filename must be specified\n\n"); - usage(); - } - if (!code_size) { - fprintf(stderr, "MCU type must be specified\n\n"); - usage(); - } - printf_verbose("Teensy Loader, Command Line, Version 2.0\n"); - - // read the intel hex file - // this is done first so any error is reported before using USB - num = read_intel_hex(filename); - if (num < 0) die("error reading intel hex file \"%s\"", filename); - printf_verbose("Read \"%s\": %d bytes, %.1f%% usage\n", - filename, num, (double)num / (double)code_size * 100.0); - - // open the USB device - while (1) { - if (teensy_open()) break; - if (hard_reboot_device) { - if (!hard_reboot()) die("Unable to find rebootor\n"); - printf_verbose("Hard Reboot performed\n"); - hard_reboot_device = 0; // only hard reboot once - wait_for_device_to_appear = 1; - } - if (!wait_for_device_to_appear) die("Unable to open device\n"); - if (!waited) { - printf_verbose("Waiting for Teensy device...\n"); - printf_verbose(" (hint: press the reset button)\n"); - waited = 1; - } - delay(0.25); - } - printf_verbose("Found HalfKay Bootloader\n"); - - // if we waited for the device, read the hex file again - // perhaps it changed while we were waiting? - if (waited) { - num = read_intel_hex(filename); - if (num < 0) die("error reading intel hex file \"%s\"", filename); - printf_verbose("Read \"%s\": %d bytes, %.1f%% usage\n", - filename, num, (double)num / (double)code_size * 100.0); - } - - // program the data - printf_verbose("Programming"); - fflush(stdout); - for (addr = 0; addr < code_size; addr += block_size) { - if (addr > 0 && !ihex_bytes_within_range(addr, addr + block_size - 1)) { - // don't waste time on blocks that are unused, - // but always do the first one to erase the chip - continue; - } - printf_verbose("."); - if (code_size < 0x10000) { - buf[0] = addr & 255; - buf[1] = (addr >> 8) & 255; - } else { - buf[0] = (addr >> 8) & 255; - buf[1] = (addr >> 16) & 255; - } - ihex_get_data(addr, block_size, buf + 2); - r = teensy_write(buf, block_size + 2, first_block ? 3.0 : 0.25); - if (!r) die("error writing to Teensy\n"); - first_block = 0; - } - printf_verbose("\n"); - - // reboot to the user's new code - if (reboot_after_programming) { - printf_verbose("Booting\n"); - buf[0] = 0xFF; - buf[1] = 0xFF; - memset(buf + 2, 0, sizeof(buf) - 2); - teensy_write(buf, block_size + 2, 0.25); - } - teensy_close(); - return 0; -} - - - - -/****************************************************************/ -/* */ -/* USB Access - libusb (Linux & FreeBSD) */ -/* */ -/****************************************************************/ - -#if defined(USE_LIBUSB) - -// http://libusb.sourceforge.net/doc/index.html -#include - -usb_dev_handle * open_usb_device(int vid, int pid) -{ - struct usb_bus *bus; - struct usb_device *dev; - usb_dev_handle *h; - #ifdef LIBUSB_HAS_GET_DRIVER_NP - char buf[128]; - #endif - int r; - - usb_init(); - usb_find_busses(); - usb_find_devices(); - //printf_verbose("\nSearching for USB device:\n"); - for (bus = usb_get_busses(); bus; bus = bus->next) { - for (dev = bus->devices; dev; dev = dev->next) { - //printf_verbose("bus \"%s\", device \"%s\" vid=%04X, pid=%04X\n", - // bus->dirname, dev->filename, - // dev->descriptor.idVendor, - // dev->descriptor.idProduct - //); - if (dev->descriptor.idVendor != vid) continue; - if (dev->descriptor.idProduct != pid) continue; - h = usb_open(dev); - if (!h) { - printf_verbose("Found device but unable to open"); - continue; - } - #ifdef LIBUSB_HAS_GET_DRIVER_NP - r = usb_get_driver_np(h, 0, buf, sizeof(buf)); - if (r >= 0) { - r = usb_detach_kernel_driver_np(h, 0); - if (r < 0) { - usb_close(h); - printf_verbose("Device is in use by \"%s\" driver", buf); - continue; - } - } - #endif - // Mac OS-X - removing this call to usb_claim_interface() might allow - // this to work, even though it is a clear misuse of the libusb API. - // normally Apple's IOKit should be used on Mac OS-X - r = usb_claim_interface(h, 0); - if (r < 0) { - usb_close(h); - printf_verbose("Unable to claim interface, check USB permissions"); - continue; - } - return h; - } - } - return NULL; -} - -static usb_dev_handle *libusb_teensy_handle = NULL; - -int teensy_open(void) -{ - teensy_close(); - libusb_teensy_handle = open_usb_device(0x16C0, 0x0478); - - if (!libusb_teensy_handle) - libusb_teensy_handle = open_usb_device(0x03eb, 0x2067); - - if (!libusb_teensy_handle) return 0; - return 1; -} - -int teensy_write(void *buf, int len, double timeout) -{ - int r; - - if (!libusb_teensy_handle) return 0; - r = usb_control_msg(libusb_teensy_handle, 0x21, 9, 0x0200, 0, (char *)buf, - len, (int)(timeout * 1000.0)); - if (r < 0) return 0; - return 1; -} - -void teensy_close(void) -{ - if (!libusb_teensy_handle) return; - usb_release_interface(libusb_teensy_handle, 0); - usb_close(libusb_teensy_handle); - libusb_teensy_handle = NULL; -} - -int hard_reboot(void) -{ - usb_dev_handle *rebootor; - int r; - - rebootor = open_usb_device(0x16C0, 0x0477); - - if (!rebootor) - rebootor = open_usb_device(0x03eb, 0x2067); - - if (!rebootor) return 0; - r = usb_control_msg(rebootor, 0x21, 9, 0x0200, 0, "reboot", 6, 100); - usb_release_interface(rebootor, 0); - usb_close(rebootor); - if (r < 0) return 0; - return 1; -} - -#endif - - -/****************************************************************/ -/* */ -/* USB Access - Microsoft WIN32 */ -/* */ -/****************************************************************/ - -#if defined(USE_WIN32) - -// http://msdn.microsoft.com/en-us/library/ms790932.aspx -#include -#include -#include -#include - -HANDLE open_usb_device(int vid, int pid) -{ - GUID guid; - HDEVINFO info; - DWORD index, required_size; - SP_DEVICE_INTERFACE_DATA iface; - SP_DEVICE_INTERFACE_DETAIL_DATA *details; - HIDD_ATTRIBUTES attrib; - HANDLE h; - BOOL ret; - - HidD_GetHidGuid(&guid); - info = SetupDiGetClassDevs(&guid, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); - if (info == INVALID_HANDLE_VALUE) return NULL; - for (index=0; 1 ;index++) { - iface.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); - ret = SetupDiEnumDeviceInterfaces(info, NULL, &guid, index, &iface); - if (!ret) { - SetupDiDestroyDeviceInfoList(info); - break; - } - SetupDiGetInterfaceDeviceDetail(info, &iface, NULL, 0, &required_size, NULL); - details = (SP_DEVICE_INTERFACE_DETAIL_DATA *)malloc(required_size); - if (details == NULL) continue; - memset(details, 0, required_size); - details->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); - ret = SetupDiGetDeviceInterfaceDetail(info, &iface, details, - required_size, NULL, NULL); - if (!ret) { - free(details); - continue; - } - h = CreateFile(details->DevicePath, GENERIC_READ|GENERIC_WRITE, - FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, NULL); - free(details); - if (h == INVALID_HANDLE_VALUE) continue; - attrib.Size = sizeof(HIDD_ATTRIBUTES); - ret = HidD_GetAttributes(h, &attrib); - if (!ret) { - CloseHandle(h); - continue; - } - if (attrib.VendorID != vid || attrib.ProductID != pid) { - CloseHandle(h); - continue; - } - SetupDiDestroyDeviceInfoList(info); - return h; - } - return NULL; -} - -int write_usb_device(HANDLE h, void *buf, int len, int timeout) -{ - static HANDLE event = NULL; - unsigned char tmpbuf[1040]; - OVERLAPPED ov; - DWORD n, r; - - if (len > sizeof(tmpbuf) - 1) return 0; - if (event == NULL) { - event = CreateEvent(NULL, TRUE, TRUE, NULL); - if (!event) return 0; - } - ResetEvent(&event); - memset(&ov, 0, sizeof(ov)); - ov.hEvent = event; - tmpbuf[0] = 0; - memcpy(tmpbuf + 1, buf, len); - if (!WriteFile(h, tmpbuf, len + 1, NULL, &ov)) { - if (GetLastError() != ERROR_IO_PENDING) return 0; - r = WaitForSingleObject(event, timeout); - if (r == WAIT_TIMEOUT) { - CancelIo(h); - return 0; - } - if (r != WAIT_OBJECT_0) return 0; - } - if (!GetOverlappedResult(h, &ov, &n, FALSE)) return 0; - return 1; -} - -static HANDLE win32_teensy_handle = NULL; - -int teensy_open(void) -{ - teensy_close(); - win32_teensy_handle = open_usb_device(0x16C0, 0x0478); - - if (!win32_teensy_handle) - win32_teensy_handle = open_usb_device(0x03eb, 0x2067); - - if (!win32_teensy_handle) return 0; - return 1; -} - -int teensy_write(void *buf, int len, double timeout) -{ - int r; - if (!win32_teensy_handle) return 0; - r = write_usb_device(win32_teensy_handle, buf, len, (int)(timeout * 1000.0)); - return r; -} - -void teensy_close(void) -{ - if (!win32_teensy_handle) return; - CloseHandle(win32_teensy_handle); - win32_teensy_handle = NULL; -} - -int hard_reboot(void) -{ - HANDLE rebootor; - int r; - - rebootor = open_usb_device(0x16C0, 0x0477); - - if (!rebootor) - rebootor = open_usb_device(0x03eb, 0x2067); - - if (!rebootor) return 0; - r = write_usb_device(rebootor, "reboot", 6, 100); - CloseHandle(rebootor); - return r; -} - -#endif - - - -/****************************************************************/ -/* */ -/* USB Access - Apple's IOKit, Mac OS-X */ -/* */ -/****************************************************************/ - -#if defined(USE_APPLE_IOKIT) - -// http://developer.apple.com/technotes/tn2007/tn2187.html -#include -#include -#include - -struct usb_list_struct { - IOHIDDeviceRef ref; - int pid; - int vid; - struct usb_list_struct *next; -}; - -static struct usb_list_struct *usb_list=NULL; -static IOHIDManagerRef hid_manager=NULL; - -void attach_callback(void *context, IOReturn r, void *hid_mgr, IOHIDDeviceRef dev) -{ - CFTypeRef type; - struct usb_list_struct *n, *p; - int32_t pid, vid; - - if (!dev) return; - type = IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDVendorIDKey)); - if (!type || CFGetTypeID(type) != CFNumberGetTypeID()) return; - if (!CFNumberGetValue((CFNumberRef)type, kCFNumberSInt32Type, &vid)) return; - type = IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDProductIDKey)); - if (!type || CFGetTypeID(type) != CFNumberGetTypeID()) return; - if (!CFNumberGetValue((CFNumberRef)type, kCFNumberSInt32Type, &pid)) return; - n = (struct usb_list_struct *)malloc(sizeof(struct usb_list_struct)); - if (!n) return; - //printf("attach callback: vid=%04X, pid=%04X\n", vid, pid); - n->ref = dev; - n->vid = vid; - n->pid = pid; - n->next = NULL; - if (usb_list == NULL) { - usb_list = n; - } else { - for (p = usb_list; p->next; p = p->next) ; - p->next = n; - } -} - -void detach_callback(void *context, IOReturn r, void *hid_mgr, IOHIDDeviceRef dev) -{ - struct usb_list_struct *p, *tmp, *prev=NULL; - - p = usb_list; - while (p) { - if (p->ref == dev) { - if (prev) { - prev->next = p->next; - } else { - usb_list = p->next; - } - tmp = p; - p = p->next; - free(tmp); - } else { - prev = p; - p = p->next; - } - } -} - -void init_hid_manager(void) -{ - CFMutableDictionaryRef dict; - IOReturn ret; - - if (hid_manager) return; - hid_manager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone); - if (hid_manager == NULL || CFGetTypeID(hid_manager) != IOHIDManagerGetTypeID()) { - if (hid_manager) CFRelease(hid_manager); - printf_verbose("no HID Manager - maybe this is a pre-Leopard (10.5) system?\n"); - return; - } - dict = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, - &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - if (!dict) return; - IOHIDManagerSetDeviceMatching(hid_manager, dict); - CFRelease(dict); - IOHIDManagerScheduleWithRunLoop(hid_manager, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); - IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, attach_callback, NULL); - IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, detach_callback, NULL); - ret = IOHIDManagerOpen(hid_manager, kIOHIDOptionsTypeNone); - if (ret != kIOReturnSuccess) { - IOHIDManagerUnscheduleFromRunLoop(hid_manager, - CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); - CFRelease(hid_manager); - printf_verbose("Error opening HID Manager"); - } -} - -static void do_run_loop(void) -{ - while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true) == kCFRunLoopRunHandledSource) ; -} - -IOHIDDeviceRef open_usb_device(int vid, int pid) -{ - struct usb_list_struct *p; - IOReturn ret; - - init_hid_manager(); - do_run_loop(); - for (p = usb_list; p; p = p->next) { - if (p->vid == vid && p->pid == pid) { - ret = IOHIDDeviceOpen(p->ref, kIOHIDOptionsTypeNone); - if (ret == kIOReturnSuccess) return p->ref; - } - } - return NULL; -} - -void close_usb_device(IOHIDDeviceRef dev) -{ - struct usb_list_struct *p; - - do_run_loop(); - for (p = usb_list; p; p = p->next) { - if (p->ref == dev) { - IOHIDDeviceClose(dev, kIOHIDOptionsTypeNone); - return; - } - } -} - -static IOHIDDeviceRef iokit_teensy_reference = NULL; - -int teensy_open(void) -{ - teensy_close(); - iokit_teensy_reference = open_usb_device(0x16C0, 0x0478); - - if (!iokit_teensy_reference) - iokit_teensy_reference = open_usb_device(0x03eb, 0x2067); - - if (!iokit_teensy_reference) return 0; - return 1; -} - -int teensy_write(void *buf, int len, double timeout) -{ - IOReturn ret; - - // timeouts do not work on OS-X - // IOHIDDeviceSetReportWithCallback is not implemented - // even though Apple documents it with a code example! - // submitted to Apple on 22-sep-2009, problem ID 7245050 - if (!iokit_teensy_reference) return 0; - ret = IOHIDDeviceSetReport(iokit_teensy_reference, - kIOHIDReportTypeOutput, 0, buf, len); - if (ret == kIOReturnSuccess) return 1; - return 0; -} - -void teensy_close(void) -{ - if (!iokit_teensy_reference) return; - close_usb_device(iokit_teensy_reference); - iokit_teensy_reference = NULL; -} - -int hard_reboot(void) -{ - IOHIDDeviceRef rebootor; - IOReturn ret; - - rebootor = open_usb_device(0x16C0, 0x0477); - - if (!rebootor) - rebootor = open_usb_device(0x03eb, 0x2067); - - if (!rebootor) return 0; - ret = IOHIDDeviceSetReport(rebootor, - kIOHIDReportTypeOutput, 0, (uint8_t *)("reboot"), 6); - close_usb_device(rebootor); - if (ret == kIOReturnSuccess) return 1; - return 0; -} - -#endif - - - -/****************************************************************/ -/* */ -/* USB Access - BSD's UHID driver */ -/* */ -/****************************************************************/ - -#if defined(USE_UHID) - -// Thanks to Todd T Fries for help getting this working on OpenBSD -// and to Chris Kuethe for the initial patch to use UHID. - -#include -#include -#include -#include -#ifndef USB_GET_DEVICEINFO -#include -#endif - -#ifndef USB_GET_DEVICEINFO -# define USB_GET_DEVICEINFO 0 -# error The USB_GET_DEVICEINFO ioctl() value is not defined for your system. -#endif - -int open_usb_device(int vid, int pid) -{ - int r, fd; - DIR *dir; - struct dirent *d; - struct usb_device_info info; - char buf[256]; - - dir = opendir("/dev"); - if (!dir) return -1; - while ((d = readdir(dir)) != NULL) { - if (strncmp(d->d_name, "uhid", 4) != 0) continue; - snprintf(buf, sizeof(buf), "/dev/%s", d->d_name); - fd = open(buf, O_RDWR); - if (fd < 0) continue; - r = ioctl(fd, USB_GET_DEVICEINFO, &info); - if (r < 0) { - // NetBSD: added in 2004 - // OpenBSD: added November 23, 2009 - // FreeBSD: missing (FreeBSD 8.0) - USE_LIBUSB works! - die("Error: your uhid driver does not support" - " USB_GET_DEVICEINFO, please upgrade!\n"); - close(fd); - closedir(dir); - exit(1); - } - //printf("%s: v=%d, p=%d\n", buf, info.udi_vendorNo, info.udi_productNo); - if (info.udi_vendorNo == vid && info.udi_productNo == pid) { - closedir(dir); - return fd; - } - close(fd); - } - closedir(dir); - return -1; -} - -static int uhid_teensy_fd = -1; - -int teensy_open(void) -{ - teensy_close(); - uhid_teensy_fd = open_usb_device(0x16C0, 0x0478); - - if (uhid_teensy_fd < 0) - uhid_teensy_fd = open_usb_device(0x03eb, 0x2067); - - if (uhid_teensy_fd < 0) return 0; - return 1; -} - -int teensy_write(void *buf, int len, double timeout) -{ - int r; - - // TODO: implement timeout... how?? - r = write(uhid_teensy_fd, buf, len); - if (r == len) return 1; - return 0; -} - -void teensy_close(void) -{ - if (uhid_teensy_fd >= 0) { - close(uhid_teensy_fd); - uhid_teensy_fd = -1; - } -} - -int hard_reboot(void) -{ - int r, rebootor_fd; - - rebootor_fd = open_usb_device(0x16C0, 0x0477); - - if (rebootor_fd < 0) - rebootor_fd = open_usb_device(0x03eb, 0x2067); - - if (rebootor_fd < 0) return 0; - r = write(rebootor_fd, "reboot", 6); - delay(0.1); - close(rebootor_fd); - if (r == 6) return 1; - return 0; -} - -#endif - - - -/****************************************************************/ -/* */ -/* Read Intel Hex File */ -/* */ -/****************************************************************/ - -// the maximum flash image size we can support -// chips with larger memory may be used, but only this -// much intel-hex data can be loaded into memory! -#define MAX_MEMORY_SIZE 0x10000 - -static unsigned char firmware_image[MAX_MEMORY_SIZE]; -static unsigned char firmware_mask[MAX_MEMORY_SIZE]; -static int end_record_seen=0; -static int byte_count; -static unsigned int extended_addr = 0; -static int parse_hex_line(char *line); - -int read_intel_hex(const char *filename) -{ - FILE *fp; - int i, lineno=0; - char buf[1024]; - - byte_count = 0; - end_record_seen = 0; - for (i=0; i= MAX_MEMORY_SIZE) return 0; - ptr += 2; - sum = (len & 255) + ((addr >> 8) & 255) + (addr & 255) + (code & 255); - if (code != 0) { - if (code == 1) { - end_record_seen = 1; - return 1; - } - if (code == 2 && len == 2) { - if (!sscanf(ptr, "%04x", &i)) return 1; - ptr += 4; - sum += ((i >> 8) & 255) + (i & 255); - if (!sscanf(ptr, "%02x", &cksum)) return 1; - if (((sum & 255) + (cksum & 255)) & 255) return 1; - extended_addr = i << 4; - //printf("ext addr = %05X\n", extended_addr); - } - if (code == 4 && len == 2) { - if (!sscanf(ptr, "%04x", &i)) return 1; - ptr += 4; - sum += ((i >> 8) & 255) + (i & 255); - if (!sscanf(ptr, "%02x", &cksum)) return 1; - if (((sum & 255) + (cksum & 255)) & 255) return 1; - extended_addr = i << 16; - //printf("ext addr = %08X\n", extended_addr); - } - return 1; // non-data line - } - byte_count += len; - while (num != len) { - if (sscanf(ptr, "%02x", &i) != 1) return 0; - i &= 255; - firmware_image[addr + extended_addr + num] = i; - firmware_mask[addr + extended_addr + num] = 1; - ptr += 2; - sum += i; - (num)++; - if (num >= 256) return 0; - } - if (!sscanf(ptr, "%02x", &cksum)) return 0; - if (((sum & 255) + (cksum & 255)) & 255) return 0; /* checksum error */ - return 1; -} - -int ihex_bytes_within_range(int begin, int end) -{ - int i; - - if (begin < 0 || begin >= MAX_MEMORY_SIZE || - end < 0 || end >= MAX_MEMORY_SIZE) { - return 0; - } - for (i=begin; i<=end; i++) { - if (firmware_mask[i]) return 1; - } - return 0; -} - -void ihex_get_data(int addr, int len, unsigned char *bytes) -{ - int i; - - if (addr < 0 || len < 0 || addr + len >= MAX_MEMORY_SIZE) { - for (i=0; i