[src/netbsd-1-4]: src/sys/arch/sparc/sparc Pull up revision 1.8 (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/a78cea570554
branches:  netbsd-1-4
changeset: 470330:a78cea570554
user:      he <he%NetBSD.org@localhost>
date:      Tue Feb 08 22:48:28 2000 +0000

description:
Pull up revision 1.8 (requested by pk):
  Fix several problems:
   o Floppy driver dislikes being accessed with no floppy inserted
     (PR#5740)
   o Floppy drive being detected even though there is none (PR#5760)
   o Panic when fdformat is used (PR#9251)

diffstat:

 sys/arch/sparc/sparc/auxreg.h |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (21 lines):

diff -r d69152214da9 -r a78cea570554 sys/arch/sparc/sparc/auxreg.h
--- a/sys/arch/sparc/sparc/auxreg.h     Tue Feb 08 22:43:41 2000 +0000
+++ b/sys/arch/sparc/sparc/auxreg.h     Tue Feb 08 22:48:28 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auxreg.h,v 1.7 1997/05/17 17:52:52 pk Exp $ */
+/*     $NetBSD: auxreg.h,v 1.7.16.1 2000/02/08 22:48:28 he Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -103,9 +103,8 @@
 
 #define FTC_FLIP       do {                                            \
        if (CPU_ISSUN4M) {                                              \
-               auxio_regval |= AUXIO4M_FTC;                            \
-               *AUXIO4M_REG = auxio_regval;                            \
-               *AUXIO4M_REG = *AUXIO4M_REG | AUXIO4M_MB1 | AUXIO4M_FTC;\
+               /* AUXIO4M_FTC bit is auto-clear */                     \
+               *AUXIO4M_REG = auxio_regval | AUXIO4M_FTC;              \
        } else {                                                        \
                auxio_regval |= AUXIO4C_FTC;                            \
                *AUXIO4C_REG = auxio_regval;                            \