summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorGordon Willem Klok <gwk@cvs.openbsd.org>2007-02-26 00:11:50 +0000
committerGordon Willem Klok <gwk@cvs.openbsd.org>2007-02-26 00:11:50 +0000
commit0cf44257271552bc31c97d36a142c101f9918d73 (patch)
treef232dbe65ab25b17d37422922a14f97adbe607a9 /sys/arch
parent954252b2164a8ad2adf001b02db72ec15a6e0fd4 (diff)
Revert a portion of rev 1.21, via-cuda behaves exactly opposite of via-pmu,
if we attempt to clear the wake on ac loss bit just before shutting down it yo-yo's found by claudio@, tested by drahn@ on early imac, and myself on a 9600. ok drahn@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/macppc/dev/adb.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index d8644b94ba7..b8413c852e4 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adb.c,v 1.21 2007/02/18 19:33:48 gwk Exp $ */
+/* $OpenBSD: adb.c,v 1.22 2007/02/26 00:11:49 gwk Exp $ */
/* $NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $ */
/* $NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $ */
@@ -278,7 +278,7 @@ void setsoftadb(void);
int adb_intr(void *arg);
void adb_cuda_autopoll(void);
-void adb_cuda_fileserver_mode(int);
+void adb_cuda_fileserver_mode(void);
#ifdef ADB_DEBUG
/*
@@ -1525,8 +1525,6 @@ adb_poweroff(void)
return 0;
case ADB_HW_CUDA:
- /* Clear the wake on AC loss event */
- adb_cuda_fileserver_mode(0);
output[0] = 0x02; /* 2 byte message */
output[1] = 0x01; /* to pram/rtc/soft-power device */
output[2] = 0x0a; /* set poweroff */
@@ -1572,7 +1570,7 @@ adb_cuda_autopoll()
}
void
-adb_cuda_fileserver_mode(int on)
+adb_cuda_fileserver_mode()
{
volatile int flag = 0;
int result;
@@ -1581,7 +1579,7 @@ adb_cuda_fileserver_mode(int on)
output[0] = 0x03; /* 3-byte message */
output[1] = 0x01; /* to pram/rtc device/soft-power device */
output[2] = 0x13; /* cuda file server mode */
- output[3] = on;
+ output[3] = 0x01; /* True - Turn on after AC loss */
result = send_adb_cuda(output, output, adb_op_comprout,
(void *)&flag, 0);
@@ -1743,7 +1741,7 @@ adbattach(struct device *parent, struct device *self, void *aux)
}
if (adbHardware == ADB_HW_CUDA)
- adb_cuda_fileserver_mode(1);
+ adb_cuda_fileserver_mode();
if (adbHardware == ADB_HW_PMU)
pmu_fileserver_mode(1);
}