Module Name: src
Committed By: mrg
Date: Thu Jan 20 03:14:03 UTC 2022
Modified Files:
src/sys/dev/usb: usb_quirks.c usbdi.c usbroothub.c
Log Message:
don't 'extern' some other .c file's data, espcially when it's
already in usbhist.h.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/usb/usb_quirks.c
cvs rdiff -u -r1.221 -r1.222 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/usbroothub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.103 src/sys/dev/usb/usb_quirks.c:1.104
--- src/sys/dev/usb/usb_quirks.c:1.103 Mon Jan 17 11:12:28 2022
+++ src/sys/dev/usb/usb_quirks.c Thu Jan 20 03:14:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.103 2022/01/17 11:12:28 bouyer Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.104 2022/01/20 03:14:03 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.103 2022/01/17 11:12:28 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.104 2022/01/20 03:14:03 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -48,10 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: usb_quirks.c
#include <dev/usb/usbhist.h>
#include <dev/usb/usb_quirks.h>
-#ifdef USB_DEBUG
-extern int usbdebug;
-#endif
-
#define DPRINTF(FMT,A,B,C,D) USBHIST_LOG(usbdebug,FMT,A,B,C,D)
#define ANY 0xffff
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.221 src/sys/dev/usb/usbdi.c:1.222
--- src/sys/dev/usb/usbdi.c:1.221 Fri Dec 31 12:00:18 2021
+++ src/sys/dev/usb/usbdi.c Thu Jan 20 03:14:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.221 2021/12/31 12:00:18 skrll Exp $ */
+/* $NetBSD: usbdi.c,v 1.222 2022/01/20 03:14:03 mrg Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.221 2021/12/31 12:00:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.222 2022/01/20 03:14:03 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -61,8 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.
/* UTF-8 encoding stuff */
#include <fs/unicode.h>
-extern int usbdebug;
-
SDT_PROBE_DEFINE5(usb, device, pipe, open,
"struct usbd_interface *"/*iface*/,
"uint8_t"/*address*/,
Index: src/sys/dev/usb/usbroothub.c
diff -u src/sys/dev/usb/usbroothub.c:1.10 src/sys/dev/usb/usbroothub.c:1.11
--- src/sys/dev/usb/usbroothub.c:1.10 Wed Jul 21 06:35:45 2021
+++ src/sys/dev/usb/usbroothub.c Thu Jan 20 03:14:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbroothub.c,v 1.10 2021/07/21 06:35:45 skrll Exp $ */
+/* $NetBSD: usbroothub.c,v 1.11 2022/01/20 03:14:03 mrg Exp $ */
/*-
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbroothub.c,v 1.10 2021/07/21 06:35:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbroothub.c,v 1.11 2022/01/20 03:14:03 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h> /* for ostype */
@@ -69,8 +69,6 @@ __KERNEL_RCSID(0, "$NetBSD: usbroothub.c
#include <dev/usb/usbroothub.h>
#include <dev/usb/usbhist.h>
-extern int usbdebug;
-
/* helper functions for USB root hub emulation */
static usbd_status roothub_ctrl_transfer(struct usbd_xfer *);
