summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-07-07 00:58:06 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-07-07 00:58:06 +0000
commit25346374b7cf7d0789001cead1e4921990328c69 (patch)
treeb8a67ec2f30fef7597322b3e186ca57d66976cd7 /sys/dev/usb
parent685ec648052416336ac93c79aa54817635fdbf04 (diff)
Changes EHCI_QTD_TOGGLE to EHCI_QTD_TOGGLE_MASK; loki@animata.net
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/ehci.c4
-rw-r--r--sys/dev/usb/ehcireg.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index c4ebb6e4f0e..ed986219e7e 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ehci.c,v 1.12 2004/07/06 02:51:46 deraadt Exp $ */
+/* $OpenBSD: ehci.c,v 1.13 2004/07/07 00:58:05 deraadt Exp $ */
/* $NetBSD: ehci.c,v 1.54 2004/01/17 13:15:05 jdolecek Exp $ */
/*
@@ -2211,7 +2211,7 @@ ehci_alloc_sqtd_chain(struct ehci_pipe *epipe, ehci_softc_t *sc,
qtd */
if (((curlen + mps - 1) / mps) & 1) {
tog ^= 1;
- qtdstatus ^= htole32(EHCI_QTD_TOGGLE);
+ qtdstatus ^= htole32(EHCI_QTD_TOGGLE_MASK);
}
if (len == 0)
break;
diff --git a/sys/dev/usb/ehcireg.h b/sys/dev/usb/ehcireg.h
index 61d3be72332..05d2aef1440 100644
--- a/sys/dev/usb/ehcireg.h
+++ b/sys/dev/usb/ehcireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ehcireg.h,v 1.7 2004/07/05 03:09:57 deraadt Exp $ */
+/* $OpenBSD: ehcireg.h,v 1.8 2004/07/07 00:58:05 deraadt Exp $ */
/* $NetBSD: ehcireg.h,v 1.14 2003/10/13 00:05:10 enami Exp $ */
/*
@@ -305,7 +305,7 @@ typedef struct {
#define EHCI_QTD_SET_BYTES(x) ((x) << 16)
#define EHCI_QTD_GET_TOGGLE(x) (((x) >> 31) & 0x1)
#define EHCI_QTD_SET_TOGGLE(x) ((x) << 31)
-#define EHCI_QTD_TOGGLE 0x80000000
+#define EHCI_QTD_TOGGLE_MASK 0x80000000
ehci_physaddr_t qtd_buffer[EHCI_QTD_NBUFFERS];
ehci_physaddr_t qtd_buffer_hi[EHCI_QTD_NBUFFERS];
} ehci_qtd_t;