Commit Graph

143 Commits

Author SHA1 Message Date
KATO Takenori
13b4772498 Merge from sys/i386/conf/options.i386 revision .1.20. 1999-08-23 13:39:32 +00:00
KATO Takenori
e0ecb87a2b Sync with sys/i386/conf/options.i386 revision 1.119. 1999-08-08 11:13:47 +00:00
KATO Takenori
ae67c36030 Sync with sys/i386/conf/options.i386 revision 1.118. 1999-06-24 08:31:08 +00:00
KATO Takenori
773e7f413e Sync with sys/i386/conf/options.i386 revision 1.117. 1999-06-17 11:07:52 +00:00
Doug Rabson
814ce98883 Floppy driver options moved to conf/options. 1999-06-05 13:57:10 +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
607f92b4bd Sync with sys/i386/conf/options.i386 revision 1.114. 1999-05-25 10:30:58 +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
949f91f87c Sync with sys/i386/conf/options.i386 revision 1.112. 1999-04-25 04:05:31 +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
05fa4a899f Sync with sys/i386/conf/options.i386 revision 1.110. 1999-03-17 09:00:33 +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
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
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
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
9faa78835a Sync with sys/i386/conf/options.i386 revision 1.101. 1999-01-04 08:09:15 +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
3f89e59381 Sync with sys/i386/conf/options.i386 revision 1.96. 1998-12-21 09:58:37 +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
7d1d31e431 Sync with sys/i386/conf/optins.i386 revision 1.94. 1998-12-05 09:20:53 +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
258591400a Sync with sys/i386/conf/options.i386 revision 1.92. 1998-11-16 08:11:58 +00:00
KATO Takenori
48ba888a6a Sync with sys/i386/conf/options.i386 revision 1.91. 1998-11-06 08:07:00 +00:00
KATO Takenori
4536af6a70 - Implement enabling write allocate on AMD K5/K6/K6-2 cpus.
The code was originaly contributed by Kelly Yancey
  <kbyanc@freedomnet.com> in PR i386/6269 and revised by Akio Morita
  <amorita@meadow.scphys.kyoto-u.ac.jp> and me.  Test was performed by
  Akio Morita and Toshiomi Moriki <moriki@db.is.kyushu-u.ac.jp>.
- Fix stylistic bug in identcpu.c.
- Update copyright in initcpu.c
- Fix typo in LINT.

PR:		6269 and 6270
1998-10-06 13:16:29 +00:00
KATO Takenori
f36effada3 Sync with sys/i386/conf/options.i386 revision 1.89. 1998-09-28 08:23:26 +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
c792da10e3 Sync with sys/i386/conf/options.i386 revision 1.85. 1998-09-09 14:39:20 +00:00
KATO Takenori
1e62449ada Sync with sys/i386/conf/options.i386 revision up to 1.84. 1998-08-10 16:54:09 +00:00
KATO Takenori
1479b9a895 Sync with sys/i386/conf/options.i386 revision 1.82. 1998-07-02 12:40:01 +00:00
KATO Takenori
060b58da67 Make LINE30 a new style option. 1998-06-06 05:25:37 +00:00
KATO Takenori
0f66fe0109 Make BS_TARG_SAFEMODE a new style option. 1998-06-06 05:21:56 +00:00
KATO Takenori
150bac3199 Sync with sys/i386/conf/options.i386 revision 1.78. 1998-05-12 09:31:44 +00:00
KATO Takenori
9bfbfc62fd Sync with sys/i386/conf/options.i386 revision 1.77. 1998-04-20 13:52:44 +00:00
KATO Takenori
61324207f1 Make EPSON_BOUNCEDMA a new-style option. 1998-03-17 09:11:03 +00:00
KATO Takenori
1af2c4fbaa Sync with sys/i386/conf/options.i386 revision 1.76. 1998-03-10 12:48:57 +00:00
KATO Takenori
3e8e255152 Make FPU_ERROR_BROKEN a new-style option. 1998-03-09 10:17:13 +00:00
KATO Takenori
2d67fcee71 Make pc98 options new-style. 1998-02-21 16:17:55 +00:00
KATO Takenori
9217f466af Sync with sys/i386/conf/options.i386 revision 1.21. 1998-02-21 15:50:26 +00:00
KATO Takenori
98e4a3a40b Sync with sys/i386/conf/options.i386 revision 1.72. 1998-02-12 08:15:51 +00:00
KATO Takenori
8e1f6a1f4a Sync with sys/i386/conf/options.i386 revision 1.71. 1998-02-04 10:22:05 +00:00
KATO Takenori
27b31fd7be Cosmetic changes (indentation, reordering and using existing file name).
Pointed by:	Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
1998-02-02 07:55:31 +00:00
KATO Takenori
698059e01d Sync with sys/i386/conf/files.i386 revision 1.69.
Pointed by:	KAHO Toshikazu <kaho@rocky.kais.kyoto-u.ac.jp>
Forgotten by:	kato
1998-02-02 07:50:12 +00:00
KATO Takenori
e2e660e926 Sync with sys/i386/conf/options.i386 revision 1.70. 1998-01-31 14:10:14 +00:00
KATO Takenori
15ebf6c973 Sync with sys/i386/confi/files.i386, majors.i386 and options.i386
revisions 1.187, 1.25 and 1.68, respectively.
1998-01-26 09:17:43 +00:00
KATO Takenori
40f6a786db Sync with sys/i386/conf/options.i386 revision 1.67. 1998-01-25 09:45:38 +00:00
KATO Takenori
c3ab585b5e Sync with sys/i386/conf/options.i386 revision 1.66. 1997-12-29 16:17:59 +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
KATO Takenori
fede2ad755 Sync with sys/i386/conf/files.i386, majors.i386 and options.i386
revisions 1.181, 1.23 and 1.64, respectively.
1997-12-10 09:28:59 +00:00
KATO Takenori
51b6cb0d6a Sync with sys/i386/conf/options.i386 revision 1.63. 1997-12-05 11:51:29 +00:00
KATO Takenori
ce22fd7cac Synchronize with sys/i386/conf/options.i386 revision 1.62. 1997-10-18 14:19:57 +00:00
KATO Takenori
e429a56a35 Synchronize with sys/i386/conf/options.i386 revision 1.61. 1997-10-12 11:59:43 +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
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
7aa7e2b075 Synchronize with sys/i386/conf/options.1386 revision 1.58. 1997-09-05 10:18:16 +00:00
KATO Takenori
17f8b8963b Synchronize with sys/i386/conf/options.i386 revision 1.57. 1997-09-01 10:41:04 +00:00
KATO Takenori
f791a51afe Synchronize with sys/i386/conf/options.i386 revision 1.55. 1997-08-09 01:58:50 +00:00
KATO Takenori
bbd5c527aa Synchronize with sys/i386/conf/options.i386 revision 1.54. 1997-08-02 10:23:17 +00:00
KATO Takenori
0f3fdd504d Synchronize with sys/i386/conf/options.i386 revision 1.53. 1997-08-02 06:58:07 +00:00
KATO Takenori
2f2a1f2613 Synchronize with sys/i386/conf/options.i386 revision 1.52. 1997-07-26 13:53:27 +00:00
KATO Takenori
94a95fad51 Synchronize with sys/i386/conf/options.i386 revision 1.51. 1997-07-26 01:35:14 +00:00
KATO Takenori
c39114cfcf Added CPU_BLUELIGHTNING_FPU_OP_CACHE and CPU_BLUELIGHTNING_3X.
Forgotten-by:	me.
1997-07-14 12:33:06 +00:00
KATO Takenori
4a2adb3998 Synchronize with sys/i386/conf/options.i386 revision 1.50. 1997-07-14 12:31:27 +00:00
KATO Takenori
d9b8e3127c Synchronize with sys/i386/conf/options.i386 revision 1.49. 1997-07-02 11:00:56 +00:00
KATO Takenori
879210125e Synchronize with following changes:
>  Revision  Changes    Path
>  1.250     +1 -18     src/sys/i386/i386/machdep.c
>  1.48      +1 -7      src/sys/i386/conf/options.i386
>  1.251     +19 -46    src/sys/i386/i386/machdep.c
>  1.24      +2 -6      src/sys/i386/i386/microtime.s
>  1.100     +4 -15     src/sys/i386/i386/trap.c
>  1.46      +6 -7      src/sys/i386/isa/npx.c
1997-06-23 09:35:47 +00:00
KATO Takenori
857e7b5d5b Synchronize with sys/i386/conf/options.i386 revision 1.47. 1997-06-06 13:07:18 +00:00
KATO Takenori
1e86ea47d9 Synchronize with sys/i386/conf/options.i386 revision 1.46. 1997-06-04 10:29:17 +00:00
KATO Takenori
8372e1b55f Synchronize with sys/i386/conf/files.i386 and options.i386 revisions
1.161 and 1.45, respectively.
1997-05-23 10:11:04 +00:00
KATO Takenori
5e76cb1c34 Synchronize with sys/i386/conf/options.i386 revision 1.44. 1997-05-08 09:18:11 +00:00
KATO Takenori
1a0345d543 Synchronize with sys/i386/conf/options.i386 and sys/i386/isa/wd.c
revisions 1.43 and 1.129, respectively.
1997-04-29 03:15:47 +00:00
KATO Takenori
9a2660b252 Synchornize with sys/i386/conf/options.i386 revision 1.42. 1997-04-28 15:49:55 +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
c749b25885 Synchronize with sys/i386/conf/options.i386 revision 1.39. 1997-04-05 15:06:30 +00:00
KATO Takenori
4c024bbdf8 Improved CPU identification and initialization routines. This
supports All Cyrix CPUs, IBM Blue Lightning CPU and NexGen (now AMD)
Nx586 CPU, and initialize special registers of Cyrix CPU and msr of
IBM Blue Lightning CPU.

If revision of Cyrix 6x86 CPU < 2.7, CPU cache is enabled in
write-through mode.  This can be disabled by kernel configuration
options.

Reviewed by:	Bruce Evans <bde@freebsd.org> and
            	Jordan K. Hubbard <jkh@freebsd.org>
1997-03-22 18:54:54 +00:00
KATO Takenori
904385e65b Synchornize with sys/i386/conf/options.i386 revision 1.37. 1997-03-13 17:04:23 +00:00
KATO Takenori
7f247c74a9 Synchronize with sys/i386/conf/options.i386 revision 1.36. 1997-03-01 11:06:41 +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
d00c34d948 Synchronize with sys/i386/conf/options.i386 revision 1.34. 1997-01-28 13:10:22 +00:00
KATO Takenori
66548b7ce9 Synchronize with followings:
sys/i386/conf/files.i386 revision 1.149
	sys/i386/conf/options.i386 revision 1.33
	sys/i386/isa/if_fe.c revision 1.25
	sys/i386/isa/syscons.c revision 1.194
	sys/i386/isa/syscons.h revision 1.26
1997-01-16 14:50:17 +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
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
3c6350967c Another round of resync and some added sound support.
sys/pc98/i386/machdep.c: sync with i386/i386/machdep.c
sys/pc98/conf/options.pc98: sync with i386/conf/options.i386

sys/i386/isa/sound: DMA auto initialize mode support for PC98.
contributed by: Akio Morita <amorita@bird.scphys.kyoto-u.ac.jp>

Definite 2.2 material, I believe.

Submitted by:	The FreeBSD (98) Development Team
1996-11-13 02:00:17 +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
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
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