Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix indent, fix unused vars

Browse Source
This commit is contained in:
Hoernchen
2013-06-07 23:39:11 +02:00
parent 1e326997ed
commit cf8f7644c9
2 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
host/hackrf-tools/src/hackrf_si5351c.c
View File

@ -109,60 +109,60 @@ int dump_multisynth_config(hackrf_device* device, const uint_fast8_t ms_number)
uint32_t p1,p2,p3,r_div; uint32_t p1,p2,p3,r_div;
uint_fast8_t div_lut[] = {1,2,4,8,16,32,64,128}; uint_fast8_t div_lut[] = {1,2,4,8,16,32,64,128};
printf("MS%d:", ms_number); printf("MS%d:", ms_number);
if(ms_number <6){ if(ms_number <6){
reg_base = 42 + (ms_number * 8); reg_base = 42 + (ms_number * 8);
for(i=0; i<8; i++) { for(i=0; i<8; i++) {
uint_fast8_t reg_number = reg_base + i; uint_fast8_t reg_number = reg_base + i;
int result = hackrf_si5351c_read(device, reg_number, &parameters[i]); int result = hackrf_si5351c_read(device, reg_number, &parameters[i]);
if( result != HACKRF_SUCCESS ) { if( result != HACKRF_SUCCESS ) {
return result; return result;
} }
} }
p1 = p1 =
(parameters[2] & 0x03 << 16) (parameters[2] & 0x03 << 16)
| (parameters[3] << 8) | (parameters[3] << 8)
| parameters[4] | parameters[4]
; ;
p2 = p2 =
(parameters[5] & 0x0F << 16) (parameters[5] & 0x0F << 16)
| (parameters[6] << 8) | (parameters[6] << 8)
| parameters[7] | parameters[7]
; ;
p3 = p3 =
(parameters[5] & 0xF0 << 12) (parameters[5] & 0xF0 << 12)
| (parameters[0] << 8) | (parameters[0] << 8)
| parameters[1] | parameters[1]
; ;
r_div = r_div =
(parameters[2] >> 4) & 0x7 (parameters[2] >> 4) & 0x7
; ;
printf("\tp1 = %u\n", p1); printf("\tp1 = %u\n", p1);
printf("\tp2 = %u\n", p2); printf("\tp2 = %u\n", p2);
printf("\tp3 = %u\n", p3); printf("\tp3 = %u\n", p3);
if(p3) if(p3)
printf("\tOutput (800Mhz PLL): %#.10f Mhz\n", (800 / (float)((p1*p3 + p2 + 512*p3)/(128*p3))) / div_lut[r_div] ); printf("\tOutput (800Mhz PLL): %#.10f Mhz\n", (800 / (float)((p1*p3 + p2 + 512*p3)/(128*p3))) / div_lut[r_div] );
} else { } else {
// MS6 and 7 are integer only // MS6 and 7 are integer only
unsigned int parms; unsigned int parms;
reg_base = 90; reg_base = 90;
for(i=0; i<3; i++) { for(i=0; i<3; i++) {
uint_fast8_t reg_number = reg_base + i; uint_fast8_t reg_number = reg_base + i;
int result = hackrf_si5351c_read(device, reg_number, &parameters[i]); int result = hackrf_si5351c_read(device, reg_number, &parameters[i]);
if( result != HACKRF_SUCCESS ) { if( result != HACKRF_SUCCESS ) {
return result; return result;
} }
} }
r_div = (ms_number == 6) ? parameters[2] & 0x7 : parameters[2] & 0x70 >> 4 ; r_div = (ms_number == 6) ? parameters[2] & 0x7 : parameters[2] & 0x70 >> 4 ;
parms = (ms_number == 6) ? parameters[0] : parameters[1]; parms = (ms_number == 6) ? parameters[0] : parameters[1];
printf("\tp1_int = %u\n", parms); printf("\tp1_int = %u\n", parms);
if(parms) if(parms)
printf("\tOutput (800Mhz PLL): %#.10f Mhz\n", (800.0f / parms) / div_lut[r_div] ); printf("\tOutput (800Mhz PLL): %#.10f Mhz\n", (800.0f / parms) / div_lut[r_div] );
} }
printf("\toutput divider = %u\n", div_lut[r_div]); printf("\toutput divider = %u\n", div_lut[r_div]);
return HACKRF_SUCCESS; return HACKRF_SUCCESS;
@ -244,5 +244,5 @@ int main(int argc, char** argv) {
hackrf_exit(); hackrf_exit();
return 0; return 0;
} }

2
host/libhackrf/src/hackrf.c
View File

@ -770,8 +770,6 @@ typedef struct {
int ADDCALL hackrf_set_fracrate(hackrf_device* device, const float freq_mhz) int ADDCALL hackrf_set_fracrate(hackrf_device* device, const float freq_mhz)
{ {
uint32_t l_freq_mhz;
uint32_t l_freq_hz;
set_fracrate_params_t set_fracrate_params; set_fracrate_params_t set_fracrate_params;
uint8_t length; uint8_t length;
int result; int result;