samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Change to remove void pointer usage for DP soc

Browse Source 
Add code to remove void pointer usage for dp_soc
and use original dp_soc structure inside htt_soc

Change-Id: Icdc26ecdb33d565c43dbc101584069808b31c1a0
CRs-Fixed: 2484403
This commit is contained in:
Akshay Kosigi
2019-06-27 14:17:08 +05:30
committed by nshrivas
parent eec6db94bd
commit 8a753147b7
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dp/wifi3.0/dp_htt.h
View File

@@ -115,7 +115,7 @@ struct dp_htt_htc_pkt_union {
struct htt_soc { struct htt_soc {
struct cdp_ctrl_objmgr_psoc *ctrl_psoc; struct cdp_ctrl_objmgr_psoc *ctrl_psoc;
void *dp_soc; struct dp_soc *dp_soc;
void *hal_soc; void *hal_soc;
/* htt_logger handle */ /* htt_logger handle */
struct htt_logger *htt_logger_handle; struct htt_logger *htt_logger_handle;

15
dp/wifi3.0/dp_internal.h
View File

@@ -1107,11 +1107,13 @@ int dp_set_pktlog_wifi3(struct dp_pdev *pdev, uint32_t event,
void *dp_get_pldev(struct cdp_pdev *txrx_pdev); void *dp_get_pldev(struct cdp_pdev *txrx_pdev);
void dp_pkt_log_init(struct cdp_pdev *ppdev, void *scn); void dp_pkt_log_init(struct cdp_pdev *ppdev, void *scn);
static inline void dp_hif_update_pipe_callback(void *soc, void *cb_context, static inline void
QDF_STATUS (*callback)(void *, qdf_nbuf_t, uint8_t), uint8_t pipe_id) dp_hif_update_pipe_callback(struct dp_soc *dp_soc,
void *cb_context,
QDF_STATUS (*callback)(void *, qdf_nbuf_t, uint8_t),
uint8_t pipe_id)
{ {
struct hif_msg_callbacks hif_pipe_callbacks; struct hif_msg_callbacks hif_pipe_callbacks;
struct dp_soc *dp_soc = (struct dp_soc *)soc;
/* TODO: Temporary change to bypass HTC connection for this new /* TODO: Temporary change to bypass HTC connection for this new
* HIF pipe, which will be used for packet log and other high- * HIF pipe, which will be used for packet log and other high-
@@ -1169,8 +1171,11 @@ static inline QDF_STATUS dp_h2t_cfg_stats_msg_send(struct dp_pdev *pdev,
{ {
return 0; return 0;
} }
static inline void dp_hif_update_pipe_callback(void *soc, void *cb_context,
QDF_STATUS (*callback)(void *, qdf_nbuf_t, uint8_t), uint8_t pipe_id) static inline void
dp_hif_update_pipe_callback(struct dp_soc *dp_soc, void *cb_context,
QDF_STATUS (*callback)(void *, qdf_nbuf_t, uint8_t),
uint8_t pipe_id)
{ {
} }

14
dp/wifi3.0/dp_peer.c
View File

@@ -1454,12 +1454,11 @@ static inline struct dp_peer *dp_peer_find_add_id(struct dp_soc *soc,
*/ */
void void
dp_rx_peer_map_handler(void *soc_handle, uint16_t peer_id, dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id,
uint16_t hw_peer_id, uint8_t vdev_id, uint16_t hw_peer_id, uint8_t vdev_id,
uint8_t *peer_mac_addr, uint16_t ast_hash, uint8_t *peer_mac_addr, uint16_t ast_hash,
uint8_t is_wds) uint8_t is_wds)
{ {
struct dp_soc *soc = (struct dp_soc *)soc_handle;
struct dp_peer *peer = NULL; struct dp_peer *peer = NULL;
enum cdp_txrx_ast_entry_type type = CDP_TXRX_AST_TYPE_STATIC; enum cdp_txrx_ast_entry_type type = CDP_TXRX_AST_TYPE_STATIC;
@@ -1562,12 +1561,11 @@ dp_rx_peer_map_handler(void *soc_handle, uint16_t peer_id,
* Return: none * Return: none
*/ */
void void
dp_rx_peer_unmap_handler(void *soc_handle, uint16_t peer_id, dp_rx_peer_unmap_handler(struct dp_soc *soc, uint16_t peer_id,
uint8_t vdev_id, uint8_t *mac_addr, uint8_t vdev_id, uint8_t *mac_addr,
uint8_t is_wds) uint8_t is_wds)
{ {
struct dp_peer *peer; struct dp_peer *peer;
struct dp_soc *soc = (struct dp_soc *)soc_handle;
uint8_t i; uint8_t i;
peer = __dp_peer_find_by_id(soc, peer_id); peer = __dp_peer_find_by_id(soc, peer_id);
@@ -2798,11 +2796,11 @@ dp_set_pn_check_wifi3(struct cdp_vdev *vdev_handle, struct cdp_peer *peer_handle
void void
dp_rx_sec_ind_handler(void *soc_handle, uint16_t peer_id, dp_rx_sec_ind_handler(struct dp_soc *soc, uint16_t peer_id,
enum cdp_sec_type sec_type, int is_unicast, u_int32_t *michael_key, enum cdp_sec_type sec_type, int is_unicast,
u_int32_t *rx_pn) u_int32_t *michael_key,
u_int32_t *rx_pn)
{ {
struct dp_soc *soc = (struct dp_soc *)soc_handle;
struct dp_peer *peer; struct dp_peer *peer;
int sec_index; int sec_index;

10
dp/wifi3.0/dp_peer.h
View File

@@ -90,16 +90,16 @@ dp_peer_find_by_id(struct dp_soc *soc,
#endif /* PEER_LOCK_REF_PROTECT */ #endif /* PEER_LOCK_REF_PROTECT */
void dp_print_ast_stats(struct dp_soc *soc); void dp_print_ast_stats(struct dp_soc *soc);
void dp_rx_peer_map_handler(void *soc_handle, uint16_t peer_id, void dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id,
uint16_t hw_peer_id, uint8_t vdev_id, uint16_t hw_peer_id, uint8_t vdev_id,
uint8_t *peer_mac_addr, uint16_t ast_hash, uint8_t *peer_mac_addr, uint16_t ast_hash,
uint8_t is_wds); uint8_t is_wds);
void dp_rx_peer_unmap_handler(void *soc_handle, uint16_t peer_id, void dp_rx_peer_unmap_handler(struct dp_soc *soc, uint16_t peer_id,
uint8_t vdev_id, uint8_t *peer_mac_addr, uint8_t vdev_id, uint8_t *peer_mac_addr,
uint8_t is_wds); uint8_t is_wds);
void dp_rx_sec_ind_handler(void *soc_handle, uint16_t peer_id, void dp_rx_sec_ind_handler(struct dp_soc *soc, uint16_t peer_id,
enum cdp_sec_type sec_type, int is_unicast, enum cdp_sec_type sec_type, int is_unicast,
u_int32_t *michael_key, u_int32_t *rx_pn); u_int32_t *michael_key, u_int32_t *rx_pn);
uint8_t dp_get_peer_mac_addr_frm_id(struct cdp_soc_t *soc_handle, uint8_t dp_get_peer_mac_addr_frm_id(struct cdp_soc_t *soc_handle,
uint16_t peer_id, uint8_t *peer_mac); uint16_t peer_id, uint8_t *peer_mac);