[src/netbsd-1-5]: src/sys/dev/tc Pull up rev. 1.4:

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

details:   https://anonhg.NetBSD.org/src/rev/ef62c6f5cfa2
branches:  netbsd-1-5
changeset: 488561:ef62c6f5cfa2
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jul 18 06:16:13 2000 +0000

description:
Pull up rev. 1.4:
Make sure to get the upper 5 bits of the page address mixed in
in IOASIC_DMA_ADDR(), as the le_ioasic attachment does.  Noted
by Gregory McGarry.

diffstat:

 sys/dev/tc/ioasicreg.h |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 7764f9694829 -r ef62c6f5cfa2 sys/dev/tc/ioasicreg.h
--- a/sys/dev/tc/ioasicreg.h    Tue Jul 18 06:03:07 2000 +0000
+++ b/sys/dev/tc/ioasicreg.h    Tue Jul 18 06:16:13 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasicreg.h,v 1.3 2000/05/28 06:13:40 gmcgarry Exp $ */
+/* $NetBSD: ioasicreg.h,v 1.3.2.1 2000/07/18 06:16:13 thorpej Exp $ */
 
 /* 
  * Copyright (c) 1991,1990,1989,1994,1995 Carnegie Mellon University
@@ -186,7 +186,8 @@
     (reg) = (((val)<<IOASIC_DMAPTR_SHIFT)&IOASIC_DMAPTR_MASK)
 #define IOASIC_DMAPTR_GET(reg,val) \
     (val) = (((reg)&IOASIC_DMAPTR_MASK)>>IOASIC_DMAPTR_SHIFT)
-#define IOASIC_DMA_ADDR(p)             (((unsigned)p) << (5-2))
+#define        IOASIC_DMA_ADDR(p) \
+    ((((p) << 3) & ~0x1f) | (((p) >> 29) & 0x1f))
 
 /* For the LANCE DMA pointer register initialization the above suffices */