SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-05-23 16:36:12 +00:00
parent 12fde4069b
commit c1d0febac8
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
149 changed files with 556 additions and 649 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sys/dev/ic/ufshci.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ufshci.c,v 1.29 2024/05/21 18:19:22 mglocker Exp $ */
/* $OpenBSD: ufshci.c,v 1.30 2024/05/22 11:46:06 mglocker Exp $ */
/*
* Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
@ -55,7 +55,7 @@ struct cfdriver ufshci_cd = {
};
int ufshci_reset(struct ufshci_softc *);
int ufshci_uccs_poll(struct ufshci_softc *);
int ufshci_is_poll(struct ufshci_softc *, uint32_t);
struct ufshci_dmamem *ufshci_dmamem_alloc(struct ufshci_softc *, size_t);
void ufshci_dmamem_free(struct ufshci_softc *,
struct ufshci_dmamem *);
@ -269,7 +269,7 @@ ufshci_reset(struct ufshci_softc *sc)
}
int
ufshci_uccs_poll(struct ufshci_softc *sc)
ufshci_is_poll(struct ufshci_softc *sc, uint32_t type)
{
uint32_t status;
int i, retry = 25;
@ -278,7 +278,7 @@ ufshci_uccs_poll(struct ufshci_softc *sc)
for (i = 0; i < retry; i++) {
status = UFSHCI_READ_4(sc, UFSHCI_REG_IS);
if (status & UFSHCI_REG_IS_UCCS)
if (status & type)
break;
delay(10);
}
@ -369,7 +369,7 @@ ufshci_init(struct ufshci_softc *sc)
/* 7.1.1 Host Controller Initialization: 6) */
UFSHCI_WRITE_4(sc, UFSHCI_REG_UICCMD,
UFSHCI_REG_UICCMD_CMDOP_DME_LINKSTARTUP);
if (ufshci_uccs_poll(sc) != 0)
if (ufshci_is_poll(sc, UFSHCI_REG_IS_UCCS) != 0)
return -1;
/*

10
sys/dev/ic/ufshcireg.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ufshcireg.h,v 1.10 2024/05/20 20:08:04 mglocker Exp $ */
/* $OpenBSD: ufshcireg.h,v 1.11 2024/05/22 18:10:00 mglocker Exp $ */
/*
* Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
@ -99,10 +99,10 @@
#define UFSHCI_REG_IE_UTRCE (1 << 0) /* RW */
/* Host Controller Status */
#define UFSHCI_REG_HCS 0x30
#define UFSHCI_REG_HCS_TLUNUTPE(x) ((x << 24) & 0xff000000) /* RO */
#define UFSHCI_REG_HCS_TTAGUTPE(x) ((x << 16) & 0x00ff0000) /* RO */
#define UFSHCI_REG_HCS_UTPEC(x) ((x << 12) & 0x0000f000) /* RO */
#define UFSHCI_REG_HCS_UPMCRS(x) ((x << 8) & 0x00000700) /* RO */
#define UFSHCI_REG_HCS_TLUNUTPE(x) ((x >> 24) & 0x000000ff) /* RO */
#define UFSHCI_REG_HCS_TTAGUTPE(x) ((x >> 16) & 0x000000ff) /* RO */
#define UFSHCI_REG_HCS_UTPEC(x) ((x >> 12) & 0x0000000f) /* RO */
#define UFSHCI_REG_HCS_UPMCRS(x) ((x >> 8) & 0x00000007) /* RO */
#define UFSHCI_REG_HCS_UCRDY (1 << 3) /* RO */
#define UFSHCI_REG_HCS_UTMRLRDY (1 << 2) /* RO */
#define UFSHCI_REG_HCS_UTRLRDY (1 << 1) /* RO */

75
sys/dev/pci/if_mwx.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_mwx.c,v 1.3 2024/05/20 21:22:43 martijn Exp $ */
/* $OpenBSD: if_mwx.c,v 1.5 2024/05/22 16:24:59 martijn Exp $ */
/*
* Copyright (c) 2022 Claudio Jeker <claudio@openbsd.org>
* Copyright (c) 2021 MediaTek Inc.
@ -52,6 +52,7 @@
static const struct pci_matchid mwx_devices[] = {
{ PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7921 },
{ PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7921K },
{ PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7922 },
};
#define MWX_DEBUG 1
@ -158,10 +159,17 @@ struct mwx_vif {
uint8_t scan_seq_num;
};
enum mwx_hw_type {
MWX_HW_MT7921,
MWX_HW_MT7922,
};
struct mwx_softc {
struct device sc_dev;
struct ieee80211com sc_ic;
enum mwx_hw_type sc_hwtype;
struct mwx_queue sc_txq;
struct mwx_queue sc_txmcuq;
struct mwx_queue sc_txfwdlq;
@ -375,6 +383,8 @@ int mwx_mcu_wait_resp_msg(struct mwx_softc *, uint32_t, int,
int mt7921_dma_disable(struct mwx_softc *sc, int force);
void mt7921_dma_enable(struct mwx_softc *sc);
int mt7921_e_mcu_fw_pmctrl(struct mwx_softc *);
int mt7921_e_mcu_drv_pmctrl(struct mwx_softc *);
int mt7921_wfsys_reset(struct mwx_softc *sc);
uint32_t mt7921_reg_addr(struct mwx_softc *, uint32_t);
int mt7921_init_hardware(struct mwx_softc *);
@ -1179,6 +1189,10 @@ mwx_attach(struct device *parent, struct device *self, void *aux)
sc->sc_pc = pa->pa_pc;
sc->sc_tag = pa->pa_tag;
sc->sc_dmat = pa->pa_dmat;
if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_MEDIATEK_MT7922)
sc->sc_hwtype = MWX_HW_MT7922;
else
sc->sc_hwtype = MWX_HW_MT7921;
memtype = pci_mapreg_type(pa->pa_pc, pa->pa_tag, PCI_MAPREG_START);
if (pci_mapreg_map(pa, PCI_MAPREG_START, memtype, 0,
@ -1207,6 +1221,10 @@ mwx_attach(struct device *parent, struct device *self, void *aux)
sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET,
mwx_intr, sc, DEVNAME(sc));
if (mt7921_e_mcu_fw_pmctrl(sc) != 0 ||
mt7921_e_mcu_drv_pmctrl(sc) != 0)
goto fail;
if ((error = mwx_txwi_alloc(sc, MWX_TXWI_MAX)) != 0) {
printf("%s: failed to allocate DMA resources %d\n",
DEVNAME(sc), error);
@ -2590,6 +2608,46 @@ mt7921_dma_enable(struct mwx_softc *sc)
mwx_write(sc, MT_PCIE_MAC_INT_ENABLE, 0xff);
}
int
mt7921_e_mcu_fw_pmctrl(struct mwx_softc *sc)
{
int i;
for (i = 0; i < MT7921_MCU_INIT_RETRY_COUNT; i++) {
mwx_write(sc, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_SET_OWN);
if (mwx_poll(sc, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_OWN_SYNC,
4, 50) == 0)
break;
}
if (i == MT7921_MCU_INIT_RETRY_COUNT) {
printf("%s: firmware own failed\n", DEVNAME(sc));
return EIO;
}
return 0;
}
int
mt7921_e_mcu_drv_pmctrl(struct mwx_softc *sc)
{
int i;
for (i = 0; i < MT7921_MCU_INIT_RETRY_COUNT; i++) {
mwx_write(sc, MT_CONN_ON_LPCTL, PCIE_LPCR_HOST_CLR_OWN);
if (mwx_poll(sc, MT_CONN_ON_LPCTL, 0,
PCIE_LPCR_HOST_OWN_SYNC, 50) == 0)
break;
}
if (i == MT7921_MCU_INIT_RETRY_COUNT) {
printf("%s: driver own failed\n", DEVNAME(sc));
return EIO;
}
return 0;
}
int
mt7921_wfsys_reset(struct mwx_softc *sc)
{
@ -2802,6 +2860,7 @@ mt7921_load_firmware(struct mwx_softc *sc)
{
struct mt7921_patch_hdr *hdr;
struct mt7921_fw_trailer *fwhdr;
const char *rompatch, *fw;
u_char *buf, *fwbuf, *dl;
size_t buflen, fwlen, offset = 0;
uint32_t reg, override = 0, option = 0;
@ -2813,8 +2872,18 @@ mt7921_load_firmware(struct mwx_softc *sc)
return 0;
}
if ((rv = loadfirmware(MT7921_ROM_PATCH, &buf, &buflen)) != 0 ||
(rv = loadfirmware(MT7921_FIRMWARE_WM, &fwbuf, &fwlen)) != 0) {
switch (sc->sc_hwtype) {
case MWX_HW_MT7921:
rompatch = MT7921_ROM_PATCH;
fw = MT7921_FIRMWARE_WM;
break;
case MWX_HW_MT7922:
rompatch = MT7922_ROM_PATCH;
fw = MT7922_FIRMWARE_WM;
break;
}
if ((rv = loadfirmware(rompatch, &buf, &buflen)) != 0 ||
(rv= loadfirmware(fw, &fwbuf, &fwlen)) != 0) {
printf("%s: loadfirmware error %d\n", DEVNAME(sc), rv);
return rv;
}

5
sys/dev/pci/if_mwxreg.h
View file

@ -300,6 +300,11 @@
#define MT_CONN_ON_MISC 0x7c0600f0
#define MT_TOP_MISC2_FW_N9_RDY 0x3
#define MT_CONN_ON_LPCTL 0x7c060010
#define PCIE_LPCR_HOST_SET_OWN (1U << 0)
#define PCIE_LPCR_HOST_CLR_OWN (1U << 1)
#define PCIE_LPCR_HOST_OWN_SYNC (1U << 2)
#define MT_WFSYS_SW_RST_B 0x18000140
#define WFSYS_SW_RST_B (1U << 0)
#define WFSYS_SW_INIT_DONE (1U << 4)

3
sys/dev/pci/pcidevs
View file

@ -1,4 +1,4 @@
$OpenBSD: pcidevs,v 1.2075 2024/05/21 07:03:55 jsg Exp $
$OpenBSD: pcidevs,v 1.2076 2024/05/22 16:24:59 martijn Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@ -7552,6 +7552,7 @@ product MATROX MARV_G200_SD 0xff04 MGA Marvel G200 SD
/* MediaTek products */
product MEDIATEK MT7921K 0x0608 MT7921K
product MEDIATEK MT7922 0x0616 MT7922
product MEDIATEK MT7921 0x7961 MT7921
/* Meinberg Funkuhren */

1
sys/dev/pci/pcidevs.h
View file

@ -7557,6 +7557,7 @@
/* MediaTek products */
#define PCI_PRODUCT_MEDIATEK_MT7921K 0x0608 /* MT7921K */
#define PCI_PRODUCT_MEDIATEK_MT7922 0x0616 /* MT7922 */
#define PCI_PRODUCT_MEDIATEK_MT7921 0x7961 /* MT7921 */
/* Meinberg Funkuhren */

4
sys/dev/pci/pcidevs_data.h
View file

@ -27335,6 +27335,10 @@ static const struct pci_known_product pci_known_products[] = {
PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7921K,
"MT7921K",
},
{
PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7922,
"MT7922",
},
{
PCI_VENDOR_MEDIATEK, PCI_PRODUCT_MEDIATEK_MT7921,
"MT7921",

3
sys/dev/usb/ehci.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ehci.c,v 1.219 2022/04/12 19:41:11 naddy Exp $ */
/* $OpenBSD: ehci.c,v 1.220 2024/05/23 03:21:08 jsg Exp $ */
/* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */
/*
@ -57,7 +57,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/rwlock.h>
#include <sys/malloc.h>
#include <sys/device.h>

9
sys/dev/usb/fido.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: fido.c,v 1.5 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: fido.c,v 1.6 2024/05/23 03:21:08 jsg Exp $ */
/*
* Copyright (c) 2019 Reyk Floeter <reyk@openbsd.org>
@ -20,22 +20,15 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/signalvar.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/uhidev.h>
#include <dev/usb/uhid.h>

6
sys/dev/usb/if_athn_usb.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_athn_usb.c,v 1.65 2022/07/10 21:13:41 bluhm Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.66 2024/05/23 03:21:08 jsg Exp $ */
/*-
* Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@ -26,11 +26,8 @@
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>
@ -58,7 +55,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_athn_usb.h>

5
sys/dev/usb/if_atu.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_atu.c,v 1.134 2022/04/21 21:03:03 stsp Exp $ */
/* $OpenBSD: if_atu.c,v 1.135 2024/05/23 03:21:08 jsg Exp $ */
/*
* Copyright (c) 2003, 2004
* Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved.
@ -50,10 +50,7 @@
#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/timeout.h>
#include <sys/queue.h>
#include <sys/device.h>

4
sys/dev/usb/if_aue.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_aue.c,v 1.112 2021/08/09 07:21:48 jmatthew Exp $ */
/* $OpenBSD: if_aue.c,v 1.113 2024/05/23 03:21:08 jsg Exp $ */
/* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@ -84,8 +84,6 @@
#include <sys/sockio.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>

4
sys/dev/usb/if_axe.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_axe.c,v 1.142 2020/07/31 10:49:32 mglocker Exp $ */
/* $OpenBSD: if_axe.c,v 1.143 2024/05/23 03:21:08 jsg Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@ -94,8 +94,6 @@
#include <sys/sockio.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>

4
sys/dev/usb/if_axen.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_axen.c,v 1.32 2024/01/04 08:41:59 kevlo Exp $ */
/* $OpenBSD: if_axen.c,v 1.33 2024/05/23 03:21:08 jsg Exp $ */
/*
* Copyright (c) 2013 Yojiro UO <yuo@openbsd.org>
@ -28,8 +28,6 @@
#include <sys/sockio.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>

12
sys/dev/usb/if_bwfm_usb.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_bwfm_usb.c,v 1.20 2021/11/05 11:38:51 mpi Exp $ */
/* $OpenBSD: if_bwfm_usb.c,v 1.21 2024/05/23 03:21:08 jsg Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
* Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se>
@ -16,22 +16,13 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "bpfilter.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/queue.h>
#include <sys/socket.h>
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
#include <netinet/in.h>
@ -43,7 +34,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_mem.h>
#include <dev/usb/usbdevs.h>

4
sys/dev/usb/if_cdce.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_cdce.c,v 1.82 2024/01/04 08:41:59 kevlo Exp $ */
/* $OpenBSD: if_cdce.c,v 1.83 2024/05/23 03:21:08 jsg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@ -46,8 +46,6 @@
#include <sys/systm.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
#include <net/if.h>

4
sys/dev/usb/if_cue.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_cue.c,v 1.80 2020/07/31 10:49:32 mglocker Exp $ */
/* $OpenBSD: if_cue.c,v 1.81 2024/05/23 03:21:08 jsg Exp $ */
/* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@ -62,8 +62,6 @@
#include <sys/systm.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/timeout.h>
#include <sys/device.h>

4
sys/dev/usb/if_kue.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_kue.c,v 1.92 2020/07/31 10:49:32 mglocker Exp $ */
/* $OpenBSD: if_kue.c,v 1.93 2024/05/23 03:21:08 jsg Exp $ */
/* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@ -77,8 +77,6 @@
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
#include <net/if.h>

5
sys/dev/usb/if_mos.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_mos.c,v 1.43 2020/07/31 10:49:32 mglocker Exp $ */
/* $OpenBSD: if_mos.c,v 1.44 2024/05/23 03:21:08 jsg Exp $ */
/*
* Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
@ -77,8 +77,6 @@
#include <sys/sockio.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
@ -99,7 +97,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_mosreg.h>

5
sys/dev/usb/if_mtw.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_mtw.c,v 1.10 2024/04/14 03:26:25 jsg Exp $ */
/* $OpenBSD: if_mtw.c,v 1.11 2024/05/23 03:21:08 jsg Exp $ */
/*
* Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
* Copyright (c) 2013-2014 Kevin Lo
@ -26,11 +26,8 @@
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>

4
sys/dev/usb/if_mue.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_mue.c,v 1.11 2021/07/25 06:43:04 mglocker Exp $ */
/* $OpenBSD: if_mue.c,v 1.12 2024/05/23 03:21:08 jsg Exp $ */
/*
* Copyright (c) 2018 Kevin Lo <kevlo@openbsd.org>
@ -25,8 +25,6 @@
#include <sys/sockio.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>

5
sys/dev/usb/if_otus.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_otus.c,v 1.72 2023/03/08 04:43:08 guenther Exp $ */
/* $OpenBSD: if_otus.c,v 1.73 2024/05/23 03:21:08 jsg Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@ -25,11 +25,8 @@
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>

6
sys/dev/usb/if_ral.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_ral.c,v 1.149 2022/04/21 21:03:03 stsp Exp $ */
/* $OpenBSD: if_ral.c,v 1.150 2024/05/23 03:21:08 jsg Exp $ */
/*-
* Copyright (c) 2005, 2006
@ -27,11 +27,8 @@
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>
@ -53,7 +50,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_ralreg.h>

5
sys/dev/usb/if_rsu.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_rsu.c,v 1.52 2023/03/08 04:43:08 guenther Exp $ */
/* $OpenBSD: if_rsu.c,v 1.53 2024/05/23 03:21:08 jsg Exp $ */
/*-
* Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@ -25,11 +25,8 @@
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>

6
sys/dev/usb/if_rum.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_rum.c,v 1.128 2024/04/14 03:26:25 jsg Exp $ */
/* $OpenBSD: if_rum.c,v 1.129 2024/05/23 03:21:08 jsg Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@ -27,11 +27,8 @@
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>
@ -53,7 +50,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_rumreg.h>

5
sys/dev/usb/if_run.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_run.c,v 1.139 2024/04/14 03:26:25 jsg Exp $ */
/* $OpenBSD: if_run.c,v 1.140 2024/05/23 03:21:08 jsg Exp $ */
/*-
* Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@ -27,11 +27,8 @@
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>

4
sys/dev/usb/if_smsc.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_smsc.c,v 1.38 2022/01/09 05:43:00 jsg Exp $ */
/* $OpenBSD: if_smsc.c,v 1.39 2024/05/23 03:21:08 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
/*-
* Copyright (c) 2012
@ -65,8 +65,6 @@
#include <sys/sockio.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>

5
sys/dev/usb/if_uaq.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_uaq.c,v 1.5 2022/09/01 17:07:09 mlarkin Exp $ */
/* $OpenBSD: if_uaq.c,v 1.6 2024/05/23 03:21:08 jsg Exp $ */
/*-
* Copyright (c) 2021 Jonathan Matthew <jonathan@d14n.org>
* All rights reserved.
@ -31,10 +31,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sockio.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
#include <machine/bus.h>

6
sys/dev/usb/if_uath.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_uath.c,v 1.88 2022/04/21 21:03:03 stsp Exp $ */
/* $OpenBSD: if_uath.c,v 1.89 2024/05/23 03:21:08 jsg Exp $ */
/*-
* Copyright (c) 2006
@ -31,11 +31,8 @@
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>
@ -58,7 +55,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h> /* needs_reattach() */
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_uathreg.h>

4
sys/dev/usb/if_udav.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_udav.c,v 1.85 2021/08/09 07:21:48 jmatthew Exp $ */
/* $OpenBSD: if_udav.c,v 1.86 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@ -51,8 +51,6 @@
#include <sys/systm.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>

5
sys/dev/usb/if_ugl.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_ugl.c,v 1.27 2021/08/09 07:21:48 jmatthew Exp $ */
/* $OpenBSD: if_ugl.c,v 1.28 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2013 SASANO Takayoshi <uaa@uaa.org.uk>
@ -58,8 +58,6 @@
#include <sys/timeout.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
@ -74,7 +72,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#define UGL_INTR_PKTLEN 8

6
sys/dev/usb/if_umb.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_umb.c,v 1.57 2024/04/13 23:44:11 jsg Exp $ */
/* $OpenBSD: if_umb.c,v 1.58 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2016 genua mbH
@ -29,7 +29,6 @@
#include <sys/param.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/systm.h>
#include <sys/syslog.h>
#include <sys/kstat.h>
@ -44,12 +43,9 @@
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <netinet/ip.h>
#ifdef INET6
#include <netinet/ip6.h>
#include <netinet6/in6_var.h>
#include <netinet6/ip6_var.h>
#include <netinet6/in6_ifattach.h>
#include <netinet6/nd6.h>
#endif

5
sys/dev/usb/if_upgt.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_upgt.c,v 1.89 2022/04/21 21:03:03 stsp Exp $ */
/* $OpenBSD: if_upgt.c,v 1.90 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@ -21,11 +21,8 @@
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>

5
sys/dev/usb/if_upl.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_upl.c,v 1.79 2021/08/09 07:21:48 jmatthew Exp $ */
/* $OpenBSD: if_upl.c,v 1.80 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -41,8 +41,6 @@
#include <sys/timeout.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
@ -58,7 +56,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
/*

4
sys/dev/usb/if_ure.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_ure.c,v 1.34 2024/04/13 23:44:11 jsg Exp $ */
/* $OpenBSD: if_ure.c,v 1.35 2024/05/23 03:21:09 jsg Exp $ */
/*-
* Copyright (c) 2015, 2016, 2019 Kevin Lo <kevlo@openbsd.org>
* Copyright (c) 2020 Jonathon Fletcher <jonathon.fletcher@gmail.com>
@ -34,8 +34,6 @@
#include <sys/sockio.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
#include <machine/bus.h>

4
sys/dev/usb/if_url.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_url.c,v 1.89 2021/08/09 07:21:48 jmatthew Exp $ */
/* $OpenBSD: if_url.c,v 1.90 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */
/*
* Copyright (c) 2001, 2002
@ -48,8 +48,6 @@
#include <sys/systm.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>

8
sys/dev/usb/if_urndis.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_urndis.c,v 1.73 2021/11/05 11:38:52 mpi Exp $ */
/* $OpenBSD: if_urndis.c,v 1.74 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
@ -24,17 +24,13 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sockio.h>
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
#include <machine/bus.h>
#include <net/if.h>
#include <net/if_media.h>
#if NBPFILTER > 0
#include <net/bpf.h>
@ -45,8 +41,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/rndis.h>

5
sys/dev/usb/if_urtw.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_urtw.c,v 1.72 2022/04/21 21:03:03 stsp Exp $ */
/* $OpenBSD: if_urtw.c,v 1.73 2024/05/23 03:21:09 jsg Exp $ */
/*-
* Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@ -22,11 +22,8 @@
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>

8
sys/dev/usb/if_urtwn.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_urtwn.c,v 1.109 2024/05/06 05:02:25 jsg Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.110 2024/05/23 03:21:09 jsg Exp $ */
/*-
* Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@ -26,13 +26,9 @@
#include "bpfilter.h"
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>
@ -43,7 +39,6 @@
#include <net/bpf.h>
#endif
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
#include <netinet/in.h>
@ -56,7 +51,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/ic/r92creg.h>

12
sys/dev/usb/if_wi_usb.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_wi_usb.c,v 1.76 2022/01/09 05:43:00 jsg Exp $ */
/* $OpenBSD: if_wi_usb.c,v 1.77 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
@ -27,19 +27,13 @@
* Agency (DARPA) and Air Force Research Laboratory, Air Force
* Materiel Command, USAF, under agreement number F30602-01-2-0537.
*/
#include "bpfilter.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
#include <sys/timeout.h>
#include <sys/kthread.h>
#include <sys/tree.h>
#include <net/if.h>
#include <net/if_media.h>
@ -57,10 +51,6 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_ioctl.h>
#if NBPFILTER > 0
#include <net/bpf.h>
#endif
#include <machine/bus.h>
#include <dev/ic/if_wireg.h>

5
sys/dev/usb/if_zyd.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_zyd.c,v 1.128 2022/04/21 21:03:03 stsp Exp $ */
/* $OpenBSD: if_zyd.c,v 1.129 2024/05/23 03:21:09 jsg Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@ -26,12 +26,9 @@
#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/malloc.h>
#include <sys/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>

4
sys/dev/usb/moscom.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: moscom.c,v 1.25 2022/04/09 20:07:44 naddy Exp $ */
/* $OpenBSD: moscom.c,v 1.26 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@ -18,13 +18,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/tty.h>
#include <sys/device.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

4
sys/dev/usb/uark.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uark.c,v 1.25 2022/04/09 20:07:44 naddy Exp $ */
/* $OpenBSD: uark.c,v 1.26 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@ -18,13 +18,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/tty.h>
#include <sys/device.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

4
sys/dev/usb/ubcmtp.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ubcmtp.c,v 1.25 2023/07/02 21:44:04 bru Exp $ */
/* $OpenBSD: ubcmtp.c,v 1.26 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2013-2014, joshua stein <jcs@openbsd.org>
@ -27,9 +27,7 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/systm.h>
#include <sys/tty.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>

10
sys/dev/usb/uberry.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uberry.c,v 1.24 2016/11/06 12:58:01 mpi Exp $ */
/* $OpenBSD: uberry.c,v 1.25 2024/05/23 03:21:09 jsg Exp $ */
/*-
* Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@ -17,18 +17,10 @@
*/
#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/timeout.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/endian.h>
#include <machine/bus.h>
#include <machine/intr.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>

6
sys/dev/usb/ubsa.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ubsa.c,v 1.69 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: ubsa.c,v 1.70 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@ -56,12 +56,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/ioccom.h>
#include <sys/fcntl.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <dev/usb/usb.h>

4
sys/dev/usb/uchcom.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uchcom.c,v 1.35 2024/05/15 01:41:19 kevlo Exp $ */
/* $OpenBSD: uchcom.c,v 1.36 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */
/*
@ -36,7 +36,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/tty.h>
#include <sys/device.h>
@ -46,7 +45,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

4
sys/dev/usb/ucom.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ucom.c,v 1.78 2023/10/06 16:06:11 krw Exp $ */
/* $OpenBSD: ucom.c,v 1.79 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */
/*
@ -36,7 +36,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/rwlock.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
@ -51,7 +50,6 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/uhidev.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

4
sys/dev/usb/ucrcom.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ucrcom.c,v 1.2 2022/04/09 20:07:44 naddy Exp $ */
/* $OpenBSD: ucrcom.c,v 1.3 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org>
@ -18,13 +18,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/tty.h>
#include <sys/device.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

5
sys/dev/usb/ucycom.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ucycom.c,v 1.41 2022/04/09 20:07:44 naddy Exp $ */
/* $OpenBSD: ucycom.c,v 1.42 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $ */
/*
@ -40,8 +40,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/tty.h>
@ -50,7 +48,6 @@
#include <dev/usb/usbhid.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>

4
sys/dev/usb/udcf.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: udcf.c,v 1.65 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: udcf.c,v 1.66 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2006, 2007, 2008 Marc Balmer <mbalmer@openbsd.org>
@ -18,7 +18,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/time.h>
#include <sys/sensors.h>
@ -26,7 +25,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#ifdef UDCF_DEBUG

3
sys/dev/usb/udl.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: udl.c,v 1.99 2023/05/10 18:28:04 miod Exp $ */
/* $OpenBSD: udl.c,v 1.100 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
@ -30,7 +30,6 @@
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/systm.h>

5
sys/dev/usb/uftdi.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uftdi.c,v 1.78 2022/12/30 00:54:09 kevlo Exp $ */
/* $OpenBSD: uftdi.c,v 1.79 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */
/*
@ -41,15 +41,12 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

4
sys/dev/usb/ugen.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ugen.c,v 1.117 2022/12/19 15:10:40 visa Exp $ */
/* $OpenBSD: ugen.c,v 1.118 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */
@ -35,7 +35,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
@ -50,7 +49,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
#ifdef UGEN_DEBUG
#define DPRINTF(x) do { if (ugendebug) printf x; } while (0)

3
sys/dev/usb/ugold.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ugold.c,v 1.27 2023/12/21 19:40:47 miod Exp $ */
/* $OpenBSD: ugold.c,v 1.28 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2013 Takayoshi SASANO <uaa@openbsd.org>
@ -26,7 +26,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/sensors.h>

7
sys/dev/usb/uhid.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uhid.c,v 1.90 2023/04/20 10:49:57 brynet Exp $ */
/* $OpenBSD: uhid.c,v 1.91 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */
/*
@ -40,21 +40,16 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/signalvar.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <sys/selinfo.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>

6
sys/dev/usb/uhidev.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uhidev.c,v 1.109 2023/08/12 20:47:06 miod Exp $ */
/* $OpenBSD: uhidev.c,v 1.110 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */
/*
@ -37,12 +37,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/signalvar.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <machine/bus.h>

3
sys/dev/usb/uhidpp.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uhidpp.c,v 1.43 2023/01/08 06:54:51 anton Exp $ */
/* $OpenBSD: uhidpp.c,v 1.44 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2021 Anton Lindqvist <anton@openbsd.org>
@ -18,7 +18,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/mutex.h>
#include <sys/sensors.h>

3
sys/dev/usb/uhub.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uhub.c,v 1.97 2022/09/04 08:42:39 mglocker Exp $ */
/* $OpenBSD: uhub.c,v 1.98 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
@ -34,7 +34,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>

5
sys/dev/usb/uipaq.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uipaq.c,v 1.28 2022/04/09 20:07:44 naddy Exp $ */
/* $OpenBSD: uipaq.c,v 1.29 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -42,9 +42,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <dev/usb/usb.h>
@ -52,7 +50,6 @@
#include <dev/usb/usbcdc.h> /*UCDC_* stuff */
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

9
sys/dev/usb/ujoy.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ujoy.c,v 1.4 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: ujoy.c,v 1.5 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2021 Thomas Frohwein <thfr@openbsd.org>
@ -19,23 +19,16 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/signalvar.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/fcntl.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/uhidev.h>
#include <dev/usb/uhid.h>

4
sys/dev/usb/ukbd.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ukbd.c,v 1.89 2023/12/05 20:49:31 miod Exp $ */
/* $OpenBSD: ukbd.c,v 1.90 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */
/*
@ -53,9 +53,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/timeout.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <machine/bus.h>

6
sys/dev/usb/umass.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umass.c,v 1.81 2022/08/23 15:58:57 anton Exp $ */
/* $OpenBSD: umass.c,v 1.82 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $ */
/*
@ -126,11 +126,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/timeout.h>
#include <machine/bus.h>
#include <scsi/scsi_all.h>

3
sys/dev/usb/umass_quirks.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umass_quirks.c,v 1.34 2020/08/26 13:57:20 krw Exp $ */
/* $OpenBSD: umass_quirks.c,v 1.35 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: umass_quirks.c,v 1.67 2004/06/28 07:49:16 mycroft Exp $ */
/*
@ -33,7 +33,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/buf.h>
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>

7
sys/dev/usb/umass_scsi.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umass_scsi.c,v 1.64 2023/05/10 15:28:26 krw Exp $ */
/* $OpenBSD: umass_scsi.c,v 1.65 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -32,11 +32,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/buf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/malloc.h>
#include <dev/usb/usb.h>
@ -48,7 +44,6 @@
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_disk.h>
#include <machine/bus.h>
struct umass_scsi_softc {

5
sys/dev/usb/umbg.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umbg.c,v 1.28 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: umbg.c,v 1.29 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@ -18,8 +18,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/time.h>
#include <sys/sensors.h>
@ -27,7 +25,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#ifdef UMBG_DEBUG

4
sys/dev/usb/umcs.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umcs.c,v 1.11 2023/04/10 12:11:22 jsg Exp $ */
/* $OpenBSD: umcs.c,v 1.12 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
@ -42,7 +42,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/tty.h>
#include <sys/device.h>
@ -50,7 +49,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

6
sys/dev/usb/umct.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umct.c,v 1.50 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: umct.c,v 1.51 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -37,10 +37,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <sys/device.h>
@ -48,7 +45,6 @@
#include <dev/usb/usbcdc.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

6
sys/dev/usb/umidi.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umidi.c,v 1.56 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: umidi.c,v 1.57 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -31,16 +31,12 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/umidireg.h>
#include <dev/usb/umidivar.h>

12
sys/dev/usb/umidi_quirks.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umidi_quirks.c,v 1.17 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: umidi_quirks.c,v 1.18 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $ */
/*
@ -32,18 +32,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/umidireg.h>
#include <dev/usb/umidivar.h>
#include <dev/usb/umidi_quirks.h>
/*

4
sys/dev/usb/umodem.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umodem.c,v 1.69 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: umodem.c,v 1.70 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */
/*
@ -46,8 +46,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <sys/device.h>

4
sys/dev/usb/ums.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ums.c,v 1.51 2021/11/22 11:29:17 anton Exp $ */
/* $OpenBSD: ums.c,v 1.52 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $ */
/*
@ -37,9 +37,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>

5
sys/dev/usb/umsm.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umsm.c,v 1.125 2023/04/02 23:57:57 dlg Exp $ */
/* $OpenBSD: umsm.c,v 1.127 2024/05/23 08:06:22 kevlo Exp $ */
/*
* Copyright (c) 2008 Yojiro UO <yuo@nui.org>
@ -21,10 +21,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <dev/usb/usb.h>
@ -179,6 +177,7 @@ static const struct umsm_type umsm_devs[] = {
{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EG95 }, 0},
{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_BG96 }, 0},
{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EG06 }, 0},
{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EM060K }, 0},
{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_AG15 }, 0},
{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_AG35 }, 0},
{{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_AG520R }, 0},

4
sys/dev/usb/umstc.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umstc.c,v 1.7 2021/11/22 11:29:18 anton Exp $ */
/* $OpenBSD: umstc.c,v 1.8 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2020 joshua stein <jcs@jcs.org>
@ -24,7 +24,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/atomic.h>
#include <sys/task.h>
@ -36,7 +35,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
#include "audio.h"

5
sys/dev/usb/umt.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: umt.c,v 1.6 2024/05/13 01:15:53 jsg Exp $ */
/* $OpenBSD: umt.c,v 1.7 2024/05/23 03:21:09 jsg Exp $ */
/*
* USB multitouch touchpad driver for devices conforming to
* Windows Precision Touchpad standard
@ -22,15 +22,12 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
#include <dev/usb/uhidev.h>

5
sys/dev/usb/uoak_subr.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uoak_subr.c,v 1.10 2022/01/09 05:43:01 jsg Exp $ */
/* $OpenBSD: uoak_subr.c,v 1.11 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@ -21,16 +21,13 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/sensors.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>
#include "uoak.h"

4
sys/dev/usb/uoaklux.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uoaklux.c,v 1.17 2022/04/09 20:09:03 naddy Exp $ */
/* $OpenBSD: uoaklux.c,v 1.18 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@ -21,10 +21,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/sensors.h>
#include <dev/usb/usb.h>

4
sys/dev/usb/uoakrh.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uoakrh.c,v 1.19 2022/04/09 20:09:03 naddy Exp $ */
/* $OpenBSD: uoakrh.c,v 1.20 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@ -21,10 +21,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/sensors.h>
#include <dev/usb/usb.h>

4
sys/dev/usb/uoakv.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uoakv.c,v 1.17 2022/04/09 20:09:03 naddy Exp $ */
/* $OpenBSD: uoakv.c,v 1.18 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@ -21,10 +21,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/sensors.h>
#include <dev/usb/usb.h>

5
sys/dev/usb/uonerng.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uonerng.c,v 1.6 2022/01/09 05:43:02 jsg Exp $ */
/* $OpenBSD: uonerng.c,v 1.7 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (C) 2015 Devin Reade <gdr@gno.org>
* Copyright (C) 2015 Sean Levy <attila@stalphonsos.com>
@ -33,14 +33,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/time.h>
#include <sys/timeout.h>
#include <machine/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usbcdc.h>

4
sys/dev/usb/uow.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uow.c,v 1.37 2020/07/31 10:49:33 mglocker Exp $ */
/* $OpenBSD: uow.c,v 1.38 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@ -23,7 +23,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/kernel.h>
#include <dev/onewire/onewirereg.h>
#include <dev/onewire/onewirevar.h>
@ -31,7 +30,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/uowreg.h>

5
sys/dev/usb/upd.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: upd.c,v 1.31 2021/11/15 15:36:24 anton Exp $ */
/* $OpenBSD: upd.c,v 1.32 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2015 David Higgs <higgsd@gmail.com>
@ -24,7 +24,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/queue.h>
@ -32,10 +31,8 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usbhid.h>
#include <dev/usb/uhidev.h>
#include <dev/usb/usbdi_util.h>
#ifdef UPD_DEBUG
#define DPRINTF(x) do { printf x; } while (0)

6
sys/dev/usb/uplcom.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uplcom.c,v 1.80 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: uplcom.c,v 1.81 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -39,10 +39,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <sys/device.h>
@ -50,7 +47,6 @@
#include <dev/usb/usbcdc.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

3
sys/dev/usb/urng.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: urng.c,v 1.10 2020/05/29 04:42:25 deraadt Exp $ */
/* $OpenBSD: urng.c,v 1.11 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2017 Jasper Lievisse Adriaanse <jasper@openbsd.org>
@ -31,7 +31,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/time.h>
#include <sys/timeout.h>
#include <dev/usb/usb.h>

6
sys/dev/usb/usb.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: usb.c,v 1.130 2022/07/02 08:50:42 visa Exp $ */
/* $OpenBSD: usb.c,v 1.131 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */
/*
@ -42,20 +42,16 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/timeout.h>
#include <sys/kthread.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
#include <sys/signalvar.h>
#include <sys/time.h>
#include <sys/rwlock.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <machine/bus.h>

3
sys/dev/usb/usb.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: usb.h,v 1.62 2021/01/27 17:28:19 mglocker Exp $ */
/* $OpenBSD: usb.h,v 1.63 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: usb.h,v 1.69 2002/09/22 23:20:50 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */
@ -37,7 +37,6 @@
#define _USB_H_
#include <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>

4
sys/dev/usb/usb_mem.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: usb_mem.c,v 1.34 2020/03/21 12:08:31 patrick Exp $ */
/* $OpenBSD: usb_mem.c,v 1.35 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $ */
/*
@ -40,10 +40,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/queue.h>
#include <sys/timeout.h>
#include <sys/device.h> /* for usbdivar.h */
#include <machine/bus.h>

3
sys/dev/usb/usb_subr.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: usb_subr.c,v 1.162 2023/10/06 16:06:11 krw Exp $ */
/* $OpenBSD: usb_subr.c,v 1.163 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
@ -34,7 +34,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/rwlock.h>

3
sys/dev/usb/usbdevs
View file

@ -1,4 +1,4 @@
$OpenBSD: usbdevs,v 1.764 2024/05/21 07:13:29 jsg Exp $
$OpenBSD: usbdevs,v 1.765 2024/05/23 08:06:22 kevlo Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@ -3726,6 +3726,7 @@ product QUECTEL EG91 0x0191 EG91
product QUECTEL EG95 0x0195 EG95
product QUECTEL BG96 0x0296 BG96
product QUECTEL EG06 0x0306 EG06/EP06/EM06
product QUECTEL EM060K 0x030b EM060K
product QUECTEL AG15 0x0415 AG15
product QUECTEL AG35 0x0435 AG35
product QUECTEL AG520R 0x0452 AG520R

5
sys/dev/usb/usbdevs.h
View file

@ -1,10 +1,10 @@
/* $OpenBSD: usbdevs.h,v 1.776 2024/05/21 07:14:20 jsg Exp $ */
/* $OpenBSD: usbdevs.h,v 1.777 2024/05/23 08:06:45 kevlo Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* OpenBSD: usbdevs,v 1.764 2024/05/21 07:13:29 jsg Exp
* OpenBSD: usbdevs,v 1.765 2024/05/23 08:06:22 kevlo Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@ -3733,6 +3733,7 @@
#define USB_PRODUCT_QUECTEL_EG95 0x0195 /* EG95 */
#define USB_PRODUCT_QUECTEL_BG96 0x0296 /* BG96 */
#define USB_PRODUCT_QUECTEL_EG06 0x0306 /* EG06/EP06/EM06 */
#define USB_PRODUCT_QUECTEL_EM060K 0x030b /* EM060K */
#define USB_PRODUCT_QUECTEL_AG15 0x0415 /* AG15 */
#define USB_PRODUCT_QUECTEL_AG35 0x0435 /* AG35 */
#define USB_PRODUCT_QUECTEL_AG520R 0x0452 /* AG520R */

8
sys/dev/usb/usbdevs_data.h
View file

@ -1,10 +1,10 @@
/* $OpenBSD: usbdevs_data.h,v 1.770 2024/05/21 07:14:20 jsg Exp $ */
/* $OpenBSD: usbdevs_data.h,v 1.771 2024/05/23 08:06:45 kevlo Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
* OpenBSD: usbdevs,v 1.764 2024/05/21 07:13:29 jsg Exp
* OpenBSD: usbdevs,v 1.765 2024/05/23 08:06:22 kevlo Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@ -9245,6 +9245,10 @@ const struct usb_known_product usb_known_products[] = {
USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EG06,
"EG06/EP06/EM06",
},
{
USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EM060K,
"EM060K",
},
{
USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_AG15,
"AG15",

3
sys/dev/usb/usbdi.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: usbdi.c,v 1.110 2021/02/03 11:34:24 mglocker Exp $ */
/* $OpenBSD: usbdi.c,v 1.111 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
@ -34,7 +34,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/malloc.h>

3
sys/dev/usb/usbdi_util.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: usbdi_util.c,v 1.46 2021/02/24 03:54:05 jsg Exp $ */
/* $OpenBSD: usbdi_util.c,v 1.47 2024/05/23 03:21:09 jsg Exp $ */
/* $NetBSD: usbdi_util.c,v 1.40 2002/07/11 21:14:36 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.14 1999/11/17 22:33:50 n_hibma Exp $ */
@ -34,7 +34,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <machine/bus.h>

5
sys/dev/usb/uscom.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uscom.c,v 1.8 2022/04/09 20:07:44 naddy Exp $ */
/* $OpenBSD: uscom.c,v 1.9 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@ -18,14 +18,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <sys/device.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

4
sys/dev/usb/uslcom.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uslcom.c,v 1.44 2022/04/09 20:07:44 naddy Exp $ */
/* $OpenBSD: uslcom.c,v 1.45 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@ -18,13 +18,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/tty.h>
#include <sys/device.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>

5
sys/dev/usb/uslhcom.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uslhcom.c,v 1.9 2022/04/09 20:07:44 naddy Exp $ */
/* $OpenBSD: uslhcom.c,v 1.10 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2015 SASANO Takayoshi <uaa@openbsd.org>
@ -22,15 +22,12 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <sys/device.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usbhid.h>

5
sys/dev/usb/usps.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: usps.c,v 1.11 2024/05/15 04:36:28 jsg Exp $ */
/* $OpenBSD: usps.c,v 1.12 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2011 Yojiro UO <yuo@nui.org>
@ -20,15 +20,12 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/sensors.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#ifdef USPS_DEBUG

5
sys/dev/usb/uthum.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uthum.c,v 1.39 2023/12/04 05:28:25 mglocker Exp $ */
/* $OpenBSD: uthum.c,v 1.40 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2009, 2010 Yojiro UO <yuo@nui.org>
@ -20,15 +20,12 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/sensors.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/uhidev.h>

4
sys/dev/usb/uticom.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: uticom.c,v 1.35 2022/04/09 20:07:44 naddy Exp $ */
/* $OpenBSD: uticom.c,v 1.36 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2005 Dmitry Komissaroff <dxi@mail.ru>.
*
@ -26,10 +26,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/conf.h>
#include <sys/tty.h>
#include <machine/bus.h>

5
sys/dev/usb/utpms.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: utpms.c,v 1.13 2022/01/09 05:43:02 jsg Exp $ */
/* $OpenBSD: utpms.c,v 1.14 2024/05/23 03:21:09 jsg Exp $ */
/*
* Copyright (c) 2005, Johan Wallén
@ -107,10 +107,7 @@
#include <sys/param.h>
#include <sys/device.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/systm.h>
#include <sys/tty.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>

Some files were not shown because too many files have changed in this diff Show more