Module Name: src
Committed By: skrll
Date: Mon Mar 16 16:38:27 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehcireg.h
Log Message:
Fix the part of the "no functional change" that was and shouldn't have
been.
EHCI_ITD_[GS]ET_BPTR were wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.34.14.6 -r1.34.14.7 src/sys/dev/usb/ehcireg.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.14.6 src/sys/dev/usb/ehcireg.h:1.34.14.7
--- src/sys/dev/usb/ehcireg.h:1.34.14.6 Tue Mar 3 10:06:01 2015
+++ src/sys/dev/usb/ehcireg.h Mon Mar 16 16:38:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcireg.h,v 1.34.14.6 2015/03/03 10:06:01 skrll Exp $ */
+/* $NetBSD: ehcireg.h,v 1.34.14.7 2015/03/16 16:38:27 skrll Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -236,8 +236,8 @@ typedef struct {
#define EHCI_ITD_SET_OFFS(x) __SHIFTIN((x), EHCI_ITD_OFFSET_MASK)
volatile ehci_isoc_bufr_ptr_t itd_bufr[EHCI_ITD_NBUFFERS];
#define EHCI_ITD_BPTR_MASK __BITS(31,12)
-#define EHCI_ITD_GET_BPTR(x) __SHIFTOUT((x), EHCI_ITD_BPTR_MASK)
-#define EHCI_ITD_SET_BPTR(x) __SHIFTIN((x), EHCI_ITD_BPTR_MASK)
+#define EHCI_ITD_GET_BPTR(x) ((x) & EHCI_ITD_BPTR_MASK)
+#define EHCI_ITD_SET_BPTR(x) ((x) & EHCI_ITD_BPTR_MASK)
#define EHCI_ITD_EP_MASK __BITS(11,8)
#define EHCI_ITD_GET_EP(x) __SHIFTOUT((x), EHCI_ITD_EP_MASK)
#define EHCI_ITD_SET_EP(x) __SHIFTIN((x), EHCI_ITD_EP_MASK)
