X-Git-Url: https://jxself.org/git/?p=open-ath9k-htc-firmware.git;a=blobdiff_plain;f=target_firmware%2Fmagpie_fw_dev%2Fbuild%2Futility%2Fbin2hex%2Fbin2hex.c;h=5aa447320171ac9c3642f9dffd9161a2fe79bdd3;hp=2da53c2e3d8610a359eab671f968dee9fcdafebe;hb=3d014a53a05fc905c4bd1ebfac6fc880124bed9f;hpb=4c9d9e854e0b2f59ca887bb083cc07d35a24693a 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 2da53c2..5aa4473 100755 --- 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 #include +#include #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]; @@ -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]; - fprintf(out, "0x%08X, ", *((unsigned long *)(&tmp_buf[0]))); + fprintf(out, "0x%08X, ", *((uint32_t *)(&tmp_buf[0]))); } 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]; - 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])); } } @@ -143,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; } @@ -159,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; }