Module Name: src
Committed By: christos
Date: Mon Jul 31 17:41:18 UTC 2023
Modified Files:
src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common:
sanitizer_interceptors_ioctl_netbsd.inc
sanitizer_platform_limits_netbsd.cc
src/sys/compat/common: usb_subr_30.c
src/sys/dev/usb: ugen.c uhid.c usb.c usb.h
src/sys/net: bpf.c bpf.h
src/sys/sys: compat_stub.h
Log Message:
Don't call versioned stuff "old". Follow the naming convention for versioning
and name them after the last version of the OS they appeared on.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
\
src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/common/usb_subr_30.c
cvs rdiff -u -r1.172 -r1.173 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.201 -r1.202 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/usb/usb.h
cvs rdiff -u -r1.251 -r1.252 src/sys/net/bpf.c
cvs rdiff -u -r1.78 -r1.79 src/sys/net/bpf.h
cvs rdiff -u -r1.25 -r1.26 src/sys/sys/compat_stub.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
diff -u src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.2 src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.3
--- src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc:1.2 Mon Dec 26 17:22:22 2022
+++ src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc Mon Jul 31 13:41:17 2023
@@ -451,7 +451,7 @@ static void ioctl_table_fill() {
_(USB_SETDEBUG, READ, sizeof(int));
_(USB_DISCOVER, NONE, 0);
_(USB_DEVICEINFO, READWRITE, struct_usb_device_info_sz);
- _(USB_DEVICEINFO_OLD, READWRITE, struct_usb_device_info_old_sz);
+ _(USB_DEVICEINFO_30, READWRITE, struct_usb_device_info30_sz);
_(USB_DEVICESTATS, WRITE, struct_usb_device_stats_sz);
_(USB_GET_REPORT_DESC, WRITE, struct_usb_ctl_report_desc_sz);
_(USB_SET_IMMED, READ, sizeof(int));
@@ -471,7 +471,7 @@ static void ioctl_table_fill() {
_(USB_GET_STRING_DESC, READWRITE, struct_usb_string_desc_sz);
_(USB_DO_REQUEST, READWRITE, struct_usb_ctl_request_sz);
_(USB_GET_DEVICEINFO, WRITE, struct_usb_device_info_sz);
- _(USB_GET_DEVICEINFO_OLD, WRITE, struct_usb_device_info_old_sz);
+ _(USB_GET_DEVICEINFO_30, WRITE, struct_usb_device_info30_sz);
_(USB_SET_SHORT_XFER, READ, sizeof(int));
_(USB_SET_TIMEOUT, READ, sizeof(int));
_(USB_SET_BULK_RA, READ, sizeof(int));
@@ -674,7 +674,7 @@ static void ioctl_table_fill() {
_(BIOCGETIF, WRITE, struct_ifreq_sz);
_(BIOCSETIF, READ, struct_ifreq_sz);
_(BIOCGSTATS, WRITE, struct_bpf_stat_sz);
- _(BIOCGSTATSOLD, WRITE, struct_bpf_stat_old_sz);
+ _(BIOCGSTATS_30, WRITE, struct_bpf_stat30_sz);
_(BIOCIMMEDIATE, READ, sizeof(unsigned int));
_(BIOCVERSION, WRITE, struct_bpf_version_sz);
_(BIOCSTCPF, READ, struct_bpf_program_sz);
Index: src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc
diff -u src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc:1.2 src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc:1.3
--- src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc:1.2 Mon Dec 26 17:22:22 2022
+++ src/external/gpl3/gcc.old/dist/libsanitizer/sanitizer_common/sanitizer_platform_limits_netbsd.cc Mon Jul 31 13:41:17 2023
@@ -710,7 +710,7 @@ unsigned struct_blue_interface_sz = size
unsigned struct_blue_stats_sz = sizeof(blue_stats);
unsigned struct_bpf_dltlist_sz = sizeof(bpf_dltlist);
unsigned struct_bpf_program_sz = sizeof(bpf_program);
-unsigned struct_bpf_stat_old_sz = sizeof(bpf_stat_old);
+unsigned struct_bpf_stat30_sz = sizeof(bpf_stat30);
unsigned struct_bpf_stat_sz = sizeof(bpf_stat);
unsigned struct_bpf_version_sz = sizeof(bpf_version);
unsigned struct_btreq_sz = sizeof(btreq);
@@ -1017,7 +1017,7 @@ unsigned struct_spi_ioctl_transfer_sz =
unsigned struct_autofs_daemon_request_sz = sizeof(autofs_daemon_request);
unsigned struct_autofs_daemon_done_sz = sizeof(autofs_daemon_done);
unsigned struct_sctp_connectx_addrs_sz = sizeof(sctp_connectx_addrs);
-unsigned struct_usb_device_info_old_sz = sizeof(usb_device_info_old);
+unsigned struct_usb_device_info30_sz = sizeof(usb_device_info30);
unsigned struct_usb_device_info_sz = sizeof(usb_device_info);
unsigned struct_usb_device_stats_sz = sizeof(usb_device_stats);
unsigned struct_usb_endpoint_desc_sz = sizeof(usb_endpoint_desc);
@@ -1581,7 +1581,7 @@ unsigned IOCTL_USB_REQUEST = USB_REQUEST
unsigned IOCTL_USB_SETDEBUG = USB_SETDEBUG;
unsigned IOCTL_USB_DISCOVER = USB_DISCOVER;
unsigned IOCTL_USB_DEVICEINFO = USB_DEVICEINFO;
-unsigned IOCTL_USB_DEVICEINFO_OLD = USB_DEVICEINFO_OLD;
+unsigned IOCTL_USB_DEVICEINFO_30 = USB_DEVICEINFO_30;
unsigned IOCTL_USB_DEVICESTATS = USB_DEVICESTATS;
unsigned IOCTL_USB_GET_REPORT_DESC = USB_GET_REPORT_DESC;
unsigned IOCTL_USB_SET_IMMED = USB_SET_IMMED;
@@ -1601,7 +1601,7 @@ unsigned IOCTL_USB_GET_FULL_DESC = USB_G
unsigned IOCTL_USB_GET_STRING_DESC = USB_GET_STRING_DESC;
unsigned IOCTL_USB_DO_REQUEST = USB_DO_REQUEST;
unsigned IOCTL_USB_GET_DEVICEINFO = USB_GET_DEVICEINFO;
-unsigned IOCTL_USB_GET_DEVICEINFO_OLD = USB_GET_DEVICEINFO_OLD;
+unsigned IOCTL_USB_GET_DEVICEINFO_30 = USB_GET_DEVICEINFO_30;
unsigned IOCTL_USB_SET_SHORT_XFER = USB_SET_SHORT_XFER;
unsigned IOCTL_USB_SET_TIMEOUT = USB_SET_TIMEOUT;
unsigned IOCTL_USB_SET_BULK_RA = USB_SET_BULK_RA;
@@ -1786,7 +1786,7 @@ unsigned IOCTL_BIOCGDLT = BIOCGDLT;
unsigned IOCTL_BIOCGETIF = BIOCGETIF;
unsigned IOCTL_BIOCSETIF = BIOCSETIF;
unsigned IOCTL_BIOCGSTATS = BIOCGSTATS;
-unsigned IOCTL_BIOCGSTATSOLD = BIOCGSTATSOLD;
+unsigned IOCTL_BIOCGSTATS_30 = BIOCGSTATS_30;
unsigned IOCTL_BIOCIMMEDIATE = BIOCIMMEDIATE;
unsigned IOCTL_BIOCVERSION = BIOCVERSION;
unsigned IOCTL_BIOCSTCPF = BIOCSTCPF;
Index: src/sys/compat/common/usb_subr_30.c
diff -u src/sys/compat/common/usb_subr_30.c:1.6 src/sys/compat/common/usb_subr_30.c:1.7
--- src/sys/compat/common/usb_subr_30.c:1.6 Wed Dec 11 21:15:42 2019
+++ src/sys/compat/common/usb_subr_30.c Mon Jul 31 13:41:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr_30.c,v 1.6 2019/12/12 02:15:42 pgoyette Exp $ */
+/* $NetBSD: usb_subr_30.c,v 1.7 2023/07/31 17:41:17 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.6 2019/12/12 02:15:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.7 2023/07/31 17:41:17 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -63,11 +63,11 @@ __KERNEL_RCSID(0, "$NetBSD: usb_subr_30.
#include <dev/usb/usb_verbose.h>
#include <dev/usb/usbhist.h>
-Static void usb_copy_old_devinfo(struct usb_device_info_old *,
+static void usb_copy30_devinfo(struct usb_device_info30 *,
const struct usb_device_info *);
-Static void
-usb_copy_old_devinfo(struct usb_device_info_old *uo,
+static void
+usb_copy30_devinfo(struct usb_device_info30 *uo,
const struct usb_device_info *ue)
{
const unsigned char *p;
@@ -124,8 +124,8 @@ usb_copy_old_devinfo(struct usb_device_i
}
static int
-usbd_fill_deviceinfo_old(struct usbd_device *dev,
- struct usb_device_info_old *di, int usedev,
+usbd_fill_deviceinfo30(struct usbd_device *dev,
+ struct usb_device_info30 *di, int usedev,
void (*do_devinfo_vp)(struct usbd_device *, char *, size_t, char *,
size_t, int, int),
int (*do_printBCD)(char *cp, size_t l, int bcd))
@@ -197,7 +197,7 @@ usbd_fill_deviceinfo_old(struct usbd_dev
}
static int
-usb_copy_to_old30(struct usb_event *ue, struct usb_event_old *ueo,
+usb_copy_to30(struct usb_event *ue, struct usb_event30 *ueo,
struct uio *uio)
{
@@ -206,7 +206,7 @@ usb_copy_to_old30(struct usb_event *ue,
switch (ue->ue_type) {
case USB_EVENT_DEVICE_ATTACH:
case USB_EVENT_DEVICE_DETACH:
- usb_copy_old_devinfo(&ueo->u.ue_device,
+ usb_copy30_devinfo(&ueo->u.ue_device,
&ue->u.ue_device);
break;
@@ -233,8 +233,8 @@ void
usb_30_init(void)
{
- MODULE_HOOK_SET(usb_subr_fill_30_hook, usbd_fill_deviceinfo_old);
- MODULE_HOOK_SET(usb_subr_copy_30_hook, usb_copy_to_old30);
+ MODULE_HOOK_SET(usb_subr_fill_30_hook, usbd_fill_deviceinfo30);
+ MODULE_HOOK_SET(usb_subr_copy_30_hook, usb_copy_to30);
}
void
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.172 src/sys/dev/usb/ugen.c:1.173
--- src/sys/dev/usb/ugen.c:1.172 Thu Jul 20 16:00:34 2023
+++ src/sys/dev/usb/ugen.c Mon Jul 31 13:41:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.172 2023/07/20 20:00:34 mrg Exp $ */
+/* $NetBSD: ugen.c,v 1.173 2023/07/31 17:41:18 christos Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.172 2023/07/20 20:00:34 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.173 2023/07/31 17:41:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2068,11 +2068,11 @@ ugen_do_ioctl(struct ugen_softc *sc, int
usbd_fill_deviceinfo(sc->sc_udev,
(struct usb_device_info *)addr, 0);
break;
- case USB_GET_DEVICEINFO_OLD:
+ case USB_GET_DEVICEINFO_30:
{
int ret;
MODULE_HOOK_CALL(usb_subr_fill_30_hook,
- (sc->sc_udev, (struct usb_device_info_old *)addr, 0,
+ (sc->sc_udev, (struct usb_device_info30 *)addr, 0,
usbd_devinfo_vp, usbd_printBCD),
enosys(), ret);
if (ret == 0)
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.127 src/sys/dev/usb/uhid.c:1.128
--- src/sys/dev/usb/uhid.c:1.127 Tue Mar 28 16:01:58 2023
+++ src/sys/dev/usb/uhid.c Mon Jul 31 13:41:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.127 2023/03/28 20:01:58 andvar Exp $ */
+/* $NetBSD: uhid.c,v 1.128 2023/07/31 17:41:18 christos Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.127 2023/03/28 20:01:58 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.128 2023/07/31 17:41:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -663,10 +663,10 @@ uhidioctl(dev_t dev, u_long cmd, void *a
usbd_fill_deviceinfo(sc->sc_udev,
(struct usb_device_info *)addr, 0);
break;
- case USB_GET_DEVICEINFO_OLD:
+ case USB_GET_DEVICEINFO_30:
MODULE_HOOK_CALL(usb_subr_fill_30_hook,
(sc->sc_udev,
- (struct usb_device_info_old *)addr, 0,
+ (struct usb_device_info30 *)addr, 0,
usbd_devinfo_vp, usbd_printBCD),
enosys(), err);
if (err == 0)
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.201 src/sys/dev/usb/usb.c:1.202
--- src/sys/dev/usb/usb.c:1.201 Thu Jul 20 16:00:34 2023
+++ src/sys/dev/usb/usb.c Mon Jul 31 13:41:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.201 2023/07/20 20:00:34 mrg Exp $ */
+/* $NetBSD: usb.c,v 1.202 2023/07/31 17:41:18 christos Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.201 2023/07/20 20:00:34 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.202 2023/07/31 17:41:18 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -857,7 +857,7 @@ int
usbread(dev_t dev, struct uio *uio, int flag)
{
struct usb_event *ue;
- struct usb_event_old *ueo = NULL; /* XXXGCC */
+ struct usb_event30 *ueo = NULL; /* XXXGCC */
int useold = 0;
int error, n;
@@ -865,8 +865,8 @@ usbread(dev_t dev, struct uio *uio, int
return ENXIO;
switch (uio->uio_resid) {
- case sizeof(struct usb_event_old):
- ueo = kmem_zalloc(sizeof(struct usb_event_old), KM_SLEEP);
+ case sizeof(struct usb_event30):
+ ueo = kmem_zalloc(sizeof(struct usb_event30), KM_SLEEP);
useold = 1;
/* FALLTHROUGH */
case sizeof(struct usb_event):
@@ -905,7 +905,7 @@ usbread(dev_t dev, struct uio *uio, int
}
usb_free_event(ue);
if (ueo)
- kmem_free(ueo, sizeof(struct usb_event_old));
+ kmem_free(ueo, sizeof(struct usb_event30));
return error;
}
@@ -1056,10 +1056,10 @@ usbioctl(dev_t devt, u_long cmd, void *d
break;
}
- case USB_DEVICEINFO_OLD:
+ case USB_DEVICEINFO_30:
{
struct usbd_device *dev;
- struct usb_device_info_old *di = (void *)data;
+ struct usb_device_info30 *di = (void *)data;
int addr = di->udi_addr;
if (addr < 1 || addr >= USB_MAX_DEVICES) {
Index: src/sys/dev/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.121 src/sys/dev/usb/usb.h:1.122
--- src/sys/dev/usb/usb.h:1.121 Fri Sep 16 03:35:44 2022
+++ src/sys/dev/usb/usb.h Mon Jul 31 13:41:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.121 2022/09/16 07:35:44 msaitoh Exp $ */
+/* $NetBSD: usb.h,v 1.122 2023/07/31 17:41:18 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -913,7 +913,7 @@ struct usb_device_info {
};
/* <=3.0 had this layout of the structure */
-struct usb_device_info_old {
+struct usb_device_info30 {
uint8_t udi_bus;
uint8_t udi_addr; /* device address */
usb_event_cookie_t udi_cookie;
@@ -973,14 +973,14 @@ struct usb_event {
};
/* old <=3.0 compat event */
-struct usb_event_old {
+struct usb_event30 {
int ue_type;
struct timespec ue_time;
union {
struct {
int ue_bus;
} ue_ctrlr;
- struct usb_device_info_old ue_device;
+ struct usb_device_info30 ue_device;
struct {
usb_event_cookie_t ue_cookie;
char ue_devname[16];
@@ -994,7 +994,7 @@ struct usb_event_old {
#define USB_SETDEBUG _IOW ('U', 2, int)
#define USB_DISCOVER _IO ('U', 3)
#define USB_DEVICEINFO _IOWR('U', 4, struct usb_device_info)
-#define USB_DEVICEINFO_OLD _IOWR('U', 4, struct usb_device_info_old)
+#define USB_DEVICEINFO_30 _IOWR('U', 4, struct usb_device_info30)
#define USB_DEVICESTATS _IOR ('U', 5, struct usb_device_stats)
/* Generic HID device */
@@ -1018,7 +1018,7 @@ struct usb_event_old {
#define USB_GET_STRING_DESC _IOWR('U', 110, struct usb_string_desc)
#define USB_DO_REQUEST _IOWR('U', 111, struct usb_ctl_request)
#define USB_GET_DEVICEINFO _IOR ('U', 112, struct usb_device_info)
-#define USB_GET_DEVICEINFO_OLD _IOR ('U', 112, struct usb_device_info_old)
+#define USB_GET_DEVICEINFO_30 _IOR ('U', 112, struct usb_device_info30)
#define USB_SET_SHORT_XFER _IOW ('U', 113, int)
#define USB_SET_TIMEOUT _IOW ('U', 114, int)
#define USB_SET_BULK_RA _IOW ('U', 115, int)
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.251 src/sys/net/bpf.c:1.252
--- src/sys/net/bpf.c:1.251 Tue Feb 7 20:37:53 2023
+++ src/sys/net/bpf.c Mon Jul 31 13:41:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.251 2023/02/08 01:37:53 gutteridge Exp $ */
+/* $NetBSD: bpf.c,v 1.252 2023/07/31 17:41:18 christos Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.251 2023/02/08 01:37:53 gutteridge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.252 2023/07/31 17:41:18 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -1257,9 +1257,9 @@ bpf_ioctl(struct file *fp, u_long cmd, v
break;
}
- case BIOCGSTATSOLD:
+ case BIOCGSTATS_30:
{
- struct bpf_stat_old *bs = addr;
+ struct bpf_stat30 *bs = addr;
bs->bs_recv = d->bd_rcount;
bs->bs_drop = d->bd_dcount;
Index: src/sys/net/bpf.h
diff -u src/sys/net/bpf.h:1.78 src/sys/net/bpf.h:1.79
--- src/sys/net/bpf.h:1.78 Mon Jun 20 04:20:09 2022
+++ src/sys/net/bpf.h Mon Jul 31 13:41:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.h,v 1.78 2022/06/20 08:20:09 yamaguchi Exp $ */
+/* $NetBSD: bpf.h,v 1.79 2023/07/31 17:41:18 christos Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -88,9 +88,9 @@ struct bpf_stat {
};
/*
- * Struct returned by BIOCGSTATSOLD.
+ * Struct returned by BIOCGSTATS_30.
*/
-struct bpf_stat_old {
+struct bpf_stat30 {
u_int bs_recv; /* number of packets received */
u_int bs_drop; /* number of packets dropped */
};
@@ -135,7 +135,7 @@ struct bpf_version {
#define BIOCGORTIMEOUT _IOR('B', 110, struct timeval50)
#endif
#define BIOCGSTATS _IOR('B', 111, struct bpf_stat)
-#define BIOCGSTATSOLD _IOR('B', 111, struct bpf_stat_old)
+#define BIOCGSTATS_30 _IOR('B', 111, struct bpf_stat30)
#define BIOCIMMEDIATE _IOW('B', 112, u_int)
#define BIOCVERSION _IOR('B', 113, struct bpf_version)
#define BIOCSTCPF _IOW('B', 114, struct bpf_program)
Index: src/sys/sys/compat_stub.h
diff -u src/sys/sys/compat_stub.h:1.25 src/sys/sys/compat_stub.h:1.26
--- src/sys/sys/compat_stub.h:1.25 Sun Nov 1 13:51:03 2020
+++ src/sys/sys/compat_stub.h Mon Jul 31 13:41:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_stub.h,v 1.25 2020/11/01 18:51:03 pgoyette Exp $ */
+/* $NetBSD: compat_stub.h,v 1.26 2023/07/31 17:41:18 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -82,17 +82,25 @@ MODULE_HOOK(sctp_delete_ip_address, int,
*/
struct usbd_device;
-struct usb_device_info_old;
+struct usb_device_info30;
+struct usb_device_info100;
struct usb_event;
-struct usb_event_old;
+struct usb_event30;
+struct usb_event100;
struct uio;
MODULE_HOOK(usb_subr_fill_30_hook, int,
- (struct usbd_device *, struct usb_device_info_old *, int,
+ (struct usbd_device *, struct usb_device_info30 *, int,
void (*)(struct usbd_device *, char *, size_t, char *, size_t, int, int),
int (*)(char *, size_t, int)));
MODULE_HOOK(usb_subr_copy_30_hook, int,
- (struct usb_event *, struct usb_event_old *, struct uio *));
+ (struct usb_event *, struct usb_event30 *, struct uio *));
+MODULE_HOOK(usb_subr_fill_100_hook, int,
+ (struct usbd_device *, struct usb_device_info100 *, int,
+ void (*)(struct usbd_device *, char *, size_t, char *, size_t, int, int),
+ int (*)(char *, size_t, int)));
+MODULE_HOOK(usb_subr_copy_100_hook, int,
+ (struct usb_event *, struct usb_event100 *, struct uio *));
/*
* Routine vector for dev/ccd ioctl()
*/
