int i, output_count = 0, output_connected_count = 0;
int index_dsi = 0, index_lvds = 0, index_hdmia = 0, index_hdmib = 0;
tdm_error ret;
- hal_tdm_error hret;
/* don't change list order if not init time */
if (private_module->outputs) {
return private_module->outputs;
}
- if (private_module->use_hal_tdm) {
- outputs = (tdm_output **)hal_tdm_display_get_outputs(NULL, &output_count, &hret);
- if (hret != HAL_TDM_ERROR_NONE)
- goto no_output;
- } else {
+ if (private_module->use_hal_tdm)
+ outputs = (tdm_output **)hal_tdm_display_get_outputs(NULL, &output_count, (hal_tdm_error *)&ret);
+ else
outputs = func_display->display_get_outputs(private_module->bdata, &output_count, &ret);
- if (ret != TDM_ERROR_NONE)
- goto no_output;
- }
+ if (ret != TDM_ERROR_NONE)
+ goto no_output;
*count = output_count;
tdm_caps_output caps;
memset(&caps, 0, sizeof(tdm_caps_output));
- if (private_module->use_hal_tdm) {
- hret = hal_tdm_output_get_capability(outputs[i], (hal_tdm_caps_output *)&caps);
- if (hret != HAL_TDM_ERROR_NONE) {
- TDM_ERR("output_get_capability() failed");
- goto no_output;
- }
- } else {
+ if (private_module->use_hal_tdm)
+ ret = (tdm_error)hal_tdm_output_get_capability(outputs[i], (hal_tdm_caps_output *)&caps);
+ else
ret = func_output->output_get_capability(outputs[i], &caps);
- if (ret != TDM_ERROR_NONE) {
- TDM_ERR("output_get_capability() failed");
- goto no_output;
- }
+ if (ret != TDM_ERROR_NONE) {
+ TDM_ERR("output_get_capability() failed");
+ goto no_output;
}
if (caps.status == TDM_OUTPUT_CONN_STATUS_CONNECTED) {