X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fmagpie_fw_dev%2Fbuild%2Futility%2Fbin2hex%2Fbin2hex.c;fp=target_firmware%2Fmagpie_fw_dev%2Fbuild%2Futility%2Fbin2hex%2Fbin2hex.c;h=3702bbaf140e5c2520ce8eb212afa36d3a845275;hb=e1e4a8579d35ac96455cce504bd329463bf3ce3f;hp=6fd25410914b58ad4168a2819176484af4d69961;hpb=0d18b627fb3434c4d056c34eb9834663a9c5320c;p=open-ath9k-htc-firmware.git 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 6fd2541..3702bba 100755 --- 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,12 @@ #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]; @@ -23,7 +24,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 +35,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 +110,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 +126,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; }