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

Commit 72a27fb8 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed wl_export.h 



Code cleanup, reducing number of header files. Merged into brcmsmac_80211.h.

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

drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c

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

#include "wlc_scb.h"

#include "wlc_pub.h"

#include "wl_export.h"

#include "ucode_loader.h"

#include "brcms_mac80211.h"

drivers/staging/brcm80211/brcmsmac/brcms_mac80211.h

+28 −0
Original line number Diff line number Diff line
@@ -78,4 +78,32 @@ struct brcms_info { 
	struct brcms_firmware fw;

	struct wiphy *wiphy;

};



/* misc callbacks */

struct brcms_info;

struct brcms_if;

struct wlc_if;

extern void brcms_init(struct brcms_info *wl);

extern uint brcms_reset(struct brcms_info *wl);

extern void brcms_intrson(struct brcms_info *wl);

extern u32 brcms_intrsoff(struct brcms_info *wl);

extern void brcms_intrsrestore(struct brcms_info *wl, u32 macintmask);

extern int brcms_up(struct brcms_info *wl);

extern void brcms_down(struct brcms_info *wl);

extern void brcms_txflowcontrol(struct brcms_info *wl, struct brcms_if *wlif,

				bool state, int prio);

extern bool wl_alloc_dma_resources(struct brcms_info *wl, uint dmaddrwidth);

extern bool brcms_rfkill_set_hw_state(struct brcms_info *wl);



/* timer functions */

struct brcms_timer;

extern struct brcms_timer *brcms_init_timer(struct brcms_info *wl,

				      void (*fn) (void *arg), void *arg,

				      const char *name);

extern void brcms_free_timer(struct brcms_info *wl, struct brcms_timer *timer);

extern void brcms_add_timer(struct brcms_info *wl, struct brcms_timer *timer,

			    uint ms, int periodic);

extern bool brcms_del_timer(struct brcms_info *wl, struct brcms_timer *timer);

extern void brcms_msleep(struct brcms_info *wl, uint ms);



#endif				/* _wl_mac80211_h_ */

drivers/staging/brcm80211/brcmsmac/wl_export.h

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

 */



#ifndef _wl_export_h_

#define _wl_export_h_



/* misc callbacks */

struct brcms_info;

struct brcms_if;

struct wlc_if;

extern void brcms_init(struct brcms_info *wl);

extern uint brcms_reset(struct brcms_info *wl);

extern void brcms_intrson(struct brcms_info *wl);

extern u32 brcms_intrsoff(struct brcms_info *wl);

extern void brcms_intrsrestore(struct brcms_info *wl, u32 macintmask);

extern int brcms_up(struct brcms_info *wl);

extern void brcms_down(struct brcms_info *wl);

extern void brcms_txflowcontrol(struct brcms_info *wl, struct brcms_if *wlif,

				bool state, int prio);

extern bool wl_alloc_dma_resources(struct brcms_info *wl, uint dmaddrwidth);

extern bool brcms_rfkill_set_hw_state(struct brcms_info *wl);



/* timer functions */

struct brcms_timer;

extern struct brcms_timer *brcms_init_timer(struct brcms_info *wl,

				      void (*fn) (void *arg), void *arg,

				      const char *name);

extern void brcms_free_timer(struct brcms_info *wl, struct brcms_timer *timer);

extern void brcms_add_timer(struct brcms_info *wl, struct brcms_timer *timer,

			    uint ms, int periodic);

extern bool brcms_del_timer(struct brcms_info *wl, struct brcms_timer *timer);

extern void brcms_msleep(struct brcms_info *wl, uint ms);



#endif				/* _wl_export_h_ */

drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c

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

#include "phy/wlc_phy_hal.h"

#include "wlc_antsel.h"

#include "wl_export.h"

#include "wlc_channel.h"

#include "wlc_main.h"

#include "wlc_ampdu.h"

drivers/staging/brcm80211/brcmsmac/wlc_antsel.c

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

#include "wlc_channel.h"

#include "wlc_main.h"

#include "wl_export.h"

#include "wlc_antsel.h"



#define ANT_SELCFG_AUTO		0x80	/* bit indicates antenna sel AUTO */