From owner-svn-src-head@freebsd.org Tue Sep 1 21:33:47 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CF13437A70D; Tue, 1 Sep 2020 21:33:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0gb5RxRz4MgN; Tue, 1 Sep 2020 21:33:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DCDC20086; Tue, 1 Sep 2020 21:33:47 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LXl01031866; Tue, 1 Sep 2020 21:33:47 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LXVFV031771; Tue, 1 Sep 2020 21:33:31 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012133.081LXVFV031771@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:33:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365097 - in head/sys/dev/rtwn: . pci rtl8188e rtl8188e/pci rtl8188e/usb rtl8192c rtl8192c/pci rtl8192c/usb rtl8192e rtl8192e/usb rtl8812a rtl8812a/usb rtl8821a rtl8821a/usb usb X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/rtwn: . pci rtl8188e rtl8188e/pci rtl8188e/usb rtl8192c rtl8192c/pci rtl8192c/usb rtl8192e rtl8192e/usb rtl8812a rtl8812a/usb rtl8821a rtl8821a/usb usb X-SVN-Commit-Revision: 365097 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:33:47 -0000 Author: mjg Date: Tue Sep 1 21:33:31 2020 New Revision: 365097 URL: https://svnweb.freebsd.org/changeset/base/365097 Log: rtwn: clean up empty lines in .c and .h files Modified: head/sys/dev/rtwn/if_rtwn.c head/sys/dev/rtwn/if_rtwn_beacon.c head/sys/dev/rtwn/if_rtwn_calib.c head/sys/dev/rtwn/if_rtwn_cam.c head/sys/dev/rtwn/if_rtwn_efuse.c head/sys/dev/rtwn/if_rtwn_fw.c head/sys/dev/rtwn/if_rtwn_fw.h head/sys/dev/rtwn/if_rtwn_ridx.h head/sys/dev/rtwn/if_rtwn_rx.c head/sys/dev/rtwn/if_rtwn_rx.h head/sys/dev/rtwn/if_rtwn_task.c head/sys/dev/rtwn/if_rtwn_tx.c head/sys/dev/rtwn/if_rtwnreg.h head/sys/dev/rtwn/if_rtwnvar.h head/sys/dev/rtwn/pci/rtwn_pci_attach.c head/sys/dev/rtwn/pci/rtwn_pci_reg.c head/sys/dev/rtwn/pci/rtwn_pci_rx.c head/sys/dev/rtwn/pci/rtwn_pci_tx.c head/sys/dev/rtwn/pci/rtwn_pci_var.h head/sys/dev/rtwn/rtl8188e/pci/r88ee.h head/sys/dev/rtwn/rtl8188e/pci/r88ee_reg.h head/sys/dev/rtwn/rtl8188e/r88e.h head/sys/dev/rtwn/rtl8188e/r88e_beacon.c head/sys/dev/rtwn/rtl8188e/r88e_calib.c head/sys/dev/rtwn/rtl8188e/r88e_chan.c head/sys/dev/rtwn/rtl8188e/r88e_fw.c head/sys/dev/rtwn/rtl8188e/r88e_init.c head/sys/dev/rtwn/rtl8188e/r88e_led.c head/sys/dev/rtwn/rtl8188e/r88e_priv.h head/sys/dev/rtwn/rtl8188e/r88e_reg.h head/sys/dev/rtwn/rtl8188e/r88e_rf.c head/sys/dev/rtwn/rtl8188e/r88e_rom.c head/sys/dev/rtwn/rtl8188e/r88e_rx.c head/sys/dev/rtwn/rtl8188e/r88e_tx.c head/sys/dev/rtwn/rtl8188e/usb/r88eu.h head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c head/sys/dev/rtwn/rtl8192c/pci/r92ce.h head/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h head/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h head/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c head/sys/dev/rtwn/rtl8192c/r92c.h head/sys/dev/rtwn/rtl8192c/r92c_attach.c head/sys/dev/rtwn/rtl8192c/r92c_beacon.c head/sys/dev/rtwn/rtl8192c/r92c_calib.c head/sys/dev/rtwn/rtl8192c/r92c_chan.c head/sys/dev/rtwn/rtl8192c/r92c_fw.c head/sys/dev/rtwn/rtl8192c/r92c_init.c head/sys/dev/rtwn/rtl8192c/r92c_priv.h head/sys/dev/rtwn/rtl8192c/r92c_reg.h head/sys/dev/rtwn/rtl8192c/r92c_rf.c head/sys/dev/rtwn/rtl8192c/r92c_rom.c head/sys/dev/rtwn/rtl8192c/r92c_rx.c head/sys/dev/rtwn/rtl8192c/r92c_tx.c head/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h head/sys/dev/rtwn/rtl8192c/usb/r92cu.h head/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h head/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h head/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h head/sys/dev/rtwn/rtl8192e/r92e.h head/sys/dev/rtwn/rtl8192e/r92e_chan.c head/sys/dev/rtwn/rtl8192e/r92e_priv.h head/sys/dev/rtwn/rtl8192e/usb/r92eu.h head/sys/dev/rtwn/rtl8812a/r12a.h head/sys/dev/rtwn/rtl8812a/r12a_beacon.c head/sys/dev/rtwn/rtl8812a/r12a_calib.c head/sys/dev/rtwn/rtl8812a/r12a_caps.c head/sys/dev/rtwn/rtl8812a/r12a_chan.c head/sys/dev/rtwn/rtl8812a/r12a_fw.c head/sys/dev/rtwn/rtl8812a/r12a_fw_cmd.h head/sys/dev/rtwn/rtl8812a/r12a_init.c head/sys/dev/rtwn/rtl8812a/r12a_led.c head/sys/dev/rtwn/rtl8812a/r12a_priv.h head/sys/dev/rtwn/rtl8812a/r12a_reg.h head/sys/dev/rtwn/rtl8812a/r12a_rf.c head/sys/dev/rtwn/rtl8812a/r12a_rom.c head/sys/dev/rtwn/rtl8812a/r12a_rx.c head/sys/dev/rtwn/rtl8812a/r12a_tx.c head/sys/dev/rtwn/rtl8812a/r12a_tx_desc.h head/sys/dev/rtwn/rtl8812a/usb/r12au.h head/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c head/sys/dev/rtwn/rtl8812a/usb/r12au_init.c head/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c head/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c head/sys/dev/rtwn/rtl8821a/r21a.h head/sys/dev/rtwn/rtl8821a/r21a_beacon.c head/sys/dev/rtwn/rtl8821a/r21a_calib.c head/sys/dev/rtwn/rtl8821a/r21a_chan.c head/sys/dev/rtwn/rtl8821a/r21a_fw.c head/sys/dev/rtwn/rtl8821a/r21a_init.c head/sys/dev/rtwn/rtl8821a/r21a_led.c head/sys/dev/rtwn/rtl8821a/r21a_priv.h head/sys/dev/rtwn/rtl8821a/r21a_reg.h head/sys/dev/rtwn/rtl8821a/r21a_rom.c head/sys/dev/rtwn/rtl8821a/r21a_rx.c head/sys/dev/rtwn/rtl8821a/usb/r21au.h head/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c head/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c head/sys/dev/rtwn/rtl8821a/usb/r21au_init.c head/sys/dev/rtwn/usb/rtwn_usb_attach.c head/sys/dev/rtwn/usb/rtwn_usb_ep.c head/sys/dev/rtwn/usb/rtwn_usb_reg.c head/sys/dev/rtwn/usb/rtwn_usb_tx.c Modified: head/sys/dev/rtwn/if_rtwn.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn.c Tue Sep 1 21:33:31 2020 (r365097) @@ -79,7 +79,6 @@ __FBSDID("$FreeBSD$"); #include - static void rtwn_radiotap_attach(struct rtwn_softc *); static void rtwn_vap_decrement_counters(struct rtwn_softc *, enum ieee80211_opmode, int); @@ -1541,7 +1540,6 @@ rtwn_getradiocaps(struct ieee80211com *ic, setbit(bands, IEEE80211_MODE_11A); setbit(bands, IEEE80211_MODE_11NA); for (i = 0; i < nitems(sc->chan_num_5ghz); i++) { - if (sc->chan_num_5ghz[i] == 0) continue; Modified: head/sys/dev/rtwn/if_rtwn_beacon.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_beacon.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_beacon.c Tue Sep 1 21:33:31 2020 (r365097) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include - static void rtwn_reset_beacon_valid(struct rtwn_softc *sc, int id) { Modified: head/sys/dev/rtwn/if_rtwn_calib.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_calib.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_calib.c Tue Sep 1 21:33:31 2020 (r365097) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void rtwn_temp_calib(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/if_rtwn_cam.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_cam.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_cam.c Tue Sep 1 21:33:31 2020 (r365097) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include - void rtwn_init_cam(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/if_rtwn_efuse.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_efuse.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_efuse.c Tue Sep 1 21:33:31 2020 (r365097) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include - static int rtwn_efuse_switch_power(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/if_rtwn_fw.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_fw.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_fw.c Tue Sep 1 21:33:31 2020 (r365097) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include - #ifndef RTWN_WITHOUT_UCODE static int rtwn_fw_loadpage(struct rtwn_softc *sc, int page, const uint8_t *buf, Modified: head/sys/dev/rtwn/if_rtwn_fw.h ============================================================================== --- head/sys/dev/rtwn/if_rtwn_fw.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_fw.h Tue Sep 1 21:33:31 2020 (r365097) @@ -53,7 +53,6 @@ struct r92c_fw_hdr { uint32_t reserved5; } __packed; - int rtwn_load_firmware(struct rtwn_softc *); #endif /* IF_RTWN_FW_H */ Modified: head/sys/dev/rtwn/if_rtwn_ridx.h ============================================================================== --- head/sys/dev/rtwn/if_rtwn_ridx.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_ridx.h Tue Sep 1 21:33:31 2020 (r365097) @@ -47,7 +47,6 @@ #define RTWN_RATE_IS_OFDM(rate) \ ((rate) >= RTWN_RIDX_OFDM6 && (rate) != RTWN_RIDX_UNKNOWN) - static const uint8_t ridx2rate[] = { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 }; Modified: head/sys/dev/rtwn/if_rtwn_rx.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include - void rtwn_get_rates(struct rtwn_softc *sc, const struct ieee80211_rateset *rs, const struct ieee80211_htrateset *rs_ht, uint32_t *rates_p, @@ -398,7 +397,6 @@ rtwn_set_multi(struct rtwn_softc *sc) if_foreach_llmaddr(vap->iv_ifp, rtwm_hash_maddr, mfilt); } else mfilt[0] = mfilt[1] = ~0; - rtwn_write_4(sc, R92C_MAR + 0, mfilt[0]); rtwn_write_4(sc, R92C_MAR + 4, mfilt[1]); Modified: head/sys/dev/rtwn/if_rtwn_rx.h ============================================================================== --- head/sys/dev/rtwn/if_rtwn_rx.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_rx.h Tue Sep 1 21:33:31 2020 (r365097) @@ -21,7 +21,6 @@ #define RTWN_NOISE_FLOOR -95 - void rtwn_get_rates(struct rtwn_softc *, const struct ieee80211_rateset *, const struct ieee80211_htrateset *, uint32_t *, int *, int); void rtwn_set_basicrates(struct rtwn_softc *, uint32_t); Modified: head/sys/dev/rtwn/if_rtwn_task.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_task.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_task.c Tue Sep 1 21:33:31 2020 (r365097) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include - static void rtwn_cmdq_cb(void *arg, int pending) { Modified: head/sys/dev/rtwn/if_rtwn_tx.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwn_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - void rtwn_drain_mbufq(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/if_rtwnreg.h ============================================================================== --- head/sys/dev/rtwn/if_rtwnreg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwnreg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -26,7 +26,6 @@ #define R92C_H2C_NBOX 4 - /* Common part of Tx descriptor (named only!). */ struct rtwn_tx_desc_common { uint16_t pktlen; @@ -115,7 +114,6 @@ struct rtwn_rx_stat_pci { #define RW(var, field, val) \ (((var) & ~field##_M) | SM(field, val)) - #define RTWN_MAX_CONDITIONS 3 /* @@ -154,7 +152,6 @@ struct rtwn_rf_prog { const uint8_t cond[RTWN_MAX_CONDITIONS]; const struct rtwn_rf_prog *next; }; - /* XXX move to net80211. */ static __inline int Modified: head/sys/dev/rtwn/if_rtwnvar.h ============================================================================== --- head/sys/dev/rtwn/if_rtwnvar.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/if_rtwnvar.h Tue Sep 1 21:33:31 2020 (r365097) @@ -80,7 +80,6 @@ struct rtwn_tx_phystat { uint32_t phydw[RTWN_PHY_STATUS_SIZE / sizeof(uint32_t)]; }; - struct rtwn_softc; union sec_param { @@ -423,7 +422,6 @@ MALLOC_DECLARE(M_RTWN_PRIV); #define RTWN_NT_LOCK_INITIALIZED(sc) mtx_initialized(&(sc)->nt_mtx) #define RTWN_NT_LOCK_DESTROY(sc) mtx_destroy(&(sc)->nt_mtx) - void rtwn_sysctlattach(struct rtwn_softc *); int rtwn_attach(struct rtwn_softc *); @@ -431,7 +429,6 @@ void rtwn_detach(struct rtwn_softc *); void rtwn_resume(struct rtwn_softc *); void rtwn_suspend(struct rtwn_softc *); - /* Interface-specific. */ #define rtwn_write_1(_sc, _addr, _val) \ (((_sc)->sc_write_1)((_sc), (_addr), (_val))) @@ -590,7 +587,6 @@ void rtwn_suspend(struct rtwn_softc *); (((_sc)->sc_post_init)((_sc))) #define rtwn_init_bcnq1_boundary(_sc) \ (((_sc)->sc_init_bcnq1_boundary)((_sc))) - /* * Methods to access subfields in registers. Modified: head/sys/dev/rtwn/pci/rtwn_pci_attach.c ============================================================================== --- head/sys/dev/rtwn/pci/rtwn_pci_attach.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/pci/rtwn_pci_attach.c Tue Sep 1 21:33:31 2020 (r365097) @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$"); #include - static device_probe_t rtwn_pci_probe; static device_attach_t rtwn_pci_attach; static device_detach_t rtwn_pci_detach; @@ -91,7 +90,6 @@ static void rtwn_pci_beacon_update_begin(struct rtwn_s static void rtwn_pci_beacon_update_end(struct rtwn_softc *, struct ieee80211vap *); static void rtwn_pci_attach_methods(struct rtwn_softc *); - static const struct rtwn_pci_ident * rtwn_pci_probe_sub(device_t dev) Modified: head/sys/dev/rtwn/pci/rtwn_pci_reg.c ============================================================================== --- head/sys/dev/rtwn/pci/rtwn_pci_reg.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/pci/rtwn_pci_reg.c Tue Sep 1 21:33:31 2020 (r365097) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - int rtwn_pci_write_1(struct rtwn_softc *sc, uint16_t addr, uint8_t val) { Modified: head/sys/dev/rtwn/pci/rtwn_pci_rx.c ============================================================================== --- head/sys/dev/rtwn/pci/rtwn_pci_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/pci/rtwn_pci_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - void rtwn_pci_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) Modified: head/sys/dev/rtwn/pci/rtwn_pci_tx.c ============================================================================== --- head/sys/dev/rtwn/pci/rtwn_pci_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/pci/rtwn_pci_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include - static struct mbuf * rtwn_mbuf_defrag(struct mbuf *m0, int how) { Modified: head/sys/dev/rtwn/pci/rtwn_pci_var.h ============================================================================== --- head/sys/dev/rtwn/pci/rtwn_pci_var.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/pci/rtwn_pci_var.h Tue Sep 1 21:33:31 2020 (r365097) @@ -101,7 +101,6 @@ enum { (RTWN_PCI_INTR_RX_ERROR | RTWN_PCI_INTR_RX_OVERFLOW | \ RTWN_PCI_INTR_RX_DESC_UNAVAIL | RTWN_PCI_INTR_RX_DONE) - struct rtwn_pci_softc { struct rtwn_softc pc_sc; /* must be the first */ Modified: head/sys/dev/rtwn/rtl8188e/pci/r88ee.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/pci/r88ee.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/pci/r88ee.h Tue Sep 1 21:33:31 2020 (r365097) @@ -21,7 +21,6 @@ #include - /* * Global definitions. */ @@ -33,7 +32,6 @@ (R88EE_PUBQ_NPAGES + R88EE_HPQ_NPAGES + \ R88EE_NPQ_NPAGES + R88EE_LPQ_NPAGES) - /* * Function declarations. */ @@ -50,4 +48,3 @@ void r88ee_start_xfers(struct rtwn_softc *); void r88ee_post_init(struct rtwn_softc *); #endif /* RTL8188EE_H */ - Modified: head/sys/dev/rtwn/rtl8188e/pci/r88ee_reg.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/pci/r88ee_reg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/pci/r88ee_reg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -23,4 +23,3 @@ #include #endif /* R88EE_REG_H */ - Modified: head/sys/dev/rtwn/rtl8188e/r88e.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e.h Tue Sep 1 21:33:31 2020 (r365097) @@ -33,7 +33,6 @@ #define R88E_CALIB_THRESHOLD 4 - /* * Function declarations. */ Modified: head/sys/dev/rtwn/rtl8188e/r88e_beacon.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_beacon.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_beacon.c Tue Sep 1 21:33:31 2020 (r365097) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_beacon_enable(struct rtwn_softc *sc, int id, int enable) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_calib.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_calib.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_calib.c Tue Sep 1 21:33:31 2020 (r365097) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* Registers to save and restore during IQ calibration. */ struct r88e_iq_cal_reg_vals { uint32_t adda[16]; Modified: head/sys/dev/rtwn/rtl8188e/r88e_chan.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_chan.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_chan.c Tue Sep 1 21:33:31 2020 (r365097) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int r88e_get_power_group(struct rtwn_softc *sc, struct ieee80211_channel *c) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_fw.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_fw.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_fw.c Tue Sep 1 21:33:31 2020 (r365097) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE int r88e_fw_cmd(struct rtwn_softc *sc, uint8_t id, const void *buf, int len) Modified: head/sys/dev/rtwn/rtl8188e/r88e_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void r88e_crystalcap_write(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_led.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_led.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_led.c Tue Sep 1 21:33:31 2020 (r365097) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_set_led(struct rtwn_softc *sc, int led, int on) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_priv.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_priv.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_priv.h Tue Sep 1 21:33:31 2020 (r365097) @@ -33,7 +33,6 @@ struct rtwn_r88e_txpwr { int8_t bw20_tx_pwr_diff; }; - /* * MAC initialization values. */ Modified: head/sys/dev/rtwn/rtl8188e/r88e_reg.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_reg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_reg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -44,7 +44,6 @@ #define R88E_TX_RPT_TIME 0x4f0 #define R88E_SCH_TXCMD 0x5f8 - /* Bits for R88E_HIMR. */ #define R88E_HIMR_ROK 0x00000001 /* receive DMA OK */ #define R88E_HIMR_RDU 0x00000002 /* Rx descriptor unavailable */ @@ -100,14 +99,12 @@ /* Bits for R92C_SECCFG. */ #define R88E_SECCFG_CHK_KEYID 0x0100 - /* * Baseband registers. */ /* Bits for R92C_LSSI_PARAM(i). */ #define R88E_LSSI_PARAM_ADDR_M 0x0ff00000 #define R88E_LSSI_PARAM_ADDR_S 20 - /* * RF (6052) registers. Modified: head/sys/dev/rtwn/rtl8188e/r88e_rf.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_rf.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_rf.c Tue Sep 1 21:33:31 2020 (r365097) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_rf_write(struct rtwn_softc *sc, int chain, uint8_t addr, uint32_t val) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_rom.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_rom.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_rom.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_parse_rom(struct rtwn_softc *sc, uint8_t *buf) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_rx.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r88e_classify_intr(struct rtwn_softc *sc, void *buf, int len) { Modified: head/sys/dev/rtwn/rtl8188e/r88e_tx.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/r88e_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/r88e_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_tx_enable_ampdu(void *buf, int enable) { Modified: head/sys/dev/rtwn/rtl8188e/usb/r88eu.h ============================================================================== --- head/sys/dev/rtwn/rtl8188e/usb/r88eu.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/usb/r88eu.h Tue Sep 1 21:33:31 2020 (r365097) @@ -23,13 +23,11 @@ #include - /* * Global definitions. */ #define R88EU_PUBQ_NPAGES 142 #define R88EU_TX_PAGE_COUNT 169 - /* * Function declarations. Modified: head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c Tue Sep 1 21:33:31 2020 (r365097) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include - static struct rtwn_r88e_txpwr r88e_txpwr; void r88eu_attach(struct rtwn_usb_softc *); Modified: head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88eu_init_bb(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce.h Tue Sep 1 21:33:31 2020 (r365097) @@ -25,7 +25,6 @@ #include - /* * Global definitions. */ @@ -34,7 +33,6 @@ #define R92CE_LPQ_NPAGES 28 #define R92CE_TX_PAGE_COUNT \ (R92CE_PUBQ_NPAGES + R92CE_HPQ_NPAGES + R92CE_LPQ_NPAGES) - /* * Function declarations. Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c Tue Sep 1 21:33:31 2020 (r365097) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include - static struct rtwn_r92c_txpwr r92c_txpwr; void r92ce_attach(struct rtwn_pci_softc *); Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c Tue Sep 1 21:33:31 2020 (r365097) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* Registers to save and restore during IQ calibration. */ struct r92ce_iq_cal_reg_vals { uint32_t adda[16]; Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c Tue Sep 1 21:33:31 2020 (r365097) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include - #ifndef RTWN_WITHOUT_UCODE void r92ce_fw_reset(struct rtwn_softc *sc, int reason) Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92ce_init_intr(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h Tue Sep 1 21:33:31 2020 (r365097) @@ -25,7 +25,6 @@ #include - /* * MAC initialization values. */ @@ -52,7 +51,6 @@ static const struct rtwn_mac_prog rtl8192ce_mac[] = { { 0x703, 0x87 }, { 0x708, 0x21 }, { 0x709, 0x43 }, { 0x70a, 0x65 }, { 0x70b, 0x87 } }; - /* * Baseband initialization values. Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -51,7 +51,6 @@ #define R92C_UART_TX_DES 0x370 #define R92C_UART_RX_DES 0x378 - /* Bits for R92C_GPIO_MUXCFG. */ #define R92C_GPIO_MUXCFG_RFKILL 0x0008 Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r92ce_get_intr_status(struct rtwn_pci_softc *pc, int *rings) { Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92ce_setup_tx_desc(struct rtwn_pci_softc *pc, void *desc, uint32_t next_desc_addr) Modified: head/sys/dev/rtwn/rtl8192c/r92c.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c.h Tue Sep 1 21:33:31 2020 (r365097) @@ -35,7 +35,6 @@ #define R92C_CALIB_THRESHOLD 2 - /* * Function declarations. */ Modified: head/sys/dev/rtwn/rtl8192c/r92c_attach.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_attach.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_attach.c Tue Sep 1 21:33:31 2020 (r365097) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92c_detach_private(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_beacon.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_beacon.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_beacon.c Tue Sep 1 21:33:31 2020 (r365097) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92c_beacon_init(struct rtwn_softc *sc, void *buf, int id) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_calib.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_calib.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_calib.c Tue Sep 1 21:33:31 2020 (r365097) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* Registers to save and restore during IQ calibration. */ struct r92c_iq_cal_reg_vals { uint32_t adda[16]; Modified: head/sys/dev/rtwn/rtl8192c/r92c_chan.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_chan.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_chan.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int r92c_get_power_group(struct rtwn_softc *sc, struct ieee80211_channel *c) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_fw.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_fw.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_fw.c Tue Sep 1 21:33:31 2020 (r365097) @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE static int r92c_fw_cmd(struct rtwn_softc *sc, uint8_t id, const void *buf, int len) Modified: head/sys/dev/rtwn/rtl8192c/r92c_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r92c_check_condition(struct rtwn_softc *sc, const uint8_t cond[]) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_priv.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_priv.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_priv.h Tue Sep 1 21:33:31 2020 (r365097) @@ -36,7 +36,6 @@ struct rtwn_r92c_txpwr { int8_t ht20_max_pwr[R92C_MAX_CHAINS][R92C_GROUP_2G]; }; - /* * Baseband initialization values (shared parts). */ @@ -132,7 +131,6 @@ static const struct rtwn_agc_prog rtl8192ce_agc[] = { } }; - /* * RF initialization values. */ @@ -330,7 +328,6 @@ static const struct rtwn_rf_prog rtl8192c_rf[] = { }, { 0, NULL, NULL, { 0 }, NULL } }; - struct rtwn_r92c_txagc { uint8_t pwr[R92C_GROUP_2G][28]; /* RTWN_RIDX_HT_MCS(15) + 1 */ Modified: head/sys/dev/rtwn/rtl8192c/r92c_reg.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_reg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_reg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -224,7 +224,6 @@ #define R92C_MACID1 0x700 #define R92C_BSSID1 0x708 - #define R92C_MACID(id) ((id) == 0 ? R92C_MACID0 : R92C_MACID1) #define R92C_BSSID(id) ((id) == 0 ? R92C_BSSID0 : R92C_BSSID1) @@ -628,7 +627,6 @@ #define R92C_CAMCMD_CLR 0x40000000 #define R92C_CAMCMD_POLLING 0x80000000 - /* * CAM entries. */ @@ -666,7 +664,6 @@ #define R92C_RXFLTMAP_SUBTYPE(subtype) \ (1 << ((subtype) >> IEEE80211_FC0_SUBTYPE_SHIFT)) - /* * Baseband registers. */ @@ -849,7 +846,6 @@ /* Bits for R92C_[RT]X_POWER_IQK*. */ #define R92C_POWER_IQK_RESULT_S 16 #define R92C_POWER_IQK_RESULT_M 0x03ff0000 - /* * RF (6052) registers. Modified: head/sys/dev/rtwn/rtl8192c/r92c_rf.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_rf.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_rf.c Tue Sep 1 21:33:31 2020 (r365097) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include - uint32_t r92c_rf_read(struct rtwn_softc *sc, int chain, uint8_t addr) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_rom.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_rom.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_rom.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void r92c_set_chains(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_rx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r92c_classify_intr(struct rtwn_softc *sc, void *buf, int len) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_tx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int r92c_tx_get_sco(struct rtwn_softc *sc, struct ieee80211_channel *c) { Modified: head/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h Tue Sep 1 21:33:31 2020 (r365097) @@ -109,7 +109,6 @@ struct r92c_tx_desc { #define R92C_TXDW6_MAX_AGG_S 11 } __packed __attribute__((aligned(4))); - /* Rate adaptation modes. */ #define R92C_RAID_11BGN 0 #define R92C_RAID_11GN 1 Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu.h Tue Sep 1 21:33:31 2020 (r365097) @@ -23,13 +23,11 @@ #include - /* * Global definitions. */ #define R92CU_PUBQ_NPAGES 231 #define R92CU_TX_PAGE_COUNT 248 - /* * Function declarations. Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c Tue Sep 1 21:33:31 2020 (r365097) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - static struct rtwn_r92c_txpwr r92c_txpwr; void r92cu_attach(struct rtwn_usb_softc *); Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92cu_init_bb(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c Tue Sep 1 21:33:31 2020 (r365097) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include - void r92cu_set_led(struct rtwn_softc *sc, int led, int on) { Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h Tue Sep 1 21:33:31 2020 (r365097) @@ -23,7 +23,6 @@ #include - /* * MAC initialization values. */ @@ -52,7 +51,6 @@ static const struct rtwn_mac_prog rtl8192cu_mac[] = { { 0x70a, 0x65 }, { 0x70b, 0x87 } }; - /* * Baseband initialization values. */ @@ -273,7 +271,6 @@ static const struct rtwn_bb_prog rtl8192cu_bb[] = { } } }; - static const uint32_t rtl8188ru_agc_vals[] = { 0x7b000001, 0x7b010001, 0x7b020001, 0x7b030001, 0x7b040001, Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h Tue Sep 1 21:33:31 2020 (r365097) @@ -23,13 +23,11 @@ #include - /* * MAC registers. */ /* System Configuration. */ #define R92C_USB_SIE_INTF 0x0e0 - /* * USB registers. Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include - int r92cu_align_rx(int totlen, int len) { Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c Tue Sep 1 21:33:31 2020 (r365097) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92cu_dump_tx_desc(struct rtwn_softc *sc, const void *desc) { Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h ============================================================================== --- head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h Tue Sep 1 21:33:31 2020 (r365097) @@ -42,4 +42,4 @@ struct r92cu_tx_desc { uint16_t pad; } __packed __attribute__((aligned(4))); -#endif /* R92CU_TX_DESC_H */ \ No newline at end of file +#endif /* R92CU_TX_DESC_H */ Modified: head/sys/dev/rtwn/rtl8192e/r92e.h ============================================================================== --- head/sys/dev/rtwn/rtl8192e/r92e.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192e/r92e.h Tue Sep 1 21:33:31 2020 (r365097) @@ -40,7 +40,6 @@ #define R92E_MAX_FW_SIZE 0x8000 - /* * Function declarations. */ Modified: head/sys/dev/rtwn/rtl8192e/r92e_chan.c ============================================================================== --- head/sys/dev/rtwn/rtl8192e/r92e_chan.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192e/r92e_chan.c Tue Sep 1 21:33:31 2020 (r365097) @@ -127,7 +127,6 @@ r92e_get_txpower(struct rtwn_softc *sc, int chain, str min_mcs = RTWN_RIDX_HT_MCS(i * 8); for (ridx = min_mcs; ridx <= max_mcs; ridx++) power[ridx] += pwr_diff; - } /* Apply max limit. */ Modified: head/sys/dev/rtwn/rtl8192e/r92e_priv.h ============================================================================== --- head/sys/dev/rtwn/rtl8192e/r92e_priv.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192e/r92e_priv.h Tue Sep 1 21:33:31 2020 (r365097) @@ -61,7 +61,6 @@ static const struct rtwn_mac_prog rtl8192eu_mac[] = { { 0x70b, 0x87 } }; - /* * Baseband initialization values. */ @@ -146,7 +145,6 @@ static const struct rtwn_bb_prog rtl8192eu_bb[] = { NULL } }; - static const uint32_t rtl8192eu_agc_vals[] = { 0xfb000001, 0xfb010001, 0xfb020001, 0xfb030001, 0xfb040001, Modified: head/sys/dev/rtwn/rtl8192e/usb/r92eu.h ============================================================================== --- head/sys/dev/rtwn/rtl8192e/usb/r92eu.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8192e/usb/r92eu.h Tue Sep 1 21:33:31 2020 (r365097) @@ -26,7 +26,6 @@ * $FreeBSD$ */ - #ifndef RTL8192EU_H #define RTL8192EU_H Modified: head/sys/dev/rtwn/rtl8812a/r12a.h ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a.h Tue Sep 1 21:33:31 2020 (r365097) @@ -52,7 +52,6 @@ static const uint8_t r12a_chan_5ghz_1[] = static const uint8_t r12a_chan_5ghz_2[] = { 149, 153, 157, 161, 165, 169, 173, 177 }; - /* * Function declarations. */ Modified: head/sys/dev/rtwn/rtl8812a/r12a_beacon.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_beacon.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_beacon.c Tue Sep 1 21:33:31 2020 (r365097) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12a_beacon_init(struct rtwn_softc *sc, void *buf, int id) { Modified: head/sys/dev/rtwn/rtl8812a/r12a_calib.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_calib.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_calib.c Tue Sep 1 21:33:31 2020 (r365097) @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12a_lc_calib(struct rtwn_softc *sc) { Modified: head/sys/dev/rtwn/rtl8812a/r12a_caps.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_caps.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_caps.c Tue Sep 1 21:33:31 2020 (r365097) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r12a_ioctl_net(struct ieee80211com *ic, u_long cmd, void *data) { Modified: head/sys/dev/rtwn/rtl8812a/r12a_chan.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_chan.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_chan.c Tue Sep 1 21:33:31 2020 (r365097) @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void r12a_write_txpower(struct rtwn_softc *sc, int chain, struct ieee80211_channel *c, uint8_t power[RTWN_RIDX_COUNT]) Modified: head/sys/dev/rtwn/rtl8812a/r12a_fw.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_fw.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_fw.c Tue Sep 1 21:33:31 2020 (r365097) @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE void r12a_fw_reset(struct rtwn_softc *sc, int reason) Modified: head/sys/dev/rtwn/rtl8812a/r12a_fw_cmd.h ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_fw_cmd.h Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_fw_cmd.h Tue Sep 1 21:33:31 2020 (r365097) @@ -77,7 +77,6 @@ struct r12a_fw_cmd_iq_calib { #define RTWN_CMD_IQ_EXT_LNA_5G(lna) ((lna) << 1) } __packed; - /* * C2H event types. */ Modified: head/sys/dev/rtwn/rtl8812a/r12a_init.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_init.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_init.c Tue Sep 1 21:33:31 2020 (r365097) @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r12a_check_condition(struct rtwn_softc *sc, const uint8_t cond[]) { Modified: head/sys/dev/rtwn/rtl8812a/r12a_led.c ============================================================================== --- head/sys/dev/rtwn/rtl8812a/r12a_led.c Tue Sep 1 21:32:41 2020 (r365096) +++ head/sys/dev/rtwn/rtl8812a/r12a_led.c Tue Sep 1 21:33:31 2020 (r365097) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***