summaryrefslogtreecommitdiff
path: root/sys/arch/powerpc/mac
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2001-03-29 19:19:57 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2001-03-29 19:19:57 +0000
commit756bcc57aabdc1ac4617ff0957485f25d7cc472f (patch)
treec16aecaa417036ebf613c8c7c57c93e61a96497b /sys/arch/powerpc/mac
parentf795299ff5712678187e4887d63b0033d8256fc4 (diff)
Code cleanup, some update from Nbsd.
Diffstat (limited to 'sys/arch/powerpc/mac')
-rw-r--r--sys/arch/powerpc/mac/adb.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/sys/arch/powerpc/mac/adb.c b/sys/arch/powerpc/mac/adb.c
index ae507bb84dd..173305bf9ec 100644
--- a/sys/arch/powerpc/mac/adb.c
+++ b/sys/arch/powerpc/mac/adb.c
@@ -127,7 +127,7 @@ adbattach(parent, self, aux)
adb_polling = 1;
ADBReInit();
- mac_intr_establish(NULL, ca->ca_intr[0], IST_LEVEL, IPL_HIGH,
+ mac_intr_establish(parent, ca->ca_intr[0], IST_LEVEL, IPL_HIGH,
adb_intr, sc, "adb");
#ifdef ADB_DEBUG
@@ -166,8 +166,8 @@ adbattach(parent, self, aux)
int
adbprint(args, name)
- void *args;
- const char *name;
+ void *args;
+ const char *name;
{
struct adb_attach_args *aa_args = (struct adb_attach_args *)args;
int rv = UNCONF;
@@ -176,7 +176,7 @@ adbprint(args, name)
rv = UNSUPP; /* most ADB device types are unsupported */
/* print out what kind of ADB device we have found */
- printf("%s addr %d: ", name, aa_args->origaddr);
+ printf("%s addr %d: ", name, aa_args->adbaddr);
switch(aa_args->origaddr) {
#ifdef DIAGNOSTIC
case 0:
@@ -230,17 +230,7 @@ adbprint(args, name)
#endif /* DIAGNOSTIC */
}
} else /* a device matched and was configured */
- printf(" addr %d: ", aa_args->origaddr);
+ printf(" addr %d: ", aa_args->adbaddr);
- return (rv);
-}
-
-void
-extdms_complete(buffer, compdata, cmd)
- caddr_t buffer, compdata;
- int cmd;
-{
- long *p = (long *)compdata;
-
- *p= -1;
+ return rv;
}