projects
/
open-ath9k-htc-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Download through HTTPS for authenticity and privacy (fixes #48)
[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 2da53c2e3d8610a359eab671f968dee9fcdafebe..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
@@
-34,12
+34,13
@@
*/
#include <stdio.h>
#include <string.h>
*/
#include <stdio.h>
#include <string.h>
+#include <stdint.h>
#define MAX_READ_SIZE 80
#define MAX_READ_SIZE 80
-u
nsigned long
checksum = 0;
+u
int32_t
checksum = 0;
-void write_file(FILE *out, unsigned char *buf, u
nsigned long
size, unsigned char *endian, unsigned char nl)
+void write_file(FILE *out, unsigned char *buf, u
int32_t
size, unsigned char *endian, unsigned char nl)
{
int i=0;
unsigned char tmp_buf[4];
{
int i=0;
unsigned char tmp_buf[4];
@@
-57,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];
tmp_buf[2] = buf[i+2];
tmp_buf[3] = buf[i+3];
- fprintf(out, "0x%08X, ", *((u
nsigned long
*)(&tmp_buf[0])));
+ fprintf(out, "0x%08X, ", *((u
int32_t
*)(&tmp_buf[0])));
} else {
} else {
@@
-68,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];
tmp_buf[1] = buf[i+2];
tmp_buf[2] = buf[i+1];
tmp_buf[3] = buf[i+0];
- fprintf(out, "0x%08X, ", *((u
nsigned long
*)(&tmp_buf[0])));
+ fprintf(out, "0x%08X, ", *((u
int32_t
*)(&tmp_buf[0])));
}
}
- checksum = checksum ^ *((u
nsigned long
*)(&tmp_buf[0]));
+ checksum = checksum ^ *((u
int32_t
*)(&tmp_buf[0]));
}
}
}
}
@@
-143,7
+144,7
@@
void write_array(FILE *out, FILE *in, unsigned char hif)
}
fprintf(out, "};\n");
}
fprintf(out, "};\n");
- fprintf(out, "\nconst u
nsigned long
zcFwImageSize=%ld;\n", file_size);
+ fprintf(out, "\nconst u
int32_t
zcFwImageSize=%ld;\n", file_size);
goto ERR_DONE;
}
goto ERR_DONE;
}
@@
-159,7
+160,7
@@
void write_array(FILE *out, FILE *in, unsigned char hif)
file_size += 4;
fprintf(out, "};\n");
file_size += 4;
fprintf(out, "};\n");
- fprintf(out, "\nconst u
nsigned long
zcFwImageSize=%ld;\n", file_size);
+ fprintf(out, "\nconst u
int32_t
zcFwImageSize=%ld;\n", file_size);
goto ERR_DONE;
}
goto ERR_DONE;
}