Module Name: src
Committed By: skrll
Date: Sat Sep 5 06:13:54 UTC 2015
Modified Files:
src/sys/dev/usb: ehcireg.h ohcireg.h uhcireg.h
Log Message:
Fix/tweak the multiple inclusion protection define names.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/ehcireg.h
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/usb/ohcireg.h
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/uhcireg.h
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/ehcireg.h
diff -u src/sys/dev/usb/ehcireg.h:1.34 src/sys/dev/usb/ehcireg.h:1.35
--- src/sys/dev/usb/ehcireg.h:1.34 Sun Nov 4 12:01:55 2012
+++ src/sys/dev/usb/ehcireg.h Sat Sep 5 06:13:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcireg.h,v 1.34 2012/11/04 12:01:55 matt Exp $ */
+/* $NetBSD: ehcireg.h,v 1.35 2015/09/05 06:13:54 skrll Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -36,8 +36,8 @@
* http://www.usb.org/developers/data/usb_20.zip
*/
-#ifndef _DEV_PCI_EHCIREG_H_
-#define _DEV_PCI_EHCIREG_H_
+#ifndef _DEV_USB_EHCIREG_H_
+#define _DEV_USB_EHCIREG_H_
/*** PCI config registers ***/
@@ -370,4 +370,4 @@ typedef struct {
#define EHCI_DAR_ENDPOINT __BITS(3,0)
#define EHCI_DAR_ADDRESS __BITS(14,8)
-#endif /* _DEV_PCI_EHCIREG_H_ */
+#endif /* _DEV_USB_EHCIREG_H_ */
Index: src/sys/dev/usb/ohcireg.h
diff -u src/sys/dev/usb/ohcireg.h:1.25 src/sys/dev/usb/ohcireg.h:1.26
--- src/sys/dev/usb/ohcireg.h:1.25 Mon Mar 30 11:55:00 2015
+++ src/sys/dev/usb/ohcireg.h Sat Sep 5 06:13:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcireg.h,v 1.25 2015/03/30 11:55:00 skrll Exp $ */
+/* $NetBSD: ohcireg.h,v 1.26 2015/09/05 06:13:54 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.8 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -31,8 +31,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _DEV_PCI_OHCIREG_H_
-#define _DEV_PCI_OHCIREG_H_
+#ifndef _DEV_USB_OHCIREG_H_
+#define _DEV_USB_OHCIREG_H_
/*** PCI config registers ***/
@@ -239,4 +239,4 @@ typedef struct {
#define OHCI_ENABLE_POWER_DELAY 5
#define OHCI_READ_DESC_DELAY 5
-#endif /* _DEV_PCI_OHCIREG_H_ */
+#endif /* _DEV_USB_OHCIREG_H_ */
Index: src/sys/dev/usb/uhcireg.h
diff -u src/sys/dev/usb/uhcireg.h:1.19 src/sys/dev/usb/uhcireg.h:1.20
--- src/sys/dev/usb/uhcireg.h:1.19 Mon Apr 28 20:23:59 2008
+++ src/sys/dev/usb/uhcireg.h Sat Sep 5 06:13:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcireg.h,v 1.19 2008/04/28 20:23:59 martin Exp $ */
+/* $NetBSD: uhcireg.h,v 1.20 2015/09/05 06:13:54 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.12 1999/11/17 22:33:42 n_hibma Exp $ */
/*
@@ -31,8 +31,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _DEV_PCI_UHCIREG_H_
-#define _DEV_PCI_UHCIREG_H_
+#ifndef _DEV_USB_UHCIREG_H_
+#define _DEV_USB_UHCIREG_H_
/*** PCI config registers ***/
@@ -194,4 +194,4 @@ typedef struct {
volatile uhci_physaddr_t qh_elink;
} uhci_qh_t;
-#endif /* _DEV_PCI_UHCIREG_H_ */
+#endif /* _DEV_USB_UHCIREG_H_ */
