summaryrefslogtreecommitdiffstats
path: root/sys/dev/eisa/eisaconf.h
diff options
context:
space:
mode:
authorjoerg <joerg@FreeBSD.org>1997-03-13 18:04:05 +0000
committerjoerg <joerg@FreeBSD.org>1997-03-13 18:04:05 +0000
commit6299b067d045b0a710fe6e9e1d134f1028679c7f (patch)
tree832ec2164b0f65e821a4c09fee1b9ccfab2a1940 /sys/dev/eisa/eisaconf.h
parent200c003cab546fab56299d18515cc4c8c54e72e2 (diff)
downloadFreeBSD-src-6299b067d045b0a710fe6e9e1d134f1028679c7f.zip
FreeBSD-src-6299b067d045b0a710fe6e9e1d134f1028679c7f.tar.gz
Various stylistic improvements regarding num_eisa_slots & co.:
. properly declare the variable in in a .h file, as opposed to using a private extern declaration in userconfig.c; . move the definition of EISA_SLOTS and therefore the inclusion of opt_eisa.h into eisaconf.c.
Diffstat (limited to 'sys/dev/eisa/eisaconf.h')
-rw-r--r--sys/dev/eisa/eisaconf.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index a992113..38cfa94 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: eisaconf.h,v 1.14 1997/02/22 09:32:03 peter Exp $
+ * $Id: eisaconf.h,v 1.15 1997/03/12 17:41:24 joerg Exp $
*/
#ifndef _I386_EISA_EISACONF_H_
@@ -36,11 +36,6 @@
#include <sys/queue.h>
-#include "opt_eisa.h"
-
-#ifndef EISA_SLOTS
-#define EISA_SLOTS 10 /* PCI clashes with higher ones.. fix later */
-#endif
#define EISA_SLOT_SIZE 0x1000
#define EISA_MFCTR_CHAR0(ID) (char)(((ID>>26) & 0x1F) | '@') /* Bits 26-30 */
@@ -51,6 +46,7 @@
#define EISA_REVISION_ID(ID) (u_char)(ID & 0x0F) /* Bits 0-3 */
extern struct linker_set eisadriver_set;
+extern int num_eisa_slots;
typedef u_int32_t eisa_id_t;
OpenPOWER on IntegriCloud