From 400f867149041da36a769e5a22415231dcbd7fff Mon Sep 17 00:00:00 2001 From: codeworkx Date: Fri, 19 Oct 2012 19:14:29 +0200 Subject: bcmdhd: restore state from edd8a9171858fad7713b8fc07b158df5114b3c1a (samsung update 4) Change-Id: I5f216c0b67ce9a956d2af26f58fa0744cdc1d7f5 --- drivers/net/wireless/bcmdhd/include/bcmdefs.h | 239 -------------------------- 1 file changed, 239 deletions(-) delete mode 100755 drivers/net/wireless/bcmdhd/include/bcmdefs.h (limited to 'drivers/net/wireless/bcmdhd/include/bcmdefs.h') diff --git a/drivers/net/wireless/bcmdhd/include/bcmdefs.h b/drivers/net/wireless/bcmdhd/include/bcmdefs.h deleted file mode 100755 index a35ed72..0000000 --- a/drivers/net/wireless/bcmdhd/include/bcmdefs.h +++ /dev/null @@ -1,239 +0,0 @@ -/* - * Misc system wide definitions - * - * Copyright (C) 1999-2012, Broadcom Corporation - * - * Unless you and Broadcom execute a separate written software license - * agreement governing use of this software, this software is licensed to you - * under the terms of the GNU General Public License version 2 (the "GPL"), - * available at http://www.broadcom.com/licenses/GPLv2.php, with the - * following added to such license: - * - * As a special exception, the copyright holders of this software give you - * permission to link this software with independent modules, and to copy and - * distribute the resulting executable under terms of your choice, provided that - * you also meet, for each linked independent module, the terms and conditions of - * the license of that module. An independent module is a module which is not - * derived from this software. The special exception does not apply to any - * modifications of the software. - * - * Notwithstanding the above, under no circumstances may you combine this - * software in any way with any other Broadcom software provided under a license - * other than the GPL, without Broadcom's express prior written consent. - * - * $Id: bcmdefs.h 316830 2012-02-23 20:29:22Z $ - */ - -#ifndef _bcmdefs_h_ -#define _bcmdefs_h_ - - - - -#define BCM_REFERENCE(data) ((void)(data)) - - -#define STATIC_ASSERT(expr) { \ - \ - typedef enum { _STATIC_ASSERT_NOT_CONSTANT = (expr) } _static_assert_e; \ - \ - typedef char STATIC_ASSERT_FAIL[(expr) ? 1 : -1]; \ -} - - - -#define bcmreclaimed 0 -#define _data _data -#define _fn _fn -#define BCMPREATTACHDATA(_data) _data -#define BCMPREATTACHFN(_fn) _fn -#define _data _data -#define _fn _fn -#define _fn _fn -#define BCMNMIATTACHFN(_fn) _fn -#define BCMNMIATTACHDATA(_data) _data -#define CONST const -#ifndef BCMFASTPATH -#define BCMFASTPATH -#define BCMFASTPATH_HOST -#endif - - - -#define _data _data -#define BCMROMDAT_NAME(_data) _data -#define _fn _fn -#define _fn _fn -#define STATIC static -#define BCMROMDAT_ARYSIZ(data) ARRAYSIZE(data) -#define BCMROMDAT_SIZEOF(data) sizeof(data) -#define BCMROMDAT_APATCH(data) -#define BCMROMDAT_SPATCH(data) - - -#define SI_BUS 0 -#define PCI_BUS 1 -#define PCMCIA_BUS 2 -#define SDIO_BUS 3 -#define JTAG_BUS 4 -#define USB_BUS 5 -#define SPI_BUS 6 -#define RPC_BUS 7 - - -#ifdef BCMBUSTYPE -#define BUSTYPE(bus) (BCMBUSTYPE) -#else -#define BUSTYPE(bus) (bus) -#endif - - -#ifdef BCMCHIPTYPE -#define CHIPTYPE(bus) (BCMCHIPTYPE) -#else -#define CHIPTYPE(bus) (bus) -#endif - - - -#if defined(BCMSPROMBUS) -#define SPROMBUS (BCMSPROMBUS) -#elif defined(SI_PCMCIA_SROM) -#define SPROMBUS (PCMCIA_BUS) -#else -#define SPROMBUS (PCI_BUS) -#endif - - -#ifdef BCMCHIPID -#define CHIPID(chip) (BCMCHIPID) -#else -#define CHIPID(chip) (chip) -#endif - -#ifdef BCMCHIPREV -#define CHIPREV(rev) (BCMCHIPREV) -#else -#define CHIPREV(rev) (rev) -#endif - - -#define DMADDR_MASK_32 0x0 -#define DMADDR_MASK_30 0xc0000000 -#define DMADDR_MASK_0 0xffffffff - -#define DMADDRWIDTH_30 30 -#define DMADDRWIDTH_32 32 -#define DMADDRWIDTH_63 63 -#define DMADDRWIDTH_64 64 - -#ifdef BCMDMA64OSL -typedef struct { - uint32 loaddr; - uint32 hiaddr; -} dma64addr_t; - -typedef dma64addr_t dmaaddr_t; -#define PHYSADDRHI(_pa) ((_pa).hiaddr) -#define PHYSADDRHISET(_pa, _val) \ - do { \ - (_pa).hiaddr = (_val); \ - } while (0) -#define PHYSADDRLO(_pa) ((_pa).loaddr) -#define PHYSADDRLOSET(_pa, _val) \ - do { \ - (_pa).loaddr = (_val); \ - } while (0) - -#else -typedef unsigned long dmaaddr_t; -#define PHYSADDRHI(_pa) (0) -#define PHYSADDRHISET(_pa, _val) -#define PHYSADDRLO(_pa) ((_pa)) -#define PHYSADDRLOSET(_pa, _val) \ - do { \ - (_pa) = (_val); \ - } while (0) -#endif - - -typedef struct { - dmaaddr_t addr; - uint32 length; -} hnddma_seg_t; - -#define MAX_DMA_SEGS 4 - - -typedef struct { - void *oshdmah; - uint origsize; - uint nsegs; - hnddma_seg_t segs[MAX_DMA_SEGS]; -} hnddma_seg_map_t; - - - - -#if defined(BCM_RPC_NOCOPY) || defined(BCM_RCP_TXNOCOPY) - -#define BCMEXTRAHDROOM 220 -#else -#define BCMEXTRAHDROOM 172 -#endif - - -#ifndef SDALIGN -#define SDALIGN 32 -#endif - - -#define BCMDONGLEHDRSZ 12 -#define BCMDONGLEPADSZ 16 - -#define BCMDONGLEOVERHEAD (BCMDONGLEHDRSZ + BCMDONGLEPADSZ) - - -#if defined(NO_BCMDBG_ASSERT) -# undef BCMDBG_ASSERT -# undef BCMASSERT_LOG -#endif - -#if defined(BCMASSERT_LOG) -#define BCMASSERT_SUPPORT -#endif - - -#define BITFIELD_MASK(width) \ - (((unsigned)1 << (width)) - 1) -#define GFIELD(val, field) \ - (((val) >> field ## _S) & field ## _M) -#define SFIELD(val, field, bits) \ - (((val) & (~(field ## _M << field ## _S))) | \ - ((unsigned)(bits) << field ## _S)) - - -#ifdef BCMSMALL -#undef BCMSPACE -#define bcmspace FALSE -#else -#define BCMSPACE -#define bcmspace TRUE -#endif - - -#define MAXSZ_NVRAM_VARS 4096 - - - -#ifdef DL_NVRAM -#define NVRAM_ARRAY_MAXSIZE DL_NVRAM -#else -#define NVRAM_ARRAY_MAXSIZE MAXSZ_NVRAM_VARS -#endif - -#ifdef BCMUSBDEV_ENABLED -extern uint32 gFWID; -#endif - -#endif -- cgit v1.1