Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 621beaff authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: further cleaned fullmac header files 



Code cleanup. Deleted unused definitions. Moved locally used definitions to
.c files. Moved definitions from bcmsdh_sdmmc.h to bcmsdbus.h.

Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5def3b95

drivers/staging/brcm80211/brcmfmac/bcmsdbus.h

+106 −3
Original line number Diff line number Diff line
@@ -32,6 +32,60 @@ 
#define SDIOH_DATA_PIO          0	/* PIO mode */

#define SDIOH_DATA_DMA          1	/* DMA mode */



/* internal return code */

#define SUCCESS	0

#define ERROR	1



/* Common msglevel constants */

#define SDH_ERROR_VAL		0x0001	/* Error */

#define SDH_TRACE_VAL		0x0002	/* Trace */

#define SDH_INFO_VAL		0x0004	/* Info */

#define SDH_DEBUG_VAL		0x0008	/* Debug */

#define SDH_DATA_VAL		0x0010	/* Data */

#define SDH_CTRL_VAL		0x0020	/* Control Regs */

#define SDH_LOG_VAL		0x0040	/* Enable bcmlog */

#define SDH_DMA_VAL		0x0080	/* DMA */



#ifdef BCMDBG

#define sd_err(x)	\

	do { \

		if ((sd_msglevel & SDH_ERROR_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#define sd_trace(x)	\

	do { \

		if ((sd_msglevel & SDH_TRACE_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#define sd_info(x)	\

	do { \

		if ((sd_msglevel & SDH_INFO_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#define sd_debug(x)	\

	do { \

		if ((sd_msglevel & SDH_DEBUG_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#define sd_data(x)	\

	do { \

		if ((sd_msglevel & SDH_DATA_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#define sd_ctrl(x)	\

	do { \

		if ((sd_msglevel & SDH_CTRL_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#else

#define sd_err(x)

#define sd_trace(x)

#define sd_info(x)

#define sd_debug(x)

#define sd_data(x)

#define sd_ctrl(x)

#endif



struct brcmf_sdreg {

	int func;

	int offset;
@@ -41,6 +95,54 @@ struct brcmf_sdreg { 
/* callback function, taking one arg */

typedef void (*sdioh_cb_fn_t) (void *);



struct sdioh_info {

	struct osl_info *osh;		/* osh handler */

	bool client_intr_enabled;	/* interrupt connnected flag */

	bool intr_handler_valid;	/* client driver interrupt handler valid */

	sdioh_cb_fn_t intr_handler;	/* registered interrupt handler */

	void *intr_handler_arg;	/* argument to call interrupt handler */

	u16 intmask;		/* Current active interrupts */

	void *sdos_info;	/* Pointer to per-OS private data */



	uint irq;		/* Client irq */

	int intrcount;		/* Client interrupts */

	bool sd_blockmode;	/* sd_blockmode == false => 64 Byte Cmd 53s. */

	/*  Must be on for sd_multiblock to be effective */

	bool use_client_ints;	/* If this is false, make sure to restore */

	int client_block_size[SDIOD_MAX_IOFUNCS];	/* Blocksize */

	u8 num_funcs;	/* Supported funcs on client */

	u32 com_cis_ptr;

	u32 func_cis_ptr[SDIOD_MAX_IOFUNCS];

	uint max_dma_len;

	uint max_dma_descriptors;	/* DMA Descriptors supported by this controller. */

	/*	SDDMA_DESCRIPTOR	SGList[32]; *//* Scatter/Gather DMA List */

};



struct brcmf_sdmmc_instance {

	struct sdioh_info *sd;

	struct sdio_func *func[SDIOD_MAX_IOFUNCS];

	u32 host_claimed;

};



/* Allocate/init/free per-OS private data */

extern int  brcmf_sdioh_osinit(struct sdioh_info *sd);

extern void brcmf_sdioh_osfree(struct sdioh_info *sd);



/* OS-independent interrupt handler */

extern bool brcmf_sdioh_check_client_intr(struct sdioh_info *sd);



/* Core interrupt enable/disable of device interrupts */

extern void brcmf_sdioh_dev_intr_on(struct sdioh_info *sd);

extern void brcmf_sdioh_dev_intr_off(struct sdioh_info *sd);



/* Register mapping routines */

extern u32 *brcmf_sdioh_reg_map(s32 addr, int size);

extern void brcmf_sdioh_reg_unmap(s32 addr, int size);



/* Interrupt (de)registration routines */

extern int  brcmf_sdioh_register_irq(struct sdioh_info *sd, uint irq);

extern void brcmf_sdioh_free_irq(uint irq, struct sdioh_info *sd);



/* attach, return handler on success, NULL if failed.

 *  The handler shall be provided by all subsequent calls. No local cache

 *  cfghdl points to the starting address of pci device mapped memory
@@ -59,9 +161,6 @@ brcmf_sdioh_interrupt_query(struct sdioh_info *si, bool *onoff); 
extern int

brcmf_sdioh_interrupt_set(struct sdioh_info *si, bool enable_disable);



extern int brcmf_sdioh_claim_host_and_lock(struct sdioh_info *si);

extern int brcmf_sdioh_release_host_and_unlock(struct sdioh_info *si);



/* read or write one byte using cmd52 */

extern int

brcmf_sdioh_request_byte(struct sdioh_info *si, uint rw, uint fnc, uint addr,
@@ -105,4 +204,8 @@ void *brcmf_sdcard_get_sdioh(struct brcmf_sdio_card *card); 
/* Watchdog timer interface for pm ops */

extern void brcmf_sdio_wdtmr_enable(bool enable);



extern uint sd_msglevel;	/* Debug message level */



extern struct brcmf_sdmmc_instance *gInstance;



#endif				/* _sdio_api_h_ */

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+22 −0
Original line number Diff line number Diff line
@@ -31,6 +31,28 @@ 
#include "dhd.h"



#define SDIOH_API_ACCESS_RETRY_LIMIT	2



#define BRCMF_SD_ERROR_VAL	0x0001	/* Error */

#define BRCMF_SD_INFO_VAL		0x0002	/* Info */



#ifdef BCMDBG

#define BRCMF_SD_ERROR(x) \

	do { \

		if ((brcmf_sdio_msglevel & BRCMF_SD_ERROR_VAL) && \

		    net_ratelimit()) \

			printk x; \

	} while (0)

#define BRCMF_SD_INFO(x)	\

	do { \

		if ((brcmf_sdio_msglevel & BRCMF_SD_INFO_VAL) && \

		    net_ratelimit()) \

			printk x; \

	} while (0)

#else				/* BCMDBG */

#define BRCMF_SD_ERROR(x)

#define BRCMF_SD_INFO(x)

#endif				/* BCMDBG */



const uint brcmf_sdio_msglevel = BRCMF_SD_ERROR_VAL;



struct brcmf_sdio_card {

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "dngl_stats.h"

#include "dhd.h"

#include "dhd_bus.h"

#include "bcmsdbus.h"



/**

 * SDIO Host Controller info
@@ -208,7 +209,6 @@ void brcmf_sdio_unregister(void) 


/* Module parameters specific to each host-controller driver */



extern uint sd_msglevel;	/* Debug message level */

module_param(sd_msglevel, uint, 0);



extern uint sd_f2_blocksize;

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+10 −1
Original line number Diff line number Diff line
@@ -30,7 +30,16 @@ 
#include "bcmsdbus.h"

#include "dngl_stats.h"

#include "dhd.h"

#include "bcmsdh_sdmmc.h"



#define BLOCK_SIZE_64 64

#define BLOCK_SIZE_512 512

#define BLOCK_SIZE_4318 64

#define BLOCK_SIZE_4328 512



/* private bus modes */

#define SDIOH_MODE_SD4		2



#define CLIENT_INTR		0x100	/* Get rid of this! */



static void brcmf_sdioh_irqhandler(struct sdio_func *func);

static void brcmf_sdioh_irqhandler_f2(struct sdio_func *func);

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h

deleted100644 → 0
+0 −140
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2010 Broadcom Corporation

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

 * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



/*

 * BRCMF SDIO Function Driver for the native SDIO/MMC driver in the Linux Kernel

 */



#ifndef __BCMSDH_SDMMC_H__

#define __BCMSDH_SDMMC_H__



/* Common msglevel constants */

#define SDH_ERROR_VAL		0x0001	/* Error */

#define SDH_TRACE_VAL		0x0002	/* Trace */

#define SDH_INFO_VAL		0x0004	/* Info */

#define SDH_DEBUG_VAL		0x0008	/* Debug */

#define SDH_DATA_VAL		0x0010	/* Data */

#define SDH_CTRL_VAL		0x0020	/* Control Regs */

#define SDH_LOG_VAL		0x0040	/* Enable bcmlog */

#define SDH_DMA_VAL		0x0080	/* DMA */



#ifdef BCMDBG

#define sd_err(x)	\

	do { \

		if ((sd_msglevel & SDH_ERROR_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#define sd_trace(x)	\

	do { \

		if ((sd_msglevel & SDH_TRACE_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#define sd_info(x)	\

	do { \

		if ((sd_msglevel & SDH_INFO_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#define sd_debug(x)	\

	do { \

		if ((sd_msglevel & SDH_DEBUG_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#define sd_data(x)	\

	do { \

		if ((sd_msglevel & SDH_DATA_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#define sd_ctrl(x)	\

	do { \

		if ((sd_msglevel & SDH_CTRL_VAL) && net_ratelimit()) \

			printk x; \

	} while (0)

#else

#define sd_err(x)

#define sd_trace(x)

#define sd_info(x)

#define sd_debug(x)

#define sd_data(x)

#define sd_ctrl(x)

#endif



#define BLOCK_SIZE_64 64

#define BLOCK_SIZE_512 512

#define BLOCK_SIZE_4318 64

#define BLOCK_SIZE_4328 512



/* internal return code */

#define SUCCESS	0

#define ERROR	1



/* private bus modes */

#define SDIOH_MODE_SD4		2

#define CLIENT_INTR		0x100	/* Get rid of this! */



struct sdioh_info {

	struct osl_info *osh;		/* osh handler */

	bool client_intr_enabled;	/* interrupt connnected flag */

	bool intr_handler_valid;	/* client driver interrupt handler valid */

	sdioh_cb_fn_t intr_handler;	/* registered interrupt handler */

	void *intr_handler_arg;	/* argument to call interrupt handler */

	u16 intmask;		/* Current active interrupts */

	void *sdos_info;	/* Pointer to per-OS private data */



	uint irq;		/* Client irq */

	int intrcount;		/* Client interrupts */

	bool sd_blockmode;	/* sd_blockmode == false => 64 Byte Cmd 53s. */

	/*  Must be on for sd_multiblock to be effective */

	bool use_client_ints;	/* If this is false, make sure to restore */

	int client_block_size[SDIOD_MAX_IOFUNCS];	/* Blocksize */

	u8 num_funcs;	/* Supported funcs on client */

	u32 com_cis_ptr;

	u32 func_cis_ptr[SDIOD_MAX_IOFUNCS];

	uint max_dma_len;

	uint max_dma_descriptors;	/* DMA Descriptors supported by this controller. */

	/*	SDDMA_DESCRIPTOR	SGList[32]; *//* Scatter/Gather DMA List */

};



/* Global message bits */

extern uint sd_msglevel;



/* Allocate/init/free per-OS private data */

extern int  brcmf_sdioh_osinit(struct sdioh_info *sd);

extern void brcmf_sdioh_osfree(struct sdioh_info *sd);



/* OS-independent interrupt handler */

extern bool brcmf_sdioh_check_client_intr(struct sdioh_info *sd);



/* Core interrupt enable/disable of device interrupts */

extern void brcmf_sdioh_dev_intr_on(struct sdioh_info *sd);

extern void brcmf_sdioh_dev_intr_off(struct sdioh_info *sd);



/* Register mapping routines */

extern u32 *brcmf_sdioh_reg_map(s32 addr, int size);

extern void brcmf_sdioh_reg_unmap(s32 addr, int size);



/* Interrupt (de)registration routines */

extern int  brcmf_sdioh_register_irq(struct sdioh_info *sd, uint irq);

extern void brcmf_sdioh_free_irq(uint irq, struct sdioh_info *sd);



struct brcmf_sdmmc_instance {

	struct sdioh_info *sd;

	struct sdio_func *func[SDIOD_MAX_IOFUNCS];

	u32 host_claimed;

};



extern struct brcmf_sdmmc_instance *gInstance;



#endif				/* __BCMSDH_SDMMC_H__ */