From 05008fbe487774f3ba975e93d08824489ba94c86 Mon Sep 17 00:00:00 2001 From: Hoernchen Date: Tue, 11 Jun 2013 12:59:02 +0200 Subject: [PATCH] tools: fix more warnings --- host/hackrf-tools/src/hackrf_max2837.c | 6 +++--- host/hackrf-tools/src/hackrf_rffc5071.c | 6 +++--- host/hackrf-tools/src/hackrf_si5351c.c | 2 +- host/hackrf-tools/src/hackrf_transfer.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/host/hackrf-tools/src/hackrf_max2837.c b/host/hackrf-tools/src/hackrf_max2837.c index ced59a48..d8fb75f5 100644 --- a/host/hackrf-tools/src/hackrf_max2837.c +++ b/host/hackrf-tools/src/hackrf_max2837.c @@ -64,7 +64,7 @@ int parse_int(char* s, uint16_t* const value) { s_end = s; long_value = strtol(s, &s_end, base); if( (s != s_end) && (*s_end == 0) ) { - *value = long_value; + *value = (uint16_t)long_value; return HACKRF_SUCCESS; } else { return HACKRF_ERROR_INVALID_PARAM; @@ -73,7 +73,7 @@ int parse_int(char* s, uint16_t* const value) { int dump_register(hackrf_device* device, const uint16_t register_number) { uint16_t register_value; - int result = hackrf_max2837_read(device, register_number, ®ister_value); + int result = hackrf_max2837_read(device, (uint8_t)register_number, ®ister_value); if( result == HACKRF_SUCCESS ) { printf("[%2d] -> 0x%03x\n", register_number, register_value); @@ -104,7 +104,7 @@ int write_register( const uint16_t register_value ) { int result = HACKRF_SUCCESS; - result = hackrf_max2837_write(device, register_number, register_value); + result = hackrf_max2837_write(device, (uint8_t)register_number, register_value); if( result == HACKRF_SUCCESS ) { printf("0x%03x -> [%2d]\n", register_value, register_number); diff --git a/host/hackrf-tools/src/hackrf_rffc5071.c b/host/hackrf-tools/src/hackrf_rffc5071.c index b5409809..c9630dd4 100644 --- a/host/hackrf-tools/src/hackrf_rffc5071.c +++ b/host/hackrf-tools/src/hackrf_rffc5071.c @@ -65,7 +65,7 @@ int parse_int(char* s, uint16_t* const value) { s_end = s; long_value = strtol(s, &s_end, base); if( (s != s_end) && (*s_end == 0) ) { - *value = long_value; + *value = (uint16_t)long_value; return HACKRF_SUCCESS; } else { return HACKRF_ERROR_INVALID_PARAM; @@ -74,7 +74,7 @@ int parse_int(char* s, uint16_t* const value) { int dump_register(hackrf_device* device, const uint16_t register_number) { uint16_t register_value; - int result = hackrf_rffc5071_read(device, register_number, ®ister_value); + int result = hackrf_rffc5071_read(device, (uint8_t)register_number, ®ister_value); if( result == HACKRF_SUCCESS ) { printf("[%2d] -> 0x%03x\n", register_number, register_value); @@ -105,7 +105,7 @@ int write_register( const uint16_t register_value ) { int result = HACKRF_SUCCESS; - result = hackrf_rffc5071_write(device, register_number, register_value); + result = hackrf_rffc5071_write(device, (uint8_t)register_number, register_value); if( result == HACKRF_SUCCESS ) { printf("0x%03x -> [%2d]\n", register_value, register_number); diff --git a/host/hackrf-tools/src/hackrf_si5351c.c b/host/hackrf-tools/src/hackrf_si5351c.c index 666ac7e4..41146f2c 100644 --- a/host/hackrf-tools/src/hackrf_si5351c.c +++ b/host/hackrf-tools/src/hackrf_si5351c.c @@ -49,7 +49,7 @@ int parse_int(char* const s, uint16_t* const value) { char* s_end = s; const long long_value = strtol(s, &s_end, 10); if( (s != s_end) && (*s_end == 0) ) { - *value = long_value; + *value = (uint16_t)long_value; return HACKRF_SUCCESS; } else { return HACKRF_ERROR_INVALID_PARAM; diff --git a/host/hackrf-tools/src/hackrf_transfer.c b/host/hackrf-tools/src/hackrf_transfer.c index 2f505dc6..66e8fbc5 100644 --- a/host/hackrf-tools/src/hackrf_transfer.c +++ b/host/hackrf-tools/src/hackrf_transfer.c @@ -216,7 +216,7 @@ int parse_u32(char* s, uint32_t* const value) { s_end = s; ulong_value = strtoul(s, &s_end, base); if( (s != s_end) && (*s_end == 0) ) { - *value = ulong_value; + *value = (uint32_t)ulong_value; return HACKRF_SUCCESS; } else { return HACKRF_ERROR_INVALID_PARAM; @@ -261,7 +261,7 @@ int rx_callback(hackrf_transfer* transfer) { bytes_to_write = transfer->valid_length; if (limit_num_samples) { if (bytes_to_write >= bytes_to_xfer) { - bytes_to_write = bytes_to_xfer; + bytes_to_write = (int)bytes_to_xfer; } bytes_to_xfer -= bytes_to_write; } @@ -293,7 +293,7 @@ int tx_callback(hackrf_transfer* transfer) { * In this condition, we probably tx some of the previous * buffer contents at the end. :-( */ - bytes_to_read = bytes_to_xfer; + bytes_to_read = (int)bytes_to_xfer; } bytes_to_xfer -= bytes_to_read; }