diff options
Diffstat (limited to 'drivers')
36 files changed, 1 insertions, 134 deletions
diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c index dbf0d64..69ae790 100644 --- a/drivers/staging/csr/csr_msgconv.c +++ b/drivers/staging/csr/csr_msgconv.c @@ -11,7 +11,6 @@ #include <linux/module.h> #include <linux/types.h> #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_panic.h" #include "csr_sched.h" #include "csr_msgconv.h" diff --git a/drivers/staging/csr/csr_pmem.h b/drivers/staging/csr/csr_pmem.h deleted file mode 100644 index 1fb74fa..0000000 --- a/drivers/staging/csr/csr_pmem.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef CSR_PMEM_H__ -#define CSR_PMEM_H__ -/***************************************************************************** - - (c) Cambridge Silicon Radio Limited 2010 - All rights reserved and confidential information of CSR - - Refer to LICENSE.txt included with this source for details - on the license terms. - -*****************************************************************************/ - -#include <linux/types.h> -#include "csr_macro.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/***************************************************************************** - - NAME - CsrPmemZalloc - - DESCRIPTION - This function is equivalent to CsrPmemAlloc, but the allocated memory - is initialised to zero. - - PARAMETERS - size - Size of memory requested. Note that a size of 0 is valid. - - RETURNS - Pointer to allocated memory. - -*****************************************************************************/ -#define CsrPmemZalloc(s) (CsrMemSet(CsrPmemAlloc(s), 0x00, (s))) - - -/***************************************************************************** - - NAME - pnew and zpnew - - DESCRIPTIOM - Type-safe wrappers for CsrPmemAlloc and CsrPmemZalloc, for allocating - single instances of a specified and named type. - - PARAMETERS - t - type to allocate. - -*****************************************************************************/ -#define pnew(t) ((t *) (CsrPmemAlloc(sizeof(t)))) -#define zpnew(t) ((t *) (CsrPmemZalloc(sizeof(t)))) - - -/*----------------------------------------------------------------------------* - * Csr Pmem Debug code. Allows custom callbacks on CsrPmemAlloc and CsrPmemFree - *----------------------------------------------------------------------------*/ -#ifdef CSR_PMEM_DEBUG_ENABLE - -typedef u8 CsrPmemDebugAllocType; -#define CSR_PMEM_DEBUG_TYPE_PMEM_ALLOC 1 -#define CSR_PMEM_DEBUG_TYPE_MEM_ALLOC 2 -#define CSR_PMEM_DEBUG_TYPE_MEM_CALLOC 3 -#define CSR_PMEM_DEBUG_TYPE_MEM_ALLOC_DMA 4 - -typedef void (CsrPmemDebugOnAlloc)(void *ptr, void *userptr, size_t size, CsrPmemDebugAllocType type, const char* file, u32 line); -typedef void (CsrPmemDebugOnFree)(void *ptr, void *userptr, CsrPmemDebugAllocType type, const char* file, u32 line); - -/*----------------------------------------------------------------------------* - * NAME - * CsrPmemInstallHooks - * - * DESCRIPTION - * Install debug hooks for memory allocation - * Use NULL values to uninstall the hooks - * headSize = The number of extra bytes to allocate in the head of the Allocated buffer - * footSize = The number of extra bytes to allocate in the end of the Allocated buffer - * - * RETURNS - * void - * - *----------------------------------------------------------------------------*/ -void CsrPmemDebugInstallHooks(u8 headSize, u8 endSize, CsrPmemDebugOnAlloc *onAllocCallback, CsrPmemDebugOnFree *onFreeCallback); - -void *CsrPmemDebugAlloc(size_t size, CsrPmemDebugAllocType type, const char* file, u32 line); - -void CsrPmemDebugFree(void *ptr, CsrPmemDebugAllocType type, const char* file, u32 line); - -#endif - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c index bb08f19..39406fd 100644 --- a/drivers/staging/csr/csr_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_serialize_primitive_types.c @@ -13,7 +13,6 @@ #include "csr_prim_defs.h" #include "csr_msgconv.h" #include "csr_macro.h" -#include "csr_pmem.h" #include "csr_lib.h" void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset) diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c index 801d8a8..4854f85 100644 --- a/drivers/staging/csr/csr_utf16.c +++ b/drivers/staging/csr/csr_utf16.c @@ -9,7 +9,6 @@ *****************************************************************************/ #include <linux/module.h> #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_unicode.h" #include "csr_macro.h" diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h index e933ab1..073e2f8 100644 --- a/drivers/staging/csr/csr_wifi_fsm.h +++ b/drivers/staging/csr/csr_wifi_fsm.h @@ -15,7 +15,6 @@ extern "C" { #endif -#include "csr_pmem.h" #include "csr_prim_defs.h" #include "csr_log_text.h" #include "csr_wifi_fsm_event.h" diff --git a/drivers/staging/csr/csr_wifi_fsm_types.h b/drivers/staging/csr/csr_wifi_fsm_types.h index 3251fa9..26752bf3 100644 --- a/drivers/staging/csr/csr_wifi_fsm_types.h +++ b/drivers/staging/csr/csr_wifi_fsm_types.h @@ -17,7 +17,6 @@ extern "C" { #include <linux/types.h> #include "csr_macro.h" -#include "csr_pmem.h" #include "csr_panic.h" #include "csr_sched.h" diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h index cabcf56..dc3c60b 100644 --- a/drivers/staging/csr/csr_wifi_hip_unifi.h +++ b/drivers/staging/csr/csr_wifi_hip_unifi.h @@ -97,7 +97,6 @@ extern "C" { #include "csr_framework_ext.h" /* from the synergy porting folder */ #include "csr_sdio.h" /* from the synergy porting folder */ -#include "csr_pmem.h" /* from the synergy porting folder */ #include "csr_macro.h" /* from the synergy porting folder */ #include "csr_formatted_io.h" /* from the synergy gsp folder */ #include "csr_wifi_result.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c index ce2c7d5..0689d6f 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_converter_init.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include "csr_msgconv.h" -#include "csr_pmem.h" #include "csr_macro.h" #ifdef CSR_WIFI_NME_ENABLE diff --git a/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c index bfc511e..ab93588 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_free_downstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_wifi_nme_ap_prim.h" #include "csr_wifi_nme_ap_lib.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c index d9ebce3..2786a6b 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_free_upstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ -#include "csr_pmem.h" #include "csr_wifi_nme_ap_prim.h" #include "csr_wifi_nme_ap_lib.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h index fed0ea2..d401470 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_AP_LIB_H__ #define CSR_WIFI_NME_AP_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_prim.h b/drivers/staging/csr/csr_wifi_nme_ap_prim.h index ec67046..fc44560 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_prim.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_prim.h @@ -13,6 +13,7 @@ #ifndef CSR_WIFI_NME_AP_PRIM_H__ #define CSR_WIFI_NME_AP_PRIM_H__ +#include <linux/types.h> #include "csr_prim_defs.h" #include "csr_sched.h" #include "csr_wifi_common.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c index 8112aa0..493e33e 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c +++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include <linux/string.h> #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_msgconv.h" #include "csr_unicode.h" diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h index 524da14..0f57829 100644 --- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.h +++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_AP_SERIALIZE_H__ #define CSR_WIFI_NME_AP_SERIALIZE_H__ -#include "csr_pmem.h" #include "csr_wifi_msgconv.h" #include "csr_wifi_nme_ap_prim.h" diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h index 04b7c31..709ece4 100644 --- a/drivers/staging/csr/csr_wifi_nme_lib.h +++ b/drivers/staging/csr/csr_wifi_nme_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_NME_LIB_H__ #define CSR_WIFI_NME_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_nme_serialize.h b/drivers/staging/csr/csr_wifi_nme_serialize.h index dca36d9..c6b1636 100644 --- a/drivers/staging/csr/csr_wifi_nme_serialize.h +++ b/drivers/staging/csr/csr_wifi_nme_serialize.h @@ -13,9 +13,7 @@ #ifndef CSR_WIFI_NME_SERIALIZE_H__ #define CSR_WIFI_NME_SERIALIZE_H__ -#include "csr_pmem.h" #include "csr_wifi_msgconv.h" - #include "csr_wifi_nme_prim.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_wifi_router_converter_init.c b/drivers/staging/csr/csr_wifi_router_converter_init.c index a321786..775c013 100644 --- a/drivers/staging/csr/csr_wifi_router_converter_init.c +++ b/drivers/staging/csr/csr_wifi_router_converter_init.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include "csr_msgconv.h" -#include "csr_pmem.h" #include "csr_macro.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c index 503f1af..a02e307 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_converter_init.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include "csr_msgconv.h" -#include "csr_pmem.h" #include "csr_macro.h" #ifdef CSR_LOG_ENABLE diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c index b4b7243..7fa85fb 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_downstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_wifi_router_ctrl_prim.h" #include "csr_wifi_router_ctrl_lib.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c index 4605c53..954b3de 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_free_upstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_wifi_router_ctrl_prim.h" #include "csr_wifi_router_ctrl_lib.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h index ba8e983..93d0fad 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_CTRL_LIB_H__ #define CSR_WIFI_ROUTER_CTRL_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c index e4b7ec9..b9f9adb 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include <linux/string.h> #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_msgconv.h" #include "csr_unicode.h" diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h index f270377..2c2a229 100644 --- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h +++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__ #define CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__ -#include "csr_pmem.h" #include "csr_wifi_msgconv.h" #include "csr_wifi_router_ctrl_prim.h" diff --git a/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c index fbd5b35..c4badc5 100644 --- a/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_free_downstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_wifi_router_prim.h" #include "csr_wifi_router_lib.h" diff --git a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c index 60f6ecd..de1086d 100644 --- a/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_router_free_upstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_wifi_router_prim.h" #include "csr_wifi_router_lib.h" diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h index f2f5196..06a2214 100644 --- a/drivers/staging/csr/csr_wifi_router_lib.h +++ b/drivers/staging/csr/csr_wifi_router_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_ROUTER_LIB_H__ #define CSR_WIFI_ROUTER_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_router_serialize.c b/drivers/staging/csr/csr_wifi_router_serialize.c index adf37d4..5717ebc 100644 --- a/drivers/staging/csr/csr_wifi_router_serialize.c +++ b/drivers/staging/csr/csr_wifi_router_serialize.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_msgconv.h" #include "csr_unicode.h" diff --git a/drivers/staging/csr/csr_wifi_router_serialize.h b/drivers/staging/csr/csr_wifi_router_serialize.h index 4951c40..07e21b2 100644 --- a/drivers/staging/csr/csr_wifi_router_serialize.h +++ b/drivers/staging/csr/csr_wifi_router_serialize.h @@ -13,9 +13,7 @@ #ifndef CSR_WIFI_ROUTER_SERIALIZE_H__ #define CSR_WIFI_ROUTER_SERIALIZE_H__ -#include "csr_pmem.h" #include "csr_wifi_msgconv.h" - #include "csr_wifi_router_prim.h" #ifdef __cplusplus diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c index 23b0e51..dd93d00 100644 --- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c +++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c @@ -10,7 +10,6 @@ #include <linux/module.h> #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_macro.h" #include "csr_msgconv.h" #include "csr_wifi_msgconv.h" diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h index 8825172..350cb9e 100644 --- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_SME_AP_LIB_H__ #define CSR_WIFI_SME_AP_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_sme_converter_init.c b/drivers/staging/csr/csr_wifi_sme_converter_init.c index 2d9c683..31835f0 100644 --- a/drivers/staging/csr/csr_wifi_sme_converter_init.c +++ b/drivers/staging/csr/csr_wifi_sme_converter_init.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include "csr_msgconv.h" -#include "csr_pmem.h" #include "csr_macro.h" diff --git a/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c b/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c index ae3fec8..03b5ddb 100644 --- a/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c +++ b/drivers/staging/csr/csr_wifi_sme_free_downstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_wifi_sme_prim.h" #include "csr_wifi_sme_lib.h" diff --git a/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c b/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c index 1977747..c04767b 100644 --- a/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c +++ b/drivers/staging/csr/csr_wifi_sme_free_upstream_contents.c @@ -10,7 +10,6 @@ /* Note: this is an auto-generated file. */ #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_wifi_sme_prim.h" #include "csr_wifi_sme_lib.h" diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h index e20ae98..3ca7456 100644 --- a/drivers/staging/csr/csr_wifi_sme_lib.h +++ b/drivers/staging/csr/csr_wifi_sme_lib.h @@ -13,7 +13,6 @@ #ifndef CSR_WIFI_SME_LIB_H__ #define CSR_WIFI_SME_LIB_H__ -#include "csr_pmem.h" #include "csr_sched.h" #include "csr_macro.h" #include "csr_msg_transport.h" diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c index a1db211..d55e3ee 100644 --- a/drivers/staging/csr/csr_wifi_sme_serialize.c +++ b/drivers/staging/csr/csr_wifi_sme_serialize.c @@ -11,7 +11,6 @@ /* Note: this is an auto-generated file. */ #include <linux/string.h> #include <linux/slab.h> -#include "csr_pmem.h" #include "csr_msgconv.h" #include "csr_unicode.h" diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.h b/drivers/staging/csr/csr_wifi_sme_serialize.h index 9ea9d15..4f3af0a 100644 --- a/drivers/staging/csr/csr_wifi_sme_serialize.h +++ b/drivers/staging/csr/csr_wifi_sme_serialize.h @@ -13,9 +13,7 @@ #ifndef CSR_WIFI_SME_SERIALIZE_H__ #define CSR_WIFI_SME_SERIALIZE_H__ -#include "csr_pmem.h" #include "csr_wifi_msgconv.h" - #include "csr_wifi_sme_prim.h" #ifdef __cplusplus |