Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/macppc/dev Back out previous change. It was harmfu...



details:   https://anonhg.NetBSD.org/src/rev/01cc672e0ee9
branches:  trunk
changeset: 504384:01cc672e0ee9
user:      tsubai <tsubai%NetBSD.org@localhost>
date:      Wed Feb 28 18:49:29 2001 +0000

description:
Back out previous change.  It was harmful on my PowerBook G3.

diffstat:

 sys/arch/macppc/dev/pm_direct.c |  29 +----------------------------
 1 files changed, 1 insertions(+), 28 deletions(-)

diffs (43 lines):

diff -r 6c9ccdc00802 -r 01cc672e0ee9 sys/arch/macppc/dev/pm_direct.c
--- a/sys/arch/macppc/dev/pm_direct.c   Wed Feb 28 18:15:42 2001 +0000
+++ b/sys/arch/macppc/dev/pm_direct.c   Wed Feb 28 18:49:29 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pm_direct.c,v 1.10 2001/02/27 07:33:18 matt Exp $      */
+/*     $NetBSD: pm_direct.c,v 1.11 2001/02/28 18:49:29 tsubai Exp $    */
 
 /*
  * Copyright (C) 1997 Takashi Hamada
@@ -831,33 +831,6 @@
 
        s = splhigh();
 
-       for (;;) {
-               u_int ifr;
-               ifr = read_via_reg(VIA1, vIFR);
-
-               if (ifr == 0)
-                       break;
-
-               if (ifr & V1IF_ADBRDY) {
-                       write_via_reg(VIA1, vIFR, V1IF_ADBRDY);
-                       ifr &= ~V1IF_ADBRDY;
-                       delay(120000); /* XXX */
-               } else if (ifr & V1IF_ADBCLK) {
-                       write_via_reg(VIA1, vIFR, V1IF_ADBCLK);
-                       ifr &= ~V1IF_ADBCLK;
-               }
-
-               if (ifr)
-                       write_via_reg(VIA1, vIFR, ifr);
-       }
-
-#if 0
-       gpio = in8(gpio_reg + 0x9);
-       if ((gpio & 0x02) != 0) {
-               splx(s);
-               return;
-       }
-#endif
        PM_VIA_CLR_INTR();                      /* clear VIA1 interrupt */
                                                /* ask PM what happend */
        pmdata.command = 0x78;



Home | Main Index | Thread Index | Old Index