Commit Graph

241 Commits

Author SHA1 Message Date
KATO Takenori
4e82d9dc12 Fixed bugs introduced by syncing with i386/isa/sio.c revision 1.143.
Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1998-02-02 07:59:05 +00:00
KATO Takenori
bbc4f6d526 Sync with sys/i386/isa/clock.c revision 1.108. 1998-01-28 12:25:06 +00:00
Eivind Eklund
7b778b5e61 Make all file-system (MFS, FFS, NFS, LFS, DEVFS) related option new-style.
This introduce an xxxFS_BOOT for each of the rootable filesystems.
(Presently not required, but encouraged to allow a smooth move of option *FS
to opt_dontuse.h later.)

LFS is temporarily disabled, and will be re-enabled tomorrow.
1998-01-24 02:54:56 +00:00
KATO Takenori
774f324f38 Added dealy.
Submitted by:	Kawanobe Koh <kawanobe@st.rim.or.jp>
1998-01-22 03:52:55 +00:00
KATO Takenori
60fa2968df Fixed bugs introduced when files were synchronized with
sys/i386/isa/mse.c and sio.c.

Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1998-01-16 11:20:22 +00:00
KATO Takenori
ab29750a7f Sync with sys/i386/isa/sio.c revision 1.194. 1998-01-08 10:50:06 +00:00
KATO Takenori
3b6f48e947 Sync with sys/i386/isa/clock.c revision up to 1.107. 1997-12-29 16:15:57 +00:00
KATO Takenori
b8c15aa548 Sync with sys/i386/isa/sio.c revision up to 1.193. 1997-12-29 16:08:48 +00:00
Poul-Henning Kamp
71f461f86a Rename "i586_ctr" to "tsc" (both upper and lower case instances).
Fix a couple of printfs too.

Warning: This changes the names of a couple of kernel options!
1997-12-26 20:42:37 +00:00
Eivind Eklund
5591b823d1 Make COMPAT_43 and COMPAT_SUNOS new-style options. 1997-12-16 17:40:42 +00:00
Bruce Evans
239b7b699e Use ENOIOCTL instead of -1 (= ERESTART) for tty ioctls that are
not handled at a particular level.  This fixes mainly restarting
of interrupted TIOCDRAINs and TIOCSETA{W,F}s.
1997-12-06 13:25:01 +00:00
Poul-Henning Kamp
ab3f746966 In all such uses of struct buf: 's/b_un.b_addr/b_data/g' 1997-12-02 21:07:20 +00:00
KATO Takenori
681be1a529 Sync with sys/i386/isa/if_ed.c, if_fe.c and sio.c revisions 1.129,
1.35 and 1.189, respectively.
1997-11-25 09:42:26 +00:00
KATO Takenori
9621c9ed58 Synchronize with sys/i386/isa/clock.c revision 1.104. 1997-11-19 11:35:22 +00:00
KATO Takenori
00be5a552a Sync with sys/i386/isa/sio.c revision 1.188. 1997-11-03 02:30:45 +00:00
KATO Takenori
016f33ea47 Synchronize with sys/i386/isa/npx.c and clock.c revisions 1.53 and
1.103, respectively.
1997-10-28 14:30:47 +00:00
KATO Takenori
6fd3c7fdea Synchronize with sys/i386/isa/sio.c revision 1.187. 1997-10-27 11:00:31 +00:00
KATO Takenori
b2bf5e1cfd Synchronize with sys/i386/isa/fd.c revision 1.105. 1997-10-21 09:48:38 +00:00
KATO Takenori
5ea17fc758 Synchronize with sys/i386/isa/sio.c revision 1.184. 1997-10-13 09:23:14 +00:00
KATO Takenori
09044baf2a Synchronize with sys/i386/isa/fd.c revision 1.104. 1997-09-24 08:21:26 +00:00
KATO Takenori
e79c5cf3a8 Synchronize with sys/i386/isa/fd.c, isa.c and sio.c revisions 1.103,
1.105 and 1.183, respectively.
1997-09-22 12:23:49 +00:00
KATO Takenori
55d994bfb5 Synchronize with sys/i386/conf/options.i386 and sys/i386/isa/sio.c
revisions 1.60 and 1.182, respectively.
1997-09-20 05:28:02 +00:00
KATO Takenori
073e89f3e6 Synchronize with sys/i386/isa/fd.c revision 1.102. 1997-09-18 08:10:45 +00:00
KATO Takenori
61fd9882c1 Synchronize with sys/i386/conf/options.i386 and sys/i386/isa/fd.c
revisions 1.59 and 1.101, respectively.
1997-09-17 08:01:07 +00:00
KATO Takenori
e70ee0f24b Synchronize with sys/i386/isa/mse.c, pcaudio.c, sio.c and syscons.c
revisions 1.34, 1.37, 1.181 and 1.232, respectively.
1997-09-14 16:27:37 +00:00
KATO Takenori
52f3a7293c Synchronize with sys/i386/isa/sio.c revision 1.180. 1997-09-01 10:45:02 +00:00
KATO Takenori
dd4ca852b4 Synchronize with sys/i386/isa/clock.c revision 1.102. 1997-09-01 10:44:06 +00:00
KATO Takenori
bc4534f4cc Synchronize with sys/i386/isa/clock.c and sio.c revisions 1.101 and
i.178, respectively.
1997-08-30 15:47:49 +00:00
KATO Takenori
463695c856 Synchronize with sys/i386/i386/userconfig.c and sys/i386/isa/clock.c
revisions 1.89 and 1.100, respectively.
1997-08-22 08:12:14 +00:00
KATO Takenori
28f454282d Synchronize with sys/i386/isa/sio.c revision up to 1.177. 1997-08-21 08:25:13 +00:00
KATO Takenori
1d39bbefd2 Synchronize with sys/i386/isa/clock.c revision 1.99. 1997-08-21 08:23:52 +00:00
KATO Takenori
3a19895e49 Synchronize with sys/i386/i386/trap.c revision 1.106 and
sys/i386/isa/sio.c revision 1.175.
1997-08-20 10:25:21 +00:00
KATO Takenori
b8baf50c94 Synchronize with sys/i386/isa/sio.c revision 1.174. 1997-08-06 09:42:57 +00:00
KATO Takenori
95ec91943b Synchronize with sys/i386/isa/clock.c revision 1.98. 1997-07-26 13:52:47 +00:00
KATO Takenori
1cc4d2e950 Synchronize with sys/i386/isa/clock.c revision up to 1.97. 1997-07-23 11:28:39 +00:00
KATO Takenori
50902335e5 Synchronize with sys/i386/isa/clock.c revision up to 1.95. 1997-07-21 13:12:01 +00:00
KATO Takenori
062569821c Synchronize with sys/i386/isa/fd.c, if_ed.c, if_fe.c, lpt.c, mse.c,
npx.c, isa.c, sio.c, syscons.c and wd.c revisions 1.100, 1.117, 1.29,
1.61, 1.33, 1.48, 1.95, 1.173, 1.226 and 1.132, respectively.
1997-07-21 13:11:16 +00:00
KATO Takenori
02f9294f2c Fixed the place of the `}' in comparam(). 1997-07-20 11:59:48 +00:00
KATO Takenori
72561927af Synchronize with sys/i386/isa/clock.c revision up to 1.92. 1997-07-20 11:55:52 +00:00
KATO Takenori
6f51f3ff27 Synchronize with sys/i386/isa/sio.c revision 1.172. 1997-07-17 10:35:43 +00:00
KATO Takenori
4e329ed74c Synchronize with sys/i386/isa/clock.c revision 1.89. 1997-07-13 12:14:18 +00:00
KATO Takenori
9679e98125 Synchronize with sys/i386/isa/clock.c and isa.c revisions 1.88 and
1.93, respectively.
1997-06-26 14:49:25 +00:00
KATO Takenori
3d9271a28a Synchronize with sys/i386/isa/sio.c and sioreg.h revisions1.171 and
1.10, respectively.
1997-06-06 13:09:55 +00:00
KATO Takenori
8f9fda2b35 Synchronize with sys/i386/isa/sio.c and sioreg.h revisions 1.170 and
1.9, respectively.
1997-06-04 10:27:53 +00:00
KATO Takenori
91097827d5 Synchronize with following files:
Revision  Changes    Path
>  1.165     +2 -1      src/sys/i386/conf/files.i386
>  1.246     +2 -1      src/sys/i386/i386/machdep.c
>  1.98      +2 -2      src/sys/i386/i386/trap.c
>  1.87      +2 -2      src/sys/i386/isa/clock.c
>  1.89      +2 -356    src/sys/i386/isa/isa.c
>  1.45      +2 -1      src/sys/i386/isa/npx.c
1997-06-02 15:45:40 +00:00
KATO Takenori
4e370d3488 Synchronize with sys/i386/isa/sio.c revision 1.169. 1997-06-02 10:51:34 +00:00
KATO Takenori
1ed2d1f6da Synchronize with following changes:
>  Revision  Changes    Path
>   1.97      +2 -1      src/sys/i386/i386/trap.c
>   1.86      +2 -1      src/sys/i386/isa/clock.c
>   1.88      +2 -1      src/sys/i386/isa/isa.c
>   1.44      +3 -2      src/sys/i386/isa/npx.c
1997-05-31 12:43:17 +00:00
KATO Takenori
e18ae85fff Synchronize with sys/i386/isa/clock.c and sio.c revisions 1.85 and
1.168, respectively.
1997-05-30 09:57:09 +00:00
KATO Takenori
b187553216 Synchronize with sys/i386/isa/clock.c revision 1.84. 1997-05-28 09:04:26 +00:00
KATO Takenori
beaea33867 Synchronize with sys/i386/isa/sio.c revison 1.167. 1997-05-19 12:39:42 +00:00
KATO Takenori
c231b961b4 Synchornize with sys/i386/isa/clock.c revision upto 1.94. 1997-05-05 13:13:47 +00:00
KATO Takenori
e1ee467aaf Merge SMP code from IBM-PC tree into PC-98 tree. 1997-04-27 13:22:09 +00:00
KATO Takenori
3238d14c9e Synchronize with sys/i386/isa/sio.c revision 1.163. 1997-04-19 14:54:32 +00:00
KATO Takenori
f62f53e408 Synchronize with sys/i386/isa/clock.c revision 1.80. 1997-04-07 10:53:14 +00:00
KATO Takenori
5b6bca02c7 Synchronize with sys/i386/isa/sio.c revision 1.162. 1997-04-05 15:04:32 +00:00
Bruce Evans
3a32c6706b Don't include <sys/ioctl.h> in the kernel. Stage 9: same changes
in pc98 as in isa.
1997-03-24 12:29:48 +00:00
Bruce Evans
fe10481de8 Don't #include <sys/fcntl.h> in <sys/file.h> if KERNEL is defined.
Fixed everything that depended on getting fcntl.h stuff from the wrong
place.  Most things don't depend on file.h stuff at all.
1997-03-23 03:49:00 +00:00
KATO Takenori
b95c15c20f Added missing i8251 code.
Submitted by:	H. Nokubi <h-nokubi@nmit.mt.nec.co.jp>
1997-03-06 15:07:04 +00:00
KATO Takenori
85c57124b2 Synchronize with sys/i386/isa/clock.c revision 1.79. 1997-03-05 16:19:48 +00:00
KATO Takenori
5db523b1d5 Fixed devfs code. Old code remained in pc98 tree.
Submitted by:	URATA Shuichiro <s-urata@nmit.tmg.nec.co.jp>
1997-03-04 06:39:02 +00:00
Peter Wemm
6875d25465 Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not
ready for it yet.
1997-02-22 09:48:43 +00:00
KATO Takenori
6ed46f82d8 Synchronize with Lite/2 commit: i386/i386/machdep.c, i386/i386/trap.c,
i386/isa/fd.c and i386/isa/wd.c revisions 1.227, 1.87, 1.96 and 1.123,
respectively.
1997-02-10 11:53:20 +00:00
KATO Takenori
15466e1892 Moved macros which are related to BIOS work area from pc98.h
(corresponds to isa.h) to pc98_machdep.h.
1997-02-07 19:07:43 +00:00
KATO Takenori
59e8efa110 Synchronize with sys/i386/isa/sio.c revision 1.158. 1997-02-02 08:09:41 +00:00
KATO Takenori
da2c67c4aa Synchronize with sys/i386/isa/sio.c revision 1.157. 1997-01-30 10:48:06 +00:00
KATO Takenori
d3e1120fab Synchronize with sys/i386/isa/clock.c revision 1.75. 1997-01-30 10:44:05 +00:00
KATO Takenori
c59a3dbd01 - Changed retry count from 1000000 to 10000 (same as IBM-PC's).
- Deleted unnecessary DELAY().
- Deleted space character at the end of line.
1997-01-18 15:51:43 +00:00
KATO Takenori
b1c7657eef Synchronize with sys/i386/isa/clock.c (revision 1.74). 1997-01-18 10:25:04 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
KATO Takenori
af4342c037 Staticize the functions rtc_inb, rtc_outb, rtc_serialcombit, and
rtc_serialcom.  These functions are only used by PC98.
1997-01-10 17:11:09 +00:00
KATO Takenori
a2aded7b8e Add `#ifdef PC98' to include PC98-specific code. Add declaration of the
function rtc_outb().
This is a 2.2 candidate.
1997-01-04 06:38:46 +00:00
KATO Takenori
d2ff8b7ea8 Synchronize with sys/i386/isa/sio.c revision 1.155 (use breakpoint()
instead of Debugger()).
1996-12-24 11:47:52 +00:00
KATO Takenori
a413ea0d8a Synchronize with sys/i386/isa/fd.c revision 1.94 (disable disk
statistics support).
1996-12-19 08:17:08 +00:00
Satoshi Asami
7a8e4111ee Syncronize.
Submitted by: The FreeBSD(98) Development Team
1996-12-04 04:36:59 +00:00
Satoshi Asami
f48465862b Synchronize with the RELENG_2_2 branch.
Definite 2.2 candidate.

Submitted by: The FreeBSD(98) Development Team
1996-12-04 04:21:30 +00:00
Satoshi Asami
6b2f48440f Re-sync with -current. Should be in 2.2.
Submitted by:	The FreeBSD(98) Development Team
1996-11-09 00:39:59 +00:00
Satoshi Asami
ce8ba0cdf6 The last update/merge of PC98 stuff before 2.2. The whole
pc98/pc98/sound directory has vanished now!

Submitted by:	FreeBSD(98) Development Team
1996-11-02 10:41:28 +00:00
Satoshi Asami
e30f001135 More merge and update.
(1) deleted #if 0

    pc98/pc98/mse.c

(2) hold per-unit I/O ports in ed_softc

    pc98/pc98/if_ed.c
    pc98/pc98/if_ed98.h

(3) merge more files by segregating changes into headers.

  new file (moved from pc98/pc98):

    i386/isa/aic_98.h

  deleted:

    well, it's already in the commit message so I won't repeat the
    long list here ;)

Submitted by:	The FreeBSD(98) Development Team
1996-10-30 22:41:46 +00:00
Satoshi Asami
4d2d765487 Another round of merge/updates.
(1) Add #ifdef PC98:

	sys/pc98/boot/biosboot/boot2.S

 (2) Fix bug that made it impossible to boot from sd's other than unit 0:
	sys/pc98/boot/biosboot/sys.c

 (3) Delete redundant $Id$:

	sys/pc98/pc98/clock.c (reject$B$5$l$k$+$b$7$l$J$$(B)

 (4) unt -> u_int:
	sys/pc98/pc98/if_ed.c

 (5) Add support for rebooting by the hot-key sequence:

	sys/pc98/pc98/kbdtables.h

 (6) Display now looks like PC/AT version:

	sys/pc98/pc98/npx.c

 (7) Change comment to match that of PC/AT version:

	sys/pc98/pc98/pc98.c

 (8) Add function prototypes:

	sys/pc98/pc98/pc98_machdep.c

 (9) Include PC98 headers:

	sys/pc98/pc98/sound/adlib_card.c
	sys/pc98/pc98/sound/audio.c
	sys/pc98/pc98/sound/dev_table.c
	sys/pc98/pc98/sound/dmabuf.c
	sys/pc98/pc98/sound/midi_synth.c
	sys/pc98/pc98/sound/midibuf.c
	sys/pc98/pc98/sound/opl3.c
	sys/pc98/pc98/sound/oatmgr.c
	sys/pc98/pc98/sound/sb16_dsp.c
	sys/pc98/pc98/sound/sb16_midi.c
	sys/pc98/pc98/sound/sb_card.c
	sys/pc98/pc98/sound/sb_dsp.c
	sys/pc98/pc98/sound/sb_midi.c
	sys/pc98/pc98/sound/sb_mixer.c
	sys/pc98/pc98/sound/sequencer.c
	sys/pc98/pc98/sound/sound_config.h
	sys/pc98/pc98/sound/sound_switch.c
	sys/pc98/pc98/sound/soundcard.c
	sys/pc98/pc98/sound/sys_timer.c

(10) Merge in PC98 changes:

	sys/i386/isa/sound/os.h

(11) Deleted as result of 9. and 10. above:

	sys/pc98/pc98/sound/ad1848_mixer.h
	sys/pc98/pc98/sound/aedsp16.c
	sys/pc98/pc98/sound/coproc.h
	sys/pc98/pc98/sound/finetune.h
	sys/pc98/pc98/sound/gus_hw.h
	sys/pc98/pc98/sound/gus_linearvol.h
	sys/pc98/pc98/sound/hex2hex.h
	sys/pc98/pc98/sound/mad16.h
	sys/pc98/pc98/sound/midi_ctrl.h
	sys/pc98/pc98/sound/midi_synth.h
	sys/pc98/pc98/sound/opl3.h
	sys/pc98/pc98/sound/os.h
	sys/pc98/pc98/sound/pas.h
	sys/pc98/pc98/sound/sb_mixer.h
	sys/pc98/pc98/sound/soundvers.h
	sys/pc98/pc98/sound/tuning.h

Submitted by:	The FreeBSD(98) Development Team
1996-10-29 08:37:02 +00:00
Satoshi Asami
4f3d818c12 Another round of merge.
(1) Bug fix (pass boot drive):

	pc98/boot/biosboot/boot2.S

(2) Delete code for unsupported high-resolution modes and move old
    Epson notebook code to epsonio.h:

  	pc98/boot/biosboot/io.c
	pc98/i386/vm_machdep.c
	pc98/pc98/fd.c
	pc98/pc98/pc98.c
	pc98/pc98/pc98.h
	pc98/pc98/epsonio.h (new)

(3) Change aic driver so that PCMCIA cards (I/O port same as PC/AT)
    and PC-9801-100 cards can be selected with a flag in kernel config
    file:

	pc98/pc98/aic6360.c
	pc98/pc98/aic_98.h (new)

(4) Fix wcd entry (it was broken).  Delete mcd, it doesn't work on
    98.  Change aic entry according to above:

	pc98/conf/GENERIC98

(5) Move pc98_machdep.c to top of files in pc98/pc98:

	pc98/conf/files.pc98

(6) Delete empty lines:

	pc98/i386/locore.s

(7) Fix (it didn't work if I586 was specified):

	pc98/pc98/clock.c

(8) Staticize:

	pc98/pc98/pc98_machdep.c

(9) Enable workaround for Cyrix bug for 5x86 also:

	pc98/i386/machdep.c
	pc98/i386/trap.c

All the above deletes this file too:

	pc98/i386/pmap.c

(phew!)
Submitted by:	The FreeBSD(98) Development Team
1996-10-23 07:25:35 +00:00
Satoshi Asami
dffcea8d5f Another round of updates. Highlights:
(1) Merged i386/i386/sb.h, deleted pc98/pc98/sb.h.

(2) pc98/conf/GENERIC8 looks more like i386/conf/GENERIC now.

(3) Fixed display bug in pc98/boot/biosboot/io.c.

(4) Prepare to merge memory allocation routines:

	pc98/i386/locore.s
	pc98/i386/machdep.c
	pc98/pc98/pc98_machdep.c
	pc98/pc98/pc98_machdep.h

(5) Support new board "C-NET(98)":

	pc98/pc98/if_ed98.h
	pc98/pc98/if_ed.c

(6) Make sure FPU is recognized for non-Intel CPUs:

	pc98/pc98/npx.c

(7) Do not expect bss to be zero-allocated:

	pc98/pc98/pc98.c

Submitted by:	The FreeBSD(98) Development Team
1996-10-09 21:47:16 +00:00
Bruce Evans
c20b324bb6 Put I*86_CPU defines in opt_cpu.h. 1996-10-09 19:47:44 +00:00
Satoshi Asami
0e408c25a1 Another round of merge/update.
(1) Add PC98 support to apm_bios.h and ns16550.h, remove pc98/pc98/ic
(2) Move PC98 specific code out of cpufunc.h (to pc98.h)
(3) Let the boot subtrees look more alike

Submitted by:	The FreeBSD(98) Development Team
		<freebsd98-hackers@jp.freebsd.org>
1996-09-12 11:12:18 +00:00
Satoshi Asami
29dde1ef71 More merge. Change "pc98" to "isa" in a few places. Misc. cleanup.
Add some more devices to userconfig.c.

Submitted by:	The FreeBSD(98) Development Team
1996-09-10 09:39:22 +00:00
Satoshi Asami
c9da8434ea Yet another merge. Remove support.s by deleting memcopy. Remove
autoconf.c by merging icu.h.  Fix a couple of typos.

Submitted by:	The FreeBSD(98) Development Team.
1996-09-07 02:14:47 +00:00
Satoshi Asami
1225e2435d Second phase of merge, get rid of more machine-independent-dependencies.
Get rid of pc98/pc98/pc98_device.h.

Submitted by:	The FreeBSD(98) Development Team
1996-09-03 10:24:29 +00:00
Satoshi Asami
b316c8b2a7 s/pc98/isa/g in struct *_device and *_driver. Resync along the way.
Submitted by:	The FreeBSD(98) Development Team
1996-08-31 15:07:42 +00:00
Satoshi Asami
91eb961985 Re-sync with the state of PC98 world. This will be the last commit before
we start merging things in earnest...

Submitted by:	The FreeBSD(98) Development Team
1996-08-30 10:43:14 +00:00
Satoshi Asami
edd84a267a Another round of merge.
Submitted by:	The FreeBSD(98) Development Team
1996-07-30 18:56:16 +00:00
Satoshi Asami
92b4f2e0df Update to current state of PC98 world.
Submitted by:	The FreeBSD(98) development team
1996-07-23 07:46:59 +00:00
Satoshi Asami
4c7278c696 The PC98-specific files.
Ok'd by:	core
Submitted by:	FreeBSD(98) development team
1996-06-14 10:04:54 +00:00