From: Adrian Chadd Date: Mon, 1 Apr 2013 16:16:16 +0000 (-0700) Subject: Merge pull request #4 from olerem/master X-Git-Tag: 1.3.2~12 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=3d014a53a05fc905c4bd1ebfac6fc880124bed9f;p=open-ath9k-htc-firmware.git Merge pull request #4 from olerem/master Merge build fixes from Oleksij! Thanks! --- 3d014a53a05fc905c4bd1ebfac6fc880124bed9f diff --cc target_firmware/magpie_fw_dev/build/utility/bin2hex/bin2hex.c index 2da53c2,3702bba..5aa4473 --- a/target_firmware/magpie_fw_dev/build/utility/bin2hex/bin2hex.c +++ b/target_firmware/magpie_fw_dev/build/utility/bin2hex/bin2hex.c @@@ -1,39 -1,6 +1,40 @@@ +/* + * Copyright (c) 2013 Qualcomm Atheros, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted (subject to the limitations in the + * disclaimer below) provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * * Neither the name of Qualcomm Atheros nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE + * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT + * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include #include + #include #define MAX_READ_SIZE 80