[src/trunk]: src/sys/dev/usb Rename TAILMASK to HEADMASK, since it really mas...

[augustss <augustss%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2c49c7a94726
branches:  trunk
changeset: 481480:2c49c7a94726
user:      augustss <augustss%NetBSD.org@localhost>
date:      Mon Jan 31 22:35:13 2000 +0000

description:
Rename TAILMASK to HEADMASK, since it really masks the head pointer.
>From FreeBSD.

diffstat:

 sys/dev/usb/ohci.c    |  14 +++++++-------
 sys/dev/usb/ohcireg.h |   6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (64 lines):

diff -r d7ff8714c27b -r 2c49c7a94726 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Mon Jan 31 22:09:13 2000 +0000
+++ b/sys/dev/usb/ohci.c        Mon Jan 31 22:35:13 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.69 2000/01/31 22:09:13 augustss Exp $       */
+/*     $NetBSD: ohci.c,v 1.70 2000/01/31 22:35:13 augustss Exp $       */
 /*     $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $       */
 
 /*
@@ -1737,8 +1737,8 @@
        s = splusb();
 #ifdef DIAGNOSTIC
        sed->ed.ed_flags |= LE(OHCI_ED_SKIP);
-       if ((sed->ed.ed_tailp & LE(OHCI_TAILMASK)) != 
-           (sed->ed.ed_headp & LE(OHCI_TAILMASK))) {
+       if ((sed->ed.ed_tailp & LE(OHCI_HEADMASK)) != 
+           (sed->ed.ed_headp & LE(OHCI_HEADMASK))) {
                ohci_physaddr_t td = sed->ed.ed_headp;
                ohci_soft_td_t *std;
                for (std = LIST_FIRST(&sc->sc_hash_tds[HASH(td)]); 
@@ -1751,8 +1751,8 @@
                       (int)LE(sed->ed.ed_headp), (int)LE(sed->ed.ed_tailp),
                       pipe, std);
                usb_delay_ms(&sc->sc_bus, 2);
-               if ((sed->ed.ed_tailp & LE(OHCI_TAILMASK)) != 
-                   (sed->ed.ed_headp & LE(OHCI_TAILMASK)))
+               if ((sed->ed.ed_tailp & LE(OHCI_HEADMASK)) != 
+                   (sed->ed.ed_headp & LE(OHCI_HEADMASK)))
                        printf("ohci_close_pipe: pipe still not empty\n");
        }
 #endif
@@ -2643,8 +2643,8 @@
                    pipe, nslots, pos));
        s = splusb();
        sed->ed.ed_flags |= LE(OHCI_ED_SKIP);
-       if ((sed->ed.ed_tailp & LE(OHCI_TAILMASK)) != 
-           (sed->ed.ed_headp & LE(OHCI_TAILMASK)))
+       if ((sed->ed.ed_tailp & LE(OHCI_HEADMASK)) != 
+           (sed->ed.ed_headp & LE(OHCI_HEADMASK)))
                usb_delay_ms(&sc->sc_bus, 2);
 
        for (p = sc->sc_eds[pos]; p && p->next != sed; p = p->next)
diff -r d7ff8714c27b -r 2c49c7a94726 sys/dev/usb/ohcireg.h
--- a/sys/dev/usb/ohcireg.h     Mon Jan 31 22:09:13 2000 +0000
+++ b/sys/dev/usb/ohcireg.h     Mon Jan 31 22:35:13 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohcireg.h,v 1.13 2000/01/31 20:17:26 augustss Exp $    */
+/*     $NetBSD: ohcireg.h,v 1.14 2000/01/31 22:35:14 augustss Exp $    */
 /*     $FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.8 1999/11/17 22:33:40 n_hibma Exp $     */
 
 
@@ -166,10 +166,10 @@
 #define OHCI_ED_SET_MAXP(s)    ((s) << 16)
 #define OHCI_ED_MAXPMASK       (0x7ff << 16)
        ohci_physaddr_t ed_tailp;
+       ohci_physaddr_t ed_headp;
 #define OHCI_HALTED            0x00000001
 #define OHCI_TOGGLECARRY       0x00000002
-#define OHCI_TAILMASK          0xfffffffc
-       ohci_physaddr_t ed_headp;
+#define OHCI_HEADMASK          0xfffffffc
        ohci_physaddr_t ed_nexted;
 } ohci_ed_t;
 /* #define OHCI_ED_SIZE 16 */