8000 host: fix builds on 32-bit platforms by rtucker · Pull Request #573 · Nuand/bladeRF · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

host: fix builds on 32-bit platforms #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 16, 2018
Merged

host: fix builds on 32-bit platforms #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c387a21
host: libbladeRF/thirdparty/adi: fix build error on 32-bit systems
rtucker Aug 16, 2018
848457f
host: libbladeRF/doc: fix 32-bit build failure on doc example
rtucker Aug 16, 2018
f0fbbb4
host: docker: remove centos-7-i386 build
rtucker Aug 16, 2018
1d6e447
host: libbladeRF/bladerf2: explicitly note constant types
rtucker Aug 16, 2018
b06ecfa
host: libbladeRF_test: explicitly note constant types
rtucker Aug 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions host/libraries/libbladeRF/doc/examples/open_via_serial.c
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ static int print_device_state(struct bladerf *dev)
return status;
}

printf(" RX frequency: %zu Hz\n", frequency);
printf(" RX frequency: %" PRIu64 " Hz\n", frequency);

status = bladerf_get_frequency(dev, tx_ch, &frequency);
if (status != 0) {
return status;
}

printf(" TX frequency: %zu Hz\n", frequency);
printf(" TX frequency: %" PRIu64 " Hz\n", frequency);

status = bladerf_get_bandwidth(dev, rx_ch, &bandwidth);
if (status != 0) {
Expand Down
40 changes: 20 additions & 20 deletions host/libraries/libbladeRF/src/board/bladerf2/bladerf2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ static const struct bladerf_gain_range bladerf2_rx_gain_ranges[] = {
{
FIELD_INIT(.name, NULL),
FIELD_INIT(.frequency, {
FIELD_INIT(.min, 1300000000),
FIELD_INIT(.max, 4000000000),
FIELD_INIT(.min, 1300000000UL),
FIELD_INIT(.max, 4000000000UL),
FIELD_INIT(.step, 1),
FIELD_INIT(.scale, 1),
}),
Expand All @@ -328,8 +328,8 @@ static const struct bladerf_gain_range bladerf2_rx_gain_ranges[] = {
{
FIELD_INIT(.name, NULL),
FIELD_INIT(.frequency, {
FIELD_INIT(.min, 4000000000),
FIELD_INIT(.max, 6000000000),
FIELD_INIT(.min, 4000000000UL),
FIELD_INIT(.max, 6000000000UL),
FIELD_INIT(.step, 1),
FIELD_INIT(.scale, 1),
}),
Expand Down Expand Up @@ -360,8 +360,8 @@ static const struct bladerf_gain_range bladerf2_rx_gain_ranges[] = {
{
FIELD_INIT(.name, "full"),
FIELD_INIT(.frequency, {
FIELD_INIT(.min, 1300000000),
FIELD_INIT(.max, 4000000000),
FIELD_INIT(.min, 1300000000UL),
FIELD_INIT(.max, 4000000000UL),
FIELD_INIT(.step, 1),
FIELD_INIT(.scale, 1),
}),
Expand All @@ -376,8 +376,8 @@ static const struct bladerf_gain_range bladerf2_rx_gain_ranges[] = {
{
FIELD_INIT(.name, "full"),
FIELD_INIT(.frequency, {
FIELD_INIT(.min, 4000000000),
FIELD_INIT(.max, 6000000000),
FIELD_INIT(.min, 4000000000UL),
FIELD_INIT(.max, 6000000000UL),
FIELD_INIT(.step, 1),
FIELD_INIT(.scale, 1),
}),
Expand All @@ -399,8 +399,8 @@ static const struct bladerf_gain_range bladerf2_tx_gain_ranges[] = {
{
FIELD_INIT(.name, NULL),
FIELD_INIT(.frequency, {
FIELD_INIT(.min, 70000000),
FIELD_INIT(.max, 6000000000),
FIELD_INIT(.min, 70000000UL),
FIELD_INIT(.max, 6000000000UL),
FIELD_INIT(.step, 1),
FIELD_INIT(.scale, 1),
}),
Expand All @@ -415,8 +415,8 @@ static const struct bladerf_gain_range bladerf2_tx_gain_ranges[] = {
{
FIELD_INIT(.name, "dsa"),
FIELD_INIT(.frequency, {
FIELD_INIT(.min, 70000000),
FIELD_INIT(.max, 6000000000),
FIELD_INIT(.min, 70000000UL),
FIELD_INIT(.max, 6000000000UL),
FIELD_INIT(.step, 1),
FIELD_INIT(.scale, 1),
}),
Expand Down Expand Up @@ -517,17 +517,17 @@ static const struct range_band_map bladerf2_rx_range_band_map[] = {
{
FIELD_INIT(.band, BAND_LOW),
FIELD_INIT(.range, {
FIELD_INIT(.min, 70000000),
FIELD_INIT(.max, 3000000000),
FIELD_INIT(.min, 70000000UL),
FIELD_INIT(.max, 3000000000UL),
FIELD_INIT(.step, 2),
FIELD_INIT(.scale, 1)
}),
},
{
FIELD_INIT(.band, BAND_HIGH),
FIELD_INIT(.range, {
FIELD_INIT(.min, 3000000000),
FIELD_INIT(.max, 6000000000),
FIELD_INIT(.min, 3000000000UL),
FIELD_INIT(.max, 6000000000UL),
FIELD_INIT(.step, 2),
FIELD_INIT(.scale, 1)
}),
Expand All @@ -538,17 +538,17 @@ static const struct range_band_map bladerf2_tx_range_band_map[] = {
{
FIELD_INIT(.band, BAND_LOW),
FIELD_INIT(.range, {
FIELD_INIT(.min, 46875000),
FIELD_INIT(.max, 3000000000),
FIELD_INIT(.min, 46875000UL),
FIELD_INIT(.max, 3000000000UL),
FIELD_INIT(.step, 2),
FIELD_INIT(.scale, 1)
}),
},
{
FIELD_INIT(.band, BAND_HIGH),
FIELD_INIT(.range, {
FIELD_INIT(.min, 3000000000),
FIELD_INIT(.max, 6000000000),
FIELD_INIT(.min, 3000000000UL),
FIELD_INIT(.max, 6000000000UL),
FIELD_INIT(.step, 2),
FIELD_INIT(.scale, 1)
}),
Expand Down
2 changes: 1 addition & 1 deletion host/libraries/libbladeRF/src/driver/thirdparty/adi/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ uint32_t find_first_bit(uint32_t word)
*******************************************************************************/
void * ERR_PTR(long error)
{
uint64_t val = error;
uintptr_t val = error;
return (void *) val;
}

Expand Down
2 changes: 1 addition & 1 deletion host/libraries/libbladeRF_test/test_digital_loopback/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ int configure_module(struct bladerf *dev,
bladerf_channel ch,
uint32_t sample_rate)
{
uint64_t const FREQUENCY = 2400000000;
uint64_t const FREQUENCY = 2400000000UL;
uint32_t const BANDWIDTH = 20000000;

int status;
Expand Down
82 changes: 0 additions & 82 deletions host/misc/docker/centos-7-i386.Dockerfile
View file
Open in desktop

This file was deleted.

0