summaryrefslogtreecommitdiff
path: root/sys/dev/sbus/stp4020var.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/sbus/stp4020var.h')
-rw-r--r--sys/dev/sbus/stp4020var.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/sbus/stp4020var.h b/sys/dev/sbus/stp4020var.h
index ebe9ead1e6f..693ef0c2947 100644
--- a/sys/dev/sbus/stp4020var.h
+++ b/sys/dev/sbus/stp4020var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stp4020var.h,v 1.2 2003/06/25 17:36:49 miod Exp $ */
+/* $OpenBSD: stp4020var.h,v 1.3 2004/03/02 23:10:18 miod Exp $ */
/* $NetBSD: stp4020.c,v 1.23 2002/06/01 23:51:03 lukem Exp $ */
/*-
@@ -38,7 +38,8 @@
*/
/*
- * STP4020: SBus/PCMCIA bridge supporting two Type-3 PCMCIA cards.
+ * STP4020: SBus/PCMCIA bridge supporting one Type-3 PCMCIA card, or up to
+ * two Type-1 and Type-2 PCMCIA cards..
*/
/*
@@ -49,6 +50,8 @@ struct stp4020_socket {
int flags;
#define STP4020_SOCKET_BUSY 0x0001
#define STP4020_SOCKET_SHUTDOWN 0x0002
+#define STP4020_SOCKET_ENABLING 0x0004
+ int sense;
int sock; /* Socket number (0 or 1) */
bus_space_tag_t tag; /* socket control space */
bus_space_handle_t regs; /* */
@@ -69,8 +72,8 @@ struct stp4020_softc {
bus_space_tag_t sc_bustag;
pcmcia_chipset_tag_t sc_pct; /* Chipset methods */
- struct proc *event_thread; /* event handling thread */
- SIMPLEQ_HEAD(, stp4020_event) events; /* Pending events for thread */
+ struct proc *event_thread; /* event handling thread */
+ unsigned int events; /* sockets with pending events */
struct stp4020_socket sc_socks[STP4020_NSOCK];
};