Merge pull request #9 from KrasnikovEugene/master

[open-ath9k-htc-firmware.git] / target_firmware / magpie_fw_dev / build / utility / bin2hex / bin2hex.c

diff --git a/target_firmware/magpie_fw_dev/build/utility/bin2hex/bin2hex.c b/target_firmware/magpie_fw_dev/build/utility/bin2hex/bin2hex.c
index 6fd25410914b58ad4168a2819176484af4d69961..5aa447320171ac9c3642f9dffd9161a2fe79bdd3 100755 (executable)
--- a/target_firmware/magpie_fw_dev/build/utility/bin2hex/bin2hex.c
+++ b/target_firmware/magpie_fw_dev/build/utility/bin2hex/bin2hex.c
@@ -1,11 +1,46 @@
+/*
+ * 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 <stdio.h>
 #include <string.h>
+#include <stdint.h>
 
 #define MAX_READ_SIZE  80
 
-unsigned long checksum = 0;
+uint32_t checksum = 0;
 
-void write_file(FILE *out, unsigned char *buf, unsigned long size, unsigned char *endian, unsigned char nl)
+void write_file(FILE *out, unsigned char *buf, uint32_t size, unsigned char *endian, unsigned char nl)
 {
        int i=0;
        unsigned char tmp_buf[4];
@@ -23,7 +58,7 @@ void write_file(FILE *out, unsigned char *buf, unsigned long size, unsigned char
                    tmp_buf[2] = buf[i+2];
                    tmp_buf[3] = buf[i+3];
 
-                       fprintf(out, "0x%08X, ", *((unsigned long *)(&tmp_buf[0])));
+                       fprintf(out, "0x%08X, ", *((uint32_t *)(&tmp_buf[0])));
 
         } else {
             
@@ -34,9 +69,9 @@ void write_file(FILE *out, unsigned char *buf, unsigned long size, unsigned char
                        tmp_buf[1] = buf[i+2];
                        tmp_buf[2] = buf[i+1];
                        tmp_buf[3] = buf[i+0];
-                       fprintf(out, "0x%08X, ", *((unsigned long *)(&tmp_buf[0])));
+                       fprintf(out, "0x%08X, ", *((uint32_t *)(&tmp_buf[0])));
                }
-        checksum = checksum ^ *((unsigned long *)(&tmp_buf[0]));
+        checksum = checksum ^ *((uint32_t *)(&tmp_buf[0]));
        }
 }
 
@@ -109,7 +144,7 @@ void write_array(FILE *out, FILE *in, unsigned char hif)
                        }
 
                        fprintf(out, "};\n");
-                       fprintf(out, "\nconst unsigned long zcFwImageSize=%ld;\n", file_size);
+                       fprintf(out, "\nconst uint32_t zcFwImageSize=%ld;\n", file_size);
 
                        goto ERR_DONE;
                }
@@ -125,7 +160,7 @@ void write_array(FILE *out, FILE *in, unsigned char hif)
 
                        file_size += 4;
                        fprintf(out, "};\n");
-                       fprintf(out, "\nconst unsigned long zcFwImageSize=%ld;\n", file_size);
+                       fprintf(out, "\nconst uint32_t zcFwImageSize=%ld;\n", file_size);
 
                        goto ERR_DONE;
                }