|
@@ -150,7 +150,7 @@ enum si476x_acf_status_report_bits {
|
|
|
SI476X_ACF_SOFTMUTE_INT = (1 << 0),
|
|
|
|
|
|
SI476X_ACF_SMUTE = (1 << 0),
|
|
|
- SI476X_ACF_SMATTN = 0b11111,
|
|
|
+ SI476X_ACF_SMATTN = 0x1f,
|
|
|
SI476X_ACF_PILOT = (1 << 7),
|
|
|
SI476X_ACF_STBLEND = ~SI476X_ACF_PILOT,
|
|
|
};
|
|
@@ -772,16 +772,16 @@ int si476x_core_cmd_am_rsq_status(struct si476x_core *core,
|
|
|
if (!report)
|
|
|
return err;
|
|
|
|
|
|
- report->snrhint = 0b00001000 & resp[1];
|
|
|
- report->snrlint = 0b00000100 & resp[1];
|
|
|
- report->rssihint = 0b00000010 & resp[1];
|
|
|
- report->rssilint = 0b00000001 & resp[1];
|
|
|
+ report->snrhint = 0x08 & resp[1];
|
|
|
+ report->snrlint = 0x04 & resp[1];
|
|
|
+ report->rssihint = 0x02 & resp[1];
|
|
|
+ report->rssilint = 0x01 & resp[1];
|
|
|
|
|
|
- report->bltf = 0b10000000 & resp[2];
|
|
|
- report->snr_ready = 0b00100000 & resp[2];
|
|
|
- report->rssiready = 0b00001000 & resp[2];
|
|
|
- report->afcrl = 0b00000010 & resp[2];
|
|
|
- report->valid = 0b00000001 & resp[2];
|
|
|
+ report->bltf = 0x80 & resp[2];
|
|
|
+ report->snr_ready = 0x20 & resp[2];
|
|
|
+ report->rssiready = 0x08 & resp[2];
|
|
|
+ report->afcrl = 0x02 & resp[2];
|
|
|
+ report->valid = 0x01 & resp[2];
|
|
|
|
|
|
report->readfreq = be16_to_cpup((__be16 *)(resp + 3));
|
|
|
report->freqoff = resp[5];
|
|
@@ -931,26 +931,26 @@ int si476x_core_cmd_fm_rds_status(struct si476x_core *core,
|
|
|
if (err < 0 || report == NULL)
|
|
|
return err;
|
|
|
|
|
|
- report->rdstpptyint = 0b00010000 & resp[1];
|
|
|
- report->rdspiint = 0b00001000 & resp[1];
|
|
|
- report->rdssyncint = 0b00000010 & resp[1];
|
|
|
- report->rdsfifoint = 0b00000001 & resp[1];
|
|
|
+ report->rdstpptyint = 0x10 & resp[1];
|
|
|
+ report->rdspiint = 0x08 & resp[1];
|
|
|
+ report->rdssyncint = 0x02 & resp[1];
|
|
|
+ report->rdsfifoint = 0x01 & resp[1];
|
|
|
|
|
|
- report->tpptyvalid = 0b00010000 & resp[2];
|
|
|
- report->pivalid = 0b00001000 & resp[2];
|
|
|
- report->rdssync = 0b00000010 & resp[2];
|
|
|
- report->rdsfifolost = 0b00000001 & resp[2];
|
|
|
+ report->tpptyvalid = 0x10 & resp[2];
|
|
|
+ report->pivalid = 0x08 & resp[2];
|
|
|
+ report->rdssync = 0x02 & resp[2];
|
|
|
+ report->rdsfifolost = 0x01 & resp[2];
|
|
|
|
|
|
- report->tp = 0b00100000 & resp[3];
|
|
|
- report->pty = 0b00011111 & resp[3];
|
|
|
+ report->tp = 0x20 & resp[3];
|
|
|
+ report->pty = 0x1f & resp[3];
|
|
|
|
|
|
report->pi = be16_to_cpup((__be16 *)(resp + 4));
|
|
|
report->rdsfifoused = resp[6];
|
|
|
|
|
|
- report->ble[V4L2_RDS_BLOCK_A] = 0b11000000 & resp[7];
|
|
|
- report->ble[V4L2_RDS_BLOCK_B] = 0b00110000 & resp[7];
|
|
|
- report->ble[V4L2_RDS_BLOCK_C] = 0b00001100 & resp[7];
|
|
|
- report->ble[V4L2_RDS_BLOCK_D] = 0b00000011 & resp[7];
|
|
|
+ report->ble[V4L2_RDS_BLOCK_A] = 0xc0 & resp[7];
|
|
|
+ report->ble[V4L2_RDS_BLOCK_B] = 0x30 & resp[7];
|
|
|
+ report->ble[V4L2_RDS_BLOCK_C] = 0x0c & resp[7];
|
|
|
+ report->ble[V4L2_RDS_BLOCK_D] = 0x03 & resp[7];
|
|
|
|
|
|
report->rds[V4L2_RDS_BLOCK_A].block = V4L2_RDS_BLOCK_A;
|
|
|
report->rds[V4L2_RDS_BLOCK_A].msb = resp[8];
|
|
@@ -1005,7 +1005,7 @@ int si476x_core_cmd_fm_phase_diversity(struct si476x_core *core,
|
|
|
{
|
|
|
u8 resp[CMD_FM_PHASE_DIVERSITY_NRESP];
|
|
|
const u8 args[CMD_FM_PHASE_DIVERSITY_NARGS] = {
|
|
|
- mode & 0b111,
|
|
|
+ mode & 0x07,
|
|
|
};
|
|
|
|
|
|
return si476x_core_send_command(core, CMD_FM_PHASE_DIVERSITY,
|
|
@@ -1162,7 +1162,7 @@ static int si476x_core_cmd_am_tune_freq_a20(struct si476x_core *core,
|
|
|
const int am_freq = tuneargs->freq;
|
|
|
u8 resp[CMD_AM_TUNE_FREQ_NRESP];
|
|
|
const u8 args[CMD_AM_TUNE_FREQ_NARGS] = {
|
|
|
- (tuneargs->zifsr << 6) | (tuneargs->injside & 0b11),
|
|
|
+ (tuneargs->zifsr << 6) | (tuneargs->injside & 0x03),
|
|
|
msb(am_freq),
|
|
|
lsb(am_freq),
|
|
|
};
|
|
@@ -1197,18 +1197,18 @@ static int si476x_core_cmd_fm_rsq_status_a10(struct si476x_core *core,
|
|
|
if (err < 0 || report == NULL)
|
|
|
return err;
|
|
|
|
|
|
- report->multhint = 0b10000000 & resp[1];
|
|
|
- report->multlint = 0b01000000 & resp[1];
|
|
|
- report->snrhint = 0b00001000 & resp[1];
|
|
|
- report->snrlint = 0b00000100 & resp[1];
|
|
|
- report->rssihint = 0b00000010 & resp[1];
|
|
|
- report->rssilint = 0b00000001 & resp[1];
|
|
|
+ report->multhint = 0x80 & resp[1];
|
|
|
+ report->multlint = 0x40 & resp[1];
|
|
|
+ report->snrhint = 0x08 & resp[1];
|
|
|
+ report->snrlint = 0x04 & resp[1];
|
|
|
+ report->rssihint = 0x02 & resp[1];
|
|
|
+ report->rssilint = 0x01 & resp[1];
|
|
|
|
|
|
- report->bltf = 0b10000000 & resp[2];
|
|
|
- report->snr_ready = 0b00100000 & resp[2];
|
|
|
- report->rssiready = 0b00001000 & resp[2];
|
|
|
- report->afcrl = 0b00000010 & resp[2];
|
|
|
- report->valid = 0b00000001 & resp[2];
|
|
|
+ report->bltf = 0x80 & resp[2];
|
|
|
+ report->snr_ready = 0x20 & resp[2];
|
|
|
+ report->rssiready = 0x08 & resp[2];
|
|
|
+ report->afcrl = 0x02 & resp[2];
|
|
|
+ report->valid = 0x01 & resp[2];
|
|
|
|
|
|
report->readfreq = be16_to_cpup((__be16 *)(resp + 3));
|
|
|
report->freqoff = resp[5];
|
|
@@ -1251,18 +1251,18 @@ static int si476x_core_cmd_fm_rsq_status_a20(struct si476x_core *core,
|
|
|
if (err < 0 || report == NULL)
|
|
|
return err;
|
|
|
|
|
|
- report->multhint = 0b10000000 & resp[1];
|
|
|
- report->multlint = 0b01000000 & resp[1];
|
|
|
- report->snrhint = 0b00001000 & resp[1];
|
|
|
- report->snrlint = 0b00000100 & resp[1];
|
|
|
- report->rssihint = 0b00000010 & resp[1];
|
|
|
- report->rssilint = 0b00000001 & resp[1];
|
|
|
+ report->multhint = 0x80 & resp[1];
|
|
|
+ report->multlint = 0x40 & resp[1];
|
|
|
+ report->snrhint = 0x08 & resp[1];
|
|
|
+ report->snrlint = 0x04 & resp[1];
|
|
|
+ report->rssihint = 0x02 & resp[1];
|
|
|
+ report->rssilint = 0x01 & resp[1];
|
|
|
|
|
|
- report->bltf = 0b10000000 & resp[2];
|
|
|
- report->snr_ready = 0b00100000 & resp[2];
|
|
|
- report->rssiready = 0b00001000 & resp[2];
|
|
|
- report->afcrl = 0b00000010 & resp[2];
|
|
|
- report->valid = 0b00000001 & resp[2];
|
|
|
+ report->bltf = 0x80 & resp[2];
|
|
|
+ report->snr_ready = 0x20 & resp[2];
|
|
|
+ report->rssiready = 0x08 & resp[2];
|
|
|
+ report->afcrl = 0x02 & resp[2];
|
|
|
+ report->valid = 0x01 & resp[2];
|
|
|
|
|
|
report->readfreq = be16_to_cpup((__be16 *)(resp + 3));
|
|
|
report->freqoff = resp[5];
|
|
@@ -1306,19 +1306,19 @@ static int si476x_core_cmd_fm_rsq_status_a30(struct si476x_core *core,
|
|
|
if (err < 0 || report == NULL)
|
|
|
return err;
|
|
|
|
|
|
- report->multhint = 0b10000000 & resp[1];
|
|
|
- report->multlint = 0b01000000 & resp[1];
|
|
|
- report->snrhint = 0b00001000 & resp[1];
|
|
|
- report->snrlint = 0b00000100 & resp[1];
|
|
|
- report->rssihint = 0b00000010 & resp[1];
|
|
|
- report->rssilint = 0b00000001 & resp[1];
|
|
|
-
|
|
|
- report->bltf = 0b10000000 & resp[2];
|
|
|
- report->snr_ready = 0b00100000 & resp[2];
|
|
|
- report->rssiready = 0b00001000 & resp[2];
|
|
|
- report->injside = 0b00000100 & resp[2];
|
|
|
- report->afcrl = 0b00000010 & resp[2];
|
|
|
- report->valid = 0b00000001 & resp[2];
|
|
|
+ report->multhint = 0x80 & resp[1];
|
|
|
+ report->multlint = 0x40 & resp[1];
|
|
|
+ report->snrhint = 0x08 & resp[1];
|
|
|
+ report->snrlint = 0x04 & resp[1];
|
|
|
+ report->rssihint = 0x02 & resp[1];
|
|
|
+ report->rssilint = 0x01 & resp[1];
|
|
|
+
|
|
|
+ report->bltf = 0x80 & resp[2];
|
|
|
+ report->snr_ready = 0x20 & resp[2];
|
|
|
+ report->rssiready = 0x08 & resp[2];
|
|
|
+ report->injside = 0x04 & resp[2];
|
|
|
+ report->afcrl = 0x02 & resp[2];
|
|
|
+ report->valid = 0x01 & resp[2];
|
|
|
|
|
|
report->readfreq = be16_to_cpup((__be16 *)(resp + 3));
|
|
|
report->freqoff = resp[5];
|