Skip to content

Commit

Permalink
Merge branch 'Nuand:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Algafix authored Aug 23, 2023
2 parents 3e3f3a3 + 452ba28 commit 16c0598
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 1 addition & 3 deletions host/libraries/libbladeRF/src/driver/si5338.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static int si5338_calculate_multisynth(struct si5338_multisynth *ms,

struct bladerf_rational_rate req;
struct bladerf_rational_rate abc;
uint8_t r_value, r_power;
uint8_t r_value;

/* Don't muss with the users data */
req = *rate;
Expand All @@ -363,11 +363,9 @@ static int si5338_calculate_multisynth(struct si5338_multisynth *ms,

/* Find a suitable R value */
r_value = 1;
r_power = 0;
while (req.integer < 5000000 && r_value < 32) {
si5338_rational_double(&req);
r_value <<= 1;
r_power++;
}

if (r_value == 32 && req.integer < 5000000) {
Expand Down
3 changes: 1 addition & 2 deletions host/libraries/libbladeRF_test/test_parse/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,11 @@ bool test_csv2int()

int main(int argc, char *argv[])
{
size_t good = 0, bad = 0;
size_t bad = 0;

printf("*** testing csv2int ***\n");
if (test_csv2int()) {
printf("*** testing csv2int: PASSED ***\n");
++good;
} else {
printf("*** testing csv2int: FAILED ***\n");
++bad;
Expand Down

0 comments on commit 16c0598

Please sign in to comment.