Commit Graph

1299 Commits

Author SHA1 Message Date
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
a3bcef65cd Fixed locations of include files. 1999-06-01 13:14:35 +00:00
KATO Takenori
f0828bf1b0 Sync with sys/i386/isa/clock.c revision 1.136. 1999-06-01 12:32:54 +00:00
Poul-Henning Kamp
2447bec829 Simplify cdevsw registration.
The cdevsw_add() function now finds the major number(s) in the
struct cdevsw passed to it.  cdevsw_add_generic() is no longer
needed, cdevsw_add() does the same thing.

cdevsw_add() will print an message if the d_maj field looks bogus.

Remove nblkdev and nchrdev variables.  Most places they were used
bogusly.  Instead check a dev_t for validity by seeing if devsw()
or bdevsw() returns NULL.

Move bdevsw() and devsw() functions to kern/kern_conf.c

Bump __FreeBSD_version to 400006

This commit removes:
        72 bogus makedev() calls
        26 bogus SYSINIT functions

if_xe.c bogusly accessed cdevsw[], author/maintainer please fix.

I4b and vinum not changed.  Patches emailed to authors.  LINT
probably broken until they catch up.
1999-05-31 11:29:30 +00:00
Poul-Henning Kamp
4e2f199e0c This commit should be a extensive NO-OP:
Reformat and initialize correctly all "struct cdevsw".

        Initialize the d_maj and d_bmaj fields.

        The d_reset field was not removed, although it is never used.

I used a program to do most of this, so all the files now use the
same consistent format.  Please keep it that way.

Vinum and i4b not modified, patches emailed to respective authors.
1999-05-30 16:53:49 +00:00
KATO Takenori
128cd97530 Merge with sys/i386/isa/wd.c revision 1.192 and 1.193.
Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1999-05-25 10:41:14 +00:00
KATO Takenori
fb84c9994c Sync with sys/i386/i386/userconfig.c revision 1.145. 1999-05-25 10:32:10 +00:00
KATO Takenori
607f92b4bd Sync with sys/i386/conf/options.i386 revision 1.114. 1999-05-25 10:30:58 +00:00
Roger Hardiman
c558c5795a Added device major 125 for the Advantech PCI-1750 Digital IO card.
A very nice i/o board with 16 open collector outputs (capable of driving 5-40v)
and 16 inputs
Also has 2 16 bit cascadable counters (10Mhz clock) capable of
generating interrupts.

It is a PCI card, and emulates the Intel 8254 timer.
It uses the PLX PCI-9050 PCI bus interface to map the
8254 style hardware and the i/o registers into the IO space.

Developed by Jennifer Clark <jen@vulture.dmem.strath.ac.uk>
Strathclyde University Transparent Telepresence Research Group
1999-05-18 16:18:42 +00:00
KATO Takenori
68d855cd75 - Fixed default irq in SMP kernel.
- Removed hardcode IRQ in #ifdef PC98.
1999-05-17 12:38:28 +00:00
KATO Takenori
d31171c3a3 Sync with sys/i386/isa/npx.c revision 1.73. 1999-05-17 12:13:28 +00:00
KATO Takenori
9ec9cc8414 Sync with sys/i386/i386/userconfig.c revision 1.144. 1999-05-17 12:09:07 +00:00
KATO Takenori
848f97e37d Removed ucmpdi2.c 1999-05-17 12:07:00 +00:00
KATO Takenori
7da4aaefd3 Sync with sys/i386/i386/userconfig.c revision 1.143. 1999-05-14 10:05:55 +00:00
KATO Takenori
5eb7d0b887 Sync with sys/i386/conf/files.i386 revision 1.241. 1999-05-14 10:03:48 +00:00
Luoqi Chen
0f0fe5a4c5 Unbreak VESA on SMP. 1999-05-12 21:39:07 +00:00
KATO Takenori
91f9d6d376 Sync with sys/i386/isa/diskslice_machdep.c revision 1.34. 1999-05-12 08:33:22 +00:00
Luoqi Chen
cd121c9cae Yet another place I missed when increasing trapframe size, which causes problem
to SIGFPE handling.

Reviewed by:	Bruce Evans	<bde@zeta.org.au>
1999-05-11 16:29:21 +00:00
Søren Schmidt
3458ae679d Make the driver work on HP8100 and the newer Philips that does not
support the rezero command.
1999-05-11 10:39:27 +00:00
KATO Takenori
09a41d3082 Sync with sys/isa/sio.c revision 1.241. 1999-05-11 08:38:28 +00:00
KATO Takenori
6048ba838c Sync with sys/i386/isa/fd.c revision 1.143. 1999-05-11 08:37:16 +00:00
KATO Takenori
a19ce74ea1 Sync with sys/i386/i386/usercnofig.c revision 1.142. 1999-05-11 08:36:12 +00:00
KATO Takenori
f77f865c0f Fixed for COM_MULTIPORT option. Members flags and unit should be
obtained via appropriate functions.
1999-05-10 09:37:37 +00:00
KATO Takenori
871d777f45 Sync with sys/isa/sio.c revision 1.240. 1999-05-10 09:14:40 +00:00
KATO Takenori
efaba47853 Sync with sys/i386/isa/isa_dma.c revision 1.3. 1999-05-10 09:09:08 +00:00
KATO Takenori
e45bad2cd7 Sync with sys/i386/isa/if_ed.c revision 1.152. 1999-05-10 09:06:12 +00:00
KATO Takenori
cd6e9ed786 Sync with sys/i386/isa/clock.c revision 1.133. 1999-05-10 09:05:01 +00:00
KATO Takenori
50b94b34bd Sync with sys/i386/conf/options.i386 revision 1.113. 1999-05-10 09:03:10 +00:00
KATO Takenori
0bb99e2a71 Sync with sys/i386/conf/majors.i386 revision 1.74. 1999-05-10 09:02:23 +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
e453f04978 Sync with sys/i386/conf/GENERIC and Makefile.i386 revisions 1.169 and
1.152, respectively.
1999-05-10 09:00:29 +00:00
Poul-Henning Kamp
52400704e9 Unconfuse DEV_MODULE() and DEV_DRIVER_MODULE() about the difference between
a major number for a dev_t.
1999-05-09 13:00:50 +00:00
KATO Takenori
c4f748e7eb Removed DRIVER_TYPE_TTY field. 1999-05-09 05:02:26 +00:00
KATO Takenori
f88efae58f Sync with sys/isa/sio.c revision 1.234. 1999-05-09 05:00:54 +00:00
KATO Takenori
ac2e82dee1 Removed DRIVER_TYPE_TTY field. 1999-05-09 04:56:42 +00:00
KATO Takenori
ad4e5e0cfe Sync with sys/isa/atkbd_isa.c revision 1.4. 1999-05-09 04:53:58 +00:00
KATO Takenori
2623b6551f Sync with sys/i386/isa/wd.c revision 1.197. 1999-05-09 04:42:10 +00:00
KATO Takenori
b07d43b4ab Sync with sys/i386/isa/pcausio.c revision 1.48. 1999-05-09 04:39:36 +00:00
KATO Takenori
0b8c369031 Sync with sys/i386/isa/npx.c revision 1.61. 1999-05-09 04:38:27 +00:00
KATO Takenori
f1ff3d972f Sync with sys/i386/isa/mse.c revision 1.42. 1999-05-09 04:37:17 +00:00
KATO Takenori
75442335ac Sync with sys/i386/isa/fd.c revision 1.142. 1999-05-09 04:34:28 +00:00
KATO Takenori
c977a12971 Sync with sys/i386/i386/userconfig.c revision 1.141. 1999-05-09 04:30:08 +00:00
KATO Takenori
b1c4ac8e82 Sync with sys/i386/conf/majors.i386 revision 1.72. 1999-05-09 04:28:23 +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
a1fe075531 Sync with sys/i386/conf/Makefile.i386 revision 1.149. 1999-05-09 04:26:06 +00:00
Poul-Henning Kamp
46eede0058 Continue where Julian left off in July 1998:
Virtualize bdevsw[] from cdevsw.  bdevsw() is now an (inline)
        function.

        Join CDEV_MODULE and BDEV_MODULE to DEV_MODULE (please pay attention
        to the order of the cmaj/bmaj arguments!)

        Join CDEV_DRIVER_MODULE and BDEV_DRIVER_MODULE to DEV_DRIVER_MODULE
        (ditto!)

(Next step will be to convert all bdev dev_t's to cdev dev_t's
before they get to do any damage^H^H^H^H^H^Hwork in the kernel.)
1999-05-07 10:11:40 +00:00
Poul-Henning Kamp
c48d17750f Introduce two functions: physread() and physwrite() and use these directly
in *devsw[] rather than the 46 local copies of the same functions.

(grog will do the same for vinum when he has time)
1999-05-07 07:03:47 +00:00
Poul-Henning Kamp
b0eeea2042 remove b_proc from struct buf, it's (now) unused.
Reviewed by:	dillon, bde
1999-05-06 20:00:34 +00:00
Peter Wemm
03a4d0108f Fix a precedence bug in the atapi tape driver. I think it could either
write a filemark where it wasn't needed, or neglect to write one at all,
depending on how the boolean converted to an int value for the &.
1999-05-06 18:50:10 +00:00
Peter Wemm
d5558c001a Fix up a few easy 'assignment used as truth value' and 'suggest parens
around && within ||' type warnings.  I'm pretty sure I have not masked
any problems here, I've committed real problem fixes seperately.
1999-05-06 18:44:42 +00:00
KATO Takenori
5c32431080 Sync with sys/i386/i386/userconfig.c revision 1.138. 1999-05-06 09:15:20 +00:00
KATO Takenori
bb0992d7ab Sync with sys/i386/conf/files.i386 revision 1.237. 1999-05-06 09:13:56 +00:00
Luoqi Chen
c300b7b6c1 Initialize dblfault_tss.tss_fs to the per-cpu private data segment selector. 1999-05-06 00:54:54 +00:00
Luoqi Chen
68db6cea99 Do not set curproc until proc0 is fully initialized (in proc0_init()). 1999-05-06 00:39:00 +00:00
KATO Takenori
ef560ddafd Sync with sys/i386/isa/fd.c revision 1.137. 1999-05-05 03:43:00 +00:00
KATO Takenori
635a64d91f Sync with sys/i386/conf/majors.i386 revision 1.71. 1999-05-05 03:41:39 +00:00
KATO Takenori
86f210dfba Fixed missing parenthesis.
Submitted by:	Takahashi Yoshihiro <nyan@dd.catv.ne.jp>
1999-05-05 01:53:43 +00:00
Peter Wemm
271694cc1e Operator precedence bug
PR:		11415
Submitted by:	Christopher Peterson <cpeterso@cs.washington.edu>
1999-05-02 21:46:31 +00:00
KATO Takenori
28e5bf9207 Added $Id$. 1999-04-30 07:31:17 +00:00
Dmitrij Tejblum
604359cf9b s/static foo_devsw_installed = 0;/static int foo_devsw_installed;/.
(Edited automatically)
1999-04-28 10:54:24 +00:00
KATO Takenori
482f0be026 Sync with sys/i386/isa/clock.c revision 1.132. 1999-04-28 08:06:00 +00:00
KATO Takenori
8aef41e249 Sync with sys/i386/i386/machdep.c revision 1.332. 1999-04-28 08:03:54 +00:00
Poul-Henning Kamp
f711d546d2 Suser() simplification:
1:
  s/suser/suser_xxx/

2:
  Add new function: suser(struct proc *), prototyped in <sys/proc.h>.

3:
  s/suser_xxx(\([a-zA-Z0-9_]*\)->p_ucred, \&\1->p_acflag)/suser(\1)/

The remaining suser_xxx() calls will be scrutinized and dealt with
later.

There may be some unneeded #include <sys/cred.h>, but they are left
as an exercise for Bruce.

More changes to the suser() API will come along with the "jail" code.
1999-04-27 11:18:52 +00:00
KATO Takenori
19add1f020 Remove obsolete interrupt labels. 1999-04-25 05:59:02 +00:00
KATO Takenori
473541c8c3 Sync with sys/i386/i386/userconfig.c revision 1.137. 1999-04-25 04:06:43 +00:00
KATO Takenori
949f91f87c Sync with sys/i386/conf/options.i386 revision 1.112. 1999-04-25 04:05:31 +00:00
KATO Takenori
c1327c0f76 Sync with sys/i386/conf/Makefile.i386 revision 1.148. 1999-04-25 04:04:24 +00:00
KATO Takenori
38160a0f0d De-quote. 1999-04-25 04:03:22 +00:00
KATO Takenori
742958ce9d Commented out adv_isa.c. 1999-04-24 04:22:57 +00:00
KATO Takenori
866a540287 Sync with sys/i386/isa/isa_dma.c revision 1.2. 1999-04-21 12:17:00 +00:00
KATO Takenori
8e6e1dfb88 Sync with sys/i386/isa/clock.c revision 1.131. 1999-04-21 12:14:37 +00:00
KATO Takenori
14349c1d6f Sync with sys/i386/i386/userconfig.c revision 1.136. 1999-04-20 09:10:47 +00:00
KATO Takenori
32c9ff911e Sync with sys/i386/i386/machdep.c revision 1.330. 1999-04-20 09:08:51 +00:00
KATO Takenori
07a6f835ff Sync with sys/i386/conf/Makefile.i386 revision 1.147. 1999-04-20 09:07:19 +00:00
KATO Takenori
bf362ede5f Rectivate pnp0. 1999-04-20 09:06:03 +00:00
KATO Takenori
feee147835 Fixed missing changes for new-bus (return value of the probe routine).
Submitted by:	Takahashi Yoshihiro <nyan@dd.catv.ne.jp>
1999-04-19 16:10:40 +00:00
KATO Takenori
3d88f91408 Sync with sys/isa/sio.c revision 1.226. 1999-04-19 11:11:01 +00:00
KATO Takenori
d4d6ff4d66 Sync with sys/i386/i386/userconfig.c revision 1.135. 1999-04-19 11:06:08 +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
Peter Wemm
3e3e4375c8 Shoot the LKM support in the old wd/wdc/atapi driver set in the head and
perform a cleanup/unifdef sweep over it to tidy things up.  The atapi
code is permanently attached to the wd driver and is always probed.

I will add an extra option bit in the flags to disable an atapi probe on
either the master or slave if needed, if people want this.

Remember, this driver is destined to die some time.  It's possible that
it will loose all atapi support down the track and only be used for
dumb non-ATA disks and all ata/atapi devices will be handled by the new
ata system.

ATAPI, ATAPI_STATIC and CMD640 are no longer options, all are implicit.

Previously discussed with:  sos
1999-04-13 19:38:12 +00:00
KATO Takenori
aafbdf0b08 Sync with sys/i386/isa/isa.c revision 1.118. 1999-04-12 03:31:05 +00:00
Greg Lehey
4357ca882d Back out default debug kernel. The flags revert to historical behaviour.
Requested-by:	ache
		bde
		dg

Modify targets for debug kernels:  when -g was specified, make will
now build a debug kernel called kernel.debug, and create a stripped
version called kernel at the same time.  The two targets install and
install.debug are otherwise unchanged.

Requested-by:	dillon

Update man page accordingly.
1999-04-11 03:40:11 +00:00
KATO Takenori
89f657276f Sync with sys/i386/i386/userconfig.c revision 1.133. 1999-04-10 04:44:33 +00:00
KATO Takenori
6b21bf93e7 Sync with sys/i386/conf/files.i386 revision 1.233. 1999-04-10 04:42:46 +00:00
Greg Lehey
2005b07aa8 1. Modify config to issue different code for debugging.
2.  Config complains if you use -g:

    Debugging is enabled by default, there is no ned to specify the -g option

3.  Config warns you if you don't use -s:

    Building kernel with full debugging symbols.  Do
    "config -s BSD" for historic partial symbolic support.
    To install the debugging kernel, do make install.debug

    (BSD was the name of the config file I used; I print out the same
    name).

4.  Modify Makefile.i386, Makefile.alpha, Makefile.pc98 and config to
    work if a kernel name other than 'kernel' is specified.  This is
    not absolutely necessary, but useful, and it was relatively easy.
    I now have a kernel called /crapshit :-)

5.  Modify Makefile.i386, Makefile.alpha, Makefile.pc98 "clean" target
    to remove both the debug and normal kernel.

6.  Modify all to install the stripped kernel by default and the debug
    kernel if you enter "make install.debug".

7.  Update version number of Makefiles and config.
1999-04-07 09:28:03 +00:00
Peter Wemm
6ac1f14d0b Use PHOLD/PRELE() instead of P_PHSYIO. 1999-04-06 03:12:22 +00:00
KATO Takenori
f110e2e328 Fix for console mouse.
Submitted by:	Nobuyuki Koganemaru <kogane@koganemaru.co.jp>
1999-04-04 02:53:08 +00:00
John Polstra
4fe88fe637 Restore support for executing BSD/OS binaries on the i386 by passing
the address of the ps_strings structure to the process via %ebx.
For other kinds of binaries, %ebx is still zeroed as before.

Submitted by:	Thomas Stephens <tas@stephens.org>
Reviewed by:	jdp
1999-04-03 22:20:03 +00:00
KATO Takenori
90aba8be4e Sync with sys/i386/isa/wd.c revision 1.191. 1999-04-03 15:51:54 +00:00
KATO Takenori
e82834ca32 Sync with sys/i386/isa/sio.c revision 1.234. 1999-04-03 15:51:14 +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
812d50e7a5 Sync with sys/i386/isa/sio.c revision up to 1.233. 1999-04-01 13:44:15 +00:00
KATO Takenori
8ee56ad2ed Sync with sys/i386/isa/npx.c revision 1.66. 1999-04-01 13:41:40 +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
02418719d1 Delete the aic driver. 1999-04-01 13:39:27 +00:00
Søren Schmidt
b31d9a1d23 The DEVFS case was screwed by my last commit here.. 1999-03-31 12:30:58 +00:00
KATO Takenori
9939a2a908 Sync with sys/i386/isa/wd.c revision 1.190. 1999-03-25 08:29:32 +00:00
KATO Takenori
b2fa1a8926 Sync with sys/i386/isa/sio.c revision up to 1.231. 1999-03-25 08:26:50 +00:00
KATO Takenori
c87c3c5cc8 Sync with sys/i386/conf/majors.i386 revision 1.69. 1999-03-25 08:25:45 +00:00
KATO Takenori
68ac28d7f9 Sync with sys/i386/isa/if_ed.c revision 1.150. 1999-03-19 16:01:34 +00:00
KATO Takenori
05fa4a899f Sync with sys/i386/conf/options.i386 revision 1.110. 1999-03-17 09:00:33 +00:00
KATO Takenori
6a0f06b109 Sync with sys/i386/conf/majors.i386 revision up to 1.68. 1999-03-17 08:59:31 +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
9ec6fcdc04 Sync with sys/i386/conf/devices.i386 revision 1.16. 1999-03-17 08:57:32 +00:00
KATO Takenori
4df62f4dc9 Sync with sys/i386/conf/GENERIC revision 1.155. 1999-03-17 08:56:28 +00:00
Søren Schmidt
d99434fb80 Rewert the atapi CDROM driver's name to wcd.
This is to avoid confusion with the new system.
Also provide real entires in MAKEDEV for the new system.
1999-03-16 13:34:03 +00:00
KATO Takenori
25032d1945 Sync with sys/i386/conf/Makefile.i386 revision 1.141. 1999-03-13 13:18:00 +00:00
KATO Takenori
b1af2afcd4 Keyboard driver update.
Submitted by:	Kazutaka YOKOTA <yokota@FreeBSD.org>
1999-03-10 14:51:53 +00:00
KATO Takenori
7cb3264c42 Sync with sys/i386/conf/options.i386 revision up to 1.108. 1999-03-10 14:01:59 +00:00
KATO Takenori
d98863613a Sync with sys/i386/conf/majors.i386 revision 1.66. 1999-03-10 14:00:21 +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
b052f82154 Sync with sys/i386/i386/machdpe.c revision 1.327. 1999-03-06 09:43:01 +00:00
KATO Takenori
bd87150cd2 Sync with sys/i386/isa/sio.c revision 1.229. 1999-03-04 10:37:30 +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
c1aca4d070 Added FE_8BIT_SUPPORT into the list. The fe driver includes opt_fe.h.
Submitted by:	Takahashi Yoshihiro <nyan@dd.catv.ne.jp>
1999-03-03 10:40: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
4f0282c066 Sync with sys/i386/conf/Makefile.i386 revision 1.140. 1999-03-02 14:01:33 +00:00
KATO Takenori
24d3fe2bd8 Fix for LINE30 option. This option was not tested under new console
driver.

Submitted by:	Takahashi Yoshihiro <nyan@dd.catv.ne.jp>
1999-03-02 12:34:24 +00:00
KATO Takenori
a9b9a6ba74 Added comment on Access/PC N98C+ and LAC-98 cards, and FE_8BIT_SUPPORT
option that LAC-98 needs.

Submitted by:	chi@bd.mbn.or.jp (Chiharu Shibata)
1999-02-25 13:59:47 +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
4a044b1d86 Commented out lpt0. 1999-02-25 13:41:54 +00:00
KATO Takenori
8446571814 Sync with sys/i386/isa/wd.c revision 1.189. 1999-02-25 11:08:53 +00:00
KATO Takenori
e1a9267366 Sync with sys/i386/i386/userconfig.c revision 1.132. 1999-02-25 11:05:50 +00:00
KATO Takenori
b6478cfe85 - Cosmetic change.
- Enable bs driver.
- Add ax and xl drivers.

Submitted by:	Takahashi Yoshihiro <nyan@dd.catv.ne.jp>
1999-02-16 11:15:21 +00:00
KATO Takenori
ef2ec056c3 Merge with sys/i386/conf/options.i386 revision 1.102.
Submitted by:	Takahashi Yoshihiro <nyan@dd.catv.ne.jp>
1999-02-16 11:12:42 +00:00
KATO Takenori
7c9eb5b166 Sync with sys/i386/i386/machdep.c revision 1.326. 1999-02-16 11:07:06 +00:00
Dag-Erling Smørgrav
ad5ebf3fba Ignore errors from chflags. This makes it possible to make installworld
with DESTDIR set to an NFS-mounted file system.
1999-02-14 13:56:15 +00:00
KATO Takenori
28791bce44 Sync with sys/i386/i386/machdep.c revision 1.325. 1999-02-12 09:15:33 +00:00
KATO Takenori
cdbef5dacd Sync with sys/i386/i386/userconfig.c revision 1.130. 1999-02-10 13:02:38 +00:00
Kenneth D. Merry
2a888f938e Add a prioritization field to the devstat_add_entry() call so that
peripheral drivers can determine where in the devstat(9) list they are
inserted.

This requires recompilation of libdevstat, systat, vmstat, rpc.rstatd, and
any ports that depend on the devstat code, since the size of the devstat
structure has changed.  The devstat version number has been incremented as
well to reflect the change.

This sorts devices in the devstat list in "more interesting" to "less
interesting" order.  So, for instance, da devices are now more important
than floppy drives, and so will appear before floppy drives in the default
output from systat, iostat, vmstat, etc.

The order of devices is, for now, kept in a central table in devicestat.h.
If individual drivers were able to make a meaningful decision on what
priority they should be at attach time, we could consider splitting the
priority information out into the various drivers.  For now, though, they
have no way of knowing that, so it's easier to put them in an easy to find
table.

Also, move the checkversion() call in vmstat(8) to a more logical place.

Thanks to Bruce and David O'Brien for suggestions, for reviewing this, and
for putting up with the long time it has taken me to commit it.  Bruce did
object somewhat to the central priority table (he would rather the
priorities be distributed in each driver), so his objection is duly noted
here.

Reviewed by:	bde, obrien
1999-02-10 00:04:13 +00:00
KATO Takenori
8ffb208fa0 Sync with syscons for i386.
Submitted by:	Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1999-02-06 09:30:19 +00:00
KATO Takenori
533601dc35 Sync with sys/i386/isa/sio.c revision up to 1.228.
Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1999-02-05 11:37:40 +00:00
KATO Takenori
1e476c296d Sync with sys/i386/i386/userconfig.c revision 1.129. 1999-02-04 13:58:44 +00:00
KATO Takenori
270b84ae95 Sync with sys/i386/i386/machdep.c revision 1.324. 1999-02-04 09:55:42 +00:00
KATO Takenori
f19a38101a Added braces around initializsers and in if-statements.
Submitted by:	Takahashi Yoshihiro <nyan@dd.catv.ne.jp>
1999-02-02 17:26:03 +00:00
KATO Takenori
524d2ab047 Sync with sys/dev/syscons/syscons.c revision 1.294. 1999-02-02 17:21:33 +00:00
Søren Schmidt
7538974af9 Bzero the devstat structure before use.
Pointed out by:	<Kenneth Merry> ken@plutotech.com
1999-01-31 23:08:47 +00:00
Søren Schmidt
a257733c19 Add device stats for the acd device. 1999-01-31 21:51:03 +00:00
KATO Takenori
a4af40881f Sync with sys/i386/i386/userconfig.c revision 1.128. 1999-01-31 17:44:06 +00:00
Poul-Henning Kamp
57c90d6fcd Use suser() to determine super-user-ness, don't examine cr_uid directly. 1999-01-30 12:21:49 +00:00
Poul-Henning Kamp
4e2d2aa1cd Use suser() to check for super user rather than examining cr_uid directly.
Use TTYDEF_SPEED rather than 9600 a couple of places.

Reviewed by:	bde, with a few grumbles.
1999-01-30 12:17:38 +00:00
KATO Takenori
fe5871fb09 Sync with sys/i386/i386/machdep.c revision 1.323. 1999-01-29 10:43:09 +00:00
KATO Takenori
32373eaf9b Oops, added parentheses after `else'.
Submitted by:	Takahashi Yoshihiro <nyan@dd.catv.ne.jp>
1999-01-28 13:32:07 +00:00
KATO Takenori
22cd7960a2 The "easy" fixe for compiling the kernel -Wunused: remove unreferenced
local variable.
1999-01-28 11:36:22 +00:00
KATO Takenori
4d8efbff69 The "easy" fixes for compiling the kernel -Wunused: remove unreferenced static
and local variables, goto labels, and functions declared but not defined.
1999-01-28 11:24:36 +00:00
KATO Takenori
ef74e9a4eb Sync with sys/i386/isa/wd.c revision 1.187. 1999-01-28 09:21:35 +00:00
KATO Takenori
965dc9cd45 Sync with sys/i386/isa/if_ed.c revision 1.149. 1999-01-28 09:19:16 +00:00
KATO Takenori
a09bd8dae6 Sync with sys/i386/isa/diskslice_machdep.c revision 1.33. 1999-01-28 09:18:21 +00:00
KATO Takenori
3109b17f32 Sync with sys/i386/i386/userconfig.c revision 1.127. 1999-01-28 09:13:20 +00:00
KATO Takenori
9a6ef21e00 Sync with sys/i386/conf/GENERIC revision 1.144. 1999-01-28 09:12:05 +00:00
KATO Takenori
f274af0063 Clean up LD-BDN reset code(PC-98).
Submitted by:	chi@bd.mbn.or.jp (Chiharu Shibata)
1999-01-27 11:05:12 +00:00
KATO Takenori
9e0c98036f Sync with sys/i386/isa/sio.c revision 1.225. 1999-01-27 08:26:16 +00:00
KATO Takenori
75929847ae Sync with sys/i386/conf/Makefile.i386 revision 1.138. 1999-01-27 08:25:19 +00:00
KATO Takenori
e7d91a508f Initialize the member atr_buffer.
Pointed out by:	Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
1999-01-27 08:22:08 +00:00
KATO Takenori
564da2b0d5 Sync with sys/i386/conf/Makefile.i386 revision 1.137. 1999-01-25 12:12:01 +00:00
KATO Takenori
38d2964075 Remove 'alog'. 1999-01-20 08:31:56 +00:00
KATO Takenori
3c4a8b442b Sync with sys/i386/conf/Makefile.i386 revision 1.136. 1999-01-20 08:29:48 +00:00
KATO Takenori
efcf88f963 Fixed argument to intr member of the variable kbd. 1999-01-19 14:08:04 +00:00
KATO Takenori
972a5e4d92 Sync with sys/dev/syscons and sys/dev/kbd drivers.
Submitted by:	Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1999-01-19 12:41:26 +00:00
Peter Wemm
d17e4ee67d Update the pccard hooks to use a module style declaration instead. 1999-01-19 00:21:53 +00:00
KATO Takenori
5343d329b6 Added copyright.
Pointed out by:	Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1999-01-18 14:55:38 +00:00
KATO Takenori
07986a05ff Merge with sys/dev/syscons/syscons.c revision 1.292.
Submitted by:	Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1999-01-18 14:48:34 +00:00
KATO Takenori
1ec0a1bcd4 Don't forget to initialize va_mode.
Submitted by:	Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
Forgotten by:	kato
1999-01-18 14:47:01 +00:00
KATO Takenori
4e1cc33d71 Sync with sys/i386/i386/userconfig.c revision 1.126. 1999-01-18 11:01:57 +00:00
KATO Takenori
56cdcc561b Sync with sys/i386/conf/Makefile.i386 revision 1.135. 1999-01-18 11:00:29 +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
a464f91c8d Make old syscons work. (New syscons driver for PC98 is still under
development.)

Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1999-01-17 15:42:27 +00:00
KATO Takenori
e53a4818c5 Sync with sys/i386/isa/wd.c revision 1.186. 1999-01-17 12:24:48 +00:00
KATO Takenori
5d4a8edf37 Revise sio entries to synchronize with current driver.
Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1999-01-16 13:20:42 +00:00
KATO Takenori
e42f0a2ea6 Sync with sys/i386/isa/wd.c revision up to 1.185. 1999-01-16 11:43:12 +00:00
KATO Takenori
a87737af86 Sync with sys/i386/isa/sio.c revision up to 1.223. 1999-01-16 11:42:16 +00:00
KATO Takenori
0061057d70 Sync with sys/i386/isa/npx.c revision 1.65. 1999-01-16 11:41:18 +00:00
KATO Takenori
21da8ffad1 Sync with sys/i386/isa/fd.c revision 1.131. 1999-01-16 11:40:02 +00:00
KATO Takenori
485f69e3db Sync with sys/i386/i386/machdep.c revision up to 1.125. 1999-01-16 11:39:08 +00:00
KATO Takenori
eb5417aa3a Sync with sys/i386/i386/machdep.c revision up to 1.322. 1999-01-16 11:38:03 +00:00
KATO Takenori
5b87bd54cf Sync with sys/i386/conf/majors.i386 revision up to 1.64. 1999-01-16 11:36:28 +00:00
Eivind Eklund
a4a4aa0dd9 Add a prototype to silence warnings. 1999-01-12 01:28:00 +00:00
Eivind Eklund
d20a303759 Silence warnings. 1999-01-12 00:36:36 +00:00
John Polstra
f92bdbd010 Switch to using ".So" as the extension for PIC object files rather
than ".so".  The old extension conflicted with well-established
naming conventions for dynamically loadable modules.

The "clean" targets continue to remove ".so" files too, to deal with
old systems.
1999-01-09 21:51:00 +00:00
KATO Takenori
fe1e7db615 Sync with sys/i386/isa/sio.c and syscons.c revisions 1.221 and 1.289,
respectively.
1999-01-08 16:09:23 +00:00
KATO Takenori
0cc73f671d Sync with sys/i386/i386/userconfig.c revision up to 1.120. 1999-01-08 16:05:27 +00:00
KATO Takenori
b4d4a2e5d4 Sync with sys/i386/i386/machdep.c revision 1.320. 1999-01-08 16:04:20 +00:00
KATO Takenori
2992a071da Oops, remove duplicate line. 1999-01-08 16:03:11 +00:00
KATO Takenori
904e55d93a Sync with sys/i386/conf/majors.i386 revision 1.60. 1999-01-08 16:02:03 +00:00
KATO Takenori
9ed7b39888 Sync with sys/i386/conf/Makefile.i386 revision 1.133. 1999-01-08 15:59:41 +00:00
KATO Takenori
9faa78835a Sync with sys/i386/conf/options.i386 revision 1.101. 1999-01-04 08:09:15 +00:00
KATO Takenori
f06eb99ea9 Sync with sys/i386/conf/majors.i386 revision 1.59. 1999-01-04 08:08:28 +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
d81f52e533 Sync with sys/i386/boot/rawboot/Makefile revision 1.12. 1999-01-04 08:05:55 +00:00
KATO Takenori
5235b94692 Sync with sys/i386/boot/netboot/Makefile revision 1.22. 1999-01-04 08:05:01 +00:00
KATO Takenori
cc44dd6486 Sync with sys/i386/boot/kzipboot/Makefile revision 1.10. 1999-01-04 08:03:17 +00:00
KATO Takenori
c1413f26a7 Sync with sys/i386/boot/biosboot/Makefile revision 1.68. 1999-01-04 08:02:13 +00:00
KATO Takenori
701c68e36b Sync with sys/i386/boot/Makefile.inc revision up to 1.5. 1999-01-04 08:01:04 +00:00
KATO Takenori
4b6b2a8495 Recognize IDE controler even if HDD is not connected.
Submitted by:	IMAI Takeshi <take-i@ceres.dti.ne.jp>
1999-01-03 17:26:04 +00:00
KATO Takenori
8f1ca31497 - Remove bus-dependent addresses from `ic' file.
- Special registers of IO-DATA device's RSA series are defined in
  ic/rsa.h (new file).

Pointed out by:	Bruce Evans <bde@zeta.org.au>
Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1999-01-03 15:57:02 +00:00
KATO Takenori
3171a83027 Support following devices:
- on board 2nd CCU
  - Midori Elec. MDC-926Rs
  - Midori-Hayes ESP98
  - NEC PC-9861K, PC-9801-101 PC-9801-120
  - Melco IND-SP and IND-SS
  - PIO-9032A/B/C
  - B98-01 and B98-02
  - IO-data device RSA-98II and RSA-98III
  - MC-16550
  - MC-RS98
  - Media Inteligent RSB-2000/3000 and RSB-384
  - PCMCIA modem card

Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1999-01-03 05:03:47 +00:00
Tim Vanderhoek
28cb15a9a9 Extraneous space. 1999-01-02 17:11:45 +00:00
KATO Takenori
bce191bf65 Enables snd driver. 1998-12-31 11:38:52 +00:00
KATO Takenori
a305035083 Add SMC EtherEZ98 support(PC-98).
Slim up of if_ed98.h.

Submitted by:	Chiharu Shibata <chi@bd.mbn.or.jp>
1998-12-31 03:23:39 +00:00
KATO Takenori
d35502a380 Sync with sys/i386/isa/sio.c revision 1.220. 1998-12-30 08:09:11 +00:00
KATO Takenori
390d616e16 Sync with sys/i386/isa/pcaudio.c revision 1.45. 1998-12-30 08:08:05 +00:00
KATO Takenori
a498ae6954 Sync with sys/i386/isa/fd.c revision 1.130. 1998-12-30 08:06:41 +00:00
KATO Takenori
7e925cf6b0 Sync with sys/i386/conf/options.i386 revision up to 1.100. 1998-12-30 08:03:03 +00:00
KATO Takenori
93bbb475a1 Sync with sys/i386/conf/majors.i386 revision up to 1.58. 1998-12-30 07:58:42 +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
91ebcb74ed Sync with sys/i386/conf/devices.i386 revision 1.15. 1998-12-30 07:51:20 +00:00
KATO Takenori
2e96c09cf7 SMP stuff has been merged into GENERIC98 file. 1998-12-30 07:49:47 +00:00
KATO Takenori
3789d36ef8 Removed GENERICupgrade file. 1998-12-30 07:47:53 +00:00
KATO Takenori
48bd413130 Sync with sys/i386/conf/GENERIC revision up to 1.140. 1998-12-30 07:46:23 +00:00
Søren Schmidt
28706d37a7 Fix breakage by cleanup. 1998-12-27 17:12:02 +00:00
KATO Takenori
0eb3f1fd2f Sync with sys/i386/isa/wd.c revision 1.182. 1998-12-25 09:05:17 +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
3bdb02e60a Sync with sys/i386/conf/Makefile.i386 revision 1.132. 1998-12-25 09:03:18 +00:00
KATO Takenori
3f89e59381 Sync with sys/i386/conf/options.i386 revision 1.96. 1998-12-21 09:58:37 +00:00
KATO Takenori
aad7f41eee Sync with sys/i386/conf/Makefile.i386 revision 1.131. 1998-12-21 09:57:42 +00:00
KATO Takenori
57276bc0d3 Sync with sys/i386/isa/clock.c revision 1.129. 1998-12-17 08:54:47 +00:00
KATO Takenori
2da7825a28 The fe driver has been merged into sys/i386/isa/if_fe.c.
Forgotten by:	kato
1998-12-17 08:45:07 +00:00
KATO Takenori
73711314e2 Sync with sys/i386/isa/wd.c revision 1.181. 1998-12-17 08:42:10 +00:00
KATO Takenori
7e2b44203e Sync with sys/i386/isa/npx.c revision 1.64. 1998-12-17 08:41:34 +00:00
KATO Takenori
012291989b Sync with sys/i386/isa/fd.c revision 1.129. 1998-12-17 08:40:36 +00:00
Bruce Evans
4c56fcdead Removed the cast to a pointer in the definition of PS_STRINGS and
adjusted related casts to match (only in the kernel in this commit).
The pointer was only wanted in one place in kern_exec.c.  Applications
should use the kern.ps_strings sysctl instead of PS_STRINGS, so they
shouldn't notice this change.
1998-12-16 16:28:58 +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
c2a3601760 Sync with sys/i386/isa/fd.c revision 1.128. 1998-12-14 09:06:23 +00:00
KATO Takenori
ba8d06b9f7 Sync with sys/i386/isa/pcaudio.c revision 1.44. 1998-12-14 08:58:56 +00:00
KATO Takenori
ec16d9c2fc Sync with sys/i386/isa/if_ed.c revision 1.147. 1998-12-14 08:58:12 +00:00
KATO Takenori
82749a0af6 Sync with sys/i386/i386/userconfig.c revision 1.118. 1998-12-14 08:53:32 +00:00
KATO Takenori
dcb6aac9bb Sync with sys/i386/conf/options.i386 revision 1.95. 1998-12-14 08:52:20 +00:00
KATO Takenori
77d493c5b5 Sync with sys/i386/isa/lpt.c revision 1.72. 1998-12-11 08:48:21 +00:00
KATO Takenori
e4a8d41703 Sync with sys/i386/i386/machdep.c revision 1.317. 1998-12-11 08:04:33 +00:00
Eivind Eklund
2ae353f9a7 Rename one of the two devfs_link's to devfs_makelink. 1998-12-10 19:57:01 +00:00
KATO Takenori
d021dab50a Sync with sys/i386/conf/Makefile.i386 revision 1.130. 1998-12-08 08:19:45 +00:00
KATO Takenori
e4561e2ae0 Sync with sys/i386/isa/fd.c, if_fe.c, npx.c and sio.c revisions 1.126,
1.44, 1.63 and 1.219, respectively.
1998-12-08 08:18:59 +00:00
KATO Takenori
5a5f82fc61 Sync with sys/i386/i386/userconfig.c revision 1.117. 1998-12-08 08:17:43 +00:00
Archie Cobbs
f1d19042b0 The "easy" fixes for compiling the kernel -Wunused: remove unreferenced static
and local variables, goto labels, and functions declared but not defined.
1998-12-07 21:58:50 +00:00
KATO Takenori
6684a4f19d Sync with sys/i386/isa/fd.c revision 1.125. 1998-12-05 09:24:20 +00:00
KATO Takenori
dae18d3bae Sync with sys/i386/i386/userconfig.c revision 1.116. 1998-12-05 09:22:05 +00:00
KATO Takenori
7d1d31e431 Sync with sys/i386/conf/optins.i386 revision 1.94. 1998-12-05 09:20:53 +00:00
KATO Takenori
0289a3dcbb Sync with sys/i386/conf/SMP-GENERIC revision 1.23. 1998-12-05 09:19:30 +00:00
KATO Takenori
5365b3a408 Sync with sys/i386/conf/GENERIC revision 1.133. 1998-12-05 09:17:31 +00:00
Archie Cobbs
2127f26023 Examine all occurrences of sprintf(), strcat(), and str[n]cpy()
for possible buffer overflow problems. Replaced most sprintf()'s
with snprintf(); for others cases, added terminating NUL bytes where
appropriate, replaced constants like "16" with sizeof(), etc.

These changes include several bug fixes, but most changes are for
maintainability's sake. Any instance where it wasn't "immediately
obvious" that a buffer overflow could not occur was made safer.

Reviewed by:	Bruce Evans <bde@zeta.org.au>
Reviewed by:	Matthew Dillon <dillon@apollo.backplane.com>
Reviewed by:	Mike Spengler <mks@networkcs.com>
1998-12-04 22:54:57 +00:00
KATO Takenori
c31c6a9cce Sync with sys/i386/conf/majors.i386 revision 1.93. 1998-12-04 14:41:32 +00:00
KATO Takenori
7ef0b9d6e5 Sync with sys/i386/conf/majors.i386 revision up to 1.55. 1998-12-04 14:39:29 +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
2992cdbc3f Sync with sys/i386/isa/isa.c revision 1.117. 1998-12-02 08:04:12 +00:00
KATO Takenori
de693de8e7 Sync with sys/i386/conf/majors.i386 revision up to 1.53. 1998-12-02 08:02:41 +00:00
KATO Takenori
f06a63b4f2 Sync with sys/i386/boot/netboot/Makefile revision 1.21. 1998-11-29 11:55:11 +00:00
KATO Takenori
7adae46cd3 Sync with sys/i386/boot/netboot/Makefile revision 1.20. 1998-11-26 11:47:51 +00:00
KATO Takenori
fcc6e7373f Reorder entries of ed drivers. Many NICs can be automatically
detected, even though a user doesn't disable unused entries with
userconfig.

Submitted by:	Nobuyuki Koganemaru <kogane@koganemaru.co.jp>
1998-11-25 11:00:31 +00:00
KATO Takenori
3bf3b7af20 Cosmetic change. 1998-11-25 10:53:21 +00:00