浏览代码

qcacmn: Fix compile issue for wifi pos

Fix below compile issues:
1.error: no previous prototype for wifi_pos_get_vdev_priv_obj()
and wifi_pos_get_psoc_priv_obj().
2. error: incompatible integer to pointer conversion assigning
to 'struct wifi_pos_vdev_priv_obj *' or 'struct wifi_pos_psoc_priv_obj *'
from 'int'.
3. error: declaration of 'struct wifi_pos_osif_ops' will not be visible
outside of wifi_pos_register_osif_callbacks();

Change-Id: I6946f6240ed5adff291871c75ca85f848d955f4d
CRs-Fixed: 3356150
Chaoli Zhou 2 年之前
父节点
当前提交
91036d45ac
共有 2 个文件被更改,包括 14 次插入4 次删除
  1. 4 0
      umac/wifi_pos/inc/wifi_pos_api.h
  2. 10 4
      umac/wifi_pos/src/wifi_pos_utils.c

+ 4 - 0
umac/wifi_pos/inc/wifi_pos_api.h

@@ -32,6 +32,10 @@
 struct wlan_objmgr_psoc;
 struct wifi_pos_driver_caps;
 
+#ifdef WIFI_POS_CONVERGED
+struct wifi_pos_osif_ops;
+#endif
+
 /**
  * enum RTT_FIELD_ID - identifies which field is being specified
  * @META_DATA_SUB_TYPE: oem data req sub type

+ 10 - 4
umac/wifi_pos/src/wifi_pos_utils.c

@@ -27,6 +27,8 @@
 #include "wlan_objmgr_psoc_obj.h"
 #include <wlan_lmac_if_def.h>
 #include "wifi_pos_utils_i.h"
+#include "wlan_objmgr_vdev_obj.h"
+
 
 /* lock to protect use of psoc global pointer variable */
 static qdf_spinlock_t psoc_ptr_lock;
@@ -40,6 +42,9 @@ static qdf_spinlock_t psoc_ptr_lock;
  */
 static struct wlan_objmgr_psoc *wifi_pos_psoc_obj;
 
+struct wlan_objmgr_vdev;
+struct wifi_pos_psoc_priv_obj;
+
 void wifi_pos_lock_init(void)
 {
 	qdf_spinlock_create(&psoc_ptr_lock);
@@ -102,8 +107,8 @@ struct wifi_pos_psoc_priv_obj *wifi_pos_get_psoc_priv_obj(
 {
 	struct wifi_pos_psoc_priv_obj *obj;
 
-	obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
-						    WLAN_UMAC_COMP_WIFI_POS);
+	obj = (struct wifi_pos_psoc_priv_obj *)wlan_objmgr_psoc_get_comp_private_obj(psoc,
+					       WLAN_UMAC_COMP_WIFI_POS);
 
 	return obj;
 }
@@ -115,8 +120,9 @@ wifi_pos_get_vdev_priv_obj(struct wlan_objmgr_vdev *vdev)
 {
 	struct wifi_pos_vdev_priv_obj *vdev_obj;
 
-	vdev_obj = wlan_objmgr_vdev_get_comp_private_obj(
-					vdev, WLAN_UMAC_COMP_WIFI_POS);
+	vdev_obj = (struct wifi_pos_vdev_priv_obj *)wlan_objmgr_vdev_get_comp_private_obj(
+						    vdev,
+						    WLAN_UMAC_COMP_WIFI_POS);
 
 	return vdev_obj;
 }