[src/netbsd-1-5]: src/sys/arch/mac68k/obio Pull up rev 1.38 from scottr:

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

details:   https://anonhg.NetBSD.org/src/rev/23f21ce4cbf2
branches:  netbsd-1-5
changeset: 489451:23f21ce4cbf2
user:      scottr <scottr%NetBSD.org@localhost>
date:      Wed Sep 13 12:43:25 2000 +0000

description:
Pull up rev 1.38 from scottr:
  Avoid attaching the asc driver on the Macintosh TV, since it seems
  to not be completely backwards compatible with the II-series hardware.

diffstat:

 sys/arch/mac68k/obio/asc.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r cbeef33c73dd -r 23f21ce4cbf2 sys/arch/mac68k/obio/asc.c
--- a/sys/arch/mac68k/obio/asc.c        Wed Sep 13 12:40:05 2000 +0000
+++ b/sys/arch/mac68k/obio/asc.c        Wed Sep 13 12:43:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asc.c,v 1.34.4.2 2000/08/06 02:08:05 briggs Exp $      */
+/*     $NetBSD: asc.c,v 1.34.4.3 2000/09/13 12:43:25 scottr Exp $      */
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -126,6 +126,8 @@
 
        if (oa->oa_addr != (-1))
                addr = (bus_addr_t)oa->oa_addr;
+       else if (current_mac_model->machineid == MACH_MACTV)
+               return 0;
        else if (current_mac_model->machineid == MACH_MACIIFX)
                addr = (bus_addr_t)MAC68K_IIFX_ASC_BASE;
        else