sync with OpenBSD -current
This commit is contained in:
parent
c1d0febac8
commit
332472a19d
GPG key ID:
F42C07F07E2E35B7
230 changed files with 822 additions and 1009 deletions
|
|
@ -757,7 +757,7 @@
|
|||
./usr/lib/libreadline.so.5.0
|
||||
./usr/lib/librpcsvc.so.3.0
|
||||
./usr/lib/libskey.so.6.0
|
||||
./usr/lib/libsndio.so.7.2
|
||||
./usr/lib/libsndio.so.7.3
|
||||
./usr/lib/libssl.so.57.0
|
||||
./usr/lib/libtermcap.so.15.0
|
||||
./usr/lib/libtermlib.so.15.0
|
||||
|
|
|
|||
|
|
@ -861,14 +861,6 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
|
|||
# End of language makefile fragments.
|
||||
#
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in config.status $(srcdir)/version.c \
|
||||
$(xmake_file) $(tmake_file) $(LANG_MAKEFILES)
|
||||
$(SHELL) $(srcdir)/configure.frag $(srcdir) "$(SUBDIRS)" \
|
||||
"$(xmake_file)" "$(tmake_file)"
|
||||
cp config.status config.run
|
||||
LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.run
|
||||
rm -f config.run
|
||||
|
||||
config.h: cs-config.h ; @true
|
||||
hconfig.h: cs-hconfig.h ; @true
|
||||
tconfig.h: cs-tconfig.h ; @true
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: sndio.h,v 1.14 2022/04/29 08:30:48 ratchov Exp $ */
|
||||
/* $OpenBSD: sndio.h,v 1.15 2024/05/24 15:10:26 ratchov Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
|
||||
*
|
||||
|
|
@ -27,8 +27,17 @@
|
|||
|
||||
/*
|
||||
* limits
|
||||
*
|
||||
* For now SIOCTL_DISPLAYMAX is 12 byte only. It nicely fits in the
|
||||
* padding of the sioctl_desc structure: this allows any binary linked
|
||||
* to the library version with no sioctl_desc->display to work with
|
||||
* this library version. Currently, any string reported by the lower
|
||||
* layers fits in the 12-byte buffer. Once larger strings start
|
||||
* being used (or the ABI changes for any other reason) increase
|
||||
* SIOCTL_DISPLAYMAX and properly pad the sioctl_desc structure.
|
||||
*/
|
||||
#define SIOCTL_NAMEMAX 12 /* max name length */
|
||||
#define SIOCTL_DISPLAYMAX 12 /* max display string length */
|
||||
|
||||
/*
|
||||
* private ``handle'' structure
|
||||
|
|
@ -115,7 +124,7 @@ struct sioctl_desc {
|
|||
struct sioctl_node node0; /* affected node */
|
||||
struct sioctl_node node1; /* dito for SIOCTL_{VEC,LIST,SEL} */
|
||||
unsigned int maxval; /* max value */
|
||||
int __pad[3];
|
||||
char display[SIOCTL_DISPLAYMAX]; /* free-format hint */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: amsg.h,v 1.15 2022/04/29 08:30:48 ratchov Exp $ */
|
||||
/* $OpenBSD: amsg.h,v 1.16 2024/05/24 15:16:09 ratchov Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
|
||||
*
|
||||
|
|
@ -46,6 +46,13 @@
|
|||
* limits
|
||||
*/
|
||||
#define AMSG_CTL_NAMEMAX 16 /* max name length */
|
||||
#define AMSG_CTL_DISPLAYMAX 32 /* max display string length */
|
||||
|
||||
/*
|
||||
* Size of the struct amsg_ctl_desc expected by clients
|
||||
* using the AMSG_CTLSUB_OLD request
|
||||
*/
|
||||
#define AMSG_OLD_DESC_SIZE 92
|
||||
|
||||
/*
|
||||
* WARNING: since the protocol may be simultaneously used by static
|
||||
|
|
@ -69,9 +76,10 @@ struct amsg {
|
|||
#define AMSG_HELLO 10 /* say hello, check versions and so ... */
|
||||
#define AMSG_BYE 11 /* ask server to drop connection */
|
||||
#define AMSG_AUTH 12 /* send authentication cookie */
|
||||
#define AMSG_CTLSUB 13 /* ondesc/onctl subscription */
|
||||
#define AMSG_CTLSUB_OLD 13 /* amsg_ctl_desc with no "display" attribute */
|
||||
#define AMSG_CTLSET 14 /* set control value */
|
||||
#define AMSG_CTLSYNC 15 /* end of controls descriptions */
|
||||
#define AMSG_CTLSUB 16 /* ondesc/onctl subscription */
|
||||
uint32_t cmd;
|
||||
uint32_t __pad;
|
||||
union {
|
||||
|
|
@ -151,7 +159,8 @@ struct amsg_ctl_desc {
|
|||
uint16_t addr; /* control address */
|
||||
uint16_t maxval;
|
||||
uint16_t curval;
|
||||
uint32_t __pad2[3];
|
||||
uint32_t __pad2[4];
|
||||
char display[AMSG_CTL_DISPLAYMAX]; /* free-format hint */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
major=7
|
||||
minor=2
|
||||
minor=3
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ sioctl_aucat_rdata(struct sioctl_aucat_hdl *hdl)
|
|||
strlcpy(desc.node1.name, c->node1.name, SIOCTL_NAMEMAX);
|
||||
desc.node1.unit = (int16_t)ntohs(c->node1.unit);
|
||||
strlcpy(desc.func, c->func, SIOCTL_NAMEMAX);
|
||||
strlcpy(desc.display, c->display, SIOCTL_DISPLAYMAX);
|
||||
desc.type = c->type;
|
||||
desc.addr = ntohs(c->addr);
|
||||
desc.maxval = ntohs(c->maxval);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: sioctl_open.3,v 1.13 2022/05/03 13:03:30 ratchov Exp $
|
||||
.\" $OpenBSD: sioctl_open.3,v 1.14 2024/05/24 15:10:27 ratchov Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2011-2020 Alexandre Ratchov <alex@caoua.org>
|
||||
.\"
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
.\"
|
||||
.Dd $Mdocdate: May 3 2022 $
|
||||
.Dd $Mdocdate: May 24 2024 $
|
||||
.Dt SIOCTL_OPEN 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -168,6 +168,7 @@ struct sioctl_desc {
|
|||
struct sioctl_node node0; /* affected node */
|
||||
struct sioctl_node node1; /* dito for SIOCTL_{VEC,LIST,SEL} */
|
||||
unsigned int maxval; /* max value */
|
||||
char display[SIOCTL_DISPLAYMAX]; /* free-format hint */
|
||||
};
|
||||
.Ed
|
||||
.Pp
|
||||
|
|
@ -238,6 +239,11 @@ The
|
|||
.Fa maxval
|
||||
attribute indicates the maximum value of this control.
|
||||
For boolean control types it is set to 1.
|
||||
.Pp
|
||||
The
|
||||
.Fa display
|
||||
attribute contains an optional free-format string providing additional
|
||||
hints about the control, like the hardware model, or the units.
|
||||
.Ss Changing and reading control values
|
||||
Controls are changed with the
|
||||
.Fn sioctl_setval
|
||||
|
|
|
|||
|
|
@ -53,6 +53,8 @@ struct volume
|
|||
|
||||
struct sioctl_sun_hdl {
|
||||
struct sioctl_hdl sioctl;
|
||||
char display[SIOCTL_DISPLAYMAX];
|
||||
int display_addr;
|
||||
struct volume output, input;
|
||||
int fd, events;
|
||||
};
|
||||
|
|
@ -147,6 +149,7 @@ init(struct sioctl_sun_hdl *hdl)
|
|||
{AudioCinputs, AudioNvolume},
|
||||
{AudioCinputs, AudioNinput}
|
||||
};
|
||||
struct audio_device getdev;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < sizeof(output_names) / sizeof(output_names[0]); i++) {
|
||||
|
|
@ -165,6 +168,13 @@ init(struct sioctl_sun_hdl *hdl)
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
hdl->display_addr = 128;
|
||||
if (ioctl(hdl->fd, AUDIO_GETDEV, &getdev) == -1)
|
||||
strlcpy(hdl->display, "unknown", SIOCTL_DISPLAYMAX);
|
||||
else
|
||||
strlcpy(hdl->display, getdev.name, SIOCTL_DISPLAYMAX);
|
||||
DPRINTF("init: server.device: display = %s\n", hdl->display);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
@ -407,12 +417,27 @@ static int
|
|||
sioctl_sun_ondesc(struct sioctl_hdl *addr)
|
||||
{
|
||||
struct sioctl_sun_hdl *hdl = (struct sioctl_sun_hdl *)addr;
|
||||
struct sioctl_desc desc;
|
||||
|
||||
if (!scanvol(hdl, &hdl->output) ||
|
||||
!scanvol(hdl, &hdl->input)) {
|
||||
hdl->sioctl.eof = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* report "server.device" control */
|
||||
memset(&desc, 0, sizeof(struct sioctl_desc));
|
||||
desc.type = SIOCTL_SEL;
|
||||
desc.maxval = 1;
|
||||
strlcpy(desc.func, "device", SIOCTL_NAMEMAX);
|
||||
strlcpy(desc.node0.name, "server", SIOCTL_NAMEMAX);
|
||||
desc.node0.unit = -1;
|
||||
strlcpy(desc.node1.name, "0", SIOCTL_NAMEMAX);
|
||||
desc.node1.unit = -1;
|
||||
strlcpy(desc.display, hdl->display, SIOCTL_DISPLAYMAX);
|
||||
desc.addr = hdl->display_addr;
|
||||
_sioctl_ondesc_cb(&hdl->sioctl, &desc, 1);
|
||||
|
||||
_sioctl_ondesc_cb(&hdl->sioctl, NULL, 0);
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: check-lib-depends.1,v 1.5 2021/06/21 15:17:32 espie Exp $
|
||||
.\" $OpenBSD: check-lib-depends.1,v 1.6 2024/05/24 11:52:45 op Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
|
||||
.\"
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
.\"
|
||||
.Dd $Mdocdate: June 21 2021 $
|
||||
.Dd $Mdocdate: May 24 2024 $
|
||||
.Dt CHECK-LIB-DEPENDS 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -98,7 +98,7 @@ Be quiet, do not emit
|
|||
.Sq Extra:
|
||||
wantlibs unless there's also an actual problem.
|
||||
.It Fl S Ar var Ns = Ns Ar value
|
||||
recognize list of libraries listed in a variable, and replace said list
|
||||
Recognize list of libraries listed in a variable, and replace said list
|
||||
with variable value.
|
||||
For instance,
|
||||
.Fl S Ar COMPILER_LIBCXX Ns = Ns Ar stdc++
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cardbus.c,v 1.53 2022/04/06 18:59:27 naddy Exp $ */
|
||||
/* $OpenBSD: cardbus.c,v 1.54 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -32,7 +32,6 @@
|
|||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cardslot.c,v 1.23 2022/04/06 18:59:27 naddy Exp $ */
|
||||
/* $OpenBSD: cardslot.c,v 1.24 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -31,9 +31,6 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <sys/pool.h>
|
||||
#include <sys/task.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: com_cardbus.c,v 1.44 2022/04/06 18:59:27 naddy Exp $ */
|
||||
/* $OpenBSD: com_cardbus.c,v 1.45 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -56,8 +56,6 @@
|
|||
|
||||
#include <dev/pcmcia/pcmciareg.h>
|
||||
|
||||
#include "com.h"
|
||||
|
||||
#include <dev/ic/comreg.h>
|
||||
#include <dev/ic/comvar.h>
|
||||
#include <dev/ic/ns16550reg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ehci_cardbus.c,v 1.23 2022/04/06 18:59:27 naddy Exp $ */
|
||||
/* $OpenBSD: ehci_cardbus.c,v 1.24 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: ehci_cardbus.c,v 1.6.6.3 2004/09/21 13:27:25 skrll Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -33,7 +33,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/rwlock.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
@ -44,7 +43,6 @@
|
|||
#include <dev/usb/usb.h>
|
||||
#include <dev/usb/usbdi.h>
|
||||
#include <dev/usb/usbdivar.h>
|
||||
#include <dev/usb/usb_mem.h>
|
||||
|
||||
#include <dev/usb/ehcireg.h>
|
||||
#include <dev/usb/ehcivar.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_acx_cardbus.c,v 1.23 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_acx_cardbus.c,v 1.24 2024/05/24 06:26:47 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
|
||||
|
|
@ -25,17 +25,11 @@
|
|||
#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/malloc.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <machine/intr.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_ath_cardbus.c,v 1.21 2023/01/04 07:06:08 jsg Exp $ */
|
||||
/* $OpenBSD: if_ath_cardbus.c,v 1.22 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: if_ath_cardbus.c,v 1.4 2004/08/02 19:14:28 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -34,15 +34,8 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/gpio.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
|
@ -54,13 +47,11 @@
|
|||
#include <net80211/ieee80211_rssadapt.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <machine/intr.h>
|
||||
|
||||
#include <dev/gpio/gpiovar.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcidevs.h>
|
||||
|
||||
#include <dev/cardbus/cardbusvar.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_athn_cardbus.c,v 1.18 2022/07/24 17:22:12 kn Exp $ */
|
||||
/* $OpenBSD: if_athn_cardbus.c,v 1.19 2024/05/24 06:26:47 jsg Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
|
||||
|
|
@ -23,12 +23,7 @@
|
|||
#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/malloc.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_atw_cardbus.c,v 1.25 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_atw_cardbus.c,v 1.26 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: if_atw_cardbus.c,v 1.9 2004/07/23 07:07:55 dyoung Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -40,14 +40,7 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
|
@ -58,15 +51,9 @@
|
|||
#include <net80211/ieee80211_radiotap.h>
|
||||
#include <net80211/ieee80211_var.h>
|
||||
|
||||
#if NBPFILTER > 0
|
||||
#include <net/bpf.h>
|
||||
#endif
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <machine/intr.h>
|
||||
|
||||
#include <dev/ic/atwreg.h>
|
||||
#include <dev/ic/si4136reg.h>
|
||||
#include <dev/ic/atwvar.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_bwi_cardbus.c,v 1.16 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_bwi_cardbus.c,v 1.17 2024/05/24 06:26:47 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
|
||||
|
|
@ -24,8 +24,6 @@
|
|||
#include "bpfilter.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/timeout.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_dc_cardbus.c,v 1.41 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_dc_cardbus.c,v 1.42 2024/05/24 06:26:47 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997, 1998, 1999
|
||||
|
|
@ -36,12 +36,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_fxp_cardbus.c,v 1.38 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_fxp_cardbus.c,v 1.39 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -39,22 +39,12 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
||||
#if NBPFILTER > 0
|
||||
#include <net/bpf.h>
|
||||
#endif
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/if_ether.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_malo_cardbus.c,v 1.13 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_malo_cardbus.c,v 1.14 2024/05/24 06:26:47 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
|
||||
|
|
@ -19,8 +19,6 @@
|
|||
#include "bpfilter.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/timeout.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_pgt_cardbus.c,v 1.19 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_pgt_cardbus.c,v 1.20 2024/05/24 06:26:47 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org>
|
||||
|
|
@ -23,12 +23,7 @@
|
|||
#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/malloc.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_ral_cardbus.c,v 1.23 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_ral_cardbus.c,v 1.24 2024/05/24 06:26:47 jsg Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2005-2010 Damien Bergamini <damien.bergamini@free.fr>
|
||||
|
|
@ -23,12 +23,7 @@
|
|||
#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/malloc.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_re_cardbus.c,v 1.31 2024/01/19 03:46:15 dlg Exp $ */
|
||||
/* $OpenBSD: if_re_cardbus.c,v 1.32 2024/05/24 06:26:47 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org>
|
||||
|
|
@ -21,15 +21,10 @@
|
|||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/endian.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/sockio.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_rl_cardbus.c,v 1.32 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_rl_cardbus.c,v 1.33 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -40,28 +40,16 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
||||
#if NBPFILTER > 0
|
||||
#include <net/bpf.h>
|
||||
#endif
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/if_ether.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <machine/intr.h>
|
||||
|
||||
#include <dev/mii/miivar.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_rtw_cardbus.c,v 1.27 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_rtw_cardbus.c,v 1.28 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -71,14 +71,7 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
|
@ -89,10 +82,6 @@
|
|||
#include <net80211/ieee80211_radiotap.h>
|
||||
#include <net80211/ieee80211_var.h>
|
||||
|
||||
#if NBPFILTER > 0
|
||||
#include <net/bpf.h>
|
||||
#endif
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
#include <dev/ic/rtwreg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_xl_cardbus.c,v 1.34 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: if_xl_cardbus.c,v 1.35 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -31,16 +31,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "bpfilter.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ohci_cardbus.c,v 1.23 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: ohci_cardbus.c,v 1.24 2024/05/24 06:26:47 jsg Exp $ */
|
||||
/* $NetBSD: ohci_cardbus.c,v 1.19 2004/08/02 19:14:28 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -41,7 +41,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
|
@ -51,7 +50,6 @@
|
|||
#include <dev/usb/usb.h>
|
||||
#include <dev/usb/usbdi.h>
|
||||
#include <dev/usb/usbdivar.h>
|
||||
#include <dev/usb/usb_mem.h>
|
||||
|
||||
#include <dev/usb/ohcireg.h>
|
||||
#include <dev/usb/ohcivar.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: puc_cardbus.c,v 1.9 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: puc_cardbus.c,v 1.10 2024/05/24 06:26:47 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Michael Shalayeff
|
||||
|
|
@ -20,10 +20,6 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/tty.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <dev/ic/comvar.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: uhci_cardbus.c,v 1.16 2022/04/06 18:59:28 naddy Exp $ */
|
||||
/* $OpenBSD: uhci_cardbus.c,v 1.17 2024/05/24 06:26:47 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -32,7 +32,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
|
@ -42,7 +41,6 @@
|
|||
#include <dev/usb/usb.h>
|
||||
#include <dev/usb/usbdi.h>
|
||||
#include <dev/usb/usbdivar.h>
|
||||
#include <dev/usb/usb_mem.h>
|
||||
|
||||
#include <dev/usb/uhcireg.h>
|
||||
#include <dev/usb/uhcivar.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: nvme.c,v 1.111 2024/05/13 11:41:52 krw Exp $ */
|
||||
/* $OpenBSD: nvme.c,v 1.112 2024/05/24 12:04:07 krw Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
|
||||
|
|
@ -42,6 +42,7 @@
|
|||
#include <dev/biovar.h>
|
||||
#include <dev/ic/nvmereg.h>
|
||||
#include <dev/ic/nvmevar.h>
|
||||
#include <dev/ic/nvmeio.h>
|
||||
|
||||
struct cfdriver nvme_cd = {
|
||||
NULL,
|
||||
|
|
@ -90,6 +91,9 @@ void nvme_minphys(struct buf *, struct scsi_link *);
|
|||
int nvme_scsi_probe(struct scsi_link *);
|
||||
void nvme_scsi_free(struct scsi_link *);
|
||||
uint64_t nvme_scsi_size(const struct nvm_identify_namespace *);
|
||||
int nvme_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
|
||||
int nvme_passthrough_cmd(struct nvme_softc *, struct nvme_pt_cmd *,
|
||||
int, int);
|
||||
|
||||
#ifdef HIBERNATE
|
||||
#include <uvm/uvm_extern.h>
|
||||
|
|
@ -111,7 +115,8 @@ int nvme_bioctl_disk(struct nvme_softc *, struct bioc_disk *);
|
|||
#endif /* NBIO > 0 */
|
||||
|
||||
const struct scsi_adapter nvme_switch = {
|
||||
nvme_scsi_cmd, nvme_minphys, nvme_scsi_probe, nvme_scsi_free, NULL
|
||||
nvme_scsi_cmd, nvme_minphys, nvme_scsi_probe, nvme_scsi_free,
|
||||
nvme_scsi_ioctl
|
||||
};
|
||||
|
||||
void nvme_scsi_io(struct scsi_xfer *, int);
|
||||
|
|
@ -924,6 +929,107 @@ nvme_scsi_size(const struct nvm_identify_namespace *ns)
|
|||
return nsze;
|
||||
}
|
||||
|
||||
int
|
||||
nvme_passthrough_cmd(struct nvme_softc *sc, struct nvme_pt_cmd *pt, int dv_unit,
|
||||
int nsid)
|
||||
{
|
||||
struct nvme_pt_status pt_status;
|
||||
struct nvme_sqe sqe;
|
||||
struct nvme_dmamem *mem = NULL;
|
||||
struct nvme_ccb *ccb = NULL;
|
||||
int flags;
|
||||
int rv = 0;
|
||||
|
||||
ccb = nvme_ccb_get(sc);
|
||||
if (ccb == NULL)
|
||||
panic("nvme_passthrough_cmd: nvme_ccb_get returned NULL");
|
||||
|
||||
memset(&sqe, 0, sizeof(sqe));
|
||||
sqe.opcode = pt->pt_opcode;
|
||||
htolem32(&sqe.nsid, pt->pt_nsid);
|
||||
htolem32(&sqe.cdw10, pt->pt_cdw10);
|
||||
htolem32(&sqe.cdw11, pt->pt_cdw11);
|
||||
htolem32(&sqe.cdw12, pt->pt_cdw12);
|
||||
htolem32(&sqe.cdw13, pt->pt_cdw13);
|
||||
htolem32(&sqe.cdw14, pt->pt_cdw14);
|
||||
htolem32(&sqe.cdw15, pt->pt_cdw15);
|
||||
|
||||
ccb->ccb_done = nvme_empty_done;
|
||||
ccb->ccb_cookie = &sqe;
|
||||
|
||||
switch (pt->pt_opcode) {
|
||||
case NVM_ADMIN_IDENTIFY:
|
||||
case NVM_ADMIN_GET_LOG_PG:
|
||||
case NVM_ADMIN_SELFTEST:
|
||||
break;
|
||||
|
||||
default:
|
||||
rv = ENOTTY;
|
||||
goto done;
|
||||
}
|
||||
|
||||
if (pt->pt_databuflen > 0) {
|
||||
mem = nvme_dmamem_alloc(sc, pt->pt_databuflen);
|
||||
if (mem == NULL) {
|
||||
rv = ENOMEM;
|
||||
goto done;
|
||||
}
|
||||
htolem64(&sqe.entry.prp[0], NVME_DMA_DVA(mem));
|
||||
nvme_dmamem_sync(sc, mem, BUS_DMASYNC_PREREAD);
|
||||
}
|
||||
|
||||
flags = nvme_poll(sc, sc->sc_admin_q, ccb, nvme_sqe_fill, NVME_TIMO_QOP);
|
||||
|
||||
if (pt->pt_databuflen > 0) {
|
||||
nvme_dmamem_sync(sc, mem, BUS_DMASYNC_POSTREAD);
|
||||
if (flags == 0)
|
||||
rv = copyout(NVME_DMA_KVA(mem), pt->pt_databuf,
|
||||
pt->pt_databuflen);
|
||||
}
|
||||
|
||||
if (rv == 0 && pt->pt_statuslen > 0) {
|
||||
pt_status.ps_dv_unit = dv_unit;
|
||||
pt_status.ps_nsid = nsid;
|
||||
pt_status.ps_flags = flags;
|
||||
pt_status.ps_cc = nvme_read4(sc, NVME_CC);
|
||||
pt_status.ps_csts = nvme_read4(sc, NVME_CSTS);
|
||||
rv = copyout(&pt_status, pt->pt_status, pt->pt_statuslen);
|
||||
}
|
||||
|
||||
done:
|
||||
if (mem)
|
||||
nvme_dmamem_free(sc, mem);
|
||||
if (ccb)
|
||||
nvme_ccb_put(sc, ccb);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
int
|
||||
nvme_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
|
||||
{
|
||||
struct nvme_softc *sc = link->bus->sb_adapter_softc;
|
||||
struct nvme_pt_cmd *pt = (struct nvme_pt_cmd *)addr;
|
||||
int rv;
|
||||
|
||||
switch (cmd) {
|
||||
case NVME_PASSTHROUGH_CMD:
|
||||
break;
|
||||
default:
|
||||
return ENOTTY;
|
||||
}
|
||||
|
||||
if ((pt->pt_cdw10 & 0xff) == 0)
|
||||
pt->pt_nsid = link->target;
|
||||
|
||||
rv = nvme_passthrough_cmd(sc, pt, sc->sc_dev.dv_unit, link->target);
|
||||
if (rv)
|
||||
goto done;
|
||||
|
||||
done:
|
||||
return rv;
|
||||
}
|
||||
|
||||
uint32_t
|
||||
nvme_op_sq_enter(struct nvme_softc *sc,
|
||||
struct nvme_queue *q, struct nvme_ccb *ccb)
|
||||
|
|
@ -1744,6 +1850,7 @@ int
|
|||
nvme_bioctl(struct device *self, u_long cmd, caddr_t data)
|
||||
{
|
||||
struct nvme_softc *sc = (struct nvme_softc *)self;
|
||||
struct nvme_pt_cmd *pt;
|
||||
int error = 0;
|
||||
|
||||
rw_enter_write(&sc->sc_lock);
|
||||
|
|
@ -1758,6 +1865,10 @@ nvme_bioctl(struct device *self, u_long cmd, caddr_t data)
|
|||
case BIOCDISK:
|
||||
error = nvme_bioctl_disk(sc, (struct bioc_disk *)data);
|
||||
break;
|
||||
case NVME_PASSTHROUGH_CMD:
|
||||
pt = (struct nvme_pt_cmd *)data;
|
||||
error = nvme_passthrough_cmd(sc, pt, sc->sc_dev.dv_unit, -1);
|
||||
break;
|
||||
default:
|
||||
printf("nvme_bioctl() Unknown command (%lu)\n", cmd);
|
||||
error = ENOTTY;
|
||||
|
|
|
|||
47
sys/dev/ic/nvmeio.h
Normal file
47
sys/dev/ic/nvmeio.h
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
/* $OpenBSD: nvmeio.h,v 1.1 2024/05/24 12:04:07 krw Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2023 Kenneth R Westerback <krw@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.
|
||||
*/
|
||||
|
||||
#define NVME_PASSTHROUGH_CMD _IOWR('n', 0, struct nvme_pt_cmd)
|
||||
|
||||
struct nvme_pt_status {
|
||||
int ps_dv_unit;
|
||||
int ps_nsid;
|
||||
int ps_flags;
|
||||
uint32_t ps_csts;
|
||||
uint32_t ps_cc;
|
||||
};
|
||||
|
||||
struct nvme_pt_cmd {
|
||||
/* Commands may arrive via /dev/bio. */
|
||||
struct bio pt_bio;
|
||||
|
||||
/* The sqe fields that the caller may specify. */
|
||||
uint8_t pt_opcode;
|
||||
uint32_t pt_nsid;
|
||||
uint32_t pt_cdw10;
|
||||
uint32_t pt_cdw11;
|
||||
uint32_t pt_cdw12;
|
||||
uint32_t pt_cdw13;
|
||||
uint32_t pt_cdw14;
|
||||
uint32_t pt_cdw15;
|
||||
|
||||
caddr_t pt_status;
|
||||
uint32_t pt_statuslen;
|
||||
|
||||
caddr_t pt_databuf; /* User space address. */
|
||||
uint32_t pt_databuflen; /* Length of buffer. */
|
||||
};
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: nvmereg.h,v 1.14 2024/05/13 11:41:52 krw Exp $ */
|
||||
/* $OpenBSD: nvmereg.h,v 1.15 2024/05/24 12:04:07 krw Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
|
||||
|
|
@ -247,6 +247,7 @@ struct nvme_cqe {
|
|||
#define NVM_ADMIN_ASYNC_EV_REQ 0x0c /* Asynchronous Event Request */
|
||||
#define NVM_ADMIN_FW_ACTIVATE 0x10 /* Firmware Activate */
|
||||
#define NVM_ADMIN_FW_DOWNLOAD 0x11 /* Firmware Image Download */
|
||||
#define NVM_ADMIN_SELFTEST 0x14 /* Start self test */
|
||||
|
||||
#define NVM_CMD_FLUSH 0x00 /* Flush */
|
||||
#define NVM_CMD_WRITE 0x01 /* Write */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ufshci.c,v 1.30 2024/05/22 11:46:06 mglocker Exp $ */
|
||||
/* $OpenBSD: ufshci.c,v 1.31 2024/05/24 09:51:14 mglocker Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
|
||||
|
|
@ -79,6 +79,8 @@ int ufshci_utr_cmd_sync(struct ufshci_softc *,
|
|||
struct ufshci_ccb *, struct scsi_xfer *,
|
||||
uint32_t, uint16_t);
|
||||
int ufshci_xfer_complete(struct ufshci_softc *);
|
||||
int ufshci_powerdown(struct ufshci_softc *);
|
||||
int ufshci_resume(struct ufshci_softc *);
|
||||
|
||||
/* SCSI */
|
||||
int ufshci_ccb_alloc(struct ufshci_softc *, int);
|
||||
|
|
@ -1317,6 +1319,81 @@ ufshci_xfer_complete(struct ufshci_softc *sc)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
ufshci_activate(struct ufshci_softc *sc, int act)
|
||||
{
|
||||
int rv = 0;
|
||||
|
||||
switch (act) {
|
||||
case DVACT_POWERDOWN:
|
||||
DPRINTF(1, "%s: POWERDOWN\n", __func__);
|
||||
rv = config_activate_children(&sc->sc_dev, act);
|
||||
ufshci_powerdown(sc);
|
||||
break;
|
||||
case DVACT_RESUME:
|
||||
DPRINTF(1, "%s: RESUME\n", __func__);
|
||||
ufshci_resume(sc);
|
||||
if (rv == 0)
|
||||
rv = config_activate_children(&sc->sc_dev, act);
|
||||
break;
|
||||
default:
|
||||
rv = config_activate_children(&sc->sc_dev, act);
|
||||
break;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
int
|
||||
ufshci_powerdown(struct ufshci_softc *sc)
|
||||
{
|
||||
uint32_t reg;
|
||||
|
||||
/* Send "hibernate enter" command. */
|
||||
UFSHCI_WRITE_4(sc, UFSHCI_REG_UICCMD,
|
||||
UFSHCI_REG_UICCMD_CMDOP_DME_HIBERNATE_ENTER);
|
||||
if (ufshci_is_poll(sc, UFSHCI_REG_IS_UHES) != 0) {
|
||||
printf("%s: hibernate enter cmd failed\n", __func__);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Check if "hibernate enter" command was executed successfully. */
|
||||
reg = UFSHCI_READ_4(sc, UFSHCI_REG_HCS);
|
||||
DPRINTF(1, "%s: UPMCRS=0x%x\n", __func__, UFSHCI_REG_HCS_UPMCRS(reg));
|
||||
if (UFSHCI_REG_HCS_UPMCRS(reg) > UFSHCI_REG_HCS_UPMCRS_PWR_REMTOTE) {
|
||||
printf("%s: hibernate enter cmd returned UPMCRS error=0x%x\n",
|
||||
__func__, UFSHCI_REG_HCS_UPMCRS(reg));
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
ufshci_resume(struct ufshci_softc *sc)
|
||||
{
|
||||
uint32_t reg;
|
||||
|
||||
/* Send "hibernate exit" command. */
|
||||
UFSHCI_WRITE_4(sc, UFSHCI_REG_UICCMD,
|
||||
UFSHCI_REG_UICCMD_CMDOP_DME_HIBERNATE_EXIT);
|
||||
if (ufshci_is_poll(sc, UFSHCI_REG_IS_UHXS) != 0) {
|
||||
printf("%s: hibernate exit command failed\n", __func__);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Check if "hibernate exit" command was executed successfully. */
|
||||
reg = UFSHCI_READ_4(sc, UFSHCI_REG_HCS);
|
||||
DPRINTF(1, "%s: UPMCRS=0x%x\n", __func__, UFSHCI_REG_HCS_UPMCRS(reg));
|
||||
if (UFSHCI_REG_HCS_UPMCRS(reg) > UFSHCI_REG_HCS_UPMCRS_PWR_REMTOTE) {
|
||||
printf("%s: hibernate exit cmd returned UPMCRS error=0x%x\n",
|
||||
__func__, UFSHCI_REG_HCS_UPMCRS(reg));
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* SCSI */
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ufshcireg.h,v 1.11 2024/05/22 18:10:00 mglocker Exp $ */
|
||||
/* $OpenBSD: ufshcireg.h,v 1.12 2024/05/24 09:51:14 mglocker Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
|
||||
|
|
@ -103,6 +103,12 @@
|
|||
#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_UPMCRS_PWR_OK 0x00
|
||||
#define UFSHCI_REG_HCS_UPMCRS_PWR_LOCAL 0x01
|
||||
#define UFSHCI_REG_HCS_UPMCRS_PWR_REMTOTE 0x02
|
||||
#define UFSHCI_REG_HCS_UMPCRS_PWR_BUSY 0x03
|
||||
#define UFSHCI_REG_HCS_UMPCRS_PWR_ERROR_CAP 0x04
|
||||
#define UFSHCI_REG_HCS_UMPCRS_PWR_FATAL_ERROR 0x05
|
||||
#define UFSHCI_REG_HCS_UCRDY (1 << 3) /* RO */
|
||||
#define UFSHCI_REG_HCS_UTMRLRDY (1 << 2) /* RO */
|
||||
#define UFSHCI_REG_HCS_UTRLRDY (1 << 1) /* RO */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ufshcivar.h,v 1.7 2024/05/20 12:42:45 mglocker Exp $ */
|
||||
/* $OpenBSD: ufshcivar.h,v 1.8 2024/05/24 09:51:14 mglocker Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2022 Marcus Glocker <mglocker@openbsd.org>
|
||||
|
|
@ -84,3 +84,4 @@ struct ufshci_softc {
|
|||
int ufshci_intr(void *);
|
||||
void ufshci_attach_hook(struct device *); /* XXX: Only for testing */
|
||||
int ufshci_attach(struct ufshci_softc *);
|
||||
int ufshci_activate(struct ufshci_softc *, int);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: aac_pci.c,v 1.28 2023/09/11 08:40:25 mvs Exp $ */
|
||||
/* $OpenBSD: aac_pci.c,v 1.29 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 Michael Smith
|
||||
|
|
@ -41,11 +41,8 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/rwlock.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <machine/intr.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: adv_pci.c,v 1.15 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: adv_pci.c,v 1.16 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: adv_pci.c,v 1.5 1998/09/26 15:52:55 dante Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -57,8 +57,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: adw_pci.c,v 1.20 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: adw_pci.c,v 1.21 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: adw_pci.c,v 1.7 2000/05/26 15:13:46 dante Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -43,11 +43,8 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: agp.c,v 1.50 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: agp.c,v 1.51 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 2000 Doug Rabson
|
||||
* All rights reserved.
|
||||
|
|
@ -34,12 +34,6 @@
|
|||
#include <uvm/uvm_extern.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcidevs.h>
|
||||
|
||||
#include <dev/ic/mc6845reg.h>
|
||||
#include <dev/ic/pcdisplayvar.h>
|
||||
#include <dev/ic/vgareg.h>
|
||||
#include <dev/ic/vgavar.h>
|
||||
|
||||
#include <dev/pci/agpvar.h>
|
||||
#include <dev/pci/agpreg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: agp_ali.c,v 1.17 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: agp_ali.c,v 1.18 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: agp_ali.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */
|
||||
|
||||
|
||||
|
|
@ -31,15 +31,12 @@
|
|||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/rwlock.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcidevs.h>
|
||||
#include <dev/pci/vga_pcivar.h>
|
||||
#include <dev/pci/agpvar.h>
|
||||
#include <dev/pci/agpreg.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: agp_amd.c,v 1.23 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: agp_amd.c,v 1.24 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: agp_amd.c,v 1.6 2001/10/06 02:48:50 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -33,11 +33,9 @@
|
|||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/rwlock.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/vga_pcivar.h>
|
||||
#include <dev/pci/agpvar.h>
|
||||
#include <dev/pci/agpreg.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: agp_apple.c,v 1.8 2016/05/07 22:46:54 kettenis Exp $ */
|
||||
/* $OpenBSD: agp_apple.c,v 1.9 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2012 Martin Pieuchot <mpi@openbsd.org>
|
||||
|
|
@ -18,9 +18,7 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/rwlock.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: agp_i810.c,v 1.96 2024/05/13 01:15:51 jsg Exp $ */
|
||||
/* $OpenBSD: agp_i810.c,v 1.97 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 Doug Rabson
|
||||
|
|
@ -36,7 +36,6 @@
|
|||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/rwlock.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: agp_intel.c,v 1.25 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: agp_intel.c,v 1.26 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: agp_intel.c,v 1.3 2001/09/15 00:25:00 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -31,9 +31,7 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/rwlock.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: agp_sis.c,v 1.20 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: agp_sis.c,v 1.21 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: agp_sis.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -31,14 +31,11 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/rwlock.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcidevs.h>
|
||||
#include <dev/pci/vga_pcivar.h>
|
||||
#include <dev/pci/agpvar.h>
|
||||
#include <dev/pci/agpreg.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: agp_via.c,v 1.22 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: agp_via.c,v 1.23 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: agp_via.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -31,14 +31,11 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/rwlock.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcidevs.h>
|
||||
#include <dev/pci/vga_pcivar.h>
|
||||
#include <dev/pci/agpvar.h>
|
||||
#include <dev/pci/agpreg.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ahc_pci.c,v 1.63 2022/10/21 17:45:40 kn Exp $ */
|
||||
/* $OpenBSD: ahc_pci.c,v 1.64 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: ahc_pci.c,v 1.43 2003/08/18 09:16:22 taca Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGES.
|
||||
*
|
||||
* $Id: ahc_pci.c,v 1.63 2022/10/21 17:45:40 kn Exp $
|
||||
* $Id: ahc_pci.c,v 1.64 2024/05/24 06:02:53 jsg Exp $
|
||||
*
|
||||
* //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $
|
||||
*
|
||||
|
|
@ -55,10 +55,8 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/reboot.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <machine/intr.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ahci_pci.c,v 1.16 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: ahci_pci.c,v 1.17 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
|
||||
|
|
@ -20,14 +20,9 @@
|
|||
|
||||
#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/timeout.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/pool.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
|
|
@ -35,8 +30,6 @@
|
|||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcidevs.h>
|
||||
|
||||
#include <dev/ata/pmreg.h>
|
||||
|
||||
#include <dev/ic/ahcireg.h>
|
||||
#include <dev/ic/ahcivar.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: alipm.c,v 1.17 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: alipm.c,v 1.18 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005 Mark Kettenis
|
||||
|
|
@ -18,7 +18,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/rwlock.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: amdiic.c,v 1.13 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: amdiic.c,v 1.14 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005 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 <sys/rwlock.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: amdpm.c,v 1.39 2023/02/04 19:19:37 cheloha Exp $ */
|
||||
/* $OpenBSD: amdpm.c,v 1.40 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
|
||||
|
|
@ -48,7 +48,6 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/rwlock.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/timetc.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ami_pci.c,v 1.45 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: ami_pci.c,v 1.46 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001 Michael Shalayeff
|
||||
|
|
@ -28,8 +28,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>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: arc.c,v 1.125 2024/04/13 23:44:11 jsg Exp $ */
|
||||
/* $OpenBSD: arc.c,v 1.126 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
|
||||
|
|
@ -23,8 +23,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/buf.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/device.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: auacer.c,v 1.29 2024/05/13 01:15:51 jsg Exp $ */
|
||||
/* $OpenBSD: auacer.c,v 1.30 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: auacer.c,v 1.3 2004/11/10 04:20:26 kent Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -41,7 +41,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: auixp.c,v 1.52 2023/09/11 08:41:26 mvs Exp $ */
|
||||
/* $OpenBSD: auixp.c,v 1.53 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -48,8 +48,6 @@
|
|||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/exec.h>
|
||||
#include <sys/audioio.h>
|
||||
#include <sys/queue.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: autri.c,v 1.50 2022/10/26 20:19:08 kn Exp $ */
|
||||
/* $OpenBSD: autri.c,v 1.51 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
|
||||
|
|
@ -38,7 +38,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
|
|
@ -51,7 +50,6 @@
|
|||
#include <dev/audio_if.h>
|
||||
#include <dev/midi_if.h>
|
||||
#include <dev/ic/ac97.h>
|
||||
#include <dev/ic/mpuvar.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <machine/intr.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: berkwdt.c,v 1.11 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: berkwdt.c,v 1.12 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2009 Wim Van Sebroeck <wim@iguana.be>
|
||||
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cac_pci.c,v 1.18 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: cac_pci.c,v 1.19 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: cac_pci.c,v 1.10 2001/01/10 16:48:04 ad Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -36,10 +36,8 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/endian.h>
|
||||
#include <sys/sensors.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ccp_pci.c,v 1.8 2023/11/24 08:47:35 jmatthew Exp $ */
|
||||
/* $OpenBSD: ccp_pci.c,v 1.9 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2018 David Gwynne <dlg@openbsd.org>
|
||||
|
|
@ -18,11 +18,8 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/rwlock.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/queue.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ciss_pci.c,v 1.22 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: ciss_pci.c,v 1.23 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005 Michael Shalayeff
|
||||
|
|
@ -19,8 +19,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <dev/pci/pcidevs.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cmpci.c,v 1.53 2023/03/08 04:43:08 guenther Exp $ */
|
||||
/* $OpenBSD: cmpci.c,v 1.54 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -51,7 +51,6 @@ int cmpcidebug = 0;
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
@ -60,7 +59,6 @@ int cmpcidebug = 0;
|
|||
|
||||
#include <sys/audioio.h>
|
||||
#include <dev/audio_if.h>
|
||||
#include <dev/midi_if.h>
|
||||
|
||||
#include <dev/pci/cmpcireg.h>
|
||||
#include <dev/pci/cmpcivar.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: com_pci.c,v 1.3 2023/09/11 08:41:26 mvs Exp $ */
|
||||
/* $OpenBSD: com_pci.c,v 1.4 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
|
||||
*
|
||||
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/tty.h>
|
||||
|
||||
#include <dev/pci/pcidevs.h>
|
||||
|
|
@ -26,7 +25,6 @@
|
|||
|
||||
#include <dev/ic/comreg.h>
|
||||
#include <dev/ic/comvar.h>
|
||||
#include <dev/ic/ns16550reg.h>
|
||||
|
||||
#define com_usr 31 /* Synopsys DesignWare UART */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cs4280.c,v 1.60 2022/10/26 20:19:08 kn Exp $ */
|
||||
/* $OpenBSD: cs4280.c,v 1.61 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -67,8 +67,6 @@ int cs4280debug = 0;
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cs4281.c,v 1.45 2022/10/26 20:19:08 kn Exp $ */
|
||||
/* $OpenBSD: cs4281.c,v 1.46 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -43,9 +43,7 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <dev/pci/pcidevs.h>
|
||||
|
|
@ -54,7 +52,6 @@
|
|||
|
||||
#include <sys/audioio.h>
|
||||
#include <dev/audio_if.h>
|
||||
#include <dev/midi_if.h>
|
||||
|
||||
#include <dev/ic/ac97.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cy82c693.c,v 1.8 2015/03/14 03:38:48 jsg Exp $ */
|
||||
/* $OpenBSD: cy82c693.c,v 1.9 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: cy82c693.c,v 1.1 2000/06/06 03:07:39 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -41,8 +41,6 @@
|
|||
|
||||
#include <machine/bus.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
||||
#include <dev/pci/cy82c693reg.h>
|
||||
#include <dev/pci/cy82c693var.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: cz.c,v 1.28 2024/05/15 12:57:36 jsg Exp $ */
|
||||
/* $OpenBSD: cz.c,v 1.29 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: cz.c,v 1.15 2001/01/20 19:10:36 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -81,8 +81,6 @@
|
|||
#include <sys/tty.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/syslog.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: dwiic_pci.c,v 1.26 2024/04/07 01:04:58 jsg Exp $ */
|
||||
/* $OpenBSD: dwiic_pci.c,v 1.27 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/*
|
||||
* Synopsys DesignWare I2C controller
|
||||
* PCI attachment
|
||||
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
|
||||
#include <dev/pci/pcidevs.h>
|
||||
#include <dev/pci/pcireg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: eap.c,v 1.64 2022/10/26 20:19:08 kn Exp $ */
|
||||
/* $OpenBSD: eap.c,v 1.65 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -51,7 +51,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/fcntl.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ehci_pci.c,v 1.32 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: ehci_pci.c,v 1.33 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: ehci_pci.c,v 1.15 2004/04/23 21:13:06 itojun Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -32,7 +32,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/rwlock.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
|
|
@ -46,7 +45,6 @@
|
|||
#include <dev/usb/usb.h>
|
||||
#include <dev/usb/usbdi.h>
|
||||
#include <dev/usb/usbdivar.h>
|
||||
#include <dev/usb/usb_mem.h>
|
||||
|
||||
#include <dev/usb/ehcireg.h>
|
||||
#include <dev/usb/ehcivar.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: envy.c,v 1.87 2022/10/26 20:19:08 kn Exp $ */
|
||||
/* $OpenBSD: envy.c,v 1.88 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org>
|
||||
*
|
||||
|
|
@ -32,7 +32,6 @@
|
|||
#include <sys/device.h>
|
||||
#include <sys/audioio.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <dev/audio_if.h>
|
||||
#include <dev/midi_if.h>
|
||||
#include <dev/ic/ac97.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: esa.c,v 1.42 2023/09/11 08:41:26 mvs Exp $ */
|
||||
/* $OpenBSD: esa.c,v 1.43 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -48,8 +48,6 @@
|
|||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/exec.h>
|
||||
#include <sys/audioio.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: eso.c,v 1.54 2023/03/08 04:43:08 guenther Exp $ */
|
||||
/* $OpenBSD: eso.c,v 1.55 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: eso.c,v 1.48 2006/12/18 23:13:39 kleink 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>
|
||||
|
||||
|
|
@ -46,7 +45,6 @@
|
|||
#include <dev/audio_if.h>
|
||||
#include <dev/midi_if.h>
|
||||
|
||||
#include <dev/ic/mpuvar.h>
|
||||
#include <dev/ic/i8237reg.h>
|
||||
#include <dev/pci/esoreg.h>
|
||||
#include <dev/pci/esovar.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: fms.c,v 1.37 2024/05/13 01:15:51 jsg Exp $ */
|
||||
/* $OpenBSD: fms.c,v 1.38 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -38,7 +38,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/audioio.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: fmsradio.c,v 1.8 2022/03/21 19:22:41 miod Exp $ */
|
||||
/* $OpenBSD: fmsradio.c,v 1.9 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2002 Vladimir Popov <jumbo@narod.ru>
|
||||
|
|
@ -39,17 +39,11 @@
|
|||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/audioio.h>
|
||||
#include <sys/radioio.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcidevs.h>
|
||||
|
||||
#include <dev/audio_if.h>
|
||||
#include <dev/radio_if.h>
|
||||
|
||||
#include <dev/ic/ac97.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: gdt_pci.c,v 1.27 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: gdt_pci.c,v 1.28 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved.
|
||||
|
|
@ -32,10 +32,7 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: i82365_pci.c,v 1.15 2024/05/13 01:15:51 jsg Exp $ */
|
||||
/* $OpenBSD: i82365_pci.c,v 1.16 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: i82365_pci.c,v 1.11 2000/02/24 03:42:44 itohy Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -36,7 +36,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <dev/ic/i82365reg.h>
|
||||
|
|
@ -47,7 +46,6 @@
|
|||
#include <dev/pci/pcidevs.h>
|
||||
#include <dev/pci/i82365_pcivar.h>
|
||||
|
||||
#include <dev/isa/isavar.h>
|
||||
#include <dev/isa/i82365_isavar.h>
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ichiic.c,v 1.54 2024/03/06 00:11:25 jsg Exp $ */
|
||||
/* $OpenBSD: ichiic.c,v 1.55 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005, 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 <sys/rwlock.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_acx_pci.c,v 1.10 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: if_acx_pci.c,v 1.11 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
|
||||
|
|
@ -25,12 +25,7 @@
|
|||
#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/malloc.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_age.c,v 1.39 2023/11/10 15:51:20 bluhm Exp $ */
|
||||
/* $OpenBSD: if_age.c,v 1.40 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
|
||||
|
|
@ -38,10 +38,8 @@
|
|||
#include <sys/sockio.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_alc.c,v 1.57 2023/11/10 15:51:20 bluhm Exp $ */
|
||||
/* $OpenBSD: if_alc.c,v 1.58 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
|
||||
* All rights reserved.
|
||||
|
|
@ -37,10 +37,8 @@
|
|||
#include <sys/sockio.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_ale.c,v 1.50 2023/11/10 15:51:20 bluhm Exp $ */
|
||||
/* $OpenBSD: if_ale.c,v 1.51 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
|
||||
* All rights reserved.
|
||||
|
|
@ -39,10 +39,8 @@
|
|||
#include <sys/sockio.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_an_pci.c,v 1.20 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: if_an_pci.c,v 1.21 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997, 1998, 1999
|
||||
|
|
@ -57,9 +57,6 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/tree.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_aq_pci.c,v 1.27 2024/05/13 01:15:51 jsg Exp $ */
|
||||
/* $OpenBSD: if_aq_pci.c,v 1.28 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: if_aq.c,v 1.27 2021/06/16 00:21:18 riastradh Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -84,7 +84,6 @@
|
|||
#include <sys/types.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/sockio.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/intrmap.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_ath_pci.c,v 1.27 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: if_ath_pci.c,v 1.28 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: if_ath_pci.c,v 1.7 2004/06/30 05:58:17 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -39,13 +39,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/lock.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/sockio.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/gpio.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_athn_pci.c,v 1.23 2022/07/24 17:22:12 kn Exp $ */
|
||||
/* $OpenBSD: if_athn_pci.c,v 1.24 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
|
||||
|
|
@ -23,12 +23,7 @@
|
|||
#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/malloc.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_atw_pci.c,v 1.19 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: if_atw_pci.c,v 1.20 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: if_atw_pci.c,v 1.7 2004/07/23 07:07:55 dyoung Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -39,14 +39,7 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
|
@ -60,8 +53,6 @@
|
|||
#include <machine/intr.h>
|
||||
|
||||
#include <dev/ic/atwreg.h>
|
||||
#include <dev/ic/rf3000reg.h>
|
||||
#include <dev/ic/si4136reg.h>
|
||||
#include <dev/ic/atwvar.h>
|
||||
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_bce.c,v 1.55 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: if_bce.c,v 1.56 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -42,10 +42,7 @@
|
|||
#include <sys/timeout.h>
|
||||
#include <sys/sockio.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
|
@ -62,7 +59,6 @@
|
|||
|
||||
#include <dev/mii/mii.h>
|
||||
#include <dev/mii/miivar.h>
|
||||
#include <dev/mii/miidevs.h>
|
||||
|
||||
#include <dev/pci/if_bcereg.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_bge.c,v 1.404 2024/04/14 03:26:25 jsg Exp $ */
|
||||
/* $OpenBSD: if_bge.c,v 1.405 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001 Wind River Systems
|
||||
|
|
@ -81,10 +81,8 @@
|
|||
#include <sys/sockio.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/atomic.h>
|
||||
#include <sys/kstat.h>
|
||||
|
||||
|
|
@ -108,7 +106,6 @@
|
|||
|
||||
#include <dev/mii/mii.h>
|
||||
#include <dev/mii/miivar.h>
|
||||
#include <dev/mii/miidevs.h>
|
||||
#include <dev/mii/brgphyreg.h>
|
||||
|
||||
#include <dev/pci/if_bgereg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_bnxt.c,v 1.49 2024/05/07 18:35:23 jan Exp $ */
|
||||
/* $OpenBSD: if_bnxt.c,v 1.50 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/*-
|
||||
* Broadcom NetXtreme-C/E network driver.
|
||||
*
|
||||
|
|
@ -50,7 +50,6 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/stdint.h>
|
||||
|
|
@ -60,7 +59,6 @@
|
|||
|
||||
#include <machine/bus.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcidevs.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_bwfm_pci.c,v 1.75 2022/12/30 14:10:17 kettenis Exp $ */
|
||||
/* $OpenBSD: if_bwfm_pci.c,v 1.76 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2010-2016 Broadcom Corporation
|
||||
* Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
|
||||
|
|
@ -16,12 +16,8 @@
|
|||
* 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>
|
||||
|
|
@ -32,11 +28,7 @@
|
|||
#include <dev/ofw/openfirm.h>
|
||||
#endif
|
||||
|
||||
#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>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_bwi_pci.c,v 1.18 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: if_bwi_pci.c,v 1.19 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
|
||||
|
|
@ -23,12 +23,7 @@
|
|||
#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/malloc.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_cas.c,v 1.55 2023/11/10 15:51:20 bluhm Exp $ */
|
||||
/* $OpenBSD: if_cas.c,v 1.56 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
*
|
||||
|
|
@ -49,13 +49,9 @@
|
|||
#include <sys/timeout.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/endian.h>
|
||||
#include <sys/atomic.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_dc_pci.c,v 1.78 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: if_dc_pci.c,v 1.79 2024/05/24 06:02:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997, 1998, 1999
|
||||
|
|
@ -34,17 +34,10 @@
|
|||
* $FreeBSD: src/sys/pci/if_dc.c,v 1.5 2000/01/12 22:24:05 wpaul Exp $
|
||||
*/
|
||||
|
||||
#include "bpfilter.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
|
@ -54,10 +47,6 @@
|
|||
|
||||
#include <net/if_media.h>
|
||||
|
||||
#if NBPFILTER > 0
|
||||
#include <net/bpf.h>
|
||||
#endif
|
||||
|
||||
#include <dev/mii/miivar.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_de.c,v 1.142 2023/04/11 00:45:08 jsg Exp $ */
|
||||
/* $OpenBSD: if_de.c,v 1.143 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -44,11 +44,9 @@
|
|||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/pool.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
|
|
|||
|
|
@ -31,14 +31,12 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
***************************************************************************/
|
||||
|
||||
/* $OpenBSD: if_em.c,v 1.376 2024/05/13 01:15:51 jsg Exp $ */
|
||||
/* $OpenBSD: if_em.c,v 1.377 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
|
||||
|
||||
#include <dev/pci/if_em.h>
|
||||
#include <dev/pci/if_em_soc.h>
|
||||
|
||||
#include <netinet/ip6.h>
|
||||
|
||||
/*********************************************************************
|
||||
* Driver version
|
||||
*********************************************************************/
|
||||
|
|
|
|||
|
|
@ -31,20 +31,14 @@
|
|||
|
||||
*******************************************************************************/
|
||||
|
||||
/* $OpenBSD: if_em_hw.c,v 1.120 2024/04/13 23:44:11 jsg Exp $ */
|
||||
/* $OpenBSD: if_em_hw.c,v 1.121 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/*
|
||||
* if_em_hw.c Shared functions for accessing and configuring the MAC
|
||||
*/
|
||||
|
||||
#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/device.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/kstat.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_media.h>
|
||||
|
|
@ -52,11 +46,6 @@
|
|||
#include <netinet/in.h>
|
||||
#include <netinet/if_ether.h>
|
||||
|
||||
#include <uvm/uvm_extern.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
|
||||
#include <dev/pci/if_em.h>
|
||||
#include <dev/pci/if_em_hw.h>
|
||||
#include <dev/pci/if_em_soc.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_ep_pci.c,v 1.37 2023/09/11 08:41:26 mvs Exp $ */
|
||||
/* $OpenBSD: if_ep_pci.c,v 1.38 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -31,16 +31,9 @@
|
|||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "bpfilter.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
|
@ -49,11 +42,6 @@
|
|||
#include <netinet/in.h>
|
||||
#include <netinet/if_ether.h>
|
||||
|
||||
#if NBPFILTER > 0
|
||||
#include <net/bpf.h>
|
||||
#endif
|
||||
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/bus.h>
|
||||
#include <machine/intr.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_epic_pci.c,v 1.17 2022/03/11 18:00:45 mpi Exp $ */
|
||||
/* $OpenBSD: if_epic_pci.c,v 1.18 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/* $NetBSD: if_epic_pci.c,v 1.28 2005/02/27 00:27:32 perry Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -38,12 +38,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_et.c,v 1.43 2023/11/10 15:51:20 bluhm Exp $ */
|
||||
/* $OpenBSD: if_et.c,v 1.44 2024/05/24 06:02:53 jsg Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
|
||||
*
|
||||
|
|
@ -38,15 +38,12 @@
|
|||
#include "bpfilter.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/endian.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/sockio.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/queue.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/timeout.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
|
|
@ -63,7 +60,6 @@
|
|||
|
||||
#include <dev/mii/miivar.h>
|
||||
|
||||
#include <dev/pci/pcireg.h>
|
||||
#include <dev/pci/pcivar.h>
|
||||
#include <dev/pci/pcidevs.h>
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue