summaryrefslogtreecommitdiff
path: root/sys/dev/adb/adb.h
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2011-06-15 21:32:06 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2011-06-15 21:32:06 +0000
commitdf2037ddb7442555cd756f9ec3b72fbeba976ec9 (patch)
tree271e985c30ad99f0a96beb3e24ed669399a9453b /sys/dev/adb/adb.h
parent7e3d4ded2937b75cb2254141749ef129a9a373c0 (diff)
Add a const char* as first member of struct adb_attach_args, so that we can
pass a struct confargs * on macppc for some specific children of the adb node, and not confuse real adb device attachments. ok mpi@
Diffstat (limited to 'sys/dev/adb/adb.h')
-rw-r--r--sys/dev/adb/adb.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/adb/adb.h b/sys/dev/adb/adb.h
index 209688337b6..8600643f93e 100644
--- a/sys/dev/adb/adb.h
+++ b/sys/dev/adb/adb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: adb.h,v 1.3 2007/03/13 20:56:56 miod Exp $ */
+/* $OpenBSD: adb.h,v 1.4 2011/06/15 21:32:05 miod Exp $ */
/* $NetBSD: adbsys.h,v 1.4 2000/12/19 02:59:24 tsubai Exp $ */
/*-
@@ -43,11 +43,14 @@
* Arguments used to attach a device to the Apple Desktop Bus
*/
struct adb_attach_args {
- int origaddr;
- int adbaddr;
- int handler_id;
+ const char *name; /* adb_device_name if real adb device */
+ int origaddr;
+ int adbaddr;
+ int handler_id;
};
+extern const char adb_device_name[];
+
#define ADB_CMDADDR(cmd) ((u_int8_t)(cmd & 0xf0) >> 4)
#define ADBFLUSH(dev) ((((u_int8_t)dev & 0x0f) << 4) | 0x01)
#define ADBLISTEN(dev, reg) ((((u_int8_t)dev & 0x0f) << 4) | 0x08 | reg)