[src/trunk]: src/sys/dev/cardbus Use opt_cardbus.h for cardbus.c and opt_card...

[haya <haya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/68671fa7a530
branches:  trunk
changeset: 477669:68671fa7a530
user:      haya <haya%NetBSD.org@localhost>
date:      Wed Oct 27 09:29:18 1999 +0000

description:
Use opt_cardbus.h for cardbus.c and opt_cardslot.h for cardslot.c.
Remove unnecessary include from cardbus.c.

diffstat:

 sys/dev/cardbus/cardbus.c     |  12 ++++--------
 sys/dev/cardbus/cardslot.c    |   4 ++--
 sys/dev/cardbus/files.cardbus |   4 +++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diffs (79 lines):

diff -r 5542fb648e49 -r 68671fa7a530 sys/dev/cardbus/cardbus.c
--- a/sys/dev/cardbus/cardbus.c Wed Oct 27 09:21:35 1999 +0000
+++ b/sys/dev/cardbus/cardbus.c Wed Oct 27 09:29:18 1999 +0000
@@ -1,7 +1,8 @@
-/*     $NetBSD: cardbus.c,v 1.3 1999/10/15 10:59:56 augustss Exp $     */
+/*     $NetBSD: cardbus.c,v 1.4 1999/10/27 09:29:18 haya Exp $ */
 
 /*
- * Copyright (c) 1997 and 1998 HAYAKAWA Koichi.  All rights reserved.
+ * Copyright (c) 1997, 1998 and 1999
+ *     HAYAKAWA Koichi.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* #define CARDBUS_DEBUG */
+#include "opt_cardbus.h"
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -43,13 +44,8 @@
 
 #include <machine/bus.h>
 
-#if pccard
-#include <dev/pccard/cardbusvar.h>
-#include <dev/pccard/pccardcis.h>
-#else
 #include <dev/cardbus/cardbusvar.h>
 #include <dev/cardbus/pccardcis.h>
-#endif
 
 #include <dev/pci/pcivar.h>    /* XXX */
 #include <dev/pci/pcireg.h>    /* XXX */
diff -r 5542fb648e49 -r 68671fa7a530 sys/dev/cardbus/cardslot.c
--- a/sys/dev/cardbus/cardslot.c        Wed Oct 27 09:21:35 1999 +0000
+++ b/sys/dev/cardbus/cardslot.c        Wed Oct 27 09:29:18 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardslot.c,v 1.2 1999/10/15 06:42:22 haya Exp $        */
+/*     $NetBSD: cardslot.c,v 1.3 1999/10/27 09:29:18 haya Exp $        */
 /*
  * Copyright (c) 1999
  *       HAYAKAWA Koichi.  All rights reserved.
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* #define CARDSLOT_DEBUG */
+#include "opt_cardslot.h"
 
 #include <sys/types.h>
 #include <sys/param.h>
diff -r 5542fb648e49 -r 68671fa7a530 sys/dev/cardbus/files.cardbus
--- a/sys/dev/cardbus/files.cardbus     Wed Oct 27 09:21:35 1999 +0000
+++ b/sys/dev/cardbus/files.cardbus     Wed Oct 27 09:29:18 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.cardbus,v 1.3 1999/10/15 11:52:45 augustss Exp $
+#      $NetBSD: files.cardbus,v 1.4 1999/10/27 09:29:19 haya Exp $
 #
 # files.cardbus
 #
@@ -6,12 +6,14 @@
 device cardslot: cbbus, pcmciabus
 attach cardslot at pcmciaslot
 file   dev/cardbus/cardslot.c          cardslot        needs-flag
+defopt opt_cardslot.h                  CARDSLOT_DEBUG
 
 device cardbus {[dev = -1], [function = -1]}
 attach cardbus at cbbus
 file   dev/cardbus/cardbus.c           cardbus         needs-flag
 file   dev/cardbus/cardbus_map.c       cardbus
 file   dev/cardbus/rbus.c              cardbus
+defopt opt_cardbus.h                   CARDBUS_DEBUG
 
 
 #