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

qcacmn: Remove ani_global.h from qca-cmn

Browse Source 
Currently ani_global.h is included in qca-cmn,
This change removes ani_global.h and there are
corresponding changes in Driver

Change-Id: I4c1cf70e8eb1f4391a25783a560c02a43c483054
CRs-Fixed: 1012452
This commit is contained in:
Anurag Chouhan
2016-07-20 18:43:18 +05:30
committed by Vishwajith Upendra
parent 87b90e5d12
commit 61d118eb9b
4 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qdf/inc/qdf_lock.h
View File

@@ -260,8 +260,9 @@ QDF_STATUS qdf_wake_lock_create(qdf_wake_lock_t *lock, const char *name);
QDF_STATUS qdf_wake_lock_acquire(qdf_wake_lock_t *lock, uint32_t reason); QDF_STATUS qdf_wake_lock_acquire(qdf_wake_lock_t *lock, uint32_t reason);
const char *qdf_wake_lock_name(qdf_wake_lock_t *lock);
QDF_STATUS qdf_wake_lock_timeout_acquire(qdf_wake_lock_t *lock, QDF_STATUS qdf_wake_lock_timeout_acquire(qdf_wake_lock_t *lock,
uint32_t msec, uint32_t reason); uint32_t msec);
QDF_STATUS qdf_wake_lock_release(qdf_wake_lock_t *lock, uint32_t reason); QDF_STATUS qdf_wake_lock_release(qdf_wake_lock_t *lock, uint32_t reason);

3
qdf/inc/qdf_types.h
View File

@@ -387,6 +387,9 @@ typedef enum {
typedef void *v_CONTEXT_t; typedef void *v_CONTEXT_t;
#define QDF_MAC_ADDR_SIZE (6) #define QDF_MAC_ADDR_SIZE (6)
#define QDF_MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x"
#define QDF_MAC_ADDR_ARRAY(a) \
(a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
/** /**
* struct qdf_mac_addr - mac address array * struct qdf_mac_addr - mac address array

15
qdf/linux/src/qdf_lock.c
View File

@@ -32,8 +32,8 @@
#include <qdf_types.h> #include <qdf_types.h>
#ifdef CONFIG_MCL #ifdef CONFIG_MCL
#include <i_host_diag_core_event.h> #include <i_host_diag_core_event.h>
#include <ani_global.h>
#include <hif.h> #include <hif.h>
#include <cds_api.h>
#endif #endif
#include <i_qdf_lock.h> #include <i_qdf_lock.h>
@@ -244,7 +244,7 @@ EXPORT_SYMBOL(qdf_mutex_release);
* *
* Return: Pointer to the name if it is valid or a default string * Return: Pointer to the name if it is valid or a default string
*/ */
static const char *qdf_wake_lock_name(qdf_wake_lock_t *lock) const char *qdf_wake_lock_name(qdf_wake_lock_t *lock)
{ {
if (lock->name) if (lock->name)
return lock->name; return lock->name;
@@ -298,20 +298,11 @@ EXPORT_SYMBOL(qdf_wake_lock_acquire);
* QDF status success: if wake lock is acquired * QDF status success: if wake lock is acquired
* QDF status failure: if wake lock was not acquired * QDF status failure: if wake lock was not acquired
*/ */
QDF_STATUS qdf_wake_lock_timeout_acquire(qdf_wake_lock_t *lock, uint32_t msec, QDF_STATUS qdf_wake_lock_timeout_acquire(qdf_wake_lock_t *lock, uint32_t msec)
uint32_t reason)
{ {
/* Wakelock for Rx is frequent. /* Wakelock for Rx is frequent.
* It is reported only during active debug * It is reported only during active debug
*/ */
#ifdef CONFIG_MCL
if (((cds_get_ring_log_level(RING_ID_WAKELOCK) >= WLAN_LOG_LEVEL_ACTIVE)
&& (WIFI_POWER_EVENT_WAKELOCK_HOLD_RX == reason)) ||
(WIFI_POWER_EVENT_WAKELOCK_HOLD_RX != reason)) {
host_diag_log_wlock(reason, qdf_wake_lock_name(lock), msec,
WIFI_POWER_EVENT_WAKELOCK_TAKEN);
}
#endif
__pm_wakeup_event(lock, msec); __pm_wakeup_event(lock, msec);
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }

10
qdf/linux/src/qdf_trace.c
View File

@@ -33,7 +33,6 @@
/* Include Files */ /* Include Files */
#include <qdf_trace.h> #include <qdf_trace.h>
#include <ani_global.h>
#include <wlan_logging_sock_svc.h> #include <wlan_logging_sock_svc.h>
#include "qdf_time.h" #include "qdf_time.h"
/* Preprocessor definitions and constants */ /* Preprocessor definitions and constants */
@@ -1306,10 +1305,11 @@ void qdf_dp_display_proto_pkt(struct qdf_dp_trace_record_s *record,
qdf_print("DPT: %04d: %012llu: %s vdev_id %d", index, qdf_print("DPT: %04d: %012llu: %s vdev_id %d", index,
record->time, qdf_dp_code_to_string(record->code), record->time, qdf_dp_code_to_string(record->code),
buf->vdev_id); buf->vdev_id);
qdf_print("DPT: SA: " MAC_ADDRESS_STR " %s DA: " qdf_print("DPT: SA: " QDF_MAC_ADDRESS_STR " %s DA: "
MAC_ADDRESS_STR " Type %s Subtype %s", QDF_MAC_ADDRESS_STR " Type %s Subtype %s",
MAC_ADDR_ARRAY(buf->sa.bytes), qdf_dp_dir_to_str(buf->dir), QDF_MAC_ADDR_ARRAY(buf->sa.bytes), qdf_dp_dir_to_str(buf->dir),
MAC_ADDR_ARRAY(buf->da.bytes), qdf_dp_type_to_str(buf->type), QDF_MAC_ADDR_ARRAY(buf->da.bytes),
qdf_dp_type_to_str(buf->type),
qdf_dp_subtype_to_str(buf->subtype)); qdf_dp_subtype_to_str(buf->subtype));
} }
EXPORT_SYMBOL(qdf_dp_display_proto_pkt); EXPORT_SYMBOL(qdf_dp_display_proto_pkt);