Commit Graph

53 Commits

Author SHA1 Message Date
KATO Takenori
635a64d91f Sync with sys/i386/conf/majors.i386 revision 1.71. 1999-05-05 03:41:39 +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
6a0f06b109 Sync with sys/i386/conf/majors.i386 revision up to 1.68. 1999-03-17 08:59:31 +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
38d2964075 Remove 'alog'. 1999-01-20 08:31:56 +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
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
f06eb99ea9 Sync with sys/i386/conf/majors.i386 revision 1.59. 1999-01-04 08:08:28 +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
7ef0b9d6e5 Sync with sys/i386/conf/majors.i386 revision up to 1.55. 1998-12-04 14:39:29 +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
91dc9190a6 Sync with sys/i386/conf/majors.i386 revision 1.50. 1998-09-22 16:11:38 +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
3031fd3097 Sync with sys/i386/conf/majors.i386 revision 1.48. 1998-09-14 10:43:26 +00:00
KATO Takenori
00d11a6a37 Sync with sys/i386/conf/majors.i386 revision 1.47. 1998-09-09 14:40:27 +00:00
KATO Takenori
c2dc9fa74b Sync with sys/i386/conf/majors.i386 revision 1.46. 1998-08-28 12:49:09 +00:00
KATO Takenori
5634e13ae6 Sync with sys/i386/conf/majors.i386 revision 1.45. 1998-08-10 16:54:47 +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
cdd1d1d0fd Sync with sys/i386/conf/majors.i386 revision 1.43. 1998-05-29 13:34:22 +00:00
KATO Takenori
73a9e38355 Sync with sys/i386conf/majors.i386 revision 1.42. 1998-05-14 12:42:11 +00:00
KATO Takenori
2b4c22da51 Sync with sys/i386/conf/majors.i386 revision 1.41. 1998-05-13 10:40:32 +00:00
KATO Takenori
b0fb6a41a9 Sync with sys/i386/conf/majors.i386 revision 1.40. 1998-05-12 09:31:12 +00:00
KATO Takenori
d6226d453f Sync with sys/i386/conf/majors.i386 revision 1.39. 1998-04-22 13:35:21 +00:00
KATO Takenori
141d52a900 Sync with sys/i386/conf/majors.i386 revision 1.37. 1998-04-18 05:09:50 +00:00
KATO Takenori
71e3969b24 Sync with sys/i386/conf/majors.i386 revision 1.36. 1998-02-27 15:20:07 +00:00
KATO Takenori
aa76a48760 Sync with sys/i386/conf/majors.i386 revision 1.35. 1998-02-26 03:22:05 +00:00
KATO Takenori
ba065b1a91 Sync with sys/i386/conf/majors.i386 revision 1.34. 1998-02-21 15:49:45 +00:00
KATO Takenori
20bea78d8c Sync with sys/i386/conf/majors.i386 revision 1.33. 1998-02-20 12:24:18 +00:00
KATO Takenori
3fa6dbe912 Sync with sys/i386/conf/majors.1.31. 1998-02-19 08:43:25 +00:00
KATO Takenori
2df8bcb8a9 Sync with sys/i386/conf/majors.i386 revision 1.29. 1998-02-18 12:34:32 +00:00
KATO Takenori
9c9349c9e7 Sync with sys/i386/conf/majors.i386 revision 1.27. 1998-02-14 08:40:09 +00:00
KATO Takenori
be46464127 Sync with sys/i386/conf/majors.i386 revision 1.26. 1998-02-13 16:57:31 +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
3c4f86eec1 Sync with sys/i386/conf/majors.i386 revision 1.24. 1998-01-18 15:08:34 +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
79f9049c46 Sync with sys/i386/conf/majors.i386 revision up to 1.22. 1997-11-19 11:34:22 +00:00
KATO Takenori
c64b60fbd7 Sync with sys/i386/conf/majors.i386 revision 1.20. 1997-11-10 13:46:38 +00:00
KATO Takenori
8cad0554ae Synchronize with sys/i386/conf/GENERIC and majors.i386 revisions 1.99
and 1.19, respectively.
1997-10-27 10:57:58 +00:00
KATO Takenori
9654a2b7eb Synchronize with sys/i386/conf/majors.i386 revision 1.18. 1997-09-24 08:20:33 +00:00
KATO Takenori
a1b442d74c Synchronize with sys/i386/conf/files.i386 and majors.i386 revisions
1.172 and 1.17, respectively.
1997-08-28 14:21:12 +00:00
KATO Takenori
b89a4737ed Synchronize with sys/i386/conf/majors.i386 revision 1.16. 1997-08-17 03:36:09 +00:00
KATO Takenori
11ca45ebea Synchronize with sys/i386/conf/majors.i386 revision 1.15. 1997-08-16 01:33:10 +00:00
KATO Takenori
ef5c2a7815 Synchronize with sys/i386/conf/majors.i386 revision 1.14. 1997-03-11 16:18:08 +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
512b30df54 Synchronize with sys/i386/conf/majors.i386 revision 1.12. 1997-02-11 13:54:44 +00:00
KATO Takenori
5007dce7da Synchronize with sys/i386/conf/majors.i386 revision 1.11. 1997-02-08 07:39:07 +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
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