diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-10-04 23:34:59 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-10-04 23:34:59 +0000 |
| commit | 336aa88c94f8c10484b22ec84f1178d0dc52e8c3 (patch) | |
| tree | a78db61d41a3df6c542783c4ab4fcb3e57d9ac0e /sys/arch/amiga/dev/flsc.c | |
| parent | 6844facfb2d8171043e78487574361a8fd1bbd43 (diff) | |
Merge of NetBSD 1.2 (961004)
Diffstat (limited to 'sys/arch/amiga/dev/flsc.c')
| -rw-r--r-- | sys/arch/amiga/dev/flsc.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/arch/amiga/dev/flsc.c b/sys/arch/amiga/dev/flsc.c index 9dca64cd8c6..72b4799743d 100644 --- a/sys/arch/amiga/dev/flsc.c +++ b/sys/arch/amiga/dev/flsc.c @@ -1,6 +1,5 @@ -/* $OpenBSD: flsc.c,v 1.4 1996/08/23 18:52:32 niklas Exp $ */ - -/* $NetBSD: flsc.c,v 1.5.4.1 1996/06/03 19:35:40 is Exp $ */ +/* $OpenBSD: flsc.c,v 1.5 1996/10/04 23:34:50 niklas Exp $ */ +/* $NetBSD: flsc.c,v 1.5.4.3 1996/08/05 20:40:35 jtc Exp $ */ /* * Copyright (c) 1995 Daniel Widenfalk @@ -343,14 +342,13 @@ flsc_need_bump(sc, ptr, len) { int p; - p = (int)ptr & 0x03; - - if (p) { - p = 4-p; - - if (len < 256) + if (((int)ptr & 0x03) || (len & 0x03)) { + if (len < 256) p = len; - } + else + p = 256; + } else + p = 0; return(p); } @@ -378,7 +376,7 @@ do { chain[n].ptr = (p); chain[n].len = (l); chain[n++].flg = (f); } while(0) if (l < 512) set_link(n, (vm_offset_t)p, l, SFAS_CHAIN_BUMP); else if ((p >= (void *)0xFF000000) -#if M68040 +#if defined(M68040) || defined(M68060) && ((mmutype == MMU_68040) && (p >= (void *)0xFFFC0000)) #endif ) { |