Browse Source

qcacmn: Remove duplicate definition from hif layer

FW common files needs to be in sync with host and fw.
There are duplicate definition of target attach API when
latest copy of fw common files are used.
Remove duplicate definition of target attach from hif layer.

Change-Id: Ie4a80ba07bc3ec2d9d1466c32062c373c9759a94
CRs-Fixed: 1012542
Govind Singh 9 years ago
parent
commit
051a8c4457
6 changed files with 11 additions and 7 deletions
  1. 6 2
      hif/inc/hif.h
  2. 1 1
      hif/inc/regtable_pcie.h
  3. 1 1
      hif/src/pcie/if_pci.c
  4. 1 1
      hif/src/regtable.c
  5. 1 1
      hif/src/snoc/if_ahb.c
  6. 1 1
      hif/src/snoc/if_snoc.c

+ 6 - 2
hif/inc/hif.h

@@ -61,8 +61,11 @@ typedef void *hif_handle_t;
 #define HIF_TYPE_IPQ4019 13
 #define HIF_TYPE_QCA9888 14
 
-
-
+/* TARGET definition needs to be abstracted in fw common
+ * header files, below is the placeholder till WIN codebase
+ * moved to latest copy of fw common header files.
+ */
+#ifdef CONFIG_WIN
 #define TARGET_TYPE_UNKNOWN   0
 #define TARGET_TYPE_AR6001    1
 #define TARGET_TYPE_AR6002    2
@@ -87,6 +90,7 @@ typedef void *hif_handle_t;
 #define TARGET_TYPE_QCA9377V1   17
 /* For Adrastea target */
 #define TARGET_TYPE_ADRASTEA     19
+#endif
 
 struct CE_state;
 #define CE_COUNT_MAX 12

+ 1 - 1
hif/inc/regtable_pcie.h

@@ -737,7 +737,7 @@ typedef struct TGT_REG_TABLE {
 } tgt_reg_table;
 
 struct hif_softc;
-void target_register_tbl_attach(struct hif_softc *scn, u32 target_type);
+void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type);
 void hif_register_tbl_attach(struct hif_softc *scn, u32 hif_type);
 
 #endif /* _REGTABLE_PCIE_H_ */

+ 1 - 1
hif/src/pcie/if_pci.c

@@ -3470,7 +3470,7 @@ again:
 		  __func__, hif_type, target_type);
 
 	hif_register_tbl_attach(ol_sc, hif_type);
-	target_register_tbl_attach(ol_sc, target_type);
+	hif_target_register_tbl_attach(ol_sc, target_type);
 
 	ret = hif_pci_probe_tgt_wakeup(sc);
 	if (ret < 0) {

+ 1 - 1
hif/src/regtable.c

@@ -36,7 +36,7 @@
 #include "targetdef.h"
 #include "hostdef.h"
 
-void target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
+void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
 {
 	switch (target_type) {
 	case TARGET_TYPE_AR6320:

+ 1 - 1
hif/src/snoc/if_ahb.c

@@ -320,7 +320,7 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
 
 	tgt_info->target_type = target_type;
 	hif_register_tbl_attach(ol_sc, hif_type);
-	target_register_tbl_attach(ol_sc, target_type);
+	hif_target_register_tbl_attach(ol_sc, target_type);
 
 	if (hif_ahb_enable_radio(sc, pdev, id) != 0) {
 		HIF_INFO("error in enabling soc\n");

+ 1 - 1
hif/src/snoc/if_snoc.c

@@ -242,7 +242,7 @@ QDF_STATUS hif_snoc_enable_bus(struct hif_softc *ol_sc,
 	ol_sc->target_info.target_type = target_type;
 
 	hif_register_tbl_attach(ol_sc, hif_type);
-	target_register_tbl_attach(ol_sc, target_type);
+	hif_target_register_tbl_attach(ol_sc, target_type);
 
 	HIF_TRACE("%s: X - hif_type = 0x%x, target_type = 0x%x",
 		  __func__, hif_type, target_type);