Browse Source

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
Poddar, Siddarth 8 years ago
parent
commit
aed8dbbeeb
2 changed files with 3 additions and 3 deletions
  1. 1 1
      core/dp/htt/htt_h2t.c
  2. 2 2
      core/dp/htt/htt_internal.h

+ 1 - 1
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__);

+ 2 - 2
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();