Просмотр исходного кода

qcacld-3.0: Remove ol_target_status in ol layer

Move ol_target_status to hif and rename it hif_target_status

Change-Id: Ia9dcb5f5b0d416f930968957ce8a3166ca7056bc
CRs-Fixed: 998536
Komal Seelam 9 лет назад
Родитель
Сommit
9d774379a8
2 измененных файлов с 3 добавлено и 12 удалено
  1. 0 8
      core/bmi/inc/ol_if_athvar.h
  2. 3 4
      core/bmi/src/ol_fw.c

+ 0 - 8
core/bmi/inc/ol_if_athvar.h

@@ -45,7 +45,6 @@
 #endif
 
 #include "ol_ctrl_addba_api.h"
-typedef void *hif_handle_t;
 
 struct ol_version {
 	uint32_t host_ver;
@@ -55,13 +54,6 @@ struct ol_version {
 	uint32_t abi_ver;
 };
 
-typedef enum _ol_target_status {
-	OL_TRGET_STATUS_CONNECTED = 0,  /* target connected */
-	OL_TRGET_STATUS_RESET,  /* target got reset */
-	OL_TRGET_STATUS_EJECT,  /* target got ejected */
-	OL_TRGET_STATUS_SUSPEND /*target got suspend */
-} ol_target_status;
-
 enum ol_ath_tx_ecodes {
 	TX_IN_PKT_INCR = 0,
 	TX_OUT_HDR_COMPL,

+ 3 - 4
core/bmi/src/ol_fw.c

@@ -621,8 +621,7 @@ void ol_target_failure(void *instance, QDF_STATUS status)
 	struct ol_config_info *ini_cfg = ol_get_ini_handle(ol_ctx);
 	int ret;
 #endif
-	ol_target_status target_status =
-			hif_get_target_status(scn);
+	enum hif_target_status target_status = hif_get_target_status(scn);
 
 	if (hif_get_bus_type(scn) == QDF_BUS_TYPE_SNOC) {
 		BMI_ERR("SNOC doesn't suppor this code path!");
@@ -631,12 +630,12 @@ void ol_target_failure(void *instance, QDF_STATUS status)
 
 	qdf_event_set(&wma->recovery_event);
 
-	if (OL_TRGET_STATUS_RESET == target_status) {
+	if (TARGET_STATUS_RESET == target_status) {
 		BMI_ERR("Target is already asserted, ignore!");
 		return;
 	}
 
-	hif_set_target_status(scn, OL_TRGET_STATUS_RESET);
+	hif_set_target_status(scn, TARGET_STATUS_RESET);
 
 	if (cds_is_driver_recovering()) {
 		BMI_ERR("%s: Recovery in progress, ignore!\n", __func__);