 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_iwm.c,v 1.38 2015/10/14 02:16:51 ozaki-r Exp $	*/
+/*	$NetBSD: if_iwm.c,v 1.39 2015/11/06 14:22:17 nonaka Exp $	*/
 /*	OpenBSD: if_iwm.c,v 1.41 2015/05/22 06:50:54 kettenis Exp	*/
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
  * Copyright (c) 2014 Fixup Software Ltd.
+ *
  * Permission to use, copy, modify, and 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
 @@ -95,27 +95,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.38 2015/10/14 02:16:51 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.39 2015/11/06 14:22:17 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 @@ -6593,29 +6593,26 @@ iwm_attach_hook(device_t dev)
+{
 	struct iwm_softc *sc = device_private(dev);
 	iwm_preinit(sc);
+}
 static void
 iwm_attach(device_t parent, device_t self, void *aux)
+{
 	struct iwm_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = &sc->sc_ec.ec_if;
 #ifndef __HAVE_PCI_MSI_MSIX
 	pci_intr_handle_t ih;
 #endif
 	pcireg_t reg, memtype;
 	char intrbuf[PCI_INTRSTR_LEN];
 	const char *intrstr;
 	int error;
 	int txq_i;
 	const struct sysctlnode *node;
 	sc->sc_dev = self;
 	sc->sc_pct = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_dmat = pa->pa_dmat;
 	sc->sc_pciid = pa->pa_id;
 @@ -6645,44 +6642,35 @@ iwm_attach(device_t parent, device_t sel
 		reg &= ~PCI_COMMAND_INTERRUPT_DISABLE;
+	}
 	pci_conf_write(sc->sc_pct, sc->sc_pcitag, PCI_COMMAND_STATUS_REG, reg);
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, PCI_MAPREG_START);
 	error = pci_mapreg_map(pa, PCI_MAPREG_START, memtype, 0,
 	    &sc->sc_st, &sc->sc_sh, NULL, &sc->sc_sz);
 	if (error != 0) {
 		aprint_error_dev(self, "can't map mem space\n");
 		return;
+	}
 	/* Install interrupt handler. */
 #ifdef __HAVE_PCI_MSI_MSIX
 	error = pci_intr_alloc(pa, &sc->sc_pihp, NULL, 0);
 	if (error != 0) {
 		aprint_error_dev(self, "can't allocate interrupt\n");
 		return;
+	}
 	intrstr = pci_intr_string(sc->sc_pct, sc->sc_pihp[0], intrbuf,
 	    sizeof(intrbuf));
 	sc->sc_ih = pci_intr_establish(sc->sc_pct, sc->sc_pihp[0], IPL_NET,
 	    iwm_intr, sc);
 #else	/* !__HAVE_PCI_MSI_MSIX */
 	if (pci_intr_map(pa, &ih)) {
 		aprint_error_dev(self, "can't map interrupt\n");
 		return;
 	intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf));
 	sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, iwm_intr, sc);
 #endif	/* __HAVE_PCI_MSI_MSIX */
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(self, "can't establish interrupt");
 		if (intrstr != NULL)
 			aprint_error(" at %s", intrstr);
 		aprint_error("\n");
 		return;
+	}
 	aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 	sc->sc_wantresp = -1;
 	switch (PCI_PRODUCT(sc->sc_pciid)) {
 	case PCI_PRODUCT_INTEL_WIFI_LINK_7260_1:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_iwmvar.h,v 1.8 2015/07/22 15:18:01 nonaka Exp $	*/
+/*	$NetBSD: if_iwmvar.h,v 1.9 2015/11/06 14:22:17 nonaka Exp $	*/
 /*	OpenBSD: if_iwmvar.h,v 1.7 2015/03/02 13:51:10 jsg Exp 	*/
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
  * Copyright (c) 2014 Fixup Software Ltd.
+ *
  * Permission to use, copy, modify, and 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
 @@ -367,29 +367,27 @@ struct iwm_bf_data {
 struct iwm_softc {
 	device_t sc_dev;
 	struct ethercom sc_ec;
 	struct ieee80211com sc_ic;
 	int (*sc_newstate)(struct ieee80211com *, enum ieee80211_state, int);
 	int sc_newstate_pending;
 	struct ieee80211_amrr sc_amrr;
 	struct callout sc_calib_to;
 	bus_space_tag_t sc_st;
 	bus_space_handle_t sc_sh;
 #ifdef __HAVE_PCI_MSI_MSIX
 	pci_intr_handle_t *sc_pihp;
 #endif
 	bus_size_t sc_sz;
 	bus_dma_tag_t sc_dmat;
 	pci_chipset_tag_t sc_pct;
 	pcitag_t sc_pcitag;
 	pcireg_t sc_pciid;
 	const void *sc_ih;
 	/* TX scheduler rings. */
 	struct iwm_dma_info		sched_dma;
 	uint32_t			sched_base;
 	/* TX/RX rings. */

 @@ -1,39 +1,39 @@
-/*	$NetBSD: if_rtwn.c,v 1.1 2015/08/27 14:04:08 nonaka Exp $	*/
+/*	$NetBSD: if_rtwn.c,v 1.2 2015/11/06 14:22:17 nonaka Exp $	*/
 /*	$OpenBSD: if_rtwn.c,v 1.5 2015/06/14 08:02:47 stsp Exp $	*/
 #define	IEEE80211_NO_HT
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2015 Stefan Sperling <stsp@openbsd.org>
+ *
  * Permission to use, copy, modify, and 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.
  */
 /*
  * Driver for Realtek RTL8188CE
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.1 2015/08/27 14:04:08 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.2 2015/11/06 14:22:17 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/mutex.h>
 @@ -203,29 +203,26 @@ rtwn_match(device_t parent, cfdata_t mat
 		return 1;
 	return 0;
+}
 static void
 rtwn_attach(device_t parent, device_t self, void *aux)
+{
 	struct rtwn_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = GET_IFP(sc);
 	int i, error;
 	pcireg_t memtype;
 #ifndef __HAVE_PCI_MSI_MSIX
 	pci_intr_handle_t ih;
 #endif
 	const char *intrstr;
 	char intrbuf[PCI_INTRSTR_LEN];
 	sc->sc_dev = self;
 	sc->sc_dmat = pa->pa_dmat;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_tag = pa->pa_tag;
 	pci_aprint_devinfo(pa, NULL);
 	callout_init(&sc->scan_to, 0);
 	callout_setfunc(&sc->scan_to, rtwn_next_scan, sc);
 	callout_init(&sc->calib_to, 0);
 @@ -236,43 +233,34 @@ rtwn_attach(device_t parent, device_t se
 	/* Power up the device */
 	pci_set_powerstate(pa->pa_pc, pa->pa_tag, PCI_PMCSR_STATE_D0);
 	/* Map control/status registers. */
 	memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, RTWN_PCI_MMBA);
 	error = pci_mapreg_map(pa, RTWN_PCI_MMBA, memtype, 0, &sc->sc_st,
 	    &sc->sc_sh, NULL, &sc->sc_mapsize);
 	if (error != 0) {
 		aprint_error_dev(self, "can't map mem space\n");
 		return;
+	}
 	/* Install interrupt handler. */
 #ifdef __HAVE_PCI_MSI_MSIX
 	if (pci_intr_alloc(pa, &sc->sc_pihp, NULL, 0)) {
 		aprint_error_dev(self, "can't map interrupt\n");
 		return;
+	}
 	intrstr = pci_intr_string(sc->sc_pc, sc->sc_pihp[0], intrbuf,
 	    sizeof(intrbuf));
 	sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->sc_pihp[0], IPL_NET,
 	    rtwn_intr, sc);
 #else	/* !__HAVE_PCI_MSI_MSIX */
 	if (pci_intr_map(pa, &ih)) {
 		aprint_error_dev(self, "can't map interrupt\n");
 		return;
 	intrstr = pci_intr_string(sc->sc_pc, ih, intrbuf, sizeof(intrbuf));
 	sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_NET, rtwn_intr, sc);
 #endif	/* __HAVE_PCI_MSI_MSIX */
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(self, "can't establish interrupt");
 		if (intrstr != NULL)
 			aprint_error(" at %s", intrstr);
 		aprint_error("\n");
 		return;
+	}
 	aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 	error = rtwn_read_chipid(sc);
 	if (error != 0) {
 		aprint_error_dev(self, "unsupported test or unknown chip\n");
 		return;
 @@ -426,29 +414,27 @@ rtwn_detach(device_t self, int flags)
 		rtwn_free_tx_list(sc, i);
 	rtwn_free_rx_list(sc);
 	splx(s);
 	callout_destroy(&sc->scan_to);
 	callout_destroy(&sc->calib_to);
 	if (sc->init_task != NULL)
 		softint_disestablish(sc->init_task);
 	if (sc->sc_ih != NULL) {
 		pci_intr_disestablish(sc->sc_pc, sc->sc_ih);
 #ifdef __HAVE_PCI_MSI_MSIX
 		pci_intr_release(sc->sc_pc, sc->sc_pihp, 1);
 #endif
+	}
 	pmf_device_deregister(self);
 	return 0;
+}
 static int
 rtwn_activate(device_t self, enum devact act)
+{
 	struct rtwn_softc *sc = device_private(self);
 	struct ifnet *ifp = GET_IFP(sc);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_rtwnreg.h,v 1.1 2015/08/27 14:04:08 nonaka Exp $	*/
+/*	$NetBSD: if_rtwnreg.h,v 1.2 2015/11/06 14:22:17 nonaka Exp $	*/
 /*	$OpenBSD: if_rtwnreg.h,v 1.3 2015/06/14 08:02:47 stsp Exp $	*/
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
  * Copyright (c) 2015 Stefan Sperling <stsp@openbsd.org>
+ *
  * Permission to use, copy, modify, and 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
 @@ -1270,29 +1270,27 @@ struct rtwn_host_cmd_ring {
 struct rtwn_softc {
 	device_t			sc_dev;
 	struct ethercom			sc_ec;
 	struct ieee80211com		sc_ic;
 	int				(*sc_newstate)(struct ieee80211com *,
 					    enum ieee80211_state, int);
 	/* PCI specific goo. */
 	bus_dma_tag_t 			sc_dmat;
 	pci_chipset_tag_t		sc_pc;
 	pcitag_t			sc_tag;
 	void				*sc_ih;
 #ifdef __HAVE_PCI_MSI_MSIX
 	pci_intr_handle_t		*sc_pihp;
 #endif
 	bus_space_tag_t			sc_st;
 	bus_space_handle_t		sc_sh;
 	bus_size_t			sc_mapsize;
 	int				sc_cap_off;
 	struct callout			scan_to;
 	struct callout			calib_to;
 	void				*init_task;
 	int				ac2idx[WME_NUM_AC];
 	uint32_t			sc_flags;
 #define RTWN_FLAG_FW_LOADED	__BIT(0)
 #define RTWN_FLAG_CCK_HIPWR	__BIT(1)

 @@ -1,61 +1,59 @@
-/*	$NetBSD: rtsx_pci.c,v 1.4 2015/09/05 04:56:53 nonaka Exp $	*/
+/*	$NetBSD: rtsx_pci.c,v 1.5 2015/11/06 14:22:17 nonaka Exp $	*/
 /*	$OpenBSD: rtsx_pci.c,v 1.7 2014/08/19 17:55:03 phessler Exp $	*/
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
  * Copyright (c) 2012 Stefan Sperling <stsp@openbsd.org>
+ *
  * Permission to use, copy, modify, and 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.4 2015/09/05 04:56:53 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.5 2015/11/06 14:22:17 nonaka Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/pmf.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/ic/rtsxreg.h>
 #include <dev/ic/rtsxvar.h>
 #include <dev/sdmmc/sdmmcvar.h>
 #define RTSX_PCI_BAR	0x10
 struct rtsx_pci_softc {
 	struct rtsx_softc sc;
 	pci_chipset_tag_t sc_pc;
 	void *sc_ih;
 #ifdef __HAVE_PCI_MSI_MSIX
 	pci_intr_handle_t *sc_pihp;
 #endif
 };
 static int rtsx_pci_match(device_t , cfdata_t, void *);
 static void rtsx_pci_attach(device_t, device_t, void *);
 static int rtsx_pci_detach(device_t, int);
 CFATTACH_DECL_NEW(rtsx_pci, sizeof(struct rtsx_pci_softc),
     rtsx_pci_match, rtsx_pci_attach, rtsx_pci_detach, NULL);
 #ifdef RTSX_DEBUG
 extern int rtsxdebug;
 #define DPRINTF(n,s)	do { if ((n) <= rtsxdebug) printf s; } while (0)
 #else
 @@ -86,69 +84,57 @@ rtsx_pci_match(device_t parent, cfdata_t
 		return 1;
+	}
 	return 0;
+}
 static void
 rtsx_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct rtsx_pci_softc *sc = device_private(self);
 	struct pci_attach_args *pa = (struct pci_attach_args *)aux;
 	pci_chipset_tag_t pc = pa->pa_pc;
 	pcitag_t tag = pa->pa_tag;
 #ifndef __HAVE_PCI_MSI_MSIX
 	pci_intr_handle_t ih;
 #endif
 	pcireg_t reg;
 	char const *intrstr;
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh;
 	bus_size_t size;
 	uint32_t flags;
 	char intrbuf[PCI_INTRSTR_LEN];
 	sc->sc.sc_dev = self;
 	sc->sc_pc = pc;
 	pci_aprint_devinfo(pa, NULL);
 	if ((pci_conf_read(pc, tag, RTSX_CFG_PCI) & RTSX_CFG_ASIC) != 0) {
 		aprint_error_dev(self, "no asic\n");
 		return;
+	}
 	if (pci_mapreg_map(pa, RTSX_PCI_BAR, PCI_MAPREG_TYPE_MEM, 0,
 	    &iot, &ioh, NULL, &size)) {
 		aprint_error_dev(self, "couldn't map registers\n");
 		return;
+	}
 #ifdef __HAVE_PCI_MSI_MSIX
 	if (pci_intr_alloc(pa, &sc->sc_pihp, NULL, 0)) {
 		aprint_error_dev(self, "couldn't map interrupt\n");
 		return;
+	}
 	intrstr = pci_intr_string(pc, sc->sc_pihp[0], intrbuf, sizeof(intrbuf));
 	sc->sc_ih = pci_intr_establish(pc, sc->sc_pihp[0], IPL_SDMMC, rtsx_intr,
 	    &sc->sc);
 #else	/* !__HAVE_PCI_MSI_MSIX */
 	if (pci_intr_map(pa, &ih)) {
 		aprint_error_dev(self, "couldn't map interrupt\n");
 		return;
 	intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
 	sc->sc_ih = pci_intr_establish(pc, ih, IPL_SDMMC, rtsx_intr, &sc->sc);
 #endif	/* __HAVE_PCI_MSI_MSIX */
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt\n");
 		return;
+	}
 	aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 	/* Enable the device */
 	reg = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG);
 	reg |= PCI_COMMAND_MASTER_ENABLE;
 	pci_conf_write(pc, tag, PCI_COMMAND_STATUS_REG, reg);
 	/* Power up the device */
 	pci_set_powerstate(pc, tag, PCI_PMCSR_STATE_D0);
 @@ -188,19 +174,17 @@ rtsx_pci_attach(device_t parent, device_
+}
 static int
 rtsx_pci_detach(device_t self, int flags)
+{
 	struct rtsx_pci_softc *sc = device_private(self);
 	int rv;
 	rv = rtsx_detach(&sc->sc, flags);
 	if (rv)
 		return rv;
 	pci_intr_disestablish(sc->sc_pc, sc->sc_ih);
 #ifdef __HAVE_PCI_MSI_MSIX
 	pci_intr_release(sc->sc_pc, sc->sc_pihp, 1);
 #endif	/* __HAVE_PCI_MSI_MSIX */
 	return 0;
+}