summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia
diff options
context:
space:
mode:
authorhvozda <hvozda@cvs.openbsd.org>1996-01-26 21:27:34 +0000
committerhvozda <hvozda@cvs.openbsd.org>1996-01-26 21:27:34 +0000
commit93c328b179c2caf07f0de68b6a1121df5339d53a (patch)
tree21ebb709369e344e387efda013a83dde8f87f7ad /sys/dev/pcmcia
parentd3a5cd54541388cd41b351de65a226dc18a1976f (diff)
Better config symantics (elimitates 'options PCMCIA_*'; thanks Theo).
Also a example kernel demonstrating how to configure PCMCIA devices.
Diffstat (limited to 'sys/dev/pcmcia')
-rw-r--r--sys/dev/pcmcia/pcmcia.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index baae3fecf92..7729774be59 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: pcmcia.c,v 1.1 1996/01/15 00:05:03 hvozda Exp $
+ * $Id: pcmcia.c,v 1.2 1996/01/26 21:27:31 hvozda Exp $
*/
/* derived from scsiconf.c writte by Julian Elischer et al */
@@ -44,6 +44,10 @@
#include <dev/pcmcia/pcmciabus.h>
#include <dev/pcmcia/pcmcia_ioctl.h>
+#include "ed.h"
+#include "com.h"
+#include "ep.h"
+
#ifdef IBM_WD
#define PCMCIA_DEBUG
#endif
@@ -70,24 +74,24 @@ static int ndeldevs = 0;
build up the knowndevs struct. Stefan may have ideas...
*/
-#ifdef PCMCIA_ED
+#if NED > 0
extern struct pcmciadevs pcmcia_ed_devs[];
#endif
-#ifdef PCMCIA_COM
+#if NCOM > 0
extern struct pcmciadevs pcmcia_com_devs[];
#endif
-#ifdef PCMCIA_EP
+#if NEP > 0
extern struct pcmciadevs pcmcia_ep_devs[];
#endif
static struct pcmciadevs *knowndevs[] = {
-#ifdef PCMCIA_ED
+#if NED > 0
pcmcia_ed_devs,
#endif
-#ifdef PCMCIA_COM
+#if NCOM > 0
pcmcia_com_devs,
#endif
-#ifdef PCMCIA_EP
+#if NEP > 0
pcmcia_ep_devs,
#endif
NULL