Commit eaae2e92 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: csr: remove csr_pmem.h

It's no longer needed.

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 786eeeb3
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_panic.h" #include "csr_panic.h"
#include "csr_sched.h" #include "csr_sched.h"
#include "csr_msgconv.h" #include "csr_msgconv.h"
......
#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
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "csr_prim_defs.h" #include "csr_prim_defs.h"
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_macro.h" #include "csr_macro.h"
#include "csr_pmem.h"
#include "csr_lib.h" #include "csr_lib.h"
void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset) void CsrUint8Des(u8 *value, u8 *buffer, size_t *offset)
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
*****************************************************************************/ *****************************************************************************/
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_unicode.h" #include "csr_unicode.h"
#include "csr_macro.h" #include "csr_macro.h"
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
extern "C" { extern "C" {
#endif #endif
#include "csr_pmem.h"
#include "csr_prim_defs.h" #include "csr_prim_defs.h"
#include "csr_log_text.h" #include "csr_log_text.h"
#include "csr_wifi_fsm_event.h" #include "csr_wifi_fsm_event.h"
......
...@@ -17,7 +17,6 @@ extern "C" { ...@@ -17,7 +17,6 @@ extern "C" {
#include <linux/types.h> #include <linux/types.h>
#include "csr_macro.h" #include "csr_macro.h"
#include "csr_pmem.h"
#include "csr_panic.h" #include "csr_panic.h"
#include "csr_sched.h" #include "csr_sched.h"
......
...@@ -97,7 +97,6 @@ extern "C" { ...@@ -97,7 +97,6 @@ extern "C" {
#include "csr_framework_ext.h" /* from the synergy porting folder */ #include "csr_framework_ext.h" /* from the synergy porting folder */
#include "csr_sdio.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_macro.h" /* from the synergy porting folder */
#include "csr_formatted_io.h" /* from the synergy gsp folder */ #include "csr_formatted_io.h" /* from the synergy gsp folder */
#include "csr_wifi_result.h" #include "csr_wifi_result.h"
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_pmem.h"
#include "csr_macro.h" #include "csr_macro.h"
#ifdef CSR_WIFI_NME_ENABLE #ifdef CSR_WIFI_NME_ENABLE
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_wifi_nme_ap_prim.h" #include "csr_wifi_nme_ap_prim.h"
#include "csr_wifi_nme_ap_lib.h" #include "csr_wifi_nme_ap_lib.h"
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include "csr_pmem.h"
#include "csr_wifi_nme_ap_prim.h" #include "csr_wifi_nme_ap_prim.h"
#include "csr_wifi_nme_ap_lib.h" #include "csr_wifi_nme_ap_lib.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#ifndef CSR_WIFI_NME_AP_LIB_H__ #ifndef CSR_WIFI_NME_AP_LIB_H__
#define CSR_WIFI_NME_AP_LIB_H__ #define CSR_WIFI_NME_AP_LIB_H__
#include "csr_pmem.h"
#include "csr_sched.h" #include "csr_sched.h"
#include "csr_macro.h" #include "csr_macro.h"
#include "csr_msg_transport.h" #include "csr_msg_transport.h"
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#ifndef CSR_WIFI_NME_AP_PRIM_H__ #ifndef CSR_WIFI_NME_AP_PRIM_H__
#define CSR_WIFI_NME_AP_PRIM_H__ #define CSR_WIFI_NME_AP_PRIM_H__
#include <linux/types.h>
#include "csr_prim_defs.h" #include "csr_prim_defs.h"
#include "csr_sched.h" #include "csr_sched.h"
#include "csr_wifi_common.h" #include "csr_wifi_common.h"
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/string.h> #include <linux/string.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_unicode.h" #include "csr_unicode.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#ifndef CSR_WIFI_NME_AP_SERIALIZE_H__ #ifndef CSR_WIFI_NME_AP_SERIALIZE_H__
#define 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_msgconv.h"
#include "csr_wifi_nme_ap_prim.h" #include "csr_wifi_nme_ap_prim.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#ifndef CSR_WIFI_NME_LIB_H__ #ifndef CSR_WIFI_NME_LIB_H__
#define CSR_WIFI_NME_LIB_H__ #define CSR_WIFI_NME_LIB_H__
#include "csr_pmem.h"
#include "csr_sched.h" #include "csr_sched.h"
#include "csr_macro.h" #include "csr_macro.h"
#include "csr_msg_transport.h" #include "csr_msg_transport.h"
......
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
#ifndef CSR_WIFI_NME_SERIALIZE_H__ #ifndef CSR_WIFI_NME_SERIALIZE_H__
#define CSR_WIFI_NME_SERIALIZE_H__ #define CSR_WIFI_NME_SERIALIZE_H__
#include "csr_pmem.h"
#include "csr_wifi_msgconv.h" #include "csr_wifi_msgconv.h"
#include "csr_wifi_nme_prim.h" #include "csr_wifi_nme_prim.h"
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_pmem.h"
#include "csr_macro.h" #include "csr_macro.h"
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_pmem.h"
#include "csr_macro.h" #include "csr_macro.h"
#ifdef CSR_LOG_ENABLE #ifdef CSR_LOG_ENABLE
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_wifi_router_ctrl_prim.h" #include "csr_wifi_router_ctrl_prim.h"
#include "csr_wifi_router_ctrl_lib.h" #include "csr_wifi_router_ctrl_lib.h"
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_wifi_router_ctrl_prim.h" #include "csr_wifi_router_ctrl_prim.h"
#include "csr_wifi_router_ctrl_lib.h" #include "csr_wifi_router_ctrl_lib.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#ifndef CSR_WIFI_ROUTER_CTRL_LIB_H__ #ifndef CSR_WIFI_ROUTER_CTRL_LIB_H__
#define CSR_WIFI_ROUTER_CTRL_LIB_H__ #define CSR_WIFI_ROUTER_CTRL_LIB_H__
#include "csr_pmem.h"
#include "csr_sched.h" #include "csr_sched.h"
#include "csr_macro.h" #include "csr_macro.h"
#include "csr_msg_transport.h" #include "csr_msg_transport.h"
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/string.h> #include <linux/string.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_unicode.h" #include "csr_unicode.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#ifndef CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__ #ifndef CSR_WIFI_ROUTER_CTRL_SERIALIZE_H__
#define 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_msgconv.h"
#include "csr_wifi_router_ctrl_prim.h" #include "csr_wifi_router_ctrl_prim.h"
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_wifi_router_prim.h" #include "csr_wifi_router_prim.h"
#include "csr_wifi_router_lib.h" #include "csr_wifi_router_lib.h"
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_wifi_router_prim.h" #include "csr_wifi_router_prim.h"
#include "csr_wifi_router_lib.h" #include "csr_wifi_router_lib.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#ifndef CSR_WIFI_ROUTER_LIB_H__ #ifndef CSR_WIFI_ROUTER_LIB_H__
#define CSR_WIFI_ROUTER_LIB_H__ #define CSR_WIFI_ROUTER_LIB_H__
#include "csr_pmem.h"
#include "csr_sched.h" #include "csr_sched.h"
#include "csr_macro.h" #include "csr_macro.h"
#include "csr_msg_transport.h" #include "csr_msg_transport.h"
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_unicode.h" #include "csr_unicode.h"
......
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
#ifndef CSR_WIFI_ROUTER_SERIALIZE_H__ #ifndef CSR_WIFI_ROUTER_SERIALIZE_H__
#define CSR_WIFI_ROUTER_SERIALIZE_H__ #define CSR_WIFI_ROUTER_SERIALIZE_H__
#include "csr_pmem.h"
#include "csr_wifi_msgconv.h" #include "csr_wifi_msgconv.h"
#include "csr_wifi_router_prim.h" #include "csr_wifi_router_prim.h"
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_macro.h" #include "csr_macro.h"
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_wifi_msgconv.h" #include "csr_wifi_msgconv.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#ifndef CSR_WIFI_SME_AP_LIB_H__ #ifndef CSR_WIFI_SME_AP_LIB_H__
#define CSR_WIFI_SME_AP_LIB_H__ #define CSR_WIFI_SME_AP_LIB_H__
#include "csr_pmem.h"
#include "csr_sched.h" #include "csr_sched.h"
#include "csr_macro.h" #include "csr_macro.h"
#include "csr_msg_transport.h" #include "csr_msg_transport.h"
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_pmem.h"
#include "csr_macro.h" #include "csr_macro.h"
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_wifi_sme_prim.h" #include "csr_wifi_sme_prim.h"
#include "csr_wifi_sme_lib.h" #include "csr_wifi_sme_lib.h"
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_wifi_sme_prim.h" #include "csr_wifi_sme_prim.h"
#include "csr_wifi_sme_lib.h" #include "csr_wifi_sme_lib.h"
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#ifndef CSR_WIFI_SME_LIB_H__ #ifndef CSR_WIFI_SME_LIB_H__
#define CSR_WIFI_SME_LIB_H__ #define CSR_WIFI_SME_LIB_H__
#include "csr_pmem.h"
#include "csr_sched.h" #include "csr_sched.h"
#include "csr_macro.h" #include "csr_macro.h"
#include "csr_msg_transport.h" #include "csr_msg_transport.h"
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
/* Note: this is an auto-generated file. */ /* Note: this is an auto-generated file. */
#include <linux/string.h> #include <linux/string.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "csr_pmem.h"
#include "csr_msgconv.h" #include "csr_msgconv.h"
#include "csr_unicode.h" #include "csr_unicode.h"
......
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
#ifndef CSR_WIFI_SME_SERIALIZE_H__ #ifndef CSR_WIFI_SME_SERIALIZE_H__
#define CSR_WIFI_SME_SERIALIZE_H__ #define CSR_WIFI_SME_SERIALIZE_H__
#include "csr_pmem.h"
#include "csr_wifi_msgconv.h" #include "csr_wifi_msgconv.h"
#include "csr_wifi_sme_prim.h" #include "csr_wifi_sme_prim.h"
#ifdef __cplusplus #ifdef __cplusplus
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment