Skip to content
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

Jump to bottom

Adds the ability to use sample rates with oversampling to bladerf_set_sample_rate #927

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adds the ability to use sample rates with oversampling to bladerf_set_sample_rate #927

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
98 changes: 52 additions & 46 deletions host/libraries/libbladeRF/src/bladerf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,52 +613,8 @@ int bladerf_get_gain_stages(struct bladerf *dev,
/* Sample Rate */
/******************************************************************************/

int bladerf_set_sample_rate(struct bladerf *dev,
bladerf_channel ch,
bladerf_sample_rate rate,
bladerf_sample_rate *actual)
{
int status;
MUTEX_LOCK(&dev->lock);

status = dev->board->set_sample_rate(dev, ch, rate, actual);

MUTEX_UNLOCK(&dev->lock);
return status;
}

int bladerf_get_sample_rate(struct bladerf *dev,
bladerf_channel ch,
bladerf_sample_rate *rate)
{
int status;
MUTEX_LOCK(&dev->lock);

status = dev->board->get_sample_rate(dev, ch, rate);

MUTEX_UNLOCK(&dev->lock);
return status;
}

int bladerf_get_sample_rate_range(struct bladerf *dev,
bladerf_channel ch,
const struct bladerf_range **range)
{
return dev->board->get_sample_rate_range(dev, ch, range);
}

int bladerf_set_rational_sample_rate(struct bladerf *dev,
bladerf_channel ch,
struct bladerf_rational_rate *rate,
struct bladerf_rational_rate *actual)
{
int status;
void bladerf_set_oversample(struct bladerf *dev) {
bladerf_feature feature = dev->feature;

MUTEX_LOCK(&dev->lock);
status = dev->board->set_rational_sample_rate(dev, ch, rate, actual);
MUTEX_UNLOCK(&dev->lock);

/*****************************************************
Register config for OVERSAMPLE operation

Expand Down Expand Up @@ -704,6 +660,56 @@ int bladerf_set_rational_sample_rate(struct bladerf *dev,
// BIST and Data Port Test Config [D1:D0] "Must be 2’b00"
bladerf_set_rfic_register(dev,0x3f6,0x03);
}
}

int bladerf_set_sample_rate(struct bladerf *dev,
bladerf_channel ch,
bladerf_sample_rate rate,
bladerf_sample_rate *actual)
{
int status;
MUTEX_LOCK(&dev->lock);

status = dev->board->set_sample_rate(dev, ch, rate, actual);

MUTEX_UNLOCK(&dev->lock);

bladerf_set_oversample(dev);
return status;
}

int bladerf_get_sample_rate(struct bladerf *dev,
bladerf_channel ch,
bladerf_sample_rate *rate)
{
int status;
MUTEX_LOCK(&dev->lock);

status = dev->board->get_sample_rate(dev, ch, rate);

MUTEX_UNLOCK(&dev->lock);
return status;
}

int bladerf_get_sample_rate_range(struct bladerf *dev,
bladerf_channel ch,
const struct bladerf_range **range)
{
return dev->board->get_sample_rate_range(dev, ch, range);
}

int bladerf_set_rational_sample_rate(struct bladerf *dev,
bladerf_channel ch,
struct bladerf_rational_rate *rate,
struct bladerf_rational_rate *actual)
{
int status;

MUTEX_LOCK(&dev->lock);
status = dev->board->set_rational_sample_rate(dev, ch, rate, actual);
MUTEX_UNLOCK(&dev->lock);

bladerf_set_oversample(dev);

return status;
}
Expand Down Expand Up @@ -1997,4 +2003,4 @@ int bladerf_get_feature(struct bladerf *dev, bladerf_feature* feature)
MUTEX_UNLOCK(&dev->lock);

return 0;
}
}