diff options
| -rw-r--r-- | drivers/media/common/siano/sms-cards.c | 12 | ||||
| -rw-r--r-- | drivers/media/common/siano/smscoreapi.c | 336 | ||||
| -rw-r--r-- | drivers/media/common/siano/smscoreapi.h | 420 | ||||
| -rw-r--r-- | drivers/media/common/siano/smsdvb-debugfs.c | 230 | ||||
| -rw-r--r-- | drivers/media/common/siano/smsdvb-main.c | 250 | ||||
| -rw-r--r-- | drivers/media/common/siano/smsdvb.h | 32 | ||||
| -rw-r--r-- | drivers/media/common/siano/smsendian.c | 30 | ||||
| -rw-r--r-- | drivers/media/mmc/siano/smssdio.c | 18 | ||||
| -rw-r--r-- | drivers/media/usb/siano/smsusb.c | 40 |
9 files changed, 684 insertions, 684 deletions
diff --git a/drivers/media/common/siano/sms-cards.c b/drivers/media/common/siano/sms-cards.c index 6680134d2336..9bd7aa1f43ec 100644 --- a/drivers/media/common/siano/sms-cards.c +++ b/drivers/media/common/siano/sms-cards.c @@ -167,13 +167,13 @@ struct sms_board *sms_get_board(unsigned id) } EXPORT_SYMBOL_GPL(sms_get_board); static inline void sms_gpio_assign_11xx_default_led_config( - struct smscore_config_gpio *pGpioConfig) { - pGpioConfig->direction = SMS_GPIO_DIRECTION_OUTPUT; - pGpioConfig->inputcharacteristics = + struct smscore_config_gpio *p_gpio_config) { + p_gpio_config->direction = SMS_GPIO_DIRECTION_OUTPUT; + p_gpio_config->inputcharacteristics = SMS_GPIO_INPUTCHARACTERISTICS_NORMAL; - pGpioConfig->outputdriving = SMS_GPIO_OUTPUTDRIVING_4mA; - pGpioConfig->outputslewrate = SMS_GPIO_OUTPUT_SLEW_RATE_0_45_V_NS; - pGpioConfig->pullupdown = SMS_GPIO_PULLUPDOWN_NONE; + p_gpio_config->outputdriving = SMS_GPIO_OUTPUTDRIVING_4mA; + p_gpio_config->outputslewrate = SMS_GPIO_OUTPUT_SLEW_RATE_0_45_V_NS; + p_gpio_config->pullupdown = SMS_GPIO_PULLUPDOWN_NONE; } int sms_board_event(struct smscore_device_t *coredev, diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c index 5006d1ce2806..e5fa4056adb3 100644 --- a/drivers/media/common/siano/smscoreapi.c +++ b/drivers/media/common/siano/smscoreapi.c @@ -792,22 +792,22 @@ static int smscore_init_ir(struct smscore_device_t *coredev) if (rc != 0) sms_err("Error initialization DTV IR sub-module"); else { - buffer = kmalloc(sizeof(struct SmsMsgData_ST2) + + buffer = kmalloc(sizeof(struct sms_msg_data2) + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA); if (buffer) { - struct SmsMsgData_ST2 *msg = - (struct SmsMsgData_ST2 *) + struct sms_msg_data2 *msg = + (struct sms_msg_data2 *) SMS_ALIGN_ADDRESS(buffer); - SMS_INIT_MSG(&msg->xMsgHeader, + SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_START_IR_REQ, - sizeof(struct SmsMsgData_ST2)); + sizeof(struct sms_msg_data2)); msg->msgData[0] = coredev->ir.controller; msg->msgData[1] = coredev->ir.timeout; rc = smscore_sendrequest_and_wait(coredev, msg, - msg->xMsgHeader. msgLength, + msg->x_msg_header. msg_length, &coredev->ir_init_done); kfree(buffer); @@ -840,14 +840,14 @@ int smscore_configure_board(struct smscore_device_t *coredev) } if (board->mtu) { - struct SmsMsgData_ST MtuMsg; + struct sms_msg_data MtuMsg; sms_debug("set max transmit unit %d", board->mtu); - MtuMsg.xMsgHeader.msgSrcId = 0; - MtuMsg.xMsgHeader.msgDstId = HIF_TASK; - MtuMsg.xMsgHeader.msgFlags = 0; - MtuMsg.xMsgHeader.msgType = MSG_SMS_SET_MAX_TX_MSG_LEN_REQ; - MtuMsg.xMsgHeader.msgLength = sizeof(MtuMsg); + MtuMsg.x_msg_header.msg_src_id = 0; + MtuMsg.x_msg_header.msg_dst_id = HIF_TASK; + MtuMsg.x_msg_header.msg_flags = 0; + MtuMsg.x_msg_header.msg_type = MSG_SMS_SET_MAX_TX_MSG_LEN_REQ; + MtuMsg.x_msg_header.msg_length = sizeof(MtuMsg); MtuMsg.msgData[0] = board->mtu; coredev->sendrequest_handler(coredev->context, &MtuMsg, @@ -855,10 +855,10 @@ int smscore_configure_board(struct smscore_device_t *coredev) } if (board->crystal) { - struct SmsMsgData_ST CrysMsg; + struct sms_msg_data CrysMsg; sms_debug("set crystal value %d", board->crystal); - SMS_INIT_MSG(&CrysMsg.xMsgHeader, + SMS_INIT_MSG(&CrysMsg.x_msg_header, MSG_SMS_NEW_CRYSTAL_REQ, sizeof(CrysMsg)); CrysMsg.msgData[0] = board->crystal; @@ -916,19 +916,19 @@ EXPORT_SYMBOL_GPL(smscore_start_device); static int smscore_load_firmware_family2(struct smscore_device_t *coredev, void *buffer, size_t size) { - struct SmsFirmware_ST *firmware = (struct SmsFirmware_ST *) buffer; - struct SmsMsgData_ST4 *msg; + struct sms_firmware *firmware = (struct sms_firmware *) buffer; + struct sms_msg_data4 *msg; u32 mem_address, calc_checksum = 0; u32 i, *ptr; - u8 *payload = firmware->Payload; + u8 *payload = firmware->payload; int rc = 0; - firmware->StartAddress = le32_to_cpu(firmware->StartAddress); - firmware->Length = le32_to_cpu(firmware->Length); + firmware->start_address = le32_to_cpu(firmware->start_address); + firmware->length = le32_to_cpu(firmware->length); - mem_address = firmware->StartAddress; + mem_address = firmware->start_address; sms_info("loading FW to addr 0x%x size %d", - mem_address, firmware->Length); + mem_address, firmware->length); if (coredev->preload_handler) { rc = coredev->preload_handler(coredev->context); if (rc < 0) @@ -942,10 +942,10 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, if (coredev->mode != DEVICE_MODE_NONE) { sms_debug("sending reload command."); - SMS_INIT_MSG(&msg->xMsgHeader, MSG_SW_RELOAD_START_REQ, - sizeof(struct SmsMsgHdr_ST)); + SMS_INIT_MSG(&msg->x_msg_header, MSG_SW_RELOAD_START_REQ, + sizeof(struct sms_msg_hdr)); rc = smscore_sendrequest_and_wait(coredev, msg, - msg->xMsgHeader.msgLength, + msg->x_msg_header.msg_length, &coredev->reload_start_done); if (rc < 0) { sms_err("device reload failed, rc %d", rc); @@ -954,24 +954,24 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, mem_address = *(u32 *) &payload[20]; } - for (i = 0, ptr = (u32 *)firmware->Payload; i < firmware->Length/4 ; + for (i = 0, ptr = (u32 *)firmware->payload; i < firmware->length/4 ; i++, ptr++) calc_checksum += *ptr; while (size && rc >= 0) { - struct SmsDataDownload_ST *DataMsg = - (struct SmsDataDownload_ST *) msg; + struct sms_data_download *DataMsg = + (struct sms_data_download *) msg; int payload_size = min((int) size, SMS_MAX_PAYLOAD_SIZE); - SMS_INIT_MSG(&msg->xMsgHeader, MSG_SMS_DATA_DOWNLOAD_REQ, - (u16)(sizeof(struct SmsMsgHdr_ST) + + SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_DATA_DOWNLOAD_REQ, + (u16)(sizeof(struct sms_msg_hdr) + sizeof(u32) + payload_size)); - DataMsg->MemAddr = mem_address; - memcpy(DataMsg->Payload, payload, payload_size); + DataMsg->mem_addr = mem_address; + memcpy(DataMsg->payload, payload, payload_size); rc = smscore_sendrequest_and_wait(coredev, DataMsg, - DataMsg->xMsgHeader.msgLength, + DataMsg->x_msg_header.msg_length, &coredev->data_download_done); payload += payload_size; @@ -984,30 +984,30 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, sms_err("sending MSG_SMS_DATA_VALIDITY_REQ expecting 0x%x", calc_checksum); - SMS_INIT_MSG(&msg->xMsgHeader, MSG_SMS_DATA_VALIDITY_REQ, - sizeof(msg->xMsgHeader) + + SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_DATA_VALIDITY_REQ, + sizeof(msg->x_msg_header) + sizeof(u32) * 3); - msg->msgData[0] = firmware->StartAddress; + msg->msgData[0] = firmware->start_address; /* Entry point */ - msg->msgData[1] = firmware->Length; + msg->msgData[1] = firmware->length; msg->msgData[2] = 0; /* Regular checksum*/ rc = smscore_sendrequest_and_wait(coredev, msg, - msg->xMsgHeader.msgLength, + msg->x_msg_header.msg_length, &coredev->data_validity_done); if (rc < 0) goto exit_fw_download; if (coredev->mode == DEVICE_MODE_NONE) { - struct SmsMsgData_ST *TriggerMsg = - (struct SmsMsgData_ST *) msg; + struct sms_msg_data *TriggerMsg = + (struct sms_msg_data *) msg; sms_debug("sending MSG_SMS_SWDOWNLOAD_TRIGGER_REQ"); - SMS_INIT_MSG(&msg->xMsgHeader, + SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_SWDOWNLOAD_TRIGGER_REQ, - sizeof(struct SmsMsgHdr_ST) + + sizeof(struct sms_msg_hdr) + sizeof(u32) * 5); - TriggerMsg->msgData[0] = firmware->StartAddress; + TriggerMsg->msgData[0] = firmware->start_address; /* Entry point */ TriggerMsg->msgData[1] = 6; /* Priority */ TriggerMsg->msgData[2] = 0x200; /* Stack size */ @@ -1015,13 +1015,13 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, TriggerMsg->msgData[4] = 4; /* Task ID */ rc = smscore_sendrequest_and_wait(coredev, TriggerMsg, - TriggerMsg->xMsgHeader.msgLength, + TriggerMsg->x_msg_header.msg_length, &coredev->trigger_done); } else { - SMS_INIT_MSG(&msg->xMsgHeader, MSG_SW_RELOAD_EXEC_REQ, - sizeof(struct SmsMsgHdr_ST)); + SMS_INIT_MSG(&msg->x_msg_header, MSG_SW_RELOAD_EXEC_REQ, + sizeof(struct sms_msg_hdr)); rc = coredev->sendrequest_handler(coredev->context, msg, - msg->xMsgHeader.msgLength); + msg->x_msg_header.msg_length); } if (rc < 0) @@ -1256,19 +1256,19 @@ EXPORT_SYMBOL_GPL(smscore_unregister_device); static int smscore_detect_mode(struct smscore_device_t *coredev) { - void *buffer = kmalloc(sizeof(struct SmsMsgHdr_ST) + SMS_DMA_ALIGNMENT, + void *buffer = kmalloc(sizeof(struct sms_msg_hdr) + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA); - struct SmsMsgHdr_ST *msg = - (struct SmsMsgHdr_ST *) SMS_ALIGN_ADDRESS(buffer); + struct sms_msg_hdr *msg = + (struct sms_msg_hdr *) SMS_ALIGN_ADDRESS(buffer); int rc; if (!buffer) return -ENOMEM; SMS_INIT_MSG(msg, MSG_SMS_GET_VERSION_EX_REQ, - sizeof(struct SmsMsgHdr_ST)); + sizeof(struct sms_msg_hdr)); - rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, + rc = smscore_sendrequest_and_wait(coredev, msg, msg->msg_length, &coredev->version_ex_done); if (rc == -ETIME) { sms_err("MSG_SMS_GET_VERSION_EX_REQ failed first try"); @@ -1276,7 +1276,7 @@ static int smscore_detect_mode(struct smscore_device_t *coredev) if (wait_for_completion_timeout(&coredev->resume_done, msecs_to_jiffies(5000))) { rc = smscore_sendrequest_and_wait( - coredev, msg, msg->msgLength, + coredev, msg, msg->msg_length, &coredev->version_ex_done); if (rc < 0) sms_err("MSG_SMS_GET_VERSION_EX_REQ failed " @@ -1302,23 +1302,23 @@ static int smscore_detect_mode(struct smscore_device_t *coredev) int smscore_init_device(struct smscore_device_t *coredev, int mode) { void *buffer; - struct SmsMsgData_ST *msg; + struct sms_msg_data *msg; int rc = 0; - buffer = kmalloc(sizeof(struct SmsMsgData_ST) + + buffer = kmalloc(sizeof(struct sms_msg_data) + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA); if (!buffer) { sms_err("Could not allocate buffer for init device message."); return -ENOMEM; } - msg = (struct SmsMsgData_ST *)SMS_ALIGN_ADDRESS(buffer); - SMS_INIT_MSG(&msg->xMsgHeader, MSG_SMS_INIT_DEVICE_REQ, - sizeof(struct SmsMsgData_ST)); + msg = (struct sms_msg_data *)SMS_ALIGN_ADDRESS(buffer); + SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_INIT_DEVICE_REQ, + sizeof(struct sms_msg_data)); msg->msgData[0] = mode; rc = smscore_sendrequest_and_wait(coredev, msg, - msg->xMsgHeader. msgLength, + msg->x_msg_header. msg_length, &coredev->init_device_done); kfree(buffer); @@ -1396,17 +1396,17 @@ int smscore_set_device_mode(struct smscore_device_t *coredev, int mode) coredev->mode = mode; coredev->device_flags &= ~SMS_DEVICE_NOT_READY; - buffer = kmalloc(sizeof(struct SmsMsgData_ST) + + buffer = kmalloc(sizeof(struct sms_msg_data) + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA); if (buffer) { - struct SmsMsgData_ST *msg = (struct SmsMsgData_ST *) SMS_ALIGN_ADDRESS(buffer); + struct sms_msg_data *msg = (struct sms_msg_data *) SMS_ALIGN_ADDRESS(buffer); - SMS_INIT_MSG(&msg->xMsgHeader, MSG_SMS_INIT_DEVICE_REQ, - sizeof(struct SmsMsgData_ST)); + SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_INIT_DEVICE_REQ, + sizeof(struct sms_msg_data)); msg->msgData[0] = mode; rc = smscore_sendrequest_and_wait( - coredev, msg, msg->xMsgHeader.msgLength, + coredev, msg, msg->x_msg_header.msg_length, &coredev->init_device_done); kfree(buffer); @@ -1483,7 +1483,7 @@ found: */ void smscore_onresponse(struct smscore_device_t *coredev, struct smscore_buffer_t *cb) { - struct SmsMsgHdr_ST *phdr = (struct SmsMsgHdr_ST *) ((u8 *) cb->p + struct sms_msg_hdr *phdr = (struct sms_msg_hdr *) ((u8 *) cb->p + cb->offset); struct smscore_client_t *client; int rc = -EBUSY; @@ -1505,14 +1505,14 @@ void smscore_onresponse(struct smscore_device_t *coredev, data_total += cb->size; /* Do we need to re-route? */ - if ((phdr->msgType == MSG_SMS_HO_PER_SLICES_IND) || - (phdr->msgType == MSG_SMS_TRANSMISSION_IND)) { + if ((phdr->msg_type == MSG_SMS_HO_PER_SLICES_IND) || + (phdr->msg_type == MSG_SMS_TRANSMISSION_IND)) { if (coredev->mode == DEVICE_MODE_DVBT_BDA) - phdr->msgDstId = DVBT_BDA_CONTROL_MSG_ID; + phdr->msg_dst_id = DVBT_BDA_CONTROL_MSG_ID; } - client = smscore_find_client(coredev, phdr->msgType, phdr->msgDstId); + client = smscore_find_client(coredev, phdr->msg_type, phdr->msg_dst_id); /* If no client registered for type & id, * check for control client where type is not registered */ @@ -1520,7 +1520,7 @@ void smscore_onresponse(struct smscore_device_t *coredev, rc = client->onresponse_handler(client->context, cb); if (rc < 0) { - switch (phdr->msgType) { + switch (phdr->msg_type) { case MSG_SMS_ISDBT_TUNE_RES: break; case MSG_SMS_RF_TUNE_RES: @@ -1537,17 +1537,17 @@ void smscore_onresponse(struct smscore_device_t *coredev, break; case MSG_SMS_GET_VERSION_EX_RES: { - struct SmsVersionRes_ST *ver = - (struct SmsVersionRes_ST *) phdr; + struct sms_version_res *ver = + (struct sms_version_res *) phdr; sms_debug("Firmware id %d prots 0x%x ver %d.%d", - ver->FirmwareId, ver->SupportedProtocols, - ver->RomVersionMajor, ver->RomVersionMinor); + ver->firmware_id, ver->supported_protocols, + ver->rom_ver_major, ver->rom_ver_minor); - coredev->mode = ver->FirmwareId == 255 ? - DEVICE_MODE_NONE : ver->FirmwareId; - coredev->modes_supported = ver->SupportedProtocols; - coredev->fw_version = ver->RomVersionMajor << 8 | - ver->RomVersionMinor; + coredev->mode = ver->firmware_id == 255 ? + DEVICE_MODE_NONE : ver->firmware_id; + coredev->modes_supported = ver->supported_protocols; + coredev->fw_version = ver->rom_ver_major << 8 | + ver->rom_ver_minor; complete(&coredev->version_ex_done); break; @@ -1560,7 +1560,7 @@ void smscore_onresponse(struct smscore_device_t *coredev, break; case MSG_SMS_DATA_VALIDITY_RES: { - struct SmsMsgData_ST *validity = (struct SmsMsgData_ST *) phdr; + struct sms_msg_data *validity = (struct sms_msg_data *) phdr; sms_err("MSG_SMS_DATA_VALIDITY_RES, checksum = 0x%x", validity->msgData[0]); @@ -1600,9 +1600,9 @@ void smscore_onresponse(struct smscore_device_t *coredev, sms_ir_event(coredev, (const char *) ((char *)phdr - + sizeof(struct SmsMsgHdr_ST)), - (int)phdr->msgLength - - sizeof(struct SmsMsgHdr_ST)); + + sizeof(struct sms_msg_hdr)), + (int)phdr->msg_length + - sizeof(struct sms_msg_hdr)); break; case MSG_SMS_DVBT_BDA_DATA: @@ -1616,8 +1616,8 @@ void smscore_onresponse(struct smscore_device_t *coredev, default: sms_debug("message %s(%d) not handled.", - smscore_translate_msg(phdr->msgType), - phdr->msgType); + smscore_translate_msg(phdr->msg_type), + phdr->msg_type); break; } smscore_putbuffer(coredev, cb); @@ -1799,7 +1799,7 @@ int smsclient_sendrequest(struct smscore_client_t *client, void *buffer, size_t size) { struct smscore_device_t *coredev; - struct SmsMsgHdr_ST *phdr = (struct SmsMsgHdr_ST *) buffer; + struct sms_msg_hdr *phdr = (struct sms_msg_hdr *) buffer; int rc; if (client == NULL) { @@ -1816,7 +1816,7 @@ int smsclient_sendrequest(struct smscore_client_t *client, } rc = smscore_validate_client(client->coredev, client, 0, - phdr->msgSrcId); + phdr->msg_src_id); if (rc < 0) return rc; @@ -1830,16 +1830,16 @@ int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin, struct smscore_config_gpio *pinconfig) { struct { - struct SmsMsgHdr_ST hdr; + struct sms_msg_hdr hdr; u32 data[6]; } msg; if (coredev->device_flags & SMS_DEVICE_FAMILY2) { - msg.hdr.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; - msg.hdr.msgDstId = HIF_TASK; - msg.hdr.msgFlags = 0; - msg.hdr.msgType = MSG_SMS_GPIO_CONFIG_EX_REQ; - msg.hdr.msgLength = sizeof(msg); + msg.hdr.msg_src_id = DVBT_BDA_CONTROL_MSG_ID; + msg.hdr.msg_dst_id = HIF_TASK; + msg.hdr.msg_flags = 0; + msg.hdr.msg_type = MSG_SMS_GPIO_CONFIG_EX_REQ; + msg.hdr.msg_length = sizeof(msg); msg.data[0] = pin; msg.data[1] = pinconfig->pullupdown; @@ -1875,18 +1875,18 @@ int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin, int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level) { struct { - struct SmsMsgHdr_ST hdr; + struct sms_msg_hdr hdr; u32 data[3]; } msg; if (pin > MAX_GPIO_PIN_NUMBER) return -EINVAL; - msg.hdr.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; - msg.hdr.msgDstId = HIF_TASK; - msg.hdr.msgFlags = 0; - msg.hdr.msgType = MSG_SMS_GPIO_SET_LEVEL_REQ; - msg.hdr.msgLength = sizeof(msg); + msg.hdr.msg_src_id = DVBT_BDA_CONTROL_MSG_ID; + msg.hdr.msg_dst_id = HIF_TASK; + msg.hdr.msg_flags = 0; + msg.hdr.msg_type = MSG_SMS_GPIO_SET_LEVEL_REQ; + msg.hdr.msg_length = sizeof(msg); msg.data[0] = pin; msg.data[1] = level ? 1 : 0; @@ -1897,47 +1897,47 @@ int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level) } /* new GPIO management implementation */ -static int GetGpioPinParams(u32 PinNum, u32 *pTranslatedPinNum, +static int GetGpioPinParams(u32 pin_num, u32 *pTranslatedpin_num, u32 *pGroupNum, u32 *pGroupCfg) { *pGroupCfg = 1; - if (PinNum <= 1) { - *pTranslatedPinNum = 0; + if (pin_num <= 1) { + *pTranslatedpin_num = 0; *pGroupNum = 9; *pGroupCfg = 2; - } else if (PinNum >= 2 && PinNum <= 6) { - *pTranslatedPinNum = 2; + } else if (pin_num >= 2 && pin_num <= 6) { + *pTranslatedpin_num = 2; *pGroupNum = 0; *pGroupCfg = 2; - } else if (PinNum >= 7 && PinNum <= 11) { - *pTranslatedPinNum = 7; + } else if (pin_num >= 7 && pin_num <= 11) { + *pTranslatedpin_num = 7; *pGroupNum = 1; - } else if (PinNum >= 12 && PinNum <= 15) { - *pTranslatedPinNum = 12; + } else if (pin_num >= 12 && pin_num <= 15) { + *pTranslatedpin_num = 12; *pGroupNum = 2; *pGroupCfg = 3; - } else if (PinNum == 16) { - *pTranslatedPinNum = 16; + } else if (pin_num == 16) { + *pTranslatedpin_num = 16; *pGroupNum = 23; - } else if (PinNum >= 17 && PinNum <= 24) { - *pTranslatedPinNum = 17; + } else if (pin_num >= 17 && pin_num <= 24) { + *pTranslatedpin_num = 17; *pGroupNum = 3; - } else if (PinNum == 25) { - *pTranslatedPinNum = 25; + } else if (pin_num == 25) { + *pTranslatedpin_num = 25; *pGroupNum = 6; - } else if (PinNum >= 26 && PinNum <= 28) { - *pTranslatedPinNum = 26; + } else if (pin_num >= 26 && pin_num <= 28) { + *pTranslatedpin_num = 26; *pGroupNum = 4; - } else if (PinNum == 29) { - *pTranslatedPinNum = 29; + } else if (pin_num == 29) { + *pTranslatedpin_num = 29; *pGroupNum = 5; *pGroupCfg = 2; - } else if (PinNum == 30) { - *pTranslatedPinNum = 30; + } else if (pin_num == 30) { + *pTranslatedpin_num = 30; *pGroupNum = 8; - } else if (PinNum == 31) { - *pTranslatedPinNum = 31; + } else if (pin_num == 31) { + *pTranslatedpin_num = 31; *pGroupNum = 17; } else return -1; @@ -1947,11 +1947,11 @@ static int GetGpioPinParams(u32 PinNum, u32 *pTranslatedPinNum, return 0; } -int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum, - struct smscore_config_gpio *pGpioConfig) { +int smscore_gpio_configure(struct smscore_device_t *coredev, u8 pin_num, + struct smscore_config_gpio *p_gpio_config) { u32 totalLen; - u32 TranslatedPinNum = 0; + u32 Translatedpin_num = 0; u32 GroupNum = 0; u32 ElectricChar; u32 groupCfg; @@ -1959,18 +1959,18 @@ int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum, int rc; struct SetGpioMsg { - struct SmsMsgHdr_ST xMsgHeader; + struct sms_msg_hdr x_msg_header; u32 msgData[6]; } *pMsg; - if (PinNum > MAX_GPIO_PIN_NUMBER) + if (pin_num > MAX_GPIO_PIN_NUMBER) return -EINVAL; - if (pGpioConfig == NULL) + if (p_gpio_config == NULL) return -EINVAL; - totalLen = sizeof(struct SmsMsgHdr_ST) + (sizeof(u32) * 6); + totalLen = sizeof(struct sms_msg_hdr) + (sizeof(u32) * 6); buffer = kmalloc(totalLen + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA); @@ -1979,35 +1979,35 @@ int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum, pMsg = (struct SetGpioMsg *) SMS_ALIGN_ADDRESS(buffer); - pMsg->xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; - pMsg->xMsgHeader.msgDstId = HIF_TASK; - pMsg->xMsgHeader.msgFlags = 0; - pMsg->xMsgHeader.msgLength = (u16) totalLen; - pMsg->msgData[0] = PinNum; + pMsg->x_msg_header.msg_src_id = DVBT_BDA_CONTROL_MSG_ID; + pMsg->x_msg_header.msg_dst_id = HIF_TASK; + pMsg->x_msg_header.msg_flags = 0; + pMsg->x_msg_header.msg_length = (u16) totalLen; + pMsg->msgData[0] = pin_num; if (!(coredev->device_flags & SMS_DEVICE_FAMILY2)) { - pMsg->xMsgHeader.msgType = MSG_SMS_GPIO_CONFIG_REQ; - if (GetGpioPinParams(PinNum, &TranslatedPinNum, &GroupNum, + pMsg->x_msg_header.msg_type = MSG_SMS_GPIO_CONFIG_REQ; + if (GetGpioPinParams(pin_num, &Translatedpin_num, &GroupNum, &groupCfg) != 0) { rc = -EINVAL; goto free; } - pMsg->msgData[1] = TranslatedPinNum; + pMsg->msgData[1] = Translatedpin_num; pMsg->msgData[2] = GroupNum; - ElectricChar = (pGpioConfig->pullupdown) - | (pGpioConfig->inputcharacteristics << 2) - | (pGpioConfig->outputslewrate << 3) - | (pGpioConfig->outputdriving << 4); + ElectricChar = (p_gpio_config->pullupdown) + | (p_gpio_config->inputcharacteristics << 2) + | (p_gpio_config->outputslewrate << 3) + | (p_gpio_config->outputdriving << 4); pMsg->msgData[3] = ElectricChar; - pMsg->msgData[4] = pGpioConfig->direction; + pMsg->msgData[4] = p_gpio_config->direction; pMsg->msgData[5] = groupCfg; } else { - pMsg->xMsgHeader.msgType = MSG_SMS_GPIO_CONFIG_EX_REQ; - pMsg->msgData[1] = pGpioConfig->pullupdown; - pMsg->msgData[2] = pGpioConfig->outputslewrate; - pMsg->msgData[3] = pGpioConfig->outputdriving; - pMsg->msgData[4] = pGpioConfig->direction; + pMsg->x_msg_header.msg_type = MSG_SMS_GPIO_CONFIG_EX_REQ; + pMsg->msgData[1] = p_gpio_config->pullupdown; + pMsg->msgData[2] = p_gpio_config->outputslewrate; + pMsg->msgData[3] = p_gpio_config->outputdriving; + pMsg->msgData[4] = p_gpio_config->direction; pMsg->msgData[5] = 0; } @@ -2026,22 +2026,22 @@ free: return rc; } -int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 PinNum, - u8 NewLevel) { +int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 pin_num, + u8 new_level) { u32 totalLen; int rc; void *buffer; struct SetGpioMsg { - struct SmsMsgHdr_ST xMsgHeader; + struct sms_msg_hdr x_msg_header; u32 msgData[3]; /* keep it 3 ! */ } *pMsg; - if ((NewLevel > 1) || (PinNum > MAX_GPIO_PIN_NUMBER)) + if ((new_level > 1) || (pin_num > MAX_GPIO_PIN_NUMBER)) return -EINVAL; - totalLen = sizeof(struct SmsMsgHdr_ST) + + totalLen = sizeof(struct sms_msg_hdr) + (3 * sizeof(u32)); /* keep it 3 ! */ buffer = kmalloc(totalLen + SMS_DMA_ALIGNMENT, @@ -2051,13 +2051,13 @@ int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 PinNum, pMsg = (struct SetGpioMsg *) SMS_ALIGN_ADDRESS(buffer); - pMsg->xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; - pMsg->xMsgHeader.msgDstId = HIF_TASK; - pMsg->xMsgHeader.msgFlags = 0; - pMsg->xMsgHeader.msgType = MSG_SMS_GPIO_SET_LEVEL_REQ; - pMsg->xMsgHeader.msgLength = (u16) totalLen; - pMsg->msgData[0] = PinNum; - pMsg->msgData[1] = NewLevel; + pMsg->x_msg_header.msg_src_id = DVBT_BDA_CONTROL_MSG_ID; + pMsg->x_msg_header.msg_dst_id = HIF_TASK; + pMsg->x_msg_header.msg_flags = 0; + pMsg->x_msg_header.msg_type = MSG_SMS_GPIO_SET_LEVEL_REQ; + pMsg->x_msg_header.msg_length = (u16) totalLen; + pMsg->msgData[0] = pin_num; + pMsg->msgData[1] = new_level; /* Send message to SMS */ rc = smscore_sendrequest_and_wait(coredev, pMsg, totalLen, @@ -2074,7 +2074,7 @@ int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 PinNum, return rc; } -int smscore_gpio_get_level(struct smscore_device_t *coredev, u8 PinNum, +int smscore_gpio_get_level(struct smscore_device_t *coredev, u8 pin_num, u8 *level) { u32 totalLen; @@ -2082,15 +2082,15 @@ int smscore_gpio_get_level(struct smscore_device_t *coredev, u8 PinNum, void *buffer; struct SetGpioMsg { - struct SmsMsgHdr_ST xMsgHeader; + struct sms_msg_hdr x_msg_header; u32 msgData[2]; } *pMsg; - if (PinNum > MAX_GPIO_PIN_NUMBER) + if (pin_num > MAX_GPIO_PIN_NUMBER) return -EINVAL; - totalLen = sizeof(struct SmsMsgHdr_ST) + (2 * sizeof(u32)); + totalLen = sizeof(struct sms_msg_hdr) + (2 * sizeof(u32)); buffer = kmalloc(totalLen + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA); @@ -2099,12 +2099,12 @@ int smscore_gpio_get_level(struct smscore_device_t *coredev, u8 PinNum, pMsg = (struct SetGpioMsg *) SMS_ALIGN_ADDRESS(buffer); - pMsg->xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; - pMsg->xMsgHeader.msgDstId = HIF_TASK; - pMsg->xMsgHeader.msgFlags = 0; - pMsg->xMsgHeader.msgType = MSG_SMS_GPIO_GET_LEVEL_REQ; - pMsg->xMsgHeader.msgLength = (u16) totalLen; - pMsg->msgData[0] = PinNum; + pMsg->x_msg_header.msg_src_id = DVBT_BDA_CONTROL_MSG_ID; + pMsg->x_msg_header.msg_dst_id = HIF_TASK; + pMsg->x_msg_header.msg_flags = 0; + pMsg->x_msg_header.msg_type = MSG_SMS_GPIO_GET_LEVEL_REQ; + pMsg->x_msg_header.msg_length = (u16) totalLen; + pMsg->msgData[0] = pin_num; pMsg->msgData[1] = 0; /* Send message to SMS */ diff --git a/drivers/media/common/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h index bb742469d40a..4b0cd7da22b7 100644 --- a/drivers/media/common/siano/smscoreapi.h +++ b/drivers/media/common/siano/smscoreapi.h @@ -577,8 +577,8 @@ enum msg_types { }; #define SMS_INIT_MSG_EX(ptr, type, src, dst, len) do { \ - (ptr)->msgType = type; (ptr)->msgSrcId = src; (ptr)->msgDstId = dst; \ - (ptr)->msgLength = len; (ptr)->msgFlags = 0; \ + (ptr)->msg_type = type; (ptr)->msg_src_id = src; (ptr)->msg_dst_id = dst; \ + (ptr)->msg_length = len; (ptr)->msg_flags = 0; \ } while (0) #define SMS_INIT_MSG(ptr, type, len) \ @@ -611,78 +611,78 @@ enum SMS_DEVICE_MODE { DEVICE_MODE_MAX, }; -struct SmsMsgHdr_ST { - u16 msgType; - u8 msgSrcId; - u8 msgDstId; - u16 msgLength; /* Length of entire message, including header */ - u16 msgFlags; +struct sms_msg_hdr { + u16 msg_type; + u8 msg_src_id; + u8 msg_dst_id; + u16 msg_length; /* length of entire message, including header */ + u16 msg_flags; }; -struct SmsMsgData_ST { - struct SmsMsgHdr_ST xMsgHeader; +struct sms_msg_data { + struct sms_msg_hdr x_msg_header; u32 msgData[1]; }; -struct SmsMsgData_ST2 { - struct SmsMsgHdr_ST xMsgHeader; +struct sms_msg_data2 { + struct sms_msg_hdr x_msg_header; u32 msgData[2]; }; -struct SmsMsgData_ST4 { - struct SmsMsgHdr_ST xMsgHeader; +struct sms_msg_data4 { + struct sms_msg_hdr x_msg_header; u32 msgData[4]; }; -struct SmsDataDownload_ST { - struct SmsMsgHdr_ST xMsgHeader; - u32 MemAddr; - u8 Payload[SMS_MAX_PAYLOAD_SIZE]; +struct sms_data_download { + struct sms_msg_hdr x_msg_header; + u32 mem_addr; + u8 payload[SMS_MAX_PAYLOAD_SIZE]; }; -struct SmsVersionRes_ST { - struct SmsMsgHdr_ST xMsgHeader; +struct sms_version_res { + struct sms_msg_hdr x_msg_header; - u16 ChipModel; /* e.g. 0x1102 for SMS-1102 "Nova" */ - u8 Step; /* 0 - Step A */ - u8 MetalFix; /* 0 - Metal 0 */ + u16 chip_model; /* e.g. 0x1102 for SMS-1102 "Nova" */ + u8 step; /* 0 - step A */ + u8 metal_fix; /* 0 - Metal 0 */ - /* FirmwareId 0xFF if ROM, otherwise the + /* firmware_id 0xFF if ROM, otherwise the * value indicated by SMSHOSTLIB_DEVICE_MODES_E */ - u8 FirmwareId; - /* SupportedProtocols Bitwise OR combination of + u8 firmware_id; + /* supported_protocols Bitwise OR combination of * supported protocols */ - u8 SupportedProtocols; + u8 supported_protocols; - u8 VersionMajor; - u8 VersionMinor; - u8 VersionPatch; - u8 VersionFieldPatch; + u8 version_major; + u8 version_minor; + u8 version_patch; + u8 version_field_patch; - u8 RomVersionMajor; - u8 RomVersionMinor; - u8 RomVersionPatch; - u8 RomVersionFieldPatch; + u8 rom_ver_major; + u8 rom_ver_minor; + u8 rom_ver_patch; + u8 rom_ver_field_patch; u8 TextLabel[34]; }; -struct SmsFirmware_ST { - u32 CheckSum; - u32 Length; - u32 StartAddress; - u8 Payload[1]; +struct sms_firmware { + u32 check_sum; + u32 length; + u32 start_address; + u8 payload[1]; }; -/* Statistics information returned as response for - * SmsHostApiGetStatistics_Req */ +/* statistics information returned as response for + * SmsHostApiGetstatistics_Req */ struct SMSHOSTLIB_STATISTICS_ST { - u32 Reserved; /* Reserved */ + u32 reserved; /* reserved */ /* Common parameters */ - u32 IsRfLocked; /* 0 - not locked, 1 - locked */ - u32 IsDemodLocked; /* 0 - not locked, 1 - locked */ - u32 IsExternalLNAOn; /* 0 - external LNA off, 1 - external LNA on */ + u32 is_rf_locked; /* 0 - not locked, 1 - locked */ + u32 is_demod_locked; /* 0 - not locked, 1 - locked */ + u32 is_external_lna_on; /* 0 - external LNA off, 1 - external LNA on */ /* Reception quality */ s32 SNR; /* dB */ @@ -693,137 +693,137 @@ struct SMSHOSTLIB_STATISTICS_ST { u32 MFER; /* DVB-H frame error rate in percentage, 0xFFFFFFFF indicate N/A, valid only for DVB-H */ s32 RSSI; /* dBm */ - s32 InBandPwr; /* In band power in dBM */ - s32 CarrierOffset; /* Carrier Offset in bin/1024 */ + s32 in_band_pwr; /* In band power in dBM */ + s32 carrier_offset; /* Carrier Offset in bin/1024 */ /* Transmission parameters */ - u32 Frequency; /* Frequency in Hz */ - u32 Bandwidth; /* Bandwidth in MHz, valid only for DVB-T/H */ - u32 TransmissionMode; /* Transmission Mode, for DAB modes 1-4, + u32 frequency; /* frequency in Hz */ + u32 bandwidth; /* bandwidth in MHz, valid only for DVB-T/H */ + u32 transmission_mode; /* Transmission Mode, for DAB modes 1-4, for DVB-T/H FFT mode carriers in Kilos */ - u32 ModemState; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET, + u32 modem_state; /* from SMSHOSTLIB_DVB_MODEM_STATE_ET, valid only for DVB-T/H */ - u32 GuardInterval; /* Guard Interval from + u32 guard_interval; /* Guard Interval from SMSHOSTLIB_GUARD_INTERVALS_ET, valid only for DVB-T/H */ - u32 CodeRate; /* Code Rate from SMSHOSTLIB_CODE_RATE_ET, + u32 code_rate; /* Code Rate from SMSHOSTLIB_CODE_RATE_ET, valid only for DVB-T/H */ - u32 LPCodeRate; /* Low Priority Code Rate from + u32 lp_code_rate; /* Low Priority Code Rate from SMSHOSTLIB_CODE_RATE_ET, valid only for DVB-T/H */ - u32 Hierarchy; /* Hierarchy from SMSHOSTLIB_HIERARCHY_ET, + u32 hierarchy; /* hierarchy from SMSHOSTLIB_HIERARCHY_ET, valid only for DVB-T/H */ - u32 Constellation; /* Constellation from + u32 constellation; /* constellation from SMSHOSTLIB_CONSTELLATION_ET, valid only for DVB-T/H */ /* Burst parameters, valid only for DVB-H */ - u32 BurstSize; /* Current burst size in bytes, + u32 burst_size; /* Current burst size in bytes, valid only for DVB-H */ - u32 BurstDuration; /* Current burst duration in mSec, + u32 burst_duration; /* Current burst duration in mSec, valid only for DVB-H */ - u32 BurstCycleTime; /* Current burst cycle time in mSec, + u32 burst_cycle_time; /* Current burst cycle time in mSec, valid only for DVB-H */ - u32 CalculatedBurstCycleTime;/* Current burst cycle time in mSec, + u32 calc_burst_cycle_time;/* Current burst cycle time in mSec, as calculated by demodulator, valid only for DVB-H */ - u32 NumOfRows; /* Number of rows in MPE table, + u32 num_of_rows; /* Number of rows in MPE table, valid only for DVB-H */ - u32 NumOfPaddCols; /* Number of padding columns in MPE table, + u32 num_of_padd_cols; /* Number of padding columns in MPE table, valid only for DVB-H */ - u32 NumOfPunctCols; /* Number of puncturing columns in MPE table, + u32 num_of_punct_cols; /* Number of puncturing columns in MPE table, valid only for DVB-H */ - u32 ErrorTSPackets; /* Number of erroneous + u32 error_ts_packets; /* Number of erroneous transport-stream packets */ - u32 TotalTSPackets; /* Total number of transport-stream packets */ - u32 NumOfValidMpeTlbs; /* Number of MPE tables which do not include + u32 total_ts_packets; /* Total number of transport-stream packets */ + u32 num_of_valid_mpe_tlbs; /* Number of MPE tables which do not include errors after MPE RS decoding */ - u32 NumOfInvalidMpeTlbs;/* Number of MPE tables which include errors + u32 num_of_invalid_mpe_tlbs;/* Number of MPE tables which include errors after MPE RS decoding */ - u32 NumOfCorrectedMpeTlbs;/* Number of MPE tables which were + u32 num_of_corrected_mpe_tlbs;/* Number of MPE tables which were corrected by MPE RS decoding */ /* Common params */ - u32 BERErrorCount; /* Number of errornous SYNC bits. */ - u32 BERBitCount; /* Total number of SYNC bits. */ + u32 ber_error_count; /* Number of errornous SYNC bits. */ + u32 ber_bit_count; /* Total number of SYNC bits. */ /* Interface information */ - u32 SmsToHostTxErrors; /* Total number of transmission errors. */ + u32 sms_to_host_tx_errors; /* Total number of transmission errors. */ /* DAB/T-DMB */ - u32 PreBER; /* DAB/T-DMB only: Pre Viterbi BER [1E-5] */ + u32 pre_ber; /* DAB/T-DMB only: Pre Viterbi BER [1E-5] */ /* DVB-H TPS parameters */ - u32 CellId; /* TPS Cell ID in bits 15..0, bits 31..16 zero; + u32 cell_id; /* TPS Cell ID in bits 15..0, bits 31..16 zero; if set to 0xFFFFFFFF cell_id not yet recovered */ - u32 DvbhSrvIndHP; /* DVB-H service indication info, bit 1 - + u32 dvbh_srv_ind_hp; /* DVB-H service indication info, bit 1 - Time Slicing indicator, bit 0 - MPE-FEC indicator */ - u32 DvbhSrvIndLP; /* DVB-H service indication info, bit 1 - + u32 dvbh_srv_ind_lp; /* DVB-H service indication info, bit 1 - Time Slicing indicator, bit 0 - MPE-FEC indicator */ - u32 NumMPEReceived; /* DVB-H, Num MPE section received */ + u32 num_mpe_received; /* DVB-H, Num MPE section received */ - u32 Re |