Commit Graph

144 Commits

Author SHA1 Message Date
Justin T. Gibbs
f7ad28d790 Add missing quote to yyerror call. 1995-07-18 06:11:34 +00:00
Justin T. Gibbs
31acd246c0 Allow the specification of the controller bus when wiring down scsi buses.
This is performed by using a line similar to:

controller scbus0 at ahc0 bus 1

to wire scbus0 to the second bus on an adaptec 2742T controller.

Reviewed by: Peter Dufault(dufault@hda.com), Rod Grimes(rgrimes@FreeBSD.org)
1995-07-17 23:38:16 +00:00
David Greenman
975f4abc69 Killed TIMEZONE, DST, and HZ keywords. They have generated a config error
for more than a year now. They've been replaced with userland methods for
changing (see adjkerntz).
1995-06-29 07:19:19 +00:00
Rodney W. Grimes
709e8f9ae1 Remove trailing whitespace. 1995-05-30 03:57:47 +00:00
Rodney W. Grimes
e602d31e02 Fix 3 printf's that had the wrong number of arguments.
Submitted by:	gibbs
1995-05-14 19:19:55 +00:00
David Greenman
bd7917b1a7 Updated to work with Poul-Henning's recent kernel changes in the swap
device table layout...basically, don't output the cruft anymore - it
is now dynamic.

Reviewed by:	John Dyson and David Greenman
Submitted by:	Poul-Henning Kamp
1995-05-14 03:10:58 +00:00
Garrett Wollman
5e7d9e89ba Don't automatically default dumps to be on a swap device; if the user
wants dumps, he can either configure it explicitly (`dumps on' whatever) or
use the dumpon(8) utility.
1995-05-12 19:12:44 +00:00
Jordan K. Hubbard
a9d7ec4113 Revise this to actually print all the various isa_device field values
it really should have been printing all this time.  Also fix my rather
bogus handling of the id_conflicts value by moving it to the end of
isa_device and dealing with that correctly now.
1995-05-11 07:54:41 +00:00
Jordan K. Hubbard
babb4e927f Add a new `conflicts' flag for telling when a device is in conflict with
others.  The flag can be put in descriptive locations, e.g.:

device sb0      at isa? port 0x220 irq 7 conflicts drq 1 vector sbintr
or
device psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr

But is nonetheless boolean only.  You can't turn conflict checking off for
only a given type of conflict.  I didn't deem it worth the trouble at this
stage, and it's far better than the ALLOW_CONFLICT_* that preceeded it.
1995-05-11 02:21:34 +00:00
Jordan K. Hubbard
786a5cad11 Change the perennially annoying reminder to "make depend" (which may or
may not be desired if you're just going to blow the kernel away again later)
and substitute one that tells the user where the new kernel build
directory actually IS, which can at least be argued to be useful information
in all cases.
Reviewed by:	davidg
1995-05-03 20:16:57 +00:00
Peter Dufault
84d84db480 Change warning message for when a device is wired to a floating
host adapter to something hopefully clearer.  Take into account
that "wnum()" writes into a static buffer in the warning.
1995-03-07 11:03:42 +00:00
Peter Dufault
f88f624943 Fixed bug with wiring down given SCSI bus. 1995-03-03 19:00:39 +00:00
Peter Dufault
c30c84ed1f Added configuration for SCSI devices wired in place. The documentation
is in "man 4 scsi".
1995-03-01 22:34:05 +00:00
Justin T. Gibbs
ce584e16e7 Implement "clean" entries for device config entries.
Submitted by: Pointed out by Bruce Evans <bde@zeta.org.au>
1995-03-01 10:09:03 +00:00
Jordan K. Hubbard
b5909509ee Make good on my promise to finally clean up the config clobbering.
If you invoke config with the `-n' flag or have NO_CONFIG_CLOBBER in
your environment, config will behave the same way it used to.  This is
now _documented_ as well.  Rip out all the CONFIG_DONT_CLOBBER cruft;
some of it wasn't even correct anyway.
1995-02-22 15:37:32 +00:00
Bruce Evans
51bcc40b35 Write setconf() in KNF, in K&R C, and in Standard C.Standard C. 1995-02-18 21:32:19 +00:00
Bill Paul
188291d20f Do away with 'options SWAP_GENERIC' once and for all: I get ill
just thinking about it.

Two changes need to be made to allow 'config kernel swap generic' to
work properly without requiring any compile-time flags:

/usr/src/usr.sbin/config/mkswapconf.c: we need to define a dummy stub
for the setconf() function to replace the one in swapgeneric.c that
isn't available in non-generic configurations.

/usr/src/sys/i386/i386/autoconf.c: the -a boot flag causes setroot()
to be skipped and lets setconf() prompt the user for a root device.
If you skip setroot() in a non-generic kernel, you could get severely
hosed. To avoid this, we silently ignore the -a flag if rootdev != NODEV.
(rootdev is always initialized to NODEV in swapgeneric.c, so if
we find that rootdev is something other than NODEV, we know we're
not using a generic configuration.)
1995-02-18 18:05:35 +00:00
Bruce Evans
da12c6d2aa config.y:
Support slice numbers in device names.  The syntax is `<driver name>
[<unit number>] ['s' <slice number>] [<partition letter>]'.  Only
`['s' <slice number>]' is new here.  The slice number defaults to 0
so that there is no change in the output from config if this new
feature is not used.

Replace some magic disk numbers by `dk' slice and label macros.

mkswapconf.c:
Improve the output formatting:
Generate <> style includes.
Print minor numbers in hex so that slice numbers are easy to see and edit.
Print the rootdev and dumpdev names in comments like the swapdev names.
1995-02-16 12:17:30 +00:00
Bruce Evans
5cea80f170 Always return null-terminated identifiers from yylex(). 1995-02-16 11:52:11 +00:00
Bruce Evans
0c47d7b5e0 Restore the field widths that were clobbered by the previous commit so that
the columns in ioconf.c line up if there are no long names.
1995-02-08 18:42:58 +00:00
Poul-Henning Kamp
c807f32c6b Removed the name length limitations on the device-driver names entirely.
Now device-names can be more than 3 chars.
1995-02-05 21:15:21 +00:00
Garrett Wollman
5ddd6b6a1a Fix Sharnoff complaint #121 (cross-reference to config.new which does not
exist on the i386 platform).
1995-01-14 20:25:02 +00:00
Justin T. Gibbs
528486881b Allow config to fully handle the aic7770 driver dependancies. 1994-12-31 19:23:10 +00:00
Bruce Evans
a2a65bbb14 Finish removing `#ifdef STATCLOCK'. Not removing it properly here
probably broke (only) the association of interrupts with strings
in vmstat output.
1994-12-06 22:01:16 +00:00
Bruce Evans
fb5960efc4 Remove ifdef for STATCLOCK. STATCLOCK is standard. 1994-11-27 16:16:35 +00:00
Garrett Wollman
8a7c811a5b Don't core on ``root on qq0 and fx0 and yy0'' specifications; just
take the first one and ignore all the rest, giving a warning message.
Fixes PR #3.
1994-11-23 20:36:08 +00:00
Andreas Schulz
dc0b56513d Put a simple algorithmus in there that checks the last generated prototype
for ioconf.c with the current and suppress the generation if they are
equal. This now prevents all the warnings from the c-compiler about
sio or snd or two adaptecs. This works only if the sio lines are grouped
together in the config files, but it is better than nothing.
1994-11-20 13:39:07 +00:00
Justin T. Gibbs
80785c507b Add new keywords to config. The options availible in file.i386 are now:
/*
         * filename     [ standard | optional ] [ config-dependent ]
         *      [ dev* | profiling-routine ] [ device-driver] [ no-obj ]
         *      [ compile-with "compile rule" [no-implicit-rule] ]
         *                     [ dependancy "dependancy-list"]
         */

I added

no-obj -  This entry does not create anything linkable to the kernel.
dependancy - Add additional dependancy rules to a target.
no-implicit-rule - Don't assume .c -> .o type rules.  Config is really
             dumb in this area and assumes that everything is a .c file
	     irregarless of extention.  This was the best choice really
	     since there may even be .c file that you don't want to follow
	     the standard rules.

This was all done so that the building to the aic7770 assembler and using
the aic7770 assembler in the building of the aic7770 driver could be config
dependant.  I can now have an entry like this for the driver:

aic7770                         optional        ahc     device-driver   \
        compile-with    "${CC} $> -o $@"                                \
        dependancy      "$S/gnu/misc/aic7770/aic7770.c"                 \
        no-obj no-implicit-rule
aic7770_seq.h                   optional        ahc     device-driver          \
        compile-with "${.CURDIR}/aic7770 -o $@ $S/gnu/misc/aic7770/aic7770.seq"\
        dependancy "$S/gnu/misc/aic7770/aic7770.seq aic7770"                   \
        no-obj no-implicit-rule
i386/isa/aic7770.c              optional        ahc     device-driver   \
        dependancy "aic7770_seq.h"

I also added '\' escaping to newlines so that this doesn't look as gross as
it could have.

Reviewed by: jkh
1994-11-17 20:30:01 +00:00
Garrett Wollman
e0a7da508f Treat formfeeds like any other whitespace. 1994-11-07 19:57:20 +00:00
David Greenman
b2ed7c74c7 Don't include map.h - it's been obsoleted. 1994-11-03 15:34:24 +00:00
Jordan K. Hubbard
e0115bffa0 Whoops - one two many zeros in the initializer. This should have everybody
enabled by default now.
1994-11-03 05:37:53 +00:00
Jordan K. Hubbard
afbf5b2156 Changes to initialize the id_enabled flag to 1.
Also initialize some fields that were never initialized before, and
simply defaulted to 0.  I've never looked at this code before, now
I know why.  Config needs to die.  Horribly.
1994-11-03 04:30:01 +00:00
Poul-Henning Kamp
28c94285c2 Added a slot in the swap-dev-table for NFS-diskless to abuse. 1994-10-18 08:16:29 +00:00
Jordan K. Hubbard
5464bfda4b Undo the damage done to my previous changes. Whoever added the
conditional did it backwards, thus flipping the behavior back off
again by default (and only re-enableable through a very counter-intuitive
option setting!).  I'm glad I caught this and would merely like to state
again for the record that if you're going to go and modify my changes then
you should at least:

	1. Do it correctly, since to do otherwise is kind of a slap in the
	   face.

	2. TELL me.

This is not me just being compulsive, this is simple courtesy.
I'm speaking just of my own preferences here, not necessarily trying
to impose my standards on the group at large (e.g. some other folks might
not even care).
Submitted by:	jkh
1994-09-08 06:38:55 +00:00
Garrett Wollman
c33f35354b Revert back to old config behavior if compiled with -DCONFIG_DONT_CLOBBER. 1994-09-06 20:04:39 +00:00
Jordan K. Hubbard
2f7b926abd Eradicate my #1 (ok, maybe #2) peeve by making config now blow away
and recreate any previous ../../compile/<blah> directory before laying
down new files.  The depends just aren't smart enough to save
us from the grief that config's old behavior has always caused.
Submitted by:	jkh
1994-09-03 21:23:36 +00:00
David Greenman
c62cd43c2b Oops...forgot to list the changes....
/usr/src/usr.sbin.config:
	o -DSTATCLOCK gives kludges to support the rtc non-device as well as
	  old kludges to support the clk non-device.

/usr/src/usr.sbin/config.8:
	o Document the trivialness of the new vector.h.

/usr/src/usr.sbin/mkglue.c:
	o Only print DEVICE_NAMES and NR_DEVICES in vector.h.  These are
	  only required to support vmstat.  The vmstat interface will need
	  to be improved for dynamic loading.

/usr/src/usr.sbin/mkioconf.c:
	o Print device ids to be used as indexes into DEVICE_NAMES.
	o Print secondary interrupt handler entry points (xxxintr()) instead
	  of primary ones (VdevU()).  Primary ones are now XintrI() and
	  XfastintrI() and are independent of the config so they are not
	  handled here.
	o Minor cleanups.

Submitted by:	Bruce Evans
1994-08-18 05:15:26 +00:00
David Greenman
5ced58e474 Support for Bruce Evans' new dynamic interrupt support.
Submitted by:	Bruce Evans
1994-08-18 05:11:32 +00:00
Garrett Wollman
99ca219150 Generate vector.h line for statclock. (See next commit for details.) 1994-08-15 03:09:29 +00:00
David Greenman
ce7ece3713 Now that the timezone specification is no longer allowed, don't issue a
warning that it is missing.
1994-08-09 08:52:53 +00:00
Garrett Wollman
021ce2d62e Disallow timezone specification, but still allow it to be present
if it is zero (so that we can parse old config files).
1994-08-08 15:09:40 +00:00
David Greenman
b3bfc7199e Converted 'vmunix' to 'kernel'. 1994-08-05 09:14:37 +00:00
Rodney W. Grimes
4eaaddb7ff Upgrade config to be compatible with our i386 port, pull in 95% of the
changes that have been made in FreeBSD 1.x, except for possibly the nfs
diskless support this is a completed config.
1994-05-26 13:24:02 +00:00
Rodney W. Grimes
dea673e932 BSD 4.4 Lite usr.sbin Sources 1994-05-26 05:23:31 +00:00