staging: brcm80211: moved sbdma.h into brcmsmac/bcmdma.h

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>

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 5b1b4c2ef6d16c0eccee2305ddd06fc4e4e7162a..fca15e8cdfc63d601e935587f18a20cdd66eed87 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -132,7 +132,6 @@ typedef struct {
 
 #endif                         /* DHD_DEBUG */
 #include <chipcommon.h>
-#include <sbdma.h>
 
 #include <sdio.h>
 #include <sbsdio.h>

diff --git a/drivers/staging/brcm80211/brcmfmac/sbsdpcmdev.h b/drivers/staging/brcm80211/brcmfmac/sbsdpcmdev.h
index 76266db7bc67e4f6ffae8101816be8f1b757c3ae..cc64b2fed5b6ecc5643d607844a70924f81c2539 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/sbsdpcmdev.h
+++ b/drivers/staging/brcm80211/brcmfmac/sbsdpcmdev.h
@@ -24,55 +24,6 @@
 #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 */
@@ -133,13 +84,7 @@ typedef volatile struct {
        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 */

diff --git a/drivers/staging/brcm80211/brcmsmac/bcmdma.h b/drivers/staging/brcm80211/brcmsmac/bcmdma.h
index 005410dff2d9309c3eb7468ed71feac399239bc6..1a1ca03da2a5ed33da1d15f0b71c7ca32a60e53f 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/bcmdma.h
+++ b/drivers/staging/brcm80211/brcmsmac/bcmdma.h
@@ -17,11 +17,40 @@
 #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 */

diff --git a/drivers/staging/brcm80211/brcmsmac/dma.c b/drivers/staging/brcm80211/brcmsmac/dma.c
index 7d666c6430998adbb21decc1863b5f6bb907ff82..d50395dcd082c380a61b2fa194669d0eeece4fce 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/dma.c
+++ b/drivers/staging/brcm80211/brcmsmac/dma.c
@@ -25,7 +25,7 @@
 #include <aiutils.h>
 
 #include "wlc_types.h"
-#include <sbdma.h>
+#include "bcmdma.h"
 #include <bcmdma.h>
 
 #if defined(__mips__)

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
index d54e264eae7637b208831a71bbc8b2c89c70e99b..8045c39062e497bb5975a85f9b4054fe0e391240 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
@@ -27,7 +27,7 @@
 #include <bcmnvram.h>
 #include <chipcommon.h>
 #include <bcmdevs.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 
 #include <wlc_types.h>
 #include <wlc_phy_int.h>

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
index b5ec9ae4a334b56e066f233fe6830a11ac168d19..1011ca512a88d9f89d08a83449655cee72dc666d 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
@@ -25,7 +25,7 @@
 #include <bcmnvram.h>
 
 #include <bcmdevs.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 
 #include "wlc_phy_radio.h"
 #include "wlc_phy_int.h"

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
index bc362f33e690c963499df0f980f005b758179a3d..da2afbbe22e8420f02722592da3d15533a439a03 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
@@ -25,7 +25,7 @@
 #include <wlc_pmu.h>
 
 #include <bcmdevs.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 
 #include <wlc_types.h>
 #include <wlc_phy_radio.h>

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
index e9d8661babd7db87c6a26a08085561b75208763d..679002e5ef15014af79e1f22b0d044ccb262b1b5 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
@@ -15,7 +15,7 @@
  */
 
 #include <linux/types.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_lcn.h>
 

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
index e4a15c4db6b46397609d9896495fefa9ee53da27..ad41a19dfa008b234802ee11bf98a6429c71d237 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
@@ -16,7 +16,7 @@
 
 #include <linux/kernel.h>
 
-#include <sbdma.h>
+#include "bcmdma.h"
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_n.h>
 

diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index ee026d32c23fd9fb284ef8c0c283edb774716695..0f4a1cca143318d64c3b330feab238c10e9c4ccb 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -30,7 +30,7 @@
 #include <bcmutils.h>
 #include <bcmnvram.h>
 #include <nicpci.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 
 #include "phy/wlc_phy_int.h"
 #include "d11.h"

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
index 8a4875da57edcccadfb7e85fb67a5564b7e2db3e..218210ad01daf51e2bdfe794250f73bfe7705cec 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
@@ -19,7 +19,7 @@
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <aiutils.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 
 #include "d11.h"
 #include "wlc_types.h"

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index 53ca0ffac477f65415c3be9ee394bfd8da9b8feb..0c325c71bd22ae0f0f3d583f589d3b8856c96ac6 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -19,7 +19,7 @@
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <aiutils.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 #include <bcmdma.h>
 #include <d11.h>
 

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
index d26a520e96227a39319c0005f74293bd23a15854..fba9eaf8bbafda37d2a502cace9f91e174c83c9e 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
@@ -25,7 +25,7 @@
 #include <bcmnvram.h>
 #include <aiutils.h>
 #include <bcmdevs.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 
 #include "d11.h"
 #include "wlc_rate.h"

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index 0f876a7e69da9b21fbcce8ee95ae295e254ff0f8..6bc547a21fbd6541666e91956a5a3a284f838038 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -31,7 +31,6 @@
 #include <bcmnvram.h>
 #include <chipcommon.h>
 #include <nicpci.h>
-#include <sbdma.h>
 #include <bcmdma.h>
 
 #include "wlc_types.h"

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
index 0b980acdf33012945a0279eba0d3e9e74e8b17c2..cd379713cf2107a9acf0b4c72a2bd2b5f0ee34af 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
@@ -23,7 +23,7 @@
 #include <bcmutils.h>
 #include <bcmnvram.h>
 #include <aiutils.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 
 #include "wlc_types.h"
 #include "d11.h"

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index 18a54638ad3a54295aeed2f15a8dee6599b721af..3e34b31ca020b5a8612c344ba93c203ee8b4596e 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -26,7 +26,7 @@
 #include <bcmnvram.h>
 #include <aiutils.h>
 #include <bcmsrom.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 #include <bcmdma.h>
 
 #include "wlc_pmu.h"

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
index b97fa3e9f7c5982c986b7df17b4f37c5c7a6b2a9..668969120506bf9b87e368cf0b6b3442d2d60204 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
@@ -29,8 +29,7 @@
 #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"

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
index 53dcf24e247c76162d9dd82ca6e11507e97c2698..d6eae1f6a64ce0a9dedcd135b4d1f188e3eaa423 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
@@ -19,7 +19,7 @@
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <aiutils.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 
 #include "wlc_types.h"
 #include "d11.h"

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
index a08db2e4ee69376ce9705a3a822d56eb6ab6373e..8fb90d4057b5d7f208921ee8a45b249587dc601c 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
@@ -22,7 +22,7 @@
 #include <aiutils.h>
 #include <bcmwifi.h>
 #include <bcmnvram.h>
-#include <sbdma.h>
+#include "bcmdma.h"
 
 #include "wlc_types.h"
 #include "d11.h"

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_types.h b/drivers/staging/brcm80211/brcmsmac/wlc_types.h
index 76a1348e11939c9473b76a0dd59bef89cfe62d19..5cca0637b33648e5950e123bc8e41931a748d20e 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_types.h
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_types.h
@@ -34,6 +34,7 @@
 #define MAX_DMA_SEGS 4
 
 /* forward declarations */
+struct sk_buff;
 struct wl_info;
 struct wlc_info;
 struct wlc_hw_info;
@@ -45,5 +46,7 @@ struct bmac_pmq;
 struct d11init;
 struct dma_pub;
 struct wlc_bsscfg;
+struct bcmstrbuf;
+struct si_pub;
 
 #endif                         /* _wlc_types_h_ */

diff --git a/drivers/staging/brcm80211/include/sbdma.h b/drivers/staging/brcm80211/include/sbdma.h
deleted file mode 100644 (file)
index 9814a0c..0000000
--- a/drivers/staging/brcm80211/include/sbdma.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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_ */