Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 dfef84fc 编写于 作者: M Mauro Carvalho Chehab
浏览文件
操作

[media] siano: get rid of CammelCase from smscoreapi.h 

It is almost impossible to see a compliant with checkpatch.pl
on those Siano drivers, as there are simply too much violations
on it. So, now that a big change was done, the better is to
cleanup the checkpatch compliants.

Let's first replace all CammelCase symbols found at smscoreapi.h
using camel_case namespace. That removed 144 checkpatch.pl
compliants on this file. Of course, the other files need to be
fixed accordingly.
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 c8b8fdb3
展开全部 隐藏空白更改
内联 并排
Showing with 684 addition and 684 deletion
drivers/media/common/siano/sms-cards.c
浏览文件 @ dfef84fc
...@@ -167,13 +167,13 @@ struct sms_board *sms_get_board(unsigned id) ...@@ -167,13 +167,13 @@ struct sms_board *sms_get_board(unsigned id)
} }
EXPORT_SYMBOL_GPL(sms_get_board); EXPORT_SYMBOL_GPL(sms_get_board);
static inline void sms_gpio_assign_11xx_default_led_config( static inline void sms_gpio_assign_11xx_default_led_config(
struct smscore_config_gpio *pGpioConfig) { struct smscore_config_gpio *p_gpio_config) {
pGpioConfig->direction = SMS_GPIO_DIRECTION_OUTPUT; p_gpio_config->direction = SMS_GPIO_DIRECTION_OUTPUT;
pGpioConfig->inputcharacteristics = p_gpio_config->inputcharacteristics =
SMS_GPIO_INPUTCHARACTERISTICS_NORMAL; SMS_GPIO_INPUTCHARACTERISTICS_NORMAL;
pGpioConfig->outputdriving = SMS_GPIO_OUTPUTDRIVING_4mA; p_gpio_config->outputdriving = SMS_GPIO_OUTPUTDRIVING_4mA;
pGpioConfig->outputslewrate = SMS_GPIO_OUTPUT_SLEW_RATE_0_45_V_NS; p_gpio_config->outputslewrate = SMS_GPIO_OUTPUT_SLEW_RATE_0_45_V_NS;
pGpioConfig->pullupdown = SMS_GPIO_PULLUPDOWN_NONE; p_gpio_config->pullupdown = SMS_GPIO_PULLUPDOWN_NONE;
} }
int sms_board_event(struct smscore_device_t *coredev, int sms_board_event(struct smscore_device_t *coredev,
......
drivers/media/common/siano/smsdvb-debugfs.c
浏览文件 @ dfef84fc
...@@ -63,11 +63,11 @@ void smsdvb_print_dvb_stats(struct smsdvb_debugfs *debug_data, ...@@ -63,11 +63,11 @@ void smsdvb_print_dvb_stats(struct smsdvb_debugfs *debug_data,
buf = debug_data->stats_data; buf = debug_data->stats_data;
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"IsRfLocked = %d\n", p->IsRfLocked); "is_rf_locked = %d\n", p->is_rf_locked);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"IsDemodLocked = %d\n", p->IsDemodLocked); "is_demod_locked = %d\n", p->is_demod_locked);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"IsExternalLNAOn = %d\n", p->IsExternalLNAOn); "is_external_lna_on = %d\n", p->is_external_lna_on);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"SNR = %d\n", p->SNR); "SNR = %d\n", p->SNR);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
...@@ -81,70 +81,70 @@ void smsdvb_print_dvb_stats(struct smsdvb_debugfs *debug_data, ...@@ -81,70 +81,70 @@ void smsdvb_print_dvb_stats(struct smsdvb_debugfs *debug_data,
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"RSSI = %d\n", p->RSSI); "RSSI = %d\n", p->RSSI);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"InBandPwr = %d\n", p->InBandPwr); "in_band_pwr = %d\n", p->in_band_pwr);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"CarrierOffset = %d\n", p->CarrierOffset); "carrier_offset = %d\n", p->carrier_offset);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"ModemState = %d\n", p->ModemState); "modem_state = %d\n", p->modem_state);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"Frequency = %d\n", p->Frequency); "frequency = %d\n", p->frequency);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"Bandwidth = %d\n", p->Bandwidth); "bandwidth = %d\n", p->bandwidth);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"TransmissionMode = %d\n", p->TransmissionMode); "transmission_mode = %d\n", p->transmission_mode);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"ModemState = %d\n", p->ModemState); "modem_state = %d\n", p->modem_state);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"GuardInterval = %d\n", p->GuardInterval); "guard_interval = %d\n", p->guard_interval);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"CodeRate = %d\n", p->CodeRate); "code_rate = %d\n", p->code_rate);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"LPCodeRate = %d\n", p->LPCodeRate); "lp_code_rate = %d\n", p->lp_code_rate);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"Hierarchy = %d\n", p->Hierarchy); "hierarchy = %d\n", p->hierarchy);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"Constellation = %d\n", p->Constellation); "constellation = %d\n", p->constellation);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"BurstSize = %d\n", p->BurstSize); "burst_size = %d\n", p->burst_size);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"BurstDuration = %d\n", p->BurstDuration); "burst_duration = %d\n", p->burst_duration);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"BurstCycleTime = %d\n", p->BurstCycleTime); "burst_cycle_time = %d\n", p->burst_cycle_time);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"CalculatedBurstCycleTime = %d\n", "calc_burst_cycle_time = %d\n",
p->CalculatedBurstCycleTime); p->calc_burst_cycle_time);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"NumOfRows = %d\n", p->NumOfRows); "num_of_rows = %d\n", p->num_of_rows);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"NumOfPaddCols = %d\n", p->NumOfPaddCols); "num_of_padd_cols = %d\n", p->num_of_padd_cols);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"NumOfPunctCols = %d\n", p->NumOfPunctCols); "num_of_punct_cols = %d\n", p->num_of_punct_cols);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"ErrorTSPackets = %d\n", p->ErrorTSPackets); "error_ts_packets = %d\n", p->error_ts_packets);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"TotalTSPackets = %d\n", p->TotalTSPackets); "total_ts_packets = %d\n", p->total_ts_packets);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"NumOfValidMpeTlbs = %d\n", p->NumOfValidMpeTlbs); "num_of_valid_mpe_tlbs = %d\n", p->num_of_valid_mpe_tlbs);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"NumOfInvalidMpeTlbs = %d\n", p->NumOfInvalidMpeTlbs); "num_of_invalid_mpe_tlbs = %d\n", p->num_of_invalid_mpe_tlbs);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"NumOfCorrectedMpeTlbs = %d\n", p->NumOfCorrectedMpeTlbs); "num_of_corrected_mpe_tlbs = %d\n", p->num_of_corrected_mpe_tlbs);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"BERErrorCount = %d\n", p->BERErrorCount); "ber_error_count = %d\n", p->ber_error_count);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"BERBitCount = %d\n", p->BERBitCount); "ber_bit_count = %d\n", p->ber_bit_count);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"SmsToHostTxErrors = %d\n", p->SmsToHostTxErrors); "sms_to_host_tx_errors = %d\n", p->sms_to_host_tx_errors);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"PreBER = %d\n", p->PreBER); "pre_ber = %d\n", p->pre_ber);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"CellId = %d\n", p->CellId); "cell_id = %d\n", p->cell_id);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"DvbhSrvIndHP = %d\n", p->DvbhSrvIndHP); "dvbh_srv_ind_hp = %d\n", p->dvbh_srv_ind_hp);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"DvbhSrvIndLP = %d\n", p->DvbhSrvIndLP); "dvbh_srv_ind_lp = %d\n", p->dvbh_srv_ind_lp);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"NumMPEReceived = %d\n", p->NumMPEReceived); "num_mpe_received = %d\n", p->num_mpe_received);
debug_data->stats_count = n; debug_data->stats_count = n;
spin_unlock(&debug_data->lock); spin_unlock(&debug_data->lock);
...@@ -166,74 +166,74 @@ void smsdvb_print_isdb_stats(struct smsdvb_debugfs *debug_data, ...@@ -166,74 +166,74 @@ void smsdvb_print_isdb_stats(struct smsdvb_debugfs *debug_data,
buf = debug_data->stats_data; buf = debug_data->stats_data;
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"StatisticsType = %d\t", p->StatisticsType); "statistics_type = %d\t", p->statistics_type);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"FullSize = %d\n", p->FullSize); "full_size = %d\n", p->full_size);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"IsRfLocked = %d\t\t", p->IsRfLocked); "is_rf_locked = %d\t\t", p->is_rf_locked);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"IsDemodLocked = %d\t", p->IsDemodLocked); "is_demod_locked = %d\t", p->is_demod_locked);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"IsExternalLNAOn = %d\n", p->IsExternalLNAOn); "is_external_lna_on = %d\n", p->is_external_lna_on);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"SNR = %d dB\t\t", p->SNR); "SNR = %d dB\t\t", p->SNR);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"RSSI = %d dBm\t\t", p->RSSI); "RSSI = %d dBm\t\t", p->RSSI);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"InBandPwr = %d dBm\n", p->InBandPwr); "in_band_pwr = %d dBm\n", p->in_band_pwr);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"CarrierOffset = %d\t", p->CarrierOffset); "carrier_offset = %d\t", p->carrier_offset);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"Bandwidth = %d\t\t", p->Bandwidth); "bandwidth = %d\t\t", p->bandwidth);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"Frequency = %d Hz\n", p->Frequency); "frequency = %d Hz\n", p->frequency);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"TransmissionMode = %d\t", p->TransmissionMode); "transmission_mode = %d\t", p->transmission_mode);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"ModemState = %d\t\t", p->ModemState); "modem_state = %d\t\t", p->modem_state);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"GuardInterval = %d\n", p->GuardInterval); "guard_interval = %d\n", p->guard_interval);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"SystemType = %d\t\t", p->SystemType); "system_type = %d\t\t", p->system_type);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"PartialReception = %d\t", p->PartialReception); "partial_reception = %d\t", p->partial_reception);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"NumOfLayers = %d\n", p->NumOfLayers); "num_of_layers = %d\n", p->num_of_layers);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"SmsToHostTxErrors = %d\n", p->SmsToHostTxErrors); "sms_to_host_tx_errors = %d\n", p->sms_to_host_tx_errors);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (p->LayerInfo[i].NumberOfSegments < 1 || if (p->LayerInfo[i].number_of_segments < 1 ||
p->LayerInfo[i].NumberOfSegments > 13) p->LayerInfo[i].number_of_segments > 13)
continue; continue;
n += snprintf(&buf[n], PAGE_SIZE - n, "\nLayer %d\n", i); n += snprintf(&buf[n], PAGE_SIZE - n, "\nLayer %d\n", i);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tCodeRate = %d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "\tcode_rate = %d\t",
p->LayerInfo[i].CodeRate); p->LayerInfo[i].code_rate);
n += snprintf(&buf[n], PAGE_SIZE - n, "Constellation = %d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "constellation = %d\n",
p->LayerInfo[i].Constellation); p->LayerInfo[i].constellation);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tBER = %-5d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "\tBER = %-5d\t",
p->LayerInfo[i].BER); p->LayerInfo[i].BER);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tBERErrorCount = %-5d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "\tber_error_count = %-5d\t",
p->LayerInfo[i].BERErrorCount); p->LayerInfo[i].ber_error_count);
n += snprintf(&buf[n], PAGE_SIZE - n, "BERBitCount = %-5d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "ber_bit_count = %-5d\n",
p->LayerInfo[i].BERBitCount); p->LayerInfo[i].ber_bit_count);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tPreBER = %-5d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "\tpre_ber = %-5d\t",
p->LayerInfo[i].PreBER); p->LayerInfo[i].pre_ber);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tTS_PER = %-5d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "\tTS_PER = %-5d\n",
p->LayerInfo[i].TS_PER); p->LayerInfo[i].TS_PER);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tErrorTSPackets = %-5d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "\terror_ts_packets = %-5d\t",
p->LayerInfo[i].ErrorTSPackets); p->LayerInfo[i].error_ts_packets);
n += snprintf(&buf[n], PAGE_SIZE - n, "TotalTSPackets = %-5d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "total_ts_packets = %-5d\t",
p->LayerInfo[i].TotalTSPackets); p->LayerInfo[i].total_ts_packets);
n += snprintf(&buf[n], PAGE_SIZE - n, "TILdepthI = %d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "ti_ldepth_i = %d\n",
p->LayerInfo[i].TILdepthI); p->LayerInfo[i].ti_ldepth_i);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"\tNumberOfSegments = %d\t", "\tnumber_of_segments = %d\t",
p->LayerInfo[i].NumberOfSegments); p->LayerInfo[i].number_of_segments);
n += snprintf(&buf[n], PAGE_SIZE - n, "TMCCErrors = %d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "tmcc_errors = %d\n",
p->LayerInfo[i].TMCCErrors); p->LayerInfo[i].tmcc_errors);
} }
debug_data->stats_count = n; debug_data->stats_count = n;
...@@ -256,76 +256,76 @@ void smsdvb_print_isdb_stats_ex(struct smsdvb_debugfs *debug_data, ...@@ -256,76 +256,76 @@ void smsdvb_print_isdb_stats_ex(struct smsdvb_debugfs *debug_data,
buf = debug_data->stats_data; buf = debug_data->stats_data;
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"StatisticsType = %d\t", p->StatisticsType); "statistics_type = %d\t", p->statistics_type);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"FullSize = %d\n", p->FullSize); "full_size = %d\n", p->full_size);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"IsRfLocked = %d\t\t", p->IsRfLocked); "is_rf_locked = %d\t\t", p->is_rf_locked);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"IsDemodLocked = %d\t", p->IsDemodLocked); "is_demod_locked = %d\t", p->is_demod_locked);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"IsExternalLNAOn = %d\n", p->IsExternalLNAOn); "is_external_lna_on = %d\n", p->is_external_lna_on);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"SNR = %d dB\t\t", p->SNR); "SNR = %d dB\t\t", p->SNR);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"RSSI = %d dBm\t\t", p->RSSI); "RSSI = %d dBm\t\t", p->RSSI);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"InBandPwr = %d dBm\n", p->InBandPwr); "in_band_pwr = %d dBm\n", p->in_band_pwr);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"CarrierOffset = %d\t", p->CarrierOffset); "carrier_offset = %d\t", p->carrier_offset);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"Bandwidth = %d\t\t", p->Bandwidth); "bandwidth = %d\t\t", p->bandwidth);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"Frequency = %d Hz\n", p->Frequency); "frequency = %d Hz\n", p->frequency);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"TransmissionMode = %d\t", p->TransmissionMode); "transmission_mode = %d\t", p->transmission_mode);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"ModemState = %d\t\t", p->ModemState); "modem_state = %d\t\t", p->modem_state);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"GuardInterval = %d\n", p->GuardInterval); "guard_interval = %d\n", p->guard_interval);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"SystemType = %d\t\t", p->SystemType); "system_type = %d\t\t", p->system_type);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"PartialReception = %d\t", p->PartialReception); "partial_reception = %d\t", p->partial_reception);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"NumOfLayers = %d\n", p->NumOfLayers); "num_of_layers = %d\n", p->num_of_layers);
n += snprintf(&buf[n], PAGE_SIZE - n, "SegmentNumber = %d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "segment_number = %d\t",
p->SegmentNumber); p->segment_number);
n += snprintf(&buf[n], PAGE_SIZE - n, "TuneBW = %d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "tune_bw = %d\n",
p->TuneBW); p->tune_bw);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (p->LayerInfo[i].NumberOfSegments < 1 || if (p->LayerInfo[i].number_of_segments < 1 ||
p->LayerInfo[i].NumberOfSegments > 13) p->LayerInfo[i].number_of_segments > 13)
continue; continue;
n += snprintf(&buf[n], PAGE_SIZE - n, "\nLayer %d\n", i); n += snprintf(&buf[n], PAGE_SIZE - n, "\nLayer %d\n", i);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tCodeRate = %d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "\tcode_rate = %d\t",
p->LayerInfo[i].CodeRate); p->LayerInfo[i].code_rate);
n += snprintf(&buf[n], PAGE_SIZE - n, "Constellation = %d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "constellation = %d\n",
p->LayerInfo[i].Constellation); p->LayerInfo[i].constellation);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tBER = %-5d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "\tBER = %-5d\t",
p->LayerInfo[i].BER); p->LayerInfo[i].BER);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tBERErrorCount = %-5d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "\tber_error_count = %-5d\t",
p->LayerInfo[i].BERErrorCount); p->LayerInfo[i].ber_error_count);
n += snprintf(&buf[n], PAGE_SIZE - n, "BERBitCount = %-5d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "ber_bit_count = %-5d\n",
p->LayerInfo[i].BERBitCount); p->LayerInfo[i].ber_bit_count);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tPreBER = %-5d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "\tpre_ber = %-5d\t",
p->LayerInfo[i].PreBER); p->LayerInfo[i].pre_ber);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tTS_PER = %-5d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "\tTS_PER = %-5d\n",
p->LayerInfo[i].TS_PER); p->LayerInfo[i].TS_PER);
n += snprintf(&buf[n], PAGE_SIZE - n, "\tErrorTSPackets = %-5d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "\terror_ts_packets = %-5d\t",
p->LayerInfo[i].ErrorTSPackets); p->LayerInfo[i].error_ts_packets);
n += snprintf(&buf[n], PAGE_SIZE - n, "TotalTSPackets = %-5d\t", n += snprintf(&buf[n], PAGE_SIZE - n, "total_ts_packets = %-5d\t",
p->LayerInfo[i].TotalTSPackets); p->LayerInfo[i].total_ts_packets);
n += snprintf(&buf[n], PAGE_SIZE - n, "TILdepthI = %d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "ti_ldepth_i = %d\n",
p->LayerInfo[i].TILdepthI); p->LayerInfo[i].ti_ldepth_i);
n += snprintf(&buf[n], PAGE_SIZE - n, n += snprintf(&buf[n], PAGE_SIZE - n,
"\tNumberOfSegments = %d\t", "\tnumber_of_segments = %d\t",
p->LayerInfo[i].NumberOfSegments); p->LayerInfo[i].number_of_segments);
n += snprintf(&buf[n], PAGE_SIZE - n, "TMCCErrors = %d\n", n += snprintf(&buf[n], PAGE_SIZE - n, "tmcc_errors = %d\n",
p->LayerInfo[i].TMCCErrors); p->LayerInfo[i].tmcc_errors);
} }
......
drivers/media/common/siano/smsdvb-main.c
浏览文件 @ dfef84fc
...@@ -228,15 +228,15 @@ static void smsdvb_update_tx_params(struct smsdvb_client_t *client, ...@@ -228,15 +228,15 @@ static void smsdvb_update_tx_params(struct smsdvb_client_t *client,
struct dvb_frontend *fe = &client->frontend; struct dvb_frontend *fe = &client->frontend;
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
c->frequency = p->Frequency; c->frequency = p->frequency;
client->fe_status = sms_to_status(p->IsDemodLocked, 0); client->fe_status = sms_to_status(p->is_demod_locked, 0);
c->bandwidth_hz = sms_to_bw(p->Bandwidth); c->bandwidth_hz = sms_to_bw(p->bandwidth);
c->transmission_mode = sms_to_mode(p->TransmissionMode); c->transmission_mode = sms_to_mode(p->transmission_mode);
c->guard_interval = sms_to_guard_interval(p->GuardInterval); c->guard_interval = sms_to_guard_interval(p->guard_interval);
c->code_rate_HP = sms_to_code_rate(p->CodeRate); c->code_rate_HP = sms_to_code_rate(p->code_rate);
c->code_rate_LP = sms_to_code_rate(p->LPCodeRate); c->code_rate_LP = sms_to_code_rate(p->lp_code_rate);
c->hierarchy = sms_to_hierarchy(p->Hierarchy); c->hierarchy = sms_to_hierarchy(p->hierarchy);
c->modulation = sms_to_modulation(p->Constellation); c->modulation = sms_to_modulation(p->constellation);
} }
static void smsdvb_update_per_slices(struct smsdvb_client_t *client, static void smsdvb_update_per_slices(struct smsdvb_client_t *client,
...@@ -245,35 +245,35 @@ static void smsdvb_update_per_slices(struct smsdvb_client_t *client, ...@@ -245,35 +245,35 @@ static void smsdvb_update_per_slices(struct smsdvb_client_t *client,
struct dvb_frontend *fe = &client->frontend; struct dvb_frontend *fe = &client->frontend;
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
client->fe_status = sms_to_status(p->IsDemodLocked, p->IsRfLocked); client->fe_status = sms_to_status(p->is_demod_locked, p->is_rf_locked);
c->modulation = sms_to_modulation(p->constellation); c->modulation = sms_to_modulation(p->constellation);
/* Signal Strength, in DBm */ /* signal Strength, in DBm */
c->strength.stat[0].uvalue = p->inBandPower * 1000; c->strength.stat[0].uvalue = p->in_band_power * 1000;
/* Carrier to Noise ratio, in DB */ /* Carrier to noise ratio, in DB */
c->cnr.stat[0].svalue = p->snr * 1000; c->cnr.stat[0].svalue = p->snr * 1000;
/* PER/BER requires demod lock */ /* PER/BER requires demod lock */
if (!p->IsDemodLocked) if (!p->is_demod_locked)
return; return;
/* TS PER */ /* TS PER */
client->last_per = c->block_error.stat[0].uvalue; client->last_per = c->block_error.stat[0].uvalue;
c->block_error.stat[0].scale = FE_SCALE_COUNTER; c->block_error.stat[0].scale = FE_SCALE_COUNTER;
c->block_count.stat[0].scale = FE_SCALE_COUNTER; c->block_count.stat[0].scale = FE_SCALE_COUNTER;
c->block_error.stat[0].uvalue += p->etsPackets; c->block_error.stat[0].uvalue += p->ets_packets;
c->block_count.stat[0].uvalue += p->etsPackets + p->tsPackets; c->block_count.stat[0].uvalue += p->ets_packets + p->ts_packets;
/* BER */ /* BER */
c->post_bit_error.stat[0].scale = FE_SCALE_COUNTER; c->post_bit_error.stat[0].scale = FE_SCALE_COUNTER;
c->post_bit_count.stat[0].scale = FE_SCALE_COUNTER; c->post_bit_count.stat[0].scale = FE_SCALE_COUNTER;
c->post_bit_error.stat[0].uvalue += p->BERErrorCount; c->post_bit_error.stat[0].uvalue += p->ber_error_count;
c->post_bit_count.stat[0].uvalue += p->BERBitCount; c->post_bit_count.stat[0].uvalue += p->ber_bit_count;
/* Legacy PER/BER */ /* Legacy PER/BER */
client->legacy_per = (p->etsPackets * 65535) / client->legacy_per = (p->ets_packets * 65535) /
(p->tsPackets + p->etsPackets); (p->ts_packets + p->ets_packets);
} }
static void smsdvb_update_dvb_stats(struct smsdvb_client_t *client, static void smsdvb_update_dvb_stats(struct smsdvb_client_t *client,
...@@ -285,44 +285,44 @@ static void smsdvb_update_dvb_stats(struct smsdvb_client_t *client, ...@@ -285,44 +285,44 @@ static void smsdvb_update_dvb_stats(struct smsdvb_client_t *client,
if (client->prt_dvb_stats) if (client->prt_dvb_stats)
client->prt_dvb_stats(client->debug_data, p); client->prt_dvb_stats(client->debug_data, p);
client->fe_status = sms_to_status(p->IsDemodLocked, p->IsRfLocked); client->fe_status = sms_to_status(p->is_demod_locked, p->is_rf_locked);
/* Update DVB modulation parameters */ /* Update DVB modulation parameters */
c->frequency = p->Frequency; c->frequency = p->frequency;
client->fe_status = sms_to_status(p->IsDemodLocked, 0); client->fe_status = sms_to_status(p->is_demod_locked, 0);
c->bandwidth_hz = sms_to_bw(p->Bandwidth); c->bandwidth_hz = sms_to_bw(p->bandwidth);
c->transmission_mode = sms_to_mode(p->TransmissionMode); c->transmission_mode = sms_to_mode(p->transmission_mode);
c->guard_interval = sms_to_guard_interval(p->GuardInterval); c->guard_interval = sms_to_guard_interval(p->guard_interval);
c->code_rate_HP = sms_to_code_rate(p->CodeRate); c->code_rate_HP = sms_to_code_rate(p->code_rate);
c->code_rate_LP = sms_to_code_rate(p->LPCodeRate); c->code_rate_LP = sms_to_code_rate(p->lp_code_rate);
c->hierarchy = sms_to_hierarchy(p->Hierarchy); c->hierarchy = sms_to_hierarchy(p->hierarchy);
c->modulation = sms_to_modulation(p->Constellation); c->modulation = sms_to_modulation(p->constellation);
/* update reception data */ /* update reception data */
c->lna = p->IsExternalLNAOn ? 1 : 0; c->lna = p->is_external_lna_on ? 1 : 0;
/* Carrier to Noise ratio, in DB */ /* Carrier to noise ratio, in DB */
c->cnr.stat[0].svalue = p->SNR * 1000; c->cnr.stat[0].svalue = p->SNR * 1000;
/* Signal Strength, in DBm */ /* signal Strength, in DBm */
c->strength.stat[0].uvalue = p->InBandPwr * 1000; c->strength.stat[0].uvalue = p->in_band_pwr * 1000;
/* PER/BER requires demod lock */ /* PER/BER requires demod lock */
if (!p->IsDemodLocked) if (!p->is_demod_locked)
return; return;
/* TS PER */ /* TS PER */
client->last_per = c->block_error.stat[0].uvalue; client->last_per = c->block_error.stat[0].uvalue;
c->block_error.stat[0].scale = FE_SCALE_COUNTER; c->block_error.stat[0].scale = FE_SCALE_COUNTER;
c->block_count.stat[0].scale = FE_SCALE_COUNTER; c->block_count.stat[0].scale = FE_SCALE_COUNTER;
c->block_error.stat[0].uvalue += p->ErrorTSPackets; c->block_error.stat[0].uvalue += p->error_ts_packets;
c->block_count.stat[0].uvalue += p->TotalTSPackets; c->block_count.stat[0].uvalue += p->total_ts_packets;
/* BER */ /* BER */
c->post_bit_error.stat[0].scale = FE_SCALE_COUNTER; c->post_bit_error.stat[0].scale = FE_SCALE_COUNTER;
c->post_bit_count.stat[0].scale = FE_SCALE_COUNTER; c->post_bit_count.stat[0].scale = FE_SCALE_COUNTER;
c->post_bit_error.stat[0].uvalue += p->BERErrorCount; c->post_bit_error.stat[0].uvalue += p->ber_error_count;
c->post_bit_count.stat[0].uvalue += p->BERBitCount; c->post_bit_count.stat[0].uvalue += p->ber_bit_count;
/* Legacy PER/BER */ /* Legacy PER/BER */
client->legacy_ber = p->BER; client->legacy_ber = p->BER;
...@@ -339,26 +339,26 @@ static void smsdvb_update_isdbt_stats(struct smsdvb_client_t *client, ...@@ -339,26 +339,26 @@ static void smsdvb_update_isdbt_stats(struct smsdvb_client_t *client,
if (client->prt_isdb_stats) if (client->prt_isdb_stats)
client->prt_isdb_stats(client->debug_data, p); client->prt_isdb_stats(client->debug_data, p);
client->fe_status = sms_to_status(p->IsDemodLocked, p->IsRfLocked); client->fe_status = sms_to_status(p->is_demod_locked, p->is_rf_locked);
/* /*
* Firmware 2.1 seems to report only lock status and * Firmware 2.1 seems to report only lock status and
* Signal strength. The signal strength indicator is at the * signal strength. The signal strength indicator is at the
* wrong field. * wrong field.
*/ */
if (p->StatisticsType == 0) { if (p->statistics_type == 0) {
c->strength.stat[0].uvalue = ((s32)p->TransmissionMode) * 1000; c->strength.stat[0].uvalue = ((s32)p->transmission_mode) * 1000;
c->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE; c->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
return; return;
} }
/* Update ISDB-T transmission parameters */ /* Update ISDB-T transmission parameters */
c->frequency = p->Frequency; c->frequency = p->frequency;
c->bandwidth_hz = sms_to_bw(p->Bandwidth); c->bandwidth_hz = sms_to_bw(p->bandwidth);
c->transmission_mode = sms_to_mode(p->TransmissionMode); c->transmission_mode = sms_to_mode(p->transmission_mode);
c->guard_interval = sms_to_guard_interval(p->GuardInterval); c->guard_interval = sms_to_guard_interval(p->guard_interval);
c->isdbt_partial_reception = p->PartialReception ? 1 : 0; c->isdbt_partial_reception = p->partial_reception ? 1 : 0;
n_layers = p->NumOfLayers; n_layers = p->num_of_layers;
if (n_layers < 1) if (n_layers < 1)
n_layers = 1; n_layers = 1;
if (n_layers > 3) if (n_layers > 3)
...@@ -366,16 +366,16 @@ static void smsdvb_update_isdbt_stats(struct smsdvb_client_t *client, ...@@ -366,16 +366,16 @@ static void smsdvb_update_isdbt_stats(struct smsdvb_client_t *client,
c->isdbt_layer_enabled = 0; c->isdbt_layer_enabled = 0;
/* update reception data */ /* update reception data */
c->lna = p->IsExternalLNAOn ? 1 : 0; c->lna = p->is_external_lna_on ? 1 : 0;
/* Carrier to Noise ratio, in DB */ /* Carrier to noise ratio, in DB */
c->cnr.stat[0].svalue = p->SNR * 1000; c->cnr.stat[0].svalue = p->SNR * 1000;
/* Signal Strength, in DBm */ /* signal Strength, in DBm */
c->strength.stat[0].uvalue = p->InBandPwr * 1000; c->strength.stat[0].uvalue = p->in_band_pwr * 1000;
/* PER/BER and per-layer stats require demod lock */ /* PER/BER and per-layer stats require demod lock */
if (!p->IsDemodLocked) if (!p->is_demod_locked)
return; return;
client->last_per = c->block_error.stat[0].uvalue; client->last_per = c->block_error.stat[0].uvalue;
...@@ -394,33 +394,33 @@ static void smsdvb_update_isdbt_stats(struct smsdvb_client_t *client, ...@@ -394,33 +394,33 @@ static void smsdvb_update_isdbt_stats(struct smsdvb_client_t *client,
lr = &p->LayerInfo[i]; lr = &p->LayerInfo[i];
/* Update per-layer transmission parameters */ /* Update per-layer transmission parameters */
if (lr->NumberOfSegments > 0 && lr->NumberOfSegments < 13) { if (lr->number_of_segments > 0 && lr->number_of_segments < 13) {
c->isdbt_layer_enabled |= 1 << i; c->isdbt_layer_enabled |= 1 << i;
c->layer[i].segment_count = lr->NumberOfSegments; c->layer[i].segment_count = lr->number_of_segments;
} else { } else {
continue; continue;
} }
c->layer[i].modulation = sms_to_modulation(lr->Constellation); c->layer[i].modulation = sms_to_modulation(lr->constellation);
/* TS PER */ /* TS PER */
c->block_error.stat[i + 1].scale = FE_SCALE_COUNTER; c->block_error.stat[i + 1].scale = FE_SCALE_COUNTER;
c->block_count.stat[i + 1].scale = FE_SCALE_COUNTER; c->block_count.stat[i + 1].scale = FE_SCALE_COUNTER;
c->block_error.stat[i + 1].uvalue += lr->ErrorTSPackets; c->block_error.stat[i + 1].uvalue += lr->error_ts_packets;
c->block_count.stat[i + 1].uvalue += lr->TotalTSPackets; c->block_count.stat[i + 1].uvalue += lr->total_ts_packets;
/* Update global PER counter */ /* Update global PER counter */
c->block_error.stat[0].uvalue += lr->ErrorTSPackets; c->block_error.stat[0].uvalue += lr->error_ts_packets;
c->block_count.stat[0].uvalue += lr->TotalTSPackets; c->block_count.stat[0].uvalue += lr->total_ts_packets;
/* BER */ /* BER */
c->post_bit_error.stat[i + 1].scale = FE_SCALE_COUNTER; c->post_bit_error.stat[i + 1].scale = FE_SCALE_COUNTER;
c->post_bit_count.stat[i + 1].scale = FE_SCALE_COUNTER; c->post_bit_count.stat[i + 1].scale = FE_SCALE_COUNTER;
c->post_bit_error.stat[i + 1].uvalue += lr->BERErrorCount; c->post_bit_error.stat[i + 1].uvalue += lr->ber_error_count;
c->post_bit_count.stat[i + 1].uvalue += lr->BERBitCount; c->post_bit_count.stat[i + 1].uvalue += lr->ber_bit_count;
/* Update global BER counter */ /* Update global BER counter */
c->post_bit_error.stat[0].uvalue += lr->BERErrorCount; c->post_bit_error.stat[0].uvalue += lr->ber_error_count;
c->post_bit_count.stat[0].uvalue += lr->BERBitCount; c->post_bit_count.stat[0].uvalue += lr->ber_bit_count;
} }
} }
...@@ -436,13 +436,13 @@ static void smsdvb_update_isdbt_stats_ex(struct smsdvb_client_t *client, ...@@ -436,13 +436,13 @@ static void smsdvb_update_isdbt_stats_ex(struct smsdvb_client_t *client,
client->prt_isdb_stats_ex(client->debug_data, p); client->prt_isdb_stats_ex(client->debug_data, p);
/* Update ISDB-T transmission parameters */ /* Update ISDB-T transmission parameters */
c->frequency = p->Frequency; c->frequency = p->frequency;
client->fe_status = sms_to_status(p->IsDemodLocked, 0); client->fe_status = sms_to_status(p->is_demod_locked, 0);
c->bandwidth_hz = sms_to_bw(p->Bandwidth); c->bandwidth_hz = sms_to_bw(p->bandwidth);
c->transmission_mode = sms_to_mode(p->TransmissionMode); c->transmission_mode = sms_to_mode(p->transmission_mode);
c->guard_interval = sms_to_guard_interval(p->GuardInterval); c->guard_interval = sms_to_guard_interval(p->guard_interval);
c->isdbt_partial_reception = p->PartialReception ? 1 : 0; c->isdbt_partial_reception = p->partial_reception ? 1 : 0;
n_layers = p->NumOfLayers; n_layers = p->num_of_layers;
if (n_layers < 1) if (n_layers < 1)
n_layers = 1; n_layers = 1;
if (n_layers > 3) if (n_layers > 3)
...@@ -450,16 +450,16 @@ static void smsdvb_update_isdbt_stats_ex(struct smsdvb_client_t *client, ...@@ -450,16 +450,16 @@ static void smsdvb_update_isdbt_stats_ex(struct smsdvb_client_t *client,
c->isdbt_layer_enabled = 0; c->isdbt_layer_enabled = 0;
/* update reception data */ /* update reception data */
c->lna = p->IsExternalLNAOn ? 1 : 0; c->lna = p->is_external_lna_on ? 1 : 0;
/* Carrier to Noise ratio, in DB */ /* Carrier to noise ratio, in DB */
c->cnr.stat[0].svalue = p->SNR * 1000; c->cnr.stat[0].svalue = p->SNR * 1000;
/* Signal Strength, in DBm */ /* signal Strength, in DBm */
c->strength.stat[0].uvalue = p->InBandPwr * 1000; c->strength.stat[0].uvalue = p->in_band_pwr * 1000;
/* PER/BER and per-layer stats require demod lock */ /* PER/BER and per-layer stats require demod lock */
if (!p->IsDemodLocked) if (!p->is_demod_locked)
return; return;
client->last_per = c->block_error.stat[0].uvalue; client->last_per = c->block_error.stat[0].uvalue;
...@@ -482,47 +482,47 @@ static void smsdvb_update_isdbt_stats_ex(struct smsdvb_client_t *client, ...@@ -482,47 +482,47 @@ static void smsdvb_update_isdbt_stats_ex(struct smsdvb_client_t *client,
lr = &p->LayerInfo[i]; lr = &p->LayerInfo[i];
/* Update per-layer transmission parameters */ /* Update per-layer transmission parameters */
if (lr->NumberOfSegments > 0 && lr->NumberOfSegments < 13) { if (lr->number_of_segments > 0 && lr->number_of_segments < 13) {
c->isdbt_layer_enabled |= 1 << i; c->isdbt_layer_enabled |= 1 << i;
c->layer[i].segment_count = lr->NumberOfSegments; c->layer[i].segment_count = lr->number_of_segments;
} else { } else {
continue; continue;
} }
c->layer[i].modulation = sms_to_modulation(lr->Constellation); c->layer[i].modulation = sms_to_modulation(lr->constellation);
/* TS PER */ /* TS PER */
c->block_error.stat[i + 1].scale = FE_SCALE_COUNTER; c->block_error.stat[i + 1].scale = FE_SCALE_COUNTER;
c->block_count.stat[i + 1].scale = FE_SCALE_COUNTER; c->block_count.stat[i + 1].scale = FE_SCALE_COUNTER;
c->block_error.stat[i + 1].uvalue += lr->ErrorTSPackets; c->block_error.stat[i + 1].uvalue += lr->error_ts_packets;
c->block_count.stat[i + 1].uvalue += lr->TotalTSPackets; c->block_count.stat[i + 1].uvalue += lr->total_ts_packets;
/* Update global PER counter */ /* Update global PER counter */
c->block_error.stat[0].uvalue += lr->ErrorTSPackets; c->block_error.stat[0].uvalue += lr->error_ts_packets;
c->block_count.stat[0].uvalue += lr->TotalTSPackets; c->block_count.stat[0].uvalue += lr->total_ts_packets;
/* BER */ /* BER */
c->post_bit_error.stat[i + 1].scale = FE_SCALE_COUNTER; c->post_bit_error.stat[i + 1].scale = FE_SCALE_COUNTER;
c->post_bit_count.stat[i + 1].scale = FE_SCALE_COUNTER; c->post_bit_count.stat[i + 1].scale = FE_SCALE_COUNTER;
c->post_bit_error.stat[i + 1].uvalue += lr->BERErrorCount; c->post_bit_error.stat[i + 1].uvalue += lr->ber_error_count;
c->post_bit_count.stat[i + 1].uvalue += lr->BERBitCount; c->post_bit_count.stat[i + 1].uvalue += lr->ber_bit_count;
/* Update global BER counter */ /* Update global BER counter */
c->post_bit_error.stat[0].uvalue += lr->BERErrorCount; c->post_bit_error.stat[0].uvalue += lr->ber_error_count;
c->post_bit_count.stat[0].uvalue += lr->BERBitCount; c->post_bit_count.stat[0].uvalue += lr->ber_bit_count;
} }
} }
static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb) static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
{ {
struct smsdvb_client_t *client = (struct smsdvb_client_t *) context; struct smsdvb_client_t *client = (struct smsdvb_client_t *) context;
struct SmsMsgHdr_ST *phdr = (struct SmsMsgHdr_ST *) (((u8 *) cb->p) struct sms_msg_hdr *phdr = (struct sms_msg_hdr *) (((u8 *) cb->p)
+ cb->offset); + cb->offset);
void *p = phdr + 1; void *p = phdr + 1;
struct dvb_frontend *fe = &client->frontend; struct dvb_frontend *fe = &client->frontend;
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
bool is_status_update = false; bool is_status_update = false;
switch (phdr->msgType) { switch (phdr->msg_type) {
case MSG_SMS_DVBT_BDA_DATA: case MSG_SMS_DVBT_BDA_DATA:
/* /*
* Only feed data to dvb demux if are there any feed listening * Only feed data to dvb demux if are there any feed listening
...@@ -530,7 +530,7 @@ static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb) ...@@ -530,7 +530,7 @@ static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
*/ */
if (client->feed_users && client->has_tuned) if (client->feed_users && client->has_tuned)
dvb_dmx_swfilter(&client->demux, p, dvb_dmx_swfilter(&client->demux, p,
cb->size - sizeof(struct SmsMsgHdr_ST)); cb->size - sizeof(struct sms_msg_hdr));
break; break;
case MSG_SMS_RF_TUNE_RES: case MSG_SMS_RF_TUNE_RES:
...@@ -571,7 +571,7 @@ static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb) ...@@ -571,7 +571,7 @@ static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
smsdvb_update_isdbt_stats(client, p); smsdvb_update_isdbt_stats(client, p);
break; break;
default: default:
/* Skip SmsMsgStatisticsInfo_ST:RequestResult field */ /* Skip sms_msg_statistics_info:request_result field */
smsdvb_update_dvb_stats(client, p + sizeof(u32)); smsdvb_update_dvb_stats(client, p + sizeof(u32));
} }
...@@ -580,7 +580,7 @@ static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb) ...@@ -580,7 +580,7 @@ static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
/* Only for ISDB-T */ /* Only for ISDB-T */
case MSG_SMS_GET_STATISTICS_EX_RES: case MSG_SMS_GET_STATISTICS_EX_RES:
/* Skip SmsMsgStatisticsInfo_ST:RequestResult field? */ /* Skip sms_msg_statistics_info:request_result field? */
smsdvb_update_isdbt_stats_ex(client, p + sizeof(u32)); smsdvb_update_isdbt_stats_ex(client, p + sizeof(u32));
is_status_update = true; is_status_update = true;
break; break;
...@@ -636,18 +636,18 @@ static int smsdvb_start_feed(struct dvb_demux_feed *feed) ...@@ -636,18 +636,18 @@ static int smsdvb_start_feed(struct dvb_demux_feed *feed)
{ {
struct smsdvb_client_t *client = struct smsdvb_client_t *client =
container_of(feed->demux, struct smsdvb_client_t, demux); container_of(feed->demux, struct smsdvb_client_t, demux);
struct SmsMsgData_ST PidMsg; struct sms_msg_data PidMsg;
sms_debug("add pid %d(%x)", sms_debug("add pid %d(%x)",
feed->pid, feed->pid); feed->pid, feed->pid);
client->feed_users++; client->feed_users++;
PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; PidMsg.x_msg_header.msg_src_id = DVBT_BDA_CONTROL_MSG_ID;
PidMsg.xMsgHeader.msgDstId = HIF_TASK; PidMsg.x_msg_header.msg_dst_id = HIF_TASK;
PidMsg.xMsgHeader.msgFlags = 0; PidMsg.x_msg_header.msg_flags = 0;
PidMsg.xMsgHeader.msgType = MSG_SMS_ADD_PID_FILTER_REQ; PidMsg.x_msg_header.msg_type = MSG_SMS_ADD_PID_FILTER_REQ;
PidMsg.xMsgHeader.msgLength = sizeof(PidMsg); PidMsg.x_msg_header.msg_length = sizeof(PidMsg);
PidMsg.msgData[0] = feed->pid; PidMsg.msgData[0] = feed->pid;
return smsclient_sendrequest(client->smsclient, return smsclient_sendrequest(client->smsclient,
...@@ -658,18 +658,18 @@ static int smsdvb_stop_feed(struct dvb_demux_feed *feed) ...@@ -658,18 +658,18 @@ static int smsdvb_stop_feed(struct dvb_demux_feed *feed)
{ {
struct smsdvb_client_t *client = struct smsdvb_client_t *client =
container_of(feed->demux, struct smsdvb_client_t, demux); container_of(feed->demux, struct smsdvb_client_t, demux);
struct SmsMsgData_ST PidMsg; struct sms_msg_data PidMsg;
sms_debug("remove pid %d(%x)", sms_debug("remove pid %d(%x)",
feed->pid, feed->pid); feed->pid, feed->pid);
client->feed_users--; client->feed_users--;
PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; PidMsg.x_msg_header.msg_src_id = DVBT_BDA_CONTROL_MSG_ID;
PidMsg.xMsgHeader.msgDstId = HIF_TASK; PidMsg.x_msg_header.msg_dst_id = HIF_TASK;
PidMsg.xMsgHeader.msgFlags = 0; PidMsg.x_msg_header.msg_flags = 0;
PidMsg.xMsgHeader.msgType = MSG_SMS_REMOVE_PID_FILTER_REQ; PidMsg.x_msg_header.msg_type = MSG_SMS_REMOVE_PID_FILTER_REQ;
PidMsg.xMsgHeader.msgLength = sizeof(PidMsg); PidMsg.x_msg_header.msg_length = sizeof(PidMsg);
PidMsg.msgData[0] = feed->pid; PidMsg.msgData[0] = feed->pid;
return smsclient_sendrequest(client->smsclient, return smsclient_sendrequest(client->smsclient,
...@@ -694,7 +694,7 @@ static int smsdvb_sendrequest_and_wait(struct smsdvb_client_t *client, ...@@ -694,7 +694,7 @@ static int smsdvb_sendrequest_and_wait(struct smsdvb_client_t *client,
static int smsdvb_send_statistics_request(struct smsdvb_client_t *client) static int smsdvb_send_statistics_request(struct smsdvb_client_t *client)
{ {
int rc; int rc;
struct SmsMsgHdr_ST Msg; struct sms_msg_hdr Msg;
/* Don't request stats too fast */ /* Don't request stats too fast */
if (client->get_stats_jiffies && if (client->get_stats_jiffies &&
...@@ -702,10 +702,10 @@ static int smsdvb_send_statistics_request(struct smsdvb_client_t *client) ...@@ -702,10 +702,10 @@ static int smsdvb_send_statistics_request(struct smsdvb_client_t *client)
return 0; return 0;
client->get_stats_jiffies = jiffies + msecs_to_jiffies(100); client->get_stats_jiffies = jiffies + msecs_to_jiffies(100);
Msg.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; Msg.msg_src_id = DVBT_BDA_CONTROL_MSG_ID;
Msg.msgDstId = HIF_TASK; Msg.msg_dst_id = HIF_TASK;
Msg.msgFlags = 0; Msg.msg_flags = 0;
Msg.msgLength = sizeof(Msg); Msg.msg_length = sizeof(Msg);
switch (smscore_get_device_mode(client->coredev)) { switch (smscore_get_device_mode(client->coredev)) {
case DEVICE_MODE_ISDBT: case DEVICE_MODE_ISDBT:
...@@ -714,12 +714,12 @@ static int smsdvb_send_statistics_request(struct smsdvb_client_t *client) ...@@ -714,12 +714,12 @@ static int smsdvb_send_statistics_request(struct smsdvb_client_t *client)
* Check for firmware version, to avoid breaking for old cards * Check for firmware version, to avoid breaking for old cards
*/ */
if (client->coredev->fw_version >= 0x800) if (client->coredev->fw_version >= 0x800)
Msg.msgType = MSG_SMS_GET_STATISTICS_EX_REQ; Msg.msg_type = MSG_SMS_GET_STATISTICS_EX_REQ;
else else
Msg.msgType = MSG_SMS_GET_STATISTICS_REQ; Msg.msg_type = MSG_SMS_GET_STATISTICS_REQ;
break; break;
default: default:
Msg.msgType = MSG_SMS_GET_STATISTICS_REQ; Msg.msg_type = MSG_SMS_GET_STATISTICS_REQ;
} }
rc = smsdvb_sendrequest_and_wait(client, &Msg, sizeof(Msg), rc = smsdvb_sendrequest_and_wait(client, &Msg, sizeof(Msg),
...@@ -845,7 +845,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe) ...@@ -845,7 +845,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe)
container_of(fe, struct smsdvb_client_t, frontend); container_of(fe, struct smsdvb_client_t, frontend);
struct { struct {
struct SmsMsgHdr_ST Msg; struct sms_msg_hdr Msg;
u32 Data[3]; u32 Data[3];
} Msg; } Msg;
...@@ -856,11 +856,11 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe) ...@@ -856,11 +856,11 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe)
client->event_unc_state = -1; client->event_unc_state = -1;
fe->dtv_property_cache.delivery_system = SYS_DVBT; fe->dtv_property_cache.delivery_system = SYS_DVBT;
Msg.Msg.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; Msg.Msg.msg_src_id = DVBT_BDA_CONTROL_MSG_ID;
Msg.Msg.msgDstId = HIF_TASK; Msg.Msg.msg_dst_id = HIF_TASK;
Msg.Msg.msgFlags = 0; Msg.Msg.msg_flags = 0;
Msg.Msg.msgType = MSG_SMS_RF_TUNE_REQ; Msg.Msg.msg_type = MSG_SMS_RF_TUNE_REQ;
Msg.Msg.msgLength = sizeof(Msg); Msg.Msg.msg_length = sizeof(Msg);
Msg.Data[0] = c->frequency; Msg.Data[0] = c->frequency;
Msg.Data[2] = 12000000; Msg.Data[2] = 12000000;
...@@ -915,17 +915,17 @@ static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe) ...@@ -915,17 +915,17 @@ static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe)
int ret; int ret;
struct { struct {
struct SmsMsgHdr_ST Msg; struct sms_msg_hdr Msg;
u32 Data[4]; u32 Data[4];
} Msg; } Msg;
fe->dtv_property_cache.delivery_system = SYS_ISDBT; fe->dtv_property_cache.delivery_system = SYS_ISDBT;
Msg.Msg.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; Msg.Msg.msg_src_id = DVBT_BDA_CONTROL_MSG_ID;
Msg.Msg.msgDstId = HIF_TASK; Msg.Msg.msg_dst_id = HIF_TASK;
Msg.Msg.msgFlags = 0; Msg.Msg.msg_flags = 0;
Msg.Msg.msgType = MSG_SMS_ISDBT_TUNE_REQ; Msg.Msg.msg_type = MSG_SMS_ISDBT_TUNE_REQ;
Msg.Msg.msgLength = sizeof(Msg); Msg.Msg.msg_length = sizeof(Msg);
if (c->isdbt_sb_segment_idx == -1) if (c->isdbt_sb_segment_idx == -1)
c->isdbt_sb_segment_idx = 0; c->isdbt_sb_segment_idx = 0;
......
drivers/media/common/siano/smsdvb.h
浏览文件 @ dfef84fc
...@@ -57,7 +57,7 @@ struct smsdvb_client_t { ...@@ -57,7 +57,7 @@ struct smsdvb_client_t {
int feed_users; int feed_users;
bool has_tuned; bool has_tuned;
/* Stats debugfs data */ /* stats debugfs data */
struct dentry *debugfs; struct dentry *debugfs;
struct smsdvb_debugfs *debug_data; struct smsdvb_debugfs *debug_data;
...@@ -74,30 +74,30 @@ struct smsdvb_client_t { ...@@ -74,30 +74,30 @@ struct smsdvb_client_t {
struct RECEPTION_STATISTICS_PER_SLICES_S { struct RECEPTION_STATISTICS_PER_SLICES_S {
u32 result; u32 result;
u32 snr; u32 snr;
s32 inBandPower; s32 in_band_power;
u32 tsPackets; u32 ts_packets;
u32 etsPackets; u32 ets_packets;
u32 constellation; u32 constellation;
u32 hpCode; u32 hp_code;
u32 tpsSrvIndLP; u32 tps_srv_ind_lp;
u32 tpsSrvIndHP; u32 tps_srv_ind_hp;
u32 cellId; u32 cell_id;
u32 reason; u32 reason;
u32 requestId; u32 request_id;
u32 ModemState; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET */ u32 modem_state; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET */
u32 BER; /* Post Viterbi BER [1E-5] */ u32 BER; /* Post Viterbi BER [1E-5] */
s32 RSSI; /* dBm */ s32 RSSI; /* dBm */
s32 CarrierOffset; /* Carrier Offset in bin/1024 */ s32 carrier_offset; /* Carrier Offset in bin/1024 */
u32 IsRfLocked; /* 0 - not locked, 1 - locked */ u32 is_rf_locked; /* 0 - not locked, 1 - locked */
u32 IsDemodLocked; /* 0 - not locked, 1 - locked */ u32 is_demod_locked; /* 0 - not locked, 1 - locked */
u32 BERBitCount; /* Total number of SYNC bits. */ u32 ber_bit_count; /* Total number of SYNC bits. */
u32 BERErrorCount; /* Number of erronous SYNC bits. */ u32 ber_error_count; /* Number of erronous SYNC bits. */
s32 MRC_SNR; /* dB */ s32 MRC_SNR; /* dB */
s32 MRC_InBandPwr; /* In band power in dBM */ s32 mrc_in_band_pwr; /* In band power in dBM */
s32 MRC_RSSI; /* dBm */ s32 MRC_RSSI; /* dBm */
}; };
......
drivers/media/common/siano/smsendian.c
浏览文件 @ dfef84fc
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
void smsendian_handle_tx_message(void *buffer) void smsendian_handle_tx_message(void *buffer)
{ {
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
struct SmsMsgData_ST *msg = (struct SmsMsgData_ST *)buffer; struct sms_msg_data *msg = (struct sms_msg_data *)buffer;
int i; int i;
int msgWords; int msgWords;
switch (msg->xMsgHeader.msgType) { switch (msg->x_msg_header.msg_type) {
case MSG_SMS_DATA_DOWNLOAD_REQ: case MSG_SMS_DATA_DOWNLOAD_REQ:
{ {
msg->msgData[0] = le32_to_cpu(msg->msgData[0]); msg->msgData[0] = le32_to_cpu(msg->msgData[0]);
...@@ -40,8 +40,8 @@ void smsendian_handle_tx_message(void *buffer) ...@@ -40,8 +40,8 @@ void smsendian_handle_tx_message(void *buffer)
} }
default: default:
msgWords = (msg->xMsgHeader.msgLength - msgWords = (msg->x_msg_header.msg_length -
sizeof(struct SmsMsgHdr_ST))/4; sizeof(struct sms_msg_hdr))/4;
for (i = 0; i < msgWords; i++) for (i = 0; i < msgWords; i++)
msg->msgData[i] = le32_to_cpu(msg->msgData[i]); msg->msgData[i] = le32_to_cpu(msg->msgData[i]);
...@@ -55,16 +55,16 @@ EXPORT_SYMBOL_GPL(smsendian_handle_tx_message); ...@@ -55,16 +55,16 @@ EXPORT_SYMBOL_GPL(smsendian_handle_tx_message);
void smsendian_handle_rx_message(void *buffer) void smsendian_handle_rx_message(void *buffer)
{ {
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
struct SmsMsgData_ST *msg = (struct SmsMsgData_ST *)buffer; struct sms_msg_data *msg = (struct sms_msg_data *)buffer;
int i; int i;
int msgWords; int msgWords;
switch (msg->xMsgHeader.msgType) { switch (msg->x_msg_header.msg_type) {
case MSG_SMS_GET_VERSION_EX_RES: case MSG_SMS_GET_VERSION_EX_RES:
{ {
struct SmsVersionRes_ST *ver = struct sms_version_res *ver =
(struct SmsVersionRes_ST *) msg; (struct sms_version_res *) msg;
ver->ChipModel = le16_to_cpu(ver->ChipModel); ver->chip_model = le16_to_cpu(ver->chip_model);
break; break;
} }
...@@ -77,8 +77,8 @@ void smsendian_handle_rx_message(void *buffer) ...@@ -77,8 +77,8 @@ void smsendian_handle_rx_message(void *buffer)
default: default:
{ {
msgWords = (msg->xMsgHeader.msgLength - msgWords = (msg->x_msg_header.msg_length -
sizeof(struct SmsMsgHdr_ST))/4; sizeof(struct sms_msg_hdr))/4;
for (i = 0; i < msgWords; i++) for (i = 0; i < msgWords; i++)
msg->msgData[i] = le32_to_cpu(msg->msgData[i]); msg->msgData[i] = le32_to_cpu(msg->msgData[i]);
...@@ -93,11 +93,11 @@ EXPORT_SYMBOL_GPL(smsendian_handle_rx_message); ...@@ -93,11 +93,11 @@ EXPORT_SYMBOL_GPL(smsendian_handle_rx_message);
void smsendian_handle_message_header(void *msg) void smsendian_handle_message_header(void *msg)
{ {
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
struct SmsMsgHdr_ST *phdr = (struct SmsMsgHdr_ST *)msg; struct sms_msg_hdr *phdr = (struct sms_msg_hdr *)msg;
phdr->msgType = le16_to_cpu(phdr->msgType); phdr->msg_type = le16_to_cpu(phdr->msg_type);
phdr->msgLength = le16_to_cpu(phdr->msgLength); phdr->msg_length = le16_to_cpu(phdr->msg_length);
phdr->msgFlags = le16_to_cpu(phdr->msgFlags); phdr->msg_flags = le16_to_cpu(phdr->msg_flags);
#endif /* __BIG_ENDIAN */ #endif /* __BIG_ENDIAN */
} }
EXPORT_SYMBOL_GPL(smsendian_handle_message_header); EXPORT_SYMBOL_GPL(smsendian_handle_message_header);
drivers/media/mmc/siano/smssdio.c
浏览文件 @ dfef84fc
...@@ -98,7 +98,7 @@ static int smssdio_sendrequest(void *context, void *buffer, size_t size) ...@@ -98,7 +98,7 @@ static int smssdio_sendrequest(void *context, void *buffer, size_t size)
sdio_claim_host(smsdev->func); sdio_claim_host(smsdev->func);
smsendian_handle_tx_message((struct SmsMsgData_ST *) buffer); smsendian_handle_tx_message((struct sms_msg_data *) buffer);
while (size >= smsdev->func->cur_blksize) { while (size >= smsdev->func->cur_blksize) {
ret = sdio_memcpy_toio(smsdev->func, SMSSDIO_DATA, ret = sdio_memcpy_toio(smsdev->func, SMSSDIO_DATA,
buffer, smsdev->func->cur_blksize); buffer, smsdev->func->cur_blksize);
...@@ -130,7 +130,7 @@ static void smssdio_interrupt(struct sdio_func *func) ...@@ -130,7 +130,7 @@ static void smssdio_interrupt(struct sdio_func *func)
struct smssdio_device *smsdev; struct smssdio_device *smsdev;
struct smscore_buffer_t *cb; struct smscore_buffer_t *cb;
struct SmsMsgHdr_ST *hdr; struct sms_msg_hdr *hdr;
size_t size; size_t size;
smsdev = sdio_get_drvdata(func); smsdev = sdio_get_drvdata(func);
...@@ -163,20 +163,20 @@ static void smssdio_interrupt(struct sdio_func *func) ...@@ -163,20 +163,20 @@ static void smssdio_interrupt(struct sdio_func *func)
hdr = cb->p; hdr = cb->p;
if (hdr->msgFlags & MSG_HDR_FLAG_SPLIT_MSG) { if (hdr->msg_flags & MSG_HDR_FLAG_SPLIT_MSG) {
smsdev->split_cb = cb; smsdev->split_cb = cb;
return; return;
} }
if (hdr->msgLength > smsdev->func->cur_blksize) if (hdr->msg_length > smsdev->func->cur_blksize)
size = hdr->msgLength - smsdev->func->cur_blksize; size = hdr->msg_length - smsdev->func->cur_blksize;
else else
size = 0; size = 0;
} else { } else {
cb = smsdev->split_cb; cb = smsdev->split_cb;
hdr = cb->p; hdr = cb->p;
size = hdr->msgLength - sizeof(struct SmsMsgHdr_ST); size = hdr->msg_length - sizeof(struct sms_msg_hdr);
smsdev->split_cb = NULL; smsdev->split_cb = NULL;
} }
...@@ -184,7 +184,7 @@ static void smssdio_interrupt(struct sdio_func *func) ...@@ -184,7 +184,7 @@ static void smssdio_interrupt(struct sdio_func *func)
if (size) { if (size) {
void *buffer; void *buffer;
buffer = cb->p + (hdr->msgLength - size); buffer = cb->p + (hdr->msg_length - size);
size = ALIGN(size, SMSSDIO_BLOCK_SIZE); size = ALIGN(size, SMSSDIO_BLOCK_SIZE);
BUG_ON(smsdev->func->cur_blksize != SMSSDIO_BLOCK_SIZE); BUG_ON(smsdev->func->cur_blksize != SMSSDIO_BLOCK_SIZE);
...@@ -230,10 +230,10 @@ static void smssdio_interrupt(struct sdio_func *func) ...@@ -230,10 +230,10 @@ static void smssdio_interrupt(struct sdio_func *func)
} }
} }
cb->size = hdr->msgLength; cb->size = hdr->msg_length;
cb->offset = 0; cb->offset = 0;
smsendian_handle_rx_message((struct SmsMsgData_ST *) cb->p); smsendian_handle_rx_message((struct sms_msg_data *) cb->p);
smscore_onresponse(smsdev->coredev, cb); smscore_onresponse(smsdev->coredev, cb);
} }
......
drivers/media/usb/siano/smsusb.c
浏览文件 @ dfef84fc
...@@ -93,26 +93,26 @@ static void smsusb_onresponse(struct urb *urb) ...@@ -93,26 +93,26 @@ static void smsusb_onresponse(struct urb *urb)
} }
if ((urb->actual_length > 0) && (urb->status == 0)) { if ((urb->actual_length > 0) && (urb->status == 0)) {
struct SmsMsgHdr_ST *phdr = (struct SmsMsgHdr_ST *)surb->cb->p; struct sms_msg_hdr *phdr = (struct sms_msg_hdr *)surb->cb->p;
smsendian_handle_message_header(phdr); smsendian_handle_message_header(phdr);
if (urb->actual_length >= phdr->msgLength) { if (urb->actual_length >= phdr->msg_length) {
surb->cb->size = phdr->msgLength; surb->cb->size = phdr->msg_length;
if (dev->response_alignment && if (dev->response_alignment &&
(phdr->msgFlags & MSG_HDR_FLAG_SPLIT_MSG)) { (phdr->msg_flags & MSG_HDR_FLAG_SPLIT_MSG)) {
surb->cb->offset = surb->cb->offset =
dev->response_alignment + dev->response_alignment +
((phdr->msgFlags >> 8) & 3); ((phdr->msg_flags >> 8) & 3);
/* sanity check */ /* sanity check */
if (((int) phdr->msgLength + if (((int) phdr->msg_length +
surb->cb->offset) > urb->actual_length) { surb->cb->offset) > urb->actual_length) {
sms_err("invalid response " sms_err("invalid response "
"msglen %d offset %d " "msglen %d offset %d "
"size %d", "size %d",
phdr->msgLength, phdr->msg_length,
surb->cb->offset, surb->cb->offset,
urb->actual_length); urb->actual_length);
goto exit_and_resubmit; goto exit_and_resubmit;
...@@ -121,22 +121,22 @@ static void smsusb_onresponse(struct urb *urb) ...@@ -121,22 +121,22 @@ static void smsusb_onresponse(struct urb *urb)
/* move buffer pointer and /* move buffer pointer and
* copy header to its new location */ * copy header to its new location */
memcpy((char *) phdr + surb->cb->offset, memcpy((char *) phdr + surb->cb->offset,
phdr, sizeof(struct SmsMsgHdr_ST)); phdr, sizeof(struct sms_msg_hdr));
} else } else
surb->cb->offset = 0; surb->cb->offset = 0;
sms_debug("received %s(%d) size: %d", sms_debug("received %s(%d) size: %d",
smscore_translate_msg(phdr->msgType), smscore_translate_msg(phdr->msg_type),
phdr->msgType, phdr->msgLength); phdr->msg_type, phdr->msg_length);
smsendian_handle_rx_message((struct SmsMsgData_ST *) phdr); smsendian_handle_rx_message((struct sms_msg_data *) phdr);
smscore_onresponse(dev->coredev, surb->cb); smscore_onresponse(dev->coredev, surb->cb);
surb->cb = NULL; surb->cb = NULL;
} else { } else {
sms_err("invalid response " sms_err("invalid response "
"msglen %d actual %d", "msglen %d actual %d",
phdr->msgLength, urb->actual_length); phdr->msg_length, urb->actual_length);
} }
} else } else
sms_err("error, urb status %d, %d bytes", sms_err("error, urb status %d, %d bytes",
...@@ -206,18 +206,18 @@ static int smsusb_start_streaming(struct smsusb_device_t *dev) ...@@ -206,18 +206,18 @@ static int smsusb_start_streaming(struct smsusb_device_t *dev)
static int smsusb_sendrequest(void *context, void *buffer, size_t size) static int smsusb_sendrequest(void *context, void *buffer, size_t size)
{ {
struct smsusb_device_t *dev = (struct smsusb_device_t *) context; struct smsusb_device_t *dev = (struct smsusb_device_t *) context;
struct SmsMsgHdr_ST *phdr = (struct SmsMsgHdr_ST *) buffer; struct sms_msg_hdr *phdr = (struct sms_msg_hdr *) buffer;
int dummy; int dummy;
if (dev->state != SMSUSB_ACTIVE) if (dev->state != SMSUSB_ACTIVE)
return -ENOENT; return -ENOENT;
sms_debug("sending %s(%d) size: %d", sms_debug("sending %s(%d) size: %d",
smscore_translate_msg(phdr->msgType), phdr->msgType, smscore_translate_msg(phdr->msg_type), phdr->msg_type,
phdr->msgLength); phdr->msg_length);
smsendian_handle_tx_message((struct SmsMsgData_ST *) phdr); smsendian_handle_tx_message((struct sms_msg_data *) phdr);
smsendian_handle_message_header((struct SmsMsgHdr_ST *)buffer); smsendian_handle_message_header((struct sms_msg_hdr *)buffer);
return usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 2), return usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 2),
buffer, size, &dummy, 1000); buffer, size, &dummy, 1000);
} }
...@@ -310,8 +310,8 @@ static void smsusb1_detectmode(void *context, int *mode) ...@@ -310,8 +310,8 @@ static void smsusb1_detectmode(void *context, int *mode)
static int smsusb1_setmode(void *context, int mode) static int smsusb1_setmode(void *context, int mode)
{ {
struct SmsMsgHdr_ST Msg = { MSG_SW_RELOAD_REQ, 0, HIF_TASK, struct sms_msg_hdr Msg = { MSG_SW_RELOAD_REQ, 0, HIF_TASK,
sizeof(struct SmsMsgHdr_ST), 0 }; sizeof(struct sms_msg_hdr), 0 };
if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA) { if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA) {
sms_err("invalid firmware id specified %d", mode); sms_err("invalid firmware id specified %d", mode);
...@@ -375,7 +375,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) ...@@ -375,7 +375,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
dev->buffer_size = USB2_BUFFER_SIZE; dev->buffer_size = USB2_BUFFER_SIZE;
dev->response_alignment = dev->response_alignment =
le16_to_cpu(dev->udev->ep_in[1]->desc.wMaxPacketSize) - le16_to_cpu(dev->udev->ep_in[1]->desc.wMaxPacketSize) -
sizeof(struct SmsMsgHdr_ST); sizeof(struct sms_msg_hdr);
params.flags |= SMS_DEVICE_FAMILY2; params.flags |= SMS_DEVICE_FAMILY2;
break; break;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或