diff options
| author | Poddar, Siddarth <siddpodd@codeaurora.org> | 2016-10-27 15:31:20 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-06 09:13:37 -0800 |
| commit | 5b655563af98c846d53a9ca31fcf5bec5bc1da4f (patch) | |
| tree | 5f5f9f1d645784a67a03b2c46bc648450c33e6d2 | |
| parent | 37bc617262105ebdc98d768941491ca8645445f0 (diff) | |
qcacld-3.0: Address 32 bit specific compilation issue
Fix 32 bit compilation issues due to improper shift operation.
Also make bitwise operations compatible with 32-bit.
CRs-Fixed: 1085499
Change-Id: Ifceefb52cfc5b89ca3e1eb0b428b34a5f7f792dc
| -rw-r--r-- | core/dp/htt/htt_h2t.c | 2 | ||||
| -rw-r--r-- | core/dp/htt/htt_internal.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c index e4b7511f311b..0296ec967839 100644 --- a/core/dp/htt/htt_h2t.c +++ b/core/dp/htt/htt_h2t.c @@ -437,7 +437,7 @@ QDF_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) { uint32_t tmp; - tmp = (pdev->rx_ring.base_paddr >> 32); + tmp = qdf_get_upper_32_bits(pdev->rx_ring.base_paddr); if (tmp & 0xfffffe0) { qdf_print("%s:%d paddr > 37 bits!. Trimmed.", __func__, __LINE__); diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index b26b58a63d8e..74b5a57740e1 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -646,7 +646,7 @@ void htt_rx_dbg_rxbuf_set(struct htt_pdev_t *pdev, qdf_dma_addr_t paddr, rx_netbuf->data; /* pdev->rx_buff_list[pdev->rx_buff_index].in_use = true; */ tmp = pdev->rx_buff_list[pdev->rx_buff_index].nbuf_data; - tmp = (void *)((uint64_t) tmp | 0x01); + tmp = (void *)((uintptr_t) tmp | 0x01); pdev->rx_buff_list[pdev->rx_buff_index].nbuf_data = tmp; pdev->rx_buff_list[pdev->rx_buff_index].nbuf = rx_netbuf; pdev->rx_buff_list[pdev->rx_buff_index].ts = @@ -678,7 +678,7 @@ void htt_rx_dbg_rxbuf_reset(struct htt_pdev_t *pdev, if (index < HTT_RX_RING_BUFF_DBG_LIST) { /* in_use = false */ tmp = pdev->rx_buff_list[index].nbuf_data; - tmp = (void *)((uint64_t)tmp & 0xfffffffffffffffe); + tmp = (void *)((uintptr_t)tmp & ~((uintptr_t)0x1)); pdev->rx_buff_list[index].nbuf_data = tmp; pdev->rx_buff_list[index].ts = qdf_get_log_timestamp(); |