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

Commit 94bdc2a2 authored by Alwin Beukers's avatar Alwin Beukers Committed by John W. Linville
Browse files

brcm80211: cleanup function prototypes 



- removed unneeded fn prototypes from include files.
- explicitly marked fn prototypes as extern in include files.
- reordered functions to account for removed forward declarations
  in include files.
- removed unused functions: brcms_c_txflowcontrol_override,
  brcms_c_txflowcontrol_prio_isset, brcms_c_txflowcontrol.

Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2a7fc5b1

drivers/net/wireless/brcm80211/brcmsmac/main.c

+1649 −1776

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/brcm80211/brcmsmac/main.h

+0 −84
Original line number Diff line number Diff line
@@ -653,9 +653,6 @@ struct brcms_bss_cfg { 
	struct brcms_bss_info *current_bss;

};



extern void brcms_c_fatal_error(struct brcms_c_info *wlc);

extern void brcms_b_rpc_watchdog(struct brcms_c_info *wlc);

extern void brcms_c_recv(struct brcms_c_info *wlc, struct sk_buff *p);

extern void brcms_c_txfifo(struct brcms_c_info *wlc, uint fifo,

			   struct sk_buff *p,

			   bool commit, s8 txpktpend);
@@ -663,47 +660,22 @@ extern void brcms_c_txfifo_complete(struct brcms_c_info *wlc, uint fifo, 
				    s8 txpktpend);

extern void brcms_c_txq_enq(struct brcms_c_info *wlc, struct scb *scb,

			    struct sk_buff *sdu, uint prec);

extern void brcms_c_info_init(struct brcms_c_info *wlc, int unit);

extern void brcms_c_print_txstatus(struct tx_status *txs);

extern int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,

		   uint *blocks);



#if defined(BCMDBG)

extern void brcms_c_print_rxh(struct d11rxhdr *rxh);

extern void brcms_c_print_txdesc(struct d11txh *txh);

#else

#define brcms_c_print_txdesc(a)

#endif



extern void brcms_c_setxband(struct brcms_hardware *wlc_hw, uint bandunit);

extern void brcms_c_coredisable(struct brcms_hardware *wlc_hw);



extern bool brcms_c_valid_rate(struct brcms_c_info *wlc, u32 rate,

			       int band, bool verbose);

extern void brcms_c_ap_upd(struct brcms_c_info *wlc);



/* helper functions */

extern void brcms_c_shm_ssid_upd(struct brcms_c_info *wlc,

				 struct brcms_bss_cfg *cfg);

extern int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config);



extern void brcms_c_mac_bcn_promisc_change(struct brcms_c_info *wlc,

					   bool promisc);

extern void brcms_c_mac_bcn_promisc(struct brcms_c_info *wlc);

extern void brcms_c_mac_promisc(struct brcms_c_info *wlc);

extern void brcms_c_txflowcontrol(struct brcms_c_info *wlc,

				  struct brcms_txq_info *qi,

				  bool on, int prio);

extern void brcms_c_txflowcontrol_override(struct brcms_c_info *wlc,

				       struct brcms_txq_info *qi,

				       bool on, uint override);

extern bool brcms_c_txflowcontrol_prio_isset(struct brcms_c_info *wlc,

					     struct brcms_txq_info *qi,

					     int prio);

extern void brcms_c_send_q(struct brcms_c_info *wlc);

extern int brcms_c_prep_pdu(struct brcms_c_info *wlc, struct sk_buff *pdu,

			    uint *fifo);



extern u16 brcms_c_calc_lsig_len(struct brcms_c_info *wlc, u32 ratespec,

				uint mac_len);

extern u32 brcms_c_rspec_to_rts_rspec(struct brcms_c_info *wlc,
@@ -715,82 +687,26 @@ extern u16 brcms_c_compute_rtscts_dur(struct brcms_c_info *wlc, bool cts_only, 
				      u8 rts_preamble_type,

				      u8 frame_preamble_type, uint frame_len,

				      bool ba);



extern void brcms_c_tbtt(struct brcms_c_info *wlc);

extern void brcms_c_inval_dma_pkts(struct brcms_hardware *hw,

			       struct ieee80211_sta *sta,

			       void (*dma_callback_fn));



/* Shared memory access */

extern void brcms_c_copyto_shm(struct brcms_c_info *wlc, uint offset,

			       const void *buf, int len);



extern void brcms_c_update_beacon(struct brcms_c_info *wlc);



extern void brcms_c_update_probe_resp(struct brcms_c_info *wlc, bool suspend);

extern void brcms_c_bss_update_probe_resp(struct brcms_c_info *wlc,

					  struct brcms_bss_cfg *cfg,

					  bool suspend);

extern bool brcms_c_ismpc(struct brcms_c_info *wlc);

extern bool brcms_c_is_non_delay_mpc(struct brcms_c_info *wlc);

extern void brcms_c_radio_mpc_upd(struct brcms_c_info *wlc);

extern bool brcms_c_prec_enq_head(struct brcms_c_info *wlc, struct pktq *q,

			      struct sk_buff *pkt, int prec, bool head);

extern u16 brcms_c_phytxctl1_calc(struct brcms_c_info *wlc, u32 rspec);

extern void brcms_c_compute_plcp(struct brcms_c_info *wlc, u32 rate,

				 uint length, u8 *plcp);

extern uint brcms_c_calc_frame_time(struct brcms_c_info *wlc,

				    u32 ratespec,

				    u8 preamble_type, uint mac_len);



extern void brcms_c_set_chanspec(struct brcms_c_info *wlc,

				 u16 chanspec);



extern bool brcms_c_timers_init(struct brcms_c_info *wlc, int unit);



extern int brcms_c_set_nmode(struct brcms_c_info *wlc);

extern void brcms_c_mimops_action_ht_send(struct brcms_c_info *wlc,

				      struct brcms_bss_cfg *bsscfg,

				      u8 mimops_mode);



extern void brcms_c_switch_shortslot(struct brcms_c_info *wlc, bool shortslot);

extern void brcms_c_set_bssid(struct brcms_bss_cfg *cfg);

extern void brcms_c_edcf_setparams(struct brcms_c_info *wlc, bool suspend);



extern void brcms_c_set_ratetable(struct brcms_c_info *wlc);

extern int brcms_c_set_mac(struct brcms_bss_cfg *cfg);

extern void brcms_c_beacon_phytxctl_txant_upd(struct brcms_c_info *wlc,

					  u32 bcn_rate);

extern void brcms_c_mod_prb_rsp_rate_table(struct brcms_c_info *wlc,

					   uint frame_len);

extern u32 brcms_c_lowest_basic_rspec(struct brcms_c_info *wlc,

					     struct brcms_c_rateset *rs);

extern void brcms_c_radio_disable(struct brcms_c_info *wlc);

extern void brcms_c_bcn_li_upd(struct brcms_c_info *wlc);

extern void brcms_c_set_home_chanspec(struct brcms_c_info *wlc,

				      u16 chanspec);

extern bool brcms_c_ps_allowed(struct brcms_c_info *wlc);

extern bool brcms_c_stay_awake(struct brcms_c_info *wlc);



extern void brcms_b_antsel_type_set(struct brcms_hardware *wlc_hw,

				     u8 antsel_type);



/* chanspec, ucode interface */

extern void brcms_b_set_chanspec(struct brcms_hardware *wlc_hw,

				  u16 chanspec,

				  bool mute, struct txpwr_limits *txpwr);



extern void brcms_b_write_shm(struct brcms_hardware *wlc_hw, uint offset,

			      u16 v);

extern u16 brcms_b_read_shm(struct brcms_hardware *wlc_hw, uint offset);



extern void brcms_b_mhf(struct brcms_hardware *wlc_hw, u8 idx, u16 mask,

			u16 val, int bands);



extern void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags);



extern void brcms_b_mctrl(struct brcms_hardware *wlc_hw, u32 mask, u32 val);



extern void brcms_b_phy_reset(struct brcms_hardware *wlc_hw);

extern void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw);

extern void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw);

drivers/net/wireless/brcm80211/brcmsmac/pub.h

+14 −35
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ struct brcms_antselcfg { 
};



/* common functions for every port */

struct brcms_c_info *

extern struct brcms_c_info *

brcms_c_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,

	       bool piomode, void __iomem *regsva, struct pci_dev *btparam,

	       uint *perr);
@@ -585,14 +585,9 @@ extern void brcms_c_sendpkt_mac80211(struct brcms_c_info *wlc, 
				     struct sk_buff *sdu,

				     struct ieee80211_hw *hw);

extern bool brcms_c_aggregatable(struct brcms_c_info *wlc, u8 tid);



/* helper functions */

extern void brcms_c_statsupd(struct brcms_c_info *wlc);

extern void brcms_c_protection_upd(struct brcms_c_info *wlc, uint idx,

				   int val);

extern int brcms_c_get_header_len(void);

extern void brcms_c_mac_bcn_promisc_change(struct brcms_c_info *wlc,

					   bool promisc);

extern void brcms_c_set_addrmatch(struct brcms_c_info *wlc,

				  int match_reg_offset,

				  const u8 *addr);
@@ -600,26 +595,12 @@ extern void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci, 
			      const struct ieee80211_tx_queue_params *arg,

			      bool suspend);

extern struct brcms_pub *brcms_c_pub(struct brcms_c_info *wlc);



/* common functions for every port */

extern void brcms_c_mhf(struct brcms_c_info *wlc, u8 idx, u16 mask, u16 val,

		    int bands);

extern void brcms_c_rate_lookup_init(struct brcms_c_info *wlc,

				     struct brcms_c_rateset *rateset);

extern void brcms_default_rateset(struct brcms_c_info *wlc,

				  struct brcms_c_rateset *rs);



extern void brcms_c_ampdu_flush(struct brcms_c_info *wlc,

			    struct ieee80211_sta *sta, u16 tid);

extern void brcms_c_ampdu_tx_operational(struct brcms_c_info *wlc, u8 tid,

					 u8 ba_wsize, uint max_rx_ampdu_bytes);

extern char *getvar(struct si_pub *sih, enum brcms_srom_id id);

extern int getintvar(struct si_pub *sih, enum brcms_srom_id id);



/* wlc_phy.c helper functions */

extern void brcms_c_set_ps_ctrl(struct brcms_c_info *wlc);

extern void brcms_c_mctrl(struct brcms_c_info *wlc, u32 mask, u32 val);



extern int brcms_c_module_register(struct brcms_pub *pub,

				   const char *name, struct brcms_info *hdl,

				   int (*down_fn)(void *handle));
@@ -633,23 +614,21 @@ extern void brcms_c_scan_stop(struct brcms_c_info *wlc); 
extern int brcms_c_get_curband(struct brcms_c_info *wlc);

extern void brcms_c_wait_for_tx_completion(struct brcms_c_info *wlc,

					   bool drop);



int brcms_c_set_channel(struct brcms_c_info *wlc, u16 channel);

int brcms_c_set_rate_limit(struct brcms_c_info *wlc, u16 srl, u16 lrl);

void brcms_c_get_current_rateset(struct brcms_c_info *wlc,

extern int brcms_c_set_channel(struct brcms_c_info *wlc, u16 channel);

extern int brcms_c_set_rate_limit(struct brcms_c_info *wlc, u16 srl, u16 lrl);

extern void brcms_c_get_current_rateset(struct brcms_c_info *wlc,

				 struct brcm_rateset *currs);

int brcms_c_set_rateset(struct brcms_c_info *wlc, struct brcm_rateset *rs);

int brcms_c_set_beacon_period(struct brcms_c_info *wlc, u16 period);

u16 brcms_c_get_phy_type(struct brcms_c_info *wlc, int phyidx);

void brcms_c_set_shortslot_override(struct brcms_c_info *wlc,

extern int brcms_c_set_rateset(struct brcms_c_info *wlc,

					struct brcm_rateset *rs);

extern int brcms_c_set_beacon_period(struct brcms_c_info *wlc, u16 period);

extern u16 brcms_c_get_phy_type(struct brcms_c_info *wlc, int phyidx);

extern void brcms_c_set_shortslot_override(struct brcms_c_info *wlc,

				    s8 sslot_override);

void brcms_c_set_beacon_listen_interval(struct brcms_c_info *wlc, u8 interval);

int brcms_c_set_tx_power(struct brcms_c_info *wlc, int txpwr);

int brcms_c_get_tx_power(struct brcms_c_info *wlc);

void brcms_c_set_radio_mpc(struct brcms_c_info *wlc, bool mpc);



/* helper functions */

extern void brcms_c_set_beacon_listen_interval(struct brcms_c_info *wlc,

					u8 interval);

extern int brcms_c_set_tx_power(struct brcms_c_info *wlc, int txpwr);

extern int brcms_c_get_tx_power(struct brcms_c_info *wlc);

extern void brcms_c_set_radio_mpc(struct brcms_c_info *wlc, bool mpc);

extern bool brcms_c_check_radio_disabled(struct brcms_c_info *wlc);

extern bool brcms_c_radio_monitor_stop(struct brcms_c_info *wlc);



#endif				/* _BRCM_PUB_H_ */