merge common code from dmf and dmz drivers

[unix-history] / usr / src / usr.sbin / config / config.h

diff --git a/usr/src/usr.sbin/config/config.h b/usr/src/usr.sbin/config/config.h
index 464cc15..d92a329 100644 (file)
--- a/usr/src/usr.sbin/config/config.h
+++ b/usr/src/usr.sbin/config/config.h
@@ -1,4 +1,10 @@
-/*     config.h        1.13    83/06/16        */
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)config.h    5.4 (Berkeley) %G%
+ */

 
 /*
  * Config.
 
 /*
  * Config.


@@ -58,7 +64,7 @@ struct        idlst {
 };
 
 struct device {
 };
 
 struct device {

-       int     d_type;                 /* CONTROLLER, DEVICE, UBA or MBA */
+       int     d_type;                 /* CONTROLLER, DEVICE, bus adaptor */

        struct  device *d_conn;         /* what it is connected to */
        char    *d_name;                /* name of device (e.g. rk11) */
        struct  idlst *d_vec;           /* interrupt vectors */
        struct  device *d_conn;         /* what it is connected to */
        char    *d_name;                /* name of device (e.g. rk11) */
        struct  idlst *d_vec;           /* interrupt vectors */


@@ -74,6 +80,7 @@ struct device {
        struct  device *d_next;         /* Next one in list */
 };
 #define TO_NEXUS       (struct device *)-1
        struct  device *d_next;         /* Next one in list */
 };
 #define TO_NEXUS       (struct device *)-1

+#define TO_VBA         (struct device *)-2

 
 struct config {
        char    *c_dev;
 
 struct config {
        char    *c_dev;


@@ -84,13 +91,13 @@ struct config {
  * Config has a global notion of which machine type is
  * being used.  It uses the name of the machine in choosing
  * files and directories.  Thus if the name of the machine is ``vax'',
  * Config has a global notion of which machine type is
  * being used.  It uses the name of the machine in choosing
  * files and directories.  Thus if the name of the machine is ``vax'',

- * it will build from ``makefile.vax'' and use ``../vax/asm.sed''
+ * it will build from ``Makefile.vax'' and use ``../vax/inline''

  * in the makerules, etc.
  */
 int    machine;
 char   *machinename;
 #define        MACHINE_VAX     1
  * in the makerules, etc.
  */
 int    machine;
 char   *machinename;
 #define        MACHINE_VAX     1

-#define        MACHINE_SUN     2
+#define        MACHINE_TAHOE   2

 
 /*
  * For each machine, a set of CPU's may be specified as supported.
 
 /*
  * For each machine, a set of CPU's may be specified as supported.


@@ -104,12 +111,13 @@ struct cputype {
 /*
  * A set of options may also be specified which are like CPU types,
  * but which may also specify values for the options.
 /*
  * A set of options may also be specified which are like CPU types,
  * but which may also specify values for the options.

+ * A separate set of options may be defined for make-style options.

  */
 struct opt {
        char    *op_name;
        char    *op_value;
        struct  opt *op_next;
  */
 struct opt {
        char    *op_name;
        char    *op_value;
        struct  opt *op_next;

-} *opt;
+} *opt, *mkopt;

 
 char   *ident;
 char   *ns();
 
 char   *ident;
 char   *ns();


@@ -131,6 +139,9 @@ char        *sprintf();
 #if MACHINE_VAX
 int    seen_mba, seen_uba;
 #endif
 #if MACHINE_VAX
 int    seen_mba, seen_uba;
 #endif

+#if MACHINE_TAHOE
+int    seen_vba;
+#endif

 
 struct device *connect();
 struct device *dtab;
 
 struct device *connect();
 struct device *dtab;