qcacld-3.0: move hdd_dump_log_buffer to wlan_hdd_ioctl.[ch]

Current code has hdd_dump_log_buffer and hdd_ioctl_log_buffer in
wlan_hdd_wext.c. This will not be included in build if wext is not
enabled. Fix this by moving the functions to wlan_hdd_ioctl.[ch].

Change-Id: Idb4824815890c605961e802e0d5a43ca2181a13d
CRs-Fixed: 3436349

core/hdd/inc/wlan_hdd_wext.h

@@ -344,24 +344,6 @@ void hdd_wext_send_event(struct net_device *dev, unsigned int cmd,
 }
 #endif /* WLAN_WEXT_SUPPORT_ENABLE */
 
-#ifdef WLAN_DUMP_LOG_BUF_CNT
-/**
- * hdd_dump_log_buffer() - dump log buffer history
- * @print_ctx: print context for custom print function
- * @custom_print: custom print function pointer
- *
- * If custom print function is NULL, will default to printk
- *
- * Return: None
- */
-void hdd_dump_log_buffer(void *print_ctx, qdf_abstract_print *custom_print);
-#else
-static inline
-void hdd_dump_log_buffer(void *print_ctx, qdf_abstract_print *custom_print)
-{
-}
-#endif
-
 #if defined(WLAN_WEXT_SUPPORT_ENABLE) && defined(HASTINGS_BT_WAR)
 int hdd_hastings_bt_war_enable_fw(struct hdd_context *hdd_ctx);
 int hdd_hastings_bt_war_disable_fw(struct hdd_context *hdd_ctx);

core/hdd/src/wlan_hdd_driver_ops.c

@@ -50,6 +50,7 @@
 #include "wlan_hdd_thermal.h"
 #include "wlan_dp_ucfg_api.h"
 #include "qdf_ssr_driver_dump.h"
+#include "wlan_hdd_ioctl.h"
 
 #ifdef MODULE
 #ifdef WLAN_WEAR_CHIPSET

core/hdd/src/wlan_hdd_ioctl.c

@@ -3463,6 +3463,82 @@ hdd_get_roam_scan_freq(struct hdd_adapter *adapter, mac_handle_t mac_handle,
 }
 #endif
 
+enum host_target_comm_log {
+	HTC_CREDIT_HISTORY_LOG = 0,
+	COMMAND_LOG,
+	COMMAND_TX_CMP_LOG,
+	MGMT_COMMAND_LOG,
+	MGMT_COMMAND_TX_CMP_LOG,
+	EVENT_LOG,
+	RX_EVENT_LOG,
+	MGMT_EVENT_LOG
+};
+
+static int printk_adapter(void *priv, const char *fmt, ...)
+{
+	int ret;
+	va_list args;
+
+	va_start(args, fmt);
+	ret = vprintk(fmt, args);
+	ret += printk("\n");
+	va_end(args);
+
+	return ret;
+}
+
+void hdd_ioctl_log_buffer(int log_id, uint32_t count, qdf_abstract_print
+							     *custom_print,
+							     void *print_ctx)
+{
+	qdf_abstract_print *print;
+
+	if (custom_print)
+		print = custom_print;
+	else
+		print = &printk_adapter;
+	switch (log_id) {
+	case HTC_CREDIT_HISTORY_LOG:
+		cds_print_htc_credit_history(count, print, print_ctx);
+		break;
+	case COMMAND_LOG:
+		wma_print_wmi_cmd_log(count, print, print_ctx);
+		break;
+	case COMMAND_TX_CMP_LOG:
+		wma_print_wmi_cmd_tx_cmp_log(count, print, print_ctx);
+		break;
+	case MGMT_COMMAND_LOG:
+		wma_print_wmi_mgmt_cmd_log(count, print, print_ctx);
+		break;
+	case MGMT_COMMAND_TX_CMP_LOG:
+		wma_print_wmi_mgmt_cmd_tx_cmp_log(count, print, print_ctx);
+		break;
+	case EVENT_LOG:
+		wma_print_wmi_event_log(count, print, print_ctx);
+		break;
+	case RX_EVENT_LOG:
+		wma_print_wmi_rx_event_log(count, print, print_ctx);
+		break;
+	case MGMT_EVENT_LOG:
+		wma_print_wmi_mgmt_event_log(count, print, print_ctx);
+		break;
+	default:
+		print(print_ctx, "Invalid Log Id %d", log_id);
+		break;
+	}
+}
+
+#ifdef WLAN_DUMP_LOG_BUF_CNT
+void hdd_dump_log_buffer(void *print_ctx, qdf_abstract_print *custom_print)
+{
+	int i;
+
+	for (i = 0; i <= MGMT_EVENT_LOG; i++)
+		hdd_ioctl_log_buffer(i, WLAN_DUMP_LOG_BUF_CNT, custom_print,
+				     print_ctx);
+}
+#endif
+
 static int drv_cmd_get_ccx_mode(struct hdd_adapter *adapter,
 				struct hdd_context *hdd_ctx,
 				uint8_t *command,

core/hdd/src/wlan_hdd_ioctl.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2014, 2017-2019, 2020 The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -122,5 +122,39 @@ hdd_get_roam_scan_freq(struct hdd_adapter *adapter, mac_handle_t mac_handle,
 {
 	return -EFAULT;
 }
+#endif
+
+/**
+ * hdd_ioctl_log_buffer() - dump log buffer of a type
+ * @log_id: id of what log type to be
+ * @count: number of lines to be copied
+ * @custom_print: custom print function pointer
+ * @print_ctx: print context for custom print function
+ *
+ * If custom print function is NULL, will default to printk
+ *
+ * Return: None
+ */
+void hdd_ioctl_log_buffer(int log_id, uint32_t count, qdf_abstract_print
+							     *custom_print,
+							     void *print_ctx);
+#ifdef WLAN_DUMP_LOG_BUF_CNT
+/**
+ * hdd_dump_log_buffer() - dump log buffer history
+ * @print_ctx: print context for custom print function
+ * @custom_print: custom print function pointer
+ *
+ * If custom print function is NULL, will default to printk
+ *
+ * Return: None
+ */
+void hdd_dump_log_buffer(void *print_ctx, qdf_abstract_print *custom_print);
+
+#else
+static inline
+void hdd_dump_log_buffer(void *print_ctx, qdf_abstract_print *custom_print)
+{
+}
+
 #endif
 #endif /* end #if !defined(WLAN_HDD_IOCTL_H) */

core/hdd/src/wlan_hdd_wext.c

@@ -2586,17 +2586,6 @@
  */
 #define WE_SET_BA_AGEING_TIMEOUT		9
 
-enum host_target_comm_log {
-	HTC_CREDIT_HISTORY_LOG = 0,
-	COMMAND_LOG,
-	COMMAND_TX_CMP_LOG,
-	MGMT_COMMAND_LOG,
-	MGMT_COMMAND_TX_CMP_LOG,
-	EVENT_LOG,
-	RX_EVENT_LOG,
-	MGMT_EVENT_LOG
-};
-
 /* (SIOCIWFIRSTPRIV + 29) is currently unused */
 
 /* 802.11p IOCTL */
@@ -8447,70 +8436,7 @@ static int iw_set_band_config(struct net_device *dev,
 	return errno;
 }
 
-static int printk_adapter(void *priv, const char *fmt, ...)
-{
-	int ret;
-	va_list args;
-
-	va_start(args, fmt);
-	ret = vprintk(fmt, args);
-	ret += printk("\n");
-	va_end(args);
-
-	return ret;
-}
-
-static void hdd_ioctl_log_buffer(int log_id, uint32_t count, qdf_abstract_print
-							     *custom_print,
-							     void *print_ctx)
-{
-	qdf_abstract_print *print;
-
-	if (custom_print)
-		print = custom_print;
-	else
-		print = &printk_adapter;
-	switch (log_id) {
-	case HTC_CREDIT_HISTORY_LOG:
-		cds_print_htc_credit_history(count, print, print_ctx);
-		break;
-	case COMMAND_LOG:
-		wma_print_wmi_cmd_log(count, print, print_ctx);
-		break;
-	case COMMAND_TX_CMP_LOG:
-		wma_print_wmi_cmd_tx_cmp_log(count, print, print_ctx);
-		break;
-	case MGMT_COMMAND_LOG:
-		wma_print_wmi_mgmt_cmd_log(count, print, print_ctx);
-		break;
-	case MGMT_COMMAND_TX_CMP_LOG:
-		wma_print_wmi_mgmt_cmd_tx_cmp_log(count, print, print_ctx);
-		break;
-	case EVENT_LOG:
-		wma_print_wmi_event_log(count, print, print_ctx);
-		break;
-	case RX_EVENT_LOG:
-		wma_print_wmi_rx_event_log(count, print, print_ctx);
-		break;
-	case MGMT_EVENT_LOG:
-		wma_print_wmi_mgmt_event_log(count, print, print_ctx);
-		break;
-	default:
-		print(print_ctx, "Invalid Log Id %d", log_id);
-		break;
-	}
-}
-
-#ifdef WLAN_DUMP_LOG_BUF_CNT
-void hdd_dump_log_buffer(void *print_ctx, qdf_abstract_print *custom_print)
-{
-	int i;
 
-	for (i = 0; i <= MGMT_EVENT_LOG; i++)
-		hdd_ioctl_log_buffer(i, WLAN_DUMP_LOG_BUF_CNT, custom_print,
-				     print_ctx);
-}
-#endif
 
 #ifdef CONFIG_DP_TRACE
 void hdd_set_dump_dp_trace(uint16_t cmd_type, uint16_t count)