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

Commit 16d691b6 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove include file d11ucode_ext.h 



Include file required by wl_ucode.h only so merged content of
d11ucode_ext.h into that include file to reduce number of include
files in the driver.

Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8a0939f5

drivers/staging/brcm80211/brcmsmac/d11ucode_ext.h

deleted100644 → 0
+0 −35
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.

 */



enum {

	D11UCODE_NAMETAG_START = 0,

	D11LCN0BSINITVALS24,

	D11LCN0INITVALS24,

	D11LCN1BSINITVALS24,

	D11LCN1INITVALS24,

	D11LCN2BSINITVALS24,

	D11LCN2INITVALS24,

	D11N0ABSINITVALS16,

	D11N0BSINITVALS16,

	D11N0INITVALS16,

	D11UCODE_OVERSIGHT16_MIMO,

	D11UCODE_OVERSIGHT16_MIMOSZ,

	D11UCODE_OVERSIGHT24_LCN,

	D11UCODE_OVERSIGHT24_LCNSZ,

	D11UCODE_OVERSIGHT_BOMMAJOR,

	D11UCODE_OVERSIGHT_BOMMINOR

};

#define UCODE_LOADER_API_VER 0

drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include "wl_dbg.h"

#include "wl_export.h"

#include "wl_ucode.h"

#include "d11ucode_ext.h"

#include "wl_mac80211.h"



static void wl_timer(unsigned long data);

drivers/staging/brcm80211/brcmsmac/wl_ucode.h

+13 −13
Original line number Diff line number Diff line
@@ -17,27 +17,27 @@ 
#define MIN_FW_SIZE 40000	/* minimum firmware file size in bytes */

#define MAX_FW_SIZE 150000



typedef struct d11init {

#define UCODE_LOADER_API_VER 0



struct d11init {

	u16 addr;

	u16 size;

	u32 value;

} d11init_t;

};



extern d11init_t *d11lcn0bsinitvals24;

extern d11init_t *d11lcn0initvals24;

extern d11init_t *d11lcn1bsinitvals24;

extern d11init_t *d11lcn1initvals24;

extern d11init_t *d11lcn2bsinitvals24;

extern d11init_t *d11lcn2initvals24;

extern d11init_t *d11n0absinitvals16;

extern d11init_t *d11n0bsinitvals16;

extern d11init_t *d11n0initvals16;

extern struct d11init *d11lcn0bsinitvals24;

extern struct d11init *d11lcn0initvals24;

extern struct d11init *d11lcn1bsinitvals24;

extern struct d11init *d11lcn1initvals24;

extern struct d11init *d11lcn2bsinitvals24;

extern struct d11init *d11lcn2initvals24;

extern struct d11init *d11n0absinitvals16;

extern struct d11init *d11n0bsinitvals16;

extern struct d11init *d11n0initvals16;

extern u32 *bcm43xx_16_mimo;

extern u32 bcm43xx_16_mimosz;

extern u32 *bcm43xx_24_lcn;

extern u32 bcm43xx_24_lcnsz;

extern u32 *bcm43xx_bommajor;

extern u32 *bcm43xx_bomminor;



extern int wl_ucode_data_init(struct wl_info *wl);

extern void wl_ucode_data_free(void);

drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c

+27 −11
Original line number Diff line number Diff line
@@ -16,20 +16,36 @@ 


#include <linux/types.h>

#include <bcmdefs.h>

#include <d11ucode_ext.h>

#include <wl_ucode.h>



enum {

	D11UCODE_NAMETAG_START = 0,

	D11LCN0BSINITVALS24,

	D11LCN0INITVALS24,

	D11LCN1BSINITVALS24,

	D11LCN1INITVALS24,

	D11LCN2BSINITVALS24,

	D11LCN2INITVALS24,

	D11N0ABSINITVALS16,

	D11N0BSINITVALS16,

	D11N0INITVALS16,

	D11UCODE_OVERSIGHT16_MIMO,

	D11UCODE_OVERSIGHT16_MIMOSZ,

	D11UCODE_OVERSIGHT24_LCN,

	D11UCODE_OVERSIGHT24_LCNSZ,

	D11UCODE_OVERSIGHT_BOMMAJOR,

	D11UCODE_OVERSIGHT_BOMMINOR

};





d11init_t *d11lcn0bsinitvals24;

d11init_t *d11lcn0initvals24;

d11init_t *d11lcn1bsinitvals24;

d11init_t *d11lcn1initvals24;

d11init_t *d11lcn2bsinitvals24;

d11init_t *d11lcn2initvals24;

d11init_t *d11n0absinitvals16;

d11init_t *d11n0bsinitvals16;

d11init_t *d11n0initvals16;

struct d11init *d11lcn0bsinitvals24;

struct d11init *d11lcn0initvals24;

struct d11init *d11lcn1bsinitvals24;

struct d11init *d11lcn1initvals24;

struct d11init *d11lcn2bsinitvals24;

struct d11init *d11lcn2initvals24;

struct d11init *d11n0absinitvals16;

struct d11init *d11n0bsinitvals16;

struct d11init *d11n0initvals16;

u32 *bcm43xx_16_mimo;

u32 bcm43xx_16_mimosz;

u32 *bcm43xx_24_lcn;

drivers/staging/brcm80211/brcmsmac/wlc_bmac.c

+4 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 
#include "wlc_mac80211.h"

#include "wl_export.h"

#include "wl_ucode.h"

#include "d11ucode_ext.h"

#include "wlc_antsel.h"

#include "pcie_core.h"

#include "wlc_alloc.h"
@@ -103,7 +102,8 @@ static void wlc_clkctl_clk(struct wlc_hw_info *wlc, uint mode); 
static void wlc_coreinit(struct wlc_info *wlc);



/* used by wlc_wakeucode_init() */

static void wlc_write_inits(struct wlc_hw_info *wlc_hw, const d11init_t *inits);

static void wlc_write_inits(struct wlc_hw_info *wlc_hw,

			    const struct d11init *inits);

static void wlc_ucode_write(struct wlc_hw_info *wlc_hw, const u32 ucode[],

			    const uint nbytes);

static void wlc_ucode_download(struct wlc_hw_info *wlc);
@@ -2672,7 +2672,8 @@ static void wlc_ucode_write(struct wlc_hw_info *wlc_hw, const u32 ucode[], 
		W_REG(osh, &regs->objdata, ucode[i]);

}



static void wlc_write_inits(struct wlc_hw_info *wlc_hw, const d11init_t *inits)

static void wlc_write_inits(struct wlc_hw_info *wlc_hw,

			    const struct d11init *inits)

{

	int i;

	struct osl_info *osh;