Code cleanup. Removed fullmac dependencies on this file.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#endif /* DHD_DEBUG */
#include <chipcommon.h>
-#include <sbdma.h>
#include <sdio.h>
#include <sbsdio.h>
#define PAD _XSTR(__LINE__)
#endif /* PAD */
-/* dma registers per channel(xmt or rcv) */
-typedef volatile struct {
- u32 control; /* enable, et al */
- u32 addr; /* descriptor ring base address (4K aligned) */
- u32 ptr; /* last descriptor posted to chip */
- u32 status; /* current active descriptor, et al */
-} dma32regs_t;
-
-typedef volatile struct {
- dma32regs_t xmt; /* dma tx channel */
- dma32regs_t rcv; /* dma rx channel */
-} dma32regp_t;
-
-typedef volatile struct {
- dma64regs_t xmt; /* dma tx */
- u32 PAD[2];
- dma64regs_t rcv; /* dma rx */
- u32 PAD[2];
-} dma64p_t;
-
-
-typedef volatile struct { /* diag access */
- u32 fifoaddr; /* diag address */
- u32 fifodatalow; /* low 32bits of data */
- u32 fifodatahigh; /* high 32bits of data */
- u32 pad; /* reserved */
-} dma64diag_t;
-
-/* dma64 sdiod corerev >= 1 */
-typedef volatile struct {
- dma64p_t dma64regs[2];
- dma64diag_t dmafifo; /* DMA Diagnostic Regs, 0x280-0x28c */
- u32 PAD[92];
-} sdiodma64_t;
-
-/* dma32 sdiod corerev == 0 */
-typedef volatile struct {
- dma32regp_t dma32regs[2]; /* dma tx & rx, 0x200-0x23c */
- dma32diag_t dmafifo; /* DMA Diagnostic Regs, 0x240-0x24c */
- u32 PAD[108];
-} sdiodma32_t;
-
-/* dma32 regs for pcmcia core */
-typedef volatile struct {
- dma32regp_t dmaregs; /* DMA Regs, 0x200-0x21c, rev8 */
- dma32diag_t dmafifo; /* DMA Diagnostic Regs, 0x220-0x22c */
- u32 PAD[116];
-} pcmdma32_t;
-
/* core registers */
typedef volatile struct {
u32 corecontrol; /* CoreControl, 0x000, rev8 */
u32 PAD[40];
u32 clockctlstatus; /* ClockCtlStatus, 0x1e0, rev8 */
u32 PAD[7];
-
- /* DMA engines */
- volatile union {
- pcmdma32_t pcm32;
- sdiodma32_t sdiod32;
- sdiodma64_t sdiod64;
- } dma;
+ u32 PAD[128]; /* DMA engines */
/* SDIO/PCMCIA CIS region */
char cis[512]; /* 512 byte CIS, 0x400-0x5ff, rev6 */
#ifndef _bcmdma_h_
#define _bcmdma_h_
+#include "wlc_types.h" /* forward structure declarations */
+
#ifndef _dma_pub_
#define _dma_pub_
struct dma_pub;
#endif /* _dma_pub_ */
+/* DMA structure:
+ * support two DMA engines: 32 bits address or 64 bit addressing
+ * basic DMA register set is per channel(transmit or receive)
+ * a pair of channels is defined for convenience
+ */
+
+/* 32 bits addressing */
+
+typedef volatile struct { /* diag access */
+ u32 fifoaddr; /* diag address */
+ u32 fifodatalow; /* low 32bits of data */
+ u32 fifodatahigh; /* high 32bits of data */
+ u32 pad; /* reserved */
+} dma32diag_t;
+
+/* 64 bits addressing */
+
+/* dma registers per channel(xmt or rcv) */
+typedef volatile struct {
+ u32 control; /* enable, et al */
+ u32 ptr; /* last descriptor posted to chip */
+ u32 addrlow; /* descriptor ring base address low 32-bits (8K aligned) */
+ u32 addrhigh; /* descriptor ring base address bits 63:32 (8K aligned) */
+ u32 status0; /* current descriptor, xmt state */
+ u32 status1; /* active descriptor, xmt error */
+} dma64regs_t;
+
/* map/unmap direction */
#define DMA_TX 1 /* TX direction for DMA */
#define DMA_RX 2 /* RX direction for DMA */
#include <aiutils.h>
#include "wlc_types.h"
-#include <sbdma.h>
+#include "bcmdma.h"
#include <bcmdma.h>
#if defined(__mips__)
#include <bcmnvram.h>
#include <chipcommon.h>
#include <bcmdevs.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include <wlc_types.h>
#include <wlc_phy_int.h>
#include <bcmnvram.h>
#include <bcmdevs.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include "wlc_phy_radio.h"
#include "wlc_phy_int.h"
#include <wlc_pmu.h>
#include <bcmdevs.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include <wlc_types.h>
#include <wlc_phy_radio.h>
*/
#include <linux/types.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include <wlc_phy_int.h>
#include <wlc_phytbl_lcn.h>
#include <linux/kernel.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include <wlc_phy_int.h>
#include <wlc_phytbl_n.h>
#include <bcmutils.h>
#include <bcmnvram.h>
#include <nicpci.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include "phy/wlc_phy_int.h"
#include "d11.h"
#include <bcmdefs.h>
#include <bcmutils.h>
#include <aiutils.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include "d11.h"
#include "wlc_types.h"
#include <bcmdefs.h>
#include <bcmutils.h>
#include <aiutils.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include <bcmdma.h>
#include <d11.h>
#include <bcmnvram.h>
#include <aiutils.h>
#include <bcmdevs.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include "d11.h"
#include "wlc_rate.h"
#include <bcmnvram.h>
#include <chipcommon.h>
#include <nicpci.h>
-#include <sbdma.h>
#include <bcmdma.h>
#include "wlc_types.h"
#include <bcmutils.h>
#include <bcmnvram.h>
#include <aiutils.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include "wlc_types.h"
#include "d11.h"
#include <bcmnvram.h>
#include <aiutils.h>
#include <bcmsrom.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include <bcmdma.h>
#include "wlc_pmu.h"
#include <bcmwifi.h>
#include <aiutils.h>
#include <chipcommon.h>
-#include <sbdma.h>
-#include <bcmdma.h>
+#include "bcmdma.h"
#include <wlc_pmu.h>
#include "wlc_types.h"
#include <bcmdefs.h>
#include <bcmutils.h>
#include <aiutils.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include "wlc_types.h"
#include "d11.h"
#include <aiutils.h>
#include <bcmwifi.h>
#include <bcmnvram.h>
-#include <sbdma.h>
+#include "bcmdma.h"
#include "wlc_types.h"
#include "d11.h"
#define MAX_DMA_SEGS 4
/* forward declarations */
+struct sk_buff;
struct wl_info;
struct wlc_info;
struct wlc_hw_info;
struct d11init;
struct dma_pub;
struct wlc_bsscfg;
+struct bcmstrbuf;
+struct si_pub;
#endif /* _wlc_types_h_ */
+++ /dev/null
-/*
- * 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.
- */
-
-#ifndef _sbdma_h_
-#define _sbdma_h_
-
-/* DMA structure:
- * support two DMA engines: 32 bits address or 64 bit addressing
- * basic DMA register set is per channel(transmit or receive)
- * a pair of channels is defined for convenience
- */
-
-/* 32 bits addressing */
-
-typedef volatile struct { /* diag access */
- u32 fifoaddr; /* diag address */
- u32 fifodatalow; /* low 32bits of data */
- u32 fifodatahigh; /* high 32bits of data */
- u32 pad; /* reserved */
-} dma32diag_t;
-
-/* 64 bits addressing */
-
-/* dma registers per channel(xmt or rcv) */
-typedef volatile struct {
- u32 control; /* enable, et al */
- u32 ptr; /* last descriptor posted to chip */
- u32 addrlow; /* descriptor ring base address low 32-bits (8K aligned) */
- u32 addrhigh; /* descriptor ring base address bits 63:32 (8K aligned) */
- u32 status0; /* current descriptor, xmt state */
- u32 status1; /* active descriptor, xmt error */
-} dma64regs_t;
-
-#endif /* _sbdma_h_ */
projects / profile / ivi / kernel-x86-ivi.git / commitdiff