Commit Graph

54 Commits

Author SHA1 Message Date
Peter Wemm
96217b0fbc More cleanups, tweaks and features.
- make this work:   options FOO123=456   *without quotes*
- grumble (but accept) vector xxxintr, and tty/net/bio/cam flags.
- complain if a device is specified twice (eg: 2 x psm0)
- don't require quotes around:  port IO_COM2
- recognize negative numbers.  (ie: options CAM_DEBUG_UNIT=-1)
- GC some more unused stuff (we don't have composite disks from config(8)).
- various other nits (snprintf paranoia etc)
1999-04-24 18:59:19 +00:00
Peter Wemm
14dd465c07 The Alpha probably wouldn't appreciate getting the pc98 isa port
definitions.  Change it from  machine != I386 to machine == PC98.
1999-04-19 14:40:55 +00:00
KATO Takenori
5fad759c59 Use pc98/pc98/pc98.h instead of isa/isareg.h in PC98 kernel.
Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1999-04-18 14:27:33 +00:00
Peter Wemm
e6fbbbe459 Further cleanups. i386_ioconf.c and alpha_ioconf.c were essentially the
same and were merged into a single newbus_ioconf.c.  CG'd some more unused
code.
1999-04-18 13:36:29 +00:00
Peter Wemm
188334f6de Get out the blow torch and hack away all the unused stuff. Note that
I zapped the MACHINE_MIPS stuff, it isn't likely to be useful apart from
recognition of the machine name.  It would be reasonable to expect new
ports would look something like the alpha/i386 from a config perspective.
1999-04-17 14:41:41 +00:00
Peter Wemm
2c43119102 Corresponding minimal changes for kernel configuration after new-bus
commit.
1999-04-16 21:28:10 +00:00
Bruce Evans
23426719ec Oops, really don't generate compiler warnings about missing braces. 1999-02-05 16:58:22 +00:00
Bruce Evans
890dfcdaec Don't generate compiler warnings about missing braces. 1999-02-05 16:49:18 +00:00
Mark Murray
b0371ff3ee Fix the handling of certain devices.
Previously the foolowing lines would have broken:
controller      fdc0 at isa? disable port ? bio
controller      fdc0 at isa? disable port 0x100 bio

While this would work:
controller      fdc0 at isa? disable port "IO_FD1" bio

The first of the three lines is useful for making placeholder devices
for PCMCIA-floppies, and the second is useful for non-standard hardware.
The failure is a "(null)" string in ioconf.c that the compiler pukes on.

Thanks to:	Bruce Evans (bde@freebsd.org)
1999-02-04 10:24:45 +00:00
Doug Rabson
2f2dcad41b * Change 'struct resource' to 'struct config_resource'.
* Bump config version.
1998-11-15 18:07:35 +00:00
Bruce Evans
4af4007dbb Ignore `vector xxxintr' specifications except for checking their syntax.
Interrupt handlers are now configured in drivers.

Didn't update config/SMM.doc.  It doesn't have any i386 examples (not
even `isa').

Bumped CONFIGVERS.  This is not necessary for -current yet, but using
the new config with old system sources gives null pointers for all
vectors.
1998-10-23 17:05:06 +00:00
Bruce Evans
28ed4514a2 Don't generate unused file ioconf.h.
Didn't bump CONFIGVERS, since ioconf.h was already unused when
CONFIGVERS was last bumped (although essentially the same (CAM)
commit batch that bumped CONFIGVERS also added bogus includes of
ioconf.h).
1998-10-16 15:00:18 +00:00
Doug Rabson
870b8846f4 Snip out some dead code from the alpha part. 1998-09-16 09:34:07 +00:00
Justin T. Gibbs
9cbac834b9 Build CAM hardwiring info. 1998-09-15 10:29:32 +00:00
Andrey A. Chernov
aa578ab67a add missing sys/queue.h 1998-09-04 07:48:53 +00:00
Nicolas Souchu
8d8b289af3 Reviewed by: Doug Rabson
Submitted by:	nsouch
'local' token added to support new bus architecture .c files generated
by .m files.
1998-09-03 21:03:43 +00:00
Doug Rabson
deec8506c1 Dump out ISA device resources for alpha. 1998-07-21 21:47:51 +00:00
Bruce Evans
afafca8bcb Don't generate declarations for isa device structs in "ioconf.h".
Don't generate declarations for isa interrupt handlers at all.
Isa interrupt handlers are now declared in <i386/isa/isa_device.h>
but should be converted take a `void *' arg and staticized as
soon as possible.

Updated CONFIGVERS.  New configs are very incompatible with
previous versions.
1998-06-17 15:16:53 +00:00
Doug Rabson
4d40ec2fb9 Add (mostly stub) alpha support. Incidentally, it doesn't build on stable
unless I manually construct y.tab.h.  Is this normal?
1998-06-09 14:02:08 +00:00
KATO Takenori
c090df3958 Support PC-98 machine. 1998-05-02 01:57:39 +00:00
Eivind Eklund
a0eea1d6ed Scaffolding for High Availability code. The actual code will probably
come tomorrow.

Submitted by:	Simon Shapiro <shimon@simon-shapiro.org>
1998-04-02 04:25:41 +00:00
Justin T. Gibbs
93384faa4c Add isa_devtab_cam. 1997-09-21 22:12:50 +00:00
Philippe Charnier
d82e5f5287 Wrap too long lines.
Requested by: Bruce.
1997-09-17 06:20:45 +00:00
Philippe Charnier
d58316915f Use err(3), add usage(). -Wall clean. 1997-09-15 06:37:10 +00:00
Peter Wemm
0f459420f8 Reserve a placeholder for 4 SMP ipi interrupts in the same way that
it's done for pci.  This is so that systat and vmstat can get at the
interrupt counts for the Inter-Processor Interrupts when running a smp
kernel.  This doesn't affect the normal kernel, but makes life easier for
the smp people who don't have to track two versions of config.
1997-03-29 12:04:51 +00:00
Andrey A. Chernov
659d2a2071 Remove support for "port none" and "port auto", it gains nothing,
non-standard and not used. "port auto" is equal to "port?" or missing "port"
keyword now. "port none" is really probe routine task (return -1 for
no ports).
1997-03-28 00:56:11 +00:00
Andrey A. Chernov
1d29927ce6 Add #define's for port "none" and "auto"
Now port ommiting is equal to port "none" not to port 0
1997-03-26 15:19:55 +00:00
Andrey A. Chernov
aab4ac4dad Print negative values only for two cases used
in config for iobase: -1 (auto) and -2 (none)
Other values are printed as big port numbers
1997-03-25 02:54:34 +00:00
Andrey A. Chernov
3be1497f41 Fix iobase printing for autodetect and none cases
(negative numbers was printed as very big ports)
1997-03-25 02:35:12 +00:00
Poul-Henning Kamp
1d95dc910b Backout yacc changes. 1996-06-02 17:22:01 +00:00
Poul-Henning Kamp
829bde8e5b yacc rule changes. 1996-05-30 23:16:31 +00:00
Bruce Evans
227941d5de Implemented a new keyword `disable'. This should be useful for controlling
dangerous drivers in GENERIC.

Removed non-comments on #endifs in config.y.

Improved output formatting in mkioconf.c.
1996-04-13 19:57:38 +00:00
Bruce Evans
b7a7f2d19d Count PCI irqs in up to 4 ISAish counters named `pci irqnn' instead of
in the clk0 counter.

Reviewed by:	se
1996-03-29 15:04:14 +00:00
Peter Wemm
d8f19d9417 Make a little more effort to avoid touching certain generated files if
they were not changed.  This makes 'make depend' more useful.
1996-01-12 08:57:10 +00:00
Joerg Wunsch
4c81de0a11 Support the configuration of "od" devices.
Submitted by:	akiyama@kme.mei.co.jp (Shunsuke Akiyama)
1995-10-31 17:31:35 +00:00
Bruce Evans
0b73305bdd Put declarations in a header file ("ioconf.h")
Generate prototypes for SCSI functions and function pointers.

Fix redundant declarations of interrupt handlers.

Generate 4.4-style includes (<> instead of "").

Clean up formatting of both the source and the output a bit.
1995-09-19 16:37: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
Rodney W. Grimes
709e8f9ae1 Remove trailing whitespace. 1995-05-30 03:57:47 +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
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
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
Bruce Evans
fb5960efc4 Remove ifdef for STATCLOCK. STATCLOCK is standard. 1994-11-27 16:16:35 +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
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