Commit Graph

205 Commits

Author SHA1 Message Date
Peter Wemm
f71c01cc52 Borrow phk's axe and apply the next stage of config(8)'s evolution.
Use Warner Losh's "hint" driver to decode ascii strings to fill the
resource table at boot time.

config(8) no longer generates an ioconf.c table - ie: the configuration
no longer has to be compiled into the kernel.  You can reconfigure your
isa devices with the likes of this at loader(8) time:
  set hint.ed.0.port=0x320

userconfig will be rewritten to use this style interface one day and will
move to /boot/userconfig.4th or something like that.

It is still possible to statically compile in a set of hints into a kernel
if you do not wish to use loader(8).  See the "hints" directive in GENERIC
as an example.

All device wiring has been moved out of config(8).  There is a set of
helper scripts (see i386/conf/gethints.pl, and the same for alpha and pc98)
that extract the 'at isa? port foo irq bar' from the old files and produces
a hints file.  If you install this file as /boot/device.hints (and update
/boot/defaults/loader.conf - You can do a build/install in sys/boot) then
loader will load it automatically for you.  You can also compile in the
hints directly with:  hints "device.hints"  as well.

There are a few things that I'm not too happy with yet.  Under this scheme,
things like LINT would no longer be useful as "documentation" of settings.
I have renamed this file to 'NOTES' and stored the example hints strings
in it.  However... this is not something that config(8) understands, so
there is a script that extracts the build-specific data from the
documentation file (NOTES) to produce a LINT that can be config'ed and
built.  A stack of man4 pages will need updating. :-/

Also, since there is no longer a difference between 'device' and
'pseudo-device' I collapsed the two together, and the resulting 'device'
takes a 'number of units' for devices that still have it statically
allocated.  eg:  'device fe 4' will compile the fe driver with NFE set
to 4.  You can then set hints for 4 units (0 - 3).  Also note that
'device fe0' will be interpreted as "zero units of 'fe'" which would be
bad, so there is a config warning for this.  This is only needed for
old drivers that still have static limits on numbers of units.
All the statically limited drivers that I could find were marked.

Please exercise EXTREME CAUTION when transitioning!

Moral support by: phk, msmith, dfr, asmodai, imp, and others
2000-06-13 22:28:50 +00:00
Peter Wemm
3f664fc689 A checkpoint of a part of a work-in-progress. Some more cleanups for
config(8).  This commit allows control of the creation of the
#include "foo.h" files.  We now only create them explicitly when needed.
BTW; these are mostly bad because they usually imply static limits on
numbers of units for devices.  eg: struct mysoftc sc[NFOO];
These static limits have Got To Go.
2000-06-10 22:13:40 +00:00
Bruce Evans
f47f0edde4 Use "nm | awk ..." instead of genassym(1) to generate symbol value headers.
Symbol values are now represented using array sizes (4 arrays per symbol
so that 16-bit machines can represent 64-bit values) instead of being raw
binary values.

Reviewed by:	marcel
2000-06-02 09:27:48 +00:00
Yoshihiro Takahashi
51f48c44d1 Fixed most disordering. 2000-05-31 10:48:36 +00:00
Peter Wemm
23dff9e066 The dreaded isa_compat.h tables are no longer used, so there is no need
for a seperate pc98 version of this stuff.  Applying the same changes
from the i386 version yields identical files so remove these and use the
common ones.
2000-05-28 13:32:49 +00:00
Yoshihiro Takahashi
67d17d7279 Fixed to support PC-98. 2000-05-19 16:31:45 +00:00
David E. O'Brien
a4cf58bd99 Use kern/kern_random.c. 2000-04-24 21:53:54 +00:00
Yoshihiro Takahashi
4b00895121 Newbusify adv driver.
Reviewed by:	imp
2000-04-07 11:32:42 +00:00
Warner Losh
5664bf9cea NewBus the cs driver.
Submitted by: max@rsu.ru
2000-03-30 05:16:16 +00:00
Yoshihiro Takahashi
239fe111cd - Added PC-98 Cbus frontend.
- Move dev/aic/aic_isa.c entry from conf/files to conf/files.MACHINE
   because PC-98 uses different file.

Submitted by:	nyan and IMAI Takeshi <take-i@ceres.dti.ne.jp>
2000-03-29 14:32:34 +00:00
Yoshihiro Takahashi
8b838a7ac2 Merge from the following changes.
File				Revision
sys/conf/files.i386		1.303 and 1.304
sys/dev/kbd/atkbd.c		1.23
sys/dev/syscons/scterm-sc.c	1.2
sys/dev/syscons/scvgarndr.c	1.5
sys/dev/syscons/scvtb.c		1.5
sys/dev/syscons/syscons.c	1.335
sys/isa/syscons_isa.c		1.11
sys/isa/vga_isa.c		1.17
2000-03-29 12:26:41 +00:00
KATO Takenori
25d654e785 Merged from sys/conf/files.i386 revision 1.310 (re-activate K6-2
MTRR driver).
2000-03-23 08:13:32 +00:00
Peter Wemm
a063b13d98 Tag a warning on the isa compat shims at config time. 2000-03-20 04:47:40 +00:00
Peter Wemm
80060e8897 Connect the ISA and PCI compatability shims to an option. In this case
it's options COMPAT_OLDISA and COMPAT_OLDPCI.  This is meant to be a
fairly strong incentive to update the older drivers to newbus, but doesn't
(quite) leave anybody hanging with no hardware support.  I was talking with
a few folks and I was encouraged to simply break or disable the shims but
that was a bit too drastic for my liking.
2000-03-19 13:07:12 +00:00
Peter Wemm
2a72e5e1c1 Move the files.* references to wdc files to the pc98 location after the
repo copy.
2000-03-15 21:53:12 +00:00
KATO Takenori
7fb0223fd0 Merged from files.i386 rev 1.307. 2000-03-01 08:50:05 +00:00
Bill Fumerola
ce0c0d9da9 kbdcontrol isn't in everyones path(read: non-root people), so specify
an absolute path for us mere mortals.

Approved by:	jkh
2000-02-10 01:42:04 +00:00
Peter Wemm
5d021a76f2 Move the (duplicated exactly!) portable ISA pcm drivers to files and
tighten up the logic a little.
2000-01-29 17:15:03 +00:00
Yoshihiro Takahashi
f91518a21e Merge from sys/conf/files.i386 revision 1.301. 2000-01-28 01:05:08 +00:00
KATO Takenori
95adcda0f9 Synced with files.i386. 2000-01-24 13:56:57 +00:00
KATO Takenori
2945c302da Synced with the sc driver in the sys/dev/syscons directory.
Submitted by:	yokota
2000-01-20 15:16:49 +00:00
Peter Wemm
c5191a983c Pre 4.0 tidy up.
Collect together the components of several drivers and export eisa from
the i386-only area (It's not, it's on some alphas too).  The code hasn't
been updated to work on the Alpha yet, but that can come later.

Repository copies were done a while ago.
Moving these now keeps them in consistant place across the 4.x series
as the newbusification progresses.

Submitted by:   mdodd
2000-01-14 07:14:17 +00:00
Yoshihiro Takahashi
dad8dd78d6 Merge from sys/conf/files.i386 revision 1.296. 2000-01-12 13:43:23 +00:00
KATO Takenori
218b3dbece Synced with sys/i386/conf/files.i386 rev 1.295. 2000-01-09 14:25:50 +00:00
KATO Takenori
cbdf33fa5d Merge from sys/i386/conf/files.i386 rev 1.293. 1999-12-24 11:20:14 +00:00
Peter Wemm
5a81d0a50b Only compile gusc for isa (the #if NISA inside gusc effectively covers
the whole file)
1999-12-21 13:53:49 +00:00
KATO Takenori
12af1e4a86 Sync with sys/i386/conf/files.i386 rev 1.291. 1999-12-20 10:58:54 +00:00
KATO Takenori
012ec02313 Merge from sys/i386/conf/files.i386 rev 1.289.
Submitted by:	yokota
1999-12-13 14:57:51 +00:00
KATO Takenori
81efad5102 Remove ze and zp drivers. 1999-12-10 14:02:48 +00:00
Archie Cobbs
f2cbe161be Move source files common to all platforms from <arch>/conf/files.<arch>
to conf/files.  If/when these files are optimized for each platform,
they can be moved back.
1999-12-09 19:38:20 +00:00
Dan Moschuk
e571afc379 arc4random.c now in conf/files (left out of last commit.. oops!) 1999-12-09 19:23:10 +00:00
KATO Takenori
6d60799dcc Merge from sys/i386/conf/files.i386 rev 1.284. 1999-12-09 12:14:35 +00:00
KATO Takenori
0388848a37 Merge from sys/i386/conf/files.i386 rev 1.283. 1999-12-07 09:23:44 +00:00
Yoshihiro Takahashi
2fc1b2c314 pc98/pc98/atapi.c
Copied from i386/isa/atapi.c.
	Fixed to support slave devices.
	Ignore the device that has strange model strings.

i386/isa/atapi.c
	Removed pc98 codes.

Submitted by:	chi@bd.mbn.or.jp (Chiharu Shibata)
1999-12-03 12:56:21 +00:00
Yoshihiro Takahashi
01c3c261d7 Sync with sys/i386/conf/files.i386 revision 1.282. 1999-11-29 12:26:30 +00:00
Yoshihiro Takahashi
53a312d593 Sync with sys/i386/conf/files.i386 revision 1.281. 1999-11-26 11:47:01 +00:00
KATO Takenori
aa0061947a Sync with sys/i386/conf/files.i386 revision 1.277. 1999-10-13 11:00:27 +00:00
KATO Takenori
8b126f131d Sync w/ sys/i386/conf/files.i386 revision 1.275. 1999-10-01 12:29:49 +00:00
KATO Takenori
0450d8a8f6 Sync w/ sys/i386/conf/files.i386 revision 1.274. 1999-09-28 08:07:42 +00:00
KATO Takenori
7cfba8ab34 Make ed driver work again.
isa_compat.c
  Copied from sys/i386/isa/isa_compat.c.  It includes
  sys/pc98/pc98/isa_compat.h instead of sys/i386/isa/isa_compat.h.

isa_compat.h
  Copied from sys/i386/isa/isa_compat.c.  The ed driver is registered
  in this file until pc98's ed driver is converted into new-bus style.

files.pc98
  Use sys/pc98/pc98/isa_compat.c instead of sys/i386/isa/isa_compat.c.

if_ed.c
  - Fixed the location of the include file.
  - Disalbed pnp support.
1999-09-27 03:35:41 +00:00
Yoshihiro Takahashi
c72561ae94 Merge from sys/i386/conf/files.i386 revision 1.270 and 1.271. 1999-09-25 05:39:19 +00:00
KATO Takenori
714ac51294 Added mp_clock.c. 1999-09-22 11:57:12 +00:00
Yoshihiro Takahashi
c95341117e Merge missing changes from sys/i386/conf/files.i386. 1999-09-12 12:32:49 +00:00
KATO Takenori
c5e304773e Commented out k6_mem.c. 1999-09-07 12:09:26 +00:00
KATO Takenori
4fcaaf69e7 Merge from sys/i386/conf/files.i386 revision 1.264. 1999-09-04 01:36:23 +00:00
KATO Takenori
c1699f31a8 Sync with sys/i386/conf/files.i386 revision 1.263. 1999-09-02 13:43:00 +00:00
Poul-Henning Kamp
f054c29093 Merge alpha and pc98 changes into i386 MBR handling code and replace all
three copies with one copy in MI land.
1999-08-29 09:12:54 +00:00
Yoshihiro Takahashi
cbf0618984 Fix ordering. 1999-08-28 16:20:53 +00:00
Peter Wemm
c3aac50f28 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
KATO Takenori
a0abbb38fb Merge from sys/i386/conf/files.i386 revision 1.259. 1999-08-18 08:20:28 +00:00
Poul-Henning Kamp
ce9edcf5b5 Merge the cons.c and cons.h to the best of my ability. alpha may or
may not compile, I can't test it.
1999-08-09 10:35:05 +00:00
KATO Takenori
ffd6f0c6a7 Sync with sys/i386/conf/files.i386 revision 1.257. 1999-08-08 11:12:00 +00:00
KATO Takenori
a5d4842f09 Removed apm_setup.s. 1999-07-30 11:40:55 +00:00
KATO Takenori
9365d83b9c Sync with sys/i386/conf/files.i386 revision 1.254. 1999-07-26 12:12:58 +00:00
KATO Takenori
6962200fc8 Removed device-dirver flags. 1999-07-09 13:19:35 +00:00
KATO Takenori
4b148932c7 PC98 part of the second phase of syscons reorganization.
Submitted by:	yokota
1999-06-24 10:51:40 +00:00
KATO Takenori
875a15da41 Sync with sys/i386/conf/files.i386 revision 1.247. 1999-06-21 11:11:39 +00:00
KATO Takenori
fe85f176c7 New parallel port support for PC98. Old PC98s which have
uni-directional parallel port should use olpt driver instead of lpt
driver.

Files ppc.c and ppcreg.h are copied form i386/isa directory with PC98
change.

Submitted by:	Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
1999-06-18 14:48:28 +00:00
KATO Takenori
90397901c8 Sync with sys/i386/conf/files.i386 and options.i386 revisions 1.246
and 1.115, respectively.
1999-06-03 13:04:00 +00:00
KATO Takenori
848f97e37d Removed ucmpdi2.c 1999-05-17 12:07:00 +00:00
KATO Takenori
5eb7d0b887 Sync with sys/i386/conf/files.i386 revision 1.241. 1999-05-14 10:03:48 +00:00
KATO Takenori
8084ded63f Sync with sys/i386/conf/files.i386 revision 1.239. 1999-05-10 09:01:19 +00:00
KATO Takenori
58d78bbe43 Sync with sys/i386/conf/files.i386 revision 1.238. 1999-05-09 04:27:30 +00:00
KATO Takenori
bb0992d7ab Sync with sys/i386/conf/files.i386 revision 1.237. 1999-05-06 09:13:56 +00:00
KATO Takenori
742958ce9d Commented out adv_isa.c. 1999-04-24 04:22:57 +00:00
KATO Takenori
c55a92c639 Sync with follwing files:
Path				Revision
i386/conf/GENERIC		1.162
i386/conf/Makefile.i386		1.146
i386/conf/files.i386		1.236
i386/conf/options.i386		1.111
i386/i386/machdep.c		1.329
i386/i386/userconfig.c		1.134
i386/isa/fd.c			1.135
i386/isa/if_ed.c		1.151
i386/isa/isa_dam.c		1.1
i386/isa/npx.c			1.67
isa/sio.c			1.224
dev/syscons/syscons.c		1.300
i386/isa/wd.c			1.194
isa/vga_isa.c           1.5
isa/atkbd_isa.c         1.3
isa/syscons_isa.c       1.2

Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1999-04-18 14:42:20 +00:00
KATO Takenori
6b21bf93e7 Sync with sys/i386/conf/files.i386 revision 1.233. 1999-04-10 04:42:46 +00:00
KATO Takenori
bd5934b045 o sys/i386/include/soundcard.h
Add Sound Card ID for the nss(NEC PC-9801-86 Sound System) driver.
      Old name of this driver was pcm driver in FreeBSD 2.2.x.
  Fix lack of the length of the name member of the synth_info structure.
      (attach_mpu401 in sys/i386/isa/sound/mpu401.c requires 33 chars.)

o sys/i386/isa/sound/dev_table.h
  Add the DMAbuf flags definition DMA_DISABLE.
  Add the nss driver entry.

o sys/i386/isa/sound/dmabuf.c
  Add the DMA_DISABLE flag check in DMAbuf_outputintr and DMAbuf_inputintr
      to disable DMA control in FIFO only use (nss driver required).

o sys/i386/isa/sound/local.h
  Add the nss driver entry.

o sys/i386/isa/sound/mpu401.c
  Replace inb function in probe_mpu401 to mpu401_status macro.
  Wrap macro argument for above replace.
  Add I/O port maping macro for NEC PC-98x1 arch.
  Add delay in NEC PC-98x1 arch.

o sys/i386/isa/sound/pcm86.c
  Change driver name to avoid name space conflict to new pcm driver.
  Fix NEC PC-9801-86 driver to work on RELENG_3 branch or latter.

o sys/i386/isa/sound/sound_calls.h
  Fix the mpuintr definition.
  Add the nss driver entry.
      attach_nss, probe_nss, nssintr

o sys/i386/isa/sound/soundcard.c
  Fix lack of the mpuintr registration.
  Add the nss driver entry.

o sys/pc98/conf/files.pc98
  Add the nss driver entry.

Reviewed by:	kato
Submitted by:	Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
1999-04-02 08:51:06 +00:00
KATO Takenori
3ba4fb4098 Sync with sys/i386/conf/files.i386 revision up to 1.232. 1999-04-01 13:40:47 +00:00
KATO Takenori
2e11ea2373 Sync with sys/i386/conf/files.i386 revision 1.229. 1999-03-17 08:58:42 +00:00
KATO Takenori
82a9512c46 Sync with sys/i386/conf/files.i386 revision up to 1.227. 1999-03-10 13:59:20 +00:00
KATO Takenori
88a368fa84 Sync with sys/i386/conf/files.i386 revision 1.225. 1999-03-04 10:36:27 +00:00
KATO Takenori
dc461a09bb Merge with sys/i386/conf/files.i386 revision 1.224. 1999-03-02 14:03:21 +00:00
KATO Takenori
3b91c9f034 Added adv driver support.
Submitted by:	Takahashi Yoshihiro <nyan@dd.catv.ne.jp>
1999-02-25 13:53:13 +00:00
KATO Takenori
38d2964075 Remove 'alog'. 1999-01-20 08:31:56 +00:00
KATO Takenori
1835ec2219 Switched to new syscons driver.
Submitted by:	NOKUBI Hirotaka <hnokubi@yyy.or.jp> and
             	Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1999-01-18 08:38:08 +00:00
KATO Takenori
47badd2e6f Sync with sys/i386/conf/files.i386 revision up to 1.217. 1999-01-04 08:07:47 +00:00
KATO Takenori
bce191bf65 Enables snd driver. 1998-12-31 11:38:52 +00:00
KATO Takenori
f6814477b7 Sync with sys/i386/conf/files.i386 revision up to 1.215. 1998-12-30 07:57:00 +00:00
KATO Takenori
3ab80a8e63 Sync with sys/i386/conf/files.i386 revision 1.207. 1998-12-25 09:04:11 +00:00
KATO Takenori
9de1707415 Sync with current sc driver in sys/i386/isa.
Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1998-12-16 14:57:38 +00:00
KATO Takenori
4896212043 Oops, I forgot to commit two diffs to fe driver. 1998-12-15 15:56:37 +00:00
KATO Takenori
9ad861edee - For some old Cyrix CPUs, %cr2 is clobbered by interrupts. This
problem is worked around by using an interrupt gate for the page
   fault handler.  This code was originally made for NetBSD/pc98 by
   Naofumi Honda <honda@kururu.math.sci.hokudai.ac.jp> and has already
   been in PC98 tree.  Because of this bug, trap_fatal cannot show
   correct page fault address if %cr2 is obtained in this function.
   Therefore, trap_fatal uses the value from trap() function.
-  The trap handler always enables interruption when buggy application
   or kernel code has disabled interrupts and then trapped.  This code
   was prepared by Bruce Evans <bde@FreeBSD.org>.

Submitted by:	Bruce Evans <bde@FreeBSD.org>
		Naofumi Honda <honda@kururu.math.sci.hokudai.ac.jp>
1998-12-02 08:15:17 +00:00
KATO Takenori
9e1e84578a Sync with sys/i386/conf/files.i386 revision 1.206. 1998-10-11 15:02:49 +00:00
KATO Takenori
47d002cf75 Sync with sys/i386/conf/files.i386 revision 1.205. 1998-09-20 10:50:18 +00:00
KATO Takenori
12629290f5 Sync with sys/i386/isa/files.i386 and options.i386 revisions 1.204 and
1.87, respectively.
1998-09-16 08:37:40 +00:00
KATO Takenori
81083f630d Sync with sys/i386/conf/GENERIC, SMP-GENERIC, device.i386, files.i386,
majors.i386 and options.i386 revisions 1.116, 1.13, 1.14, 1.203, 1.49
and 1.86, respectively.
1998-09-15 14:10:56 +00:00
KATO Takenori
2663a4af57 Sync with sys/i386/conf/files.i386 revision 1.202. 1998-09-09 14:39:56 +00:00
KATO Takenori
2bfe25d193 Sync with sys/i386/conf/files.i386 revision 1.201. 1998-09-05 02:36:18 +00:00
KATO Takenori
cdc2343491 Sync with sys/i386/conf/files.i386 and majors.i386 revisions 1.200 and
1.44, respectively.
1998-08-07 11:52:19 +00:00
KATO Takenori
fd3ae2d6b0 Sync with sys/i386/conf/files.i386 revision 1.199. 1998-07-21 12:07:02 +00:00
KATO Takenori
14f155eeb0 Sync with sys/i386/isa/conf/files.i386 revision 1.198. 1998-06-17 09:26:23 +00:00
KATO Takenori
68b675d4af Deleted unused item. 1998-05-05 13:19:34 +00:00
KATO Takenori
b4e7319708 Commented out ide_pci.c.
Reviewed by:	kato
Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1998-04-20 13:54:47 +00:00
KATO Takenori
47c5d70acc Sync with sys/i386/conf/files.i386 revision 1.197. 1998-04-20 13:52:13 +00:00
KATO Takenori
74a64e52c9 Sync with sys/i386/conf/files.i386 revision 1.196. 1998-04-07 09:08:27 +00:00
KATO Takenori
2d6b7367bc - Use existing file (psm.c) though the driver does not work under
PC-98 arch.
- Merge the change in sys/i386/conf/files.i386 revision from 1.187 to
1.188.
1998-03-30 12:36:16 +00:00
KATO Takenori
469057f93e Sync with sys/i386/conf/files.i386 revision 1.195. 1998-03-24 08:26:02 +00:00
KATO Takenori
8fb62a4f93 Sync with sys/i386/conf/files.i386 revision 1.194. 1998-03-14 02:31:00 +00:00
KATO Takenori
95b31a1d26 Sync with sys/i386/conf/files.i386 revision 1.193. 1998-02-26 03:21:41 +00:00