Commit Graph

126 Commits

Author SHA1 Message Date
Peter Wemm
c3aac50f28 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +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
6ae1d5b1aa Sync with sys/i386/isa/clock.c revision up to 1.142. 1999-07-30 11:43:10 +00:00
KATO Takenori
3311081bea Sync with sys/i386/isa/clock.c revision up to 1.140.
This commit may break 8MHz system clock mode.
1999-07-26 12:21:09 +00:00
KATO Takenori
bd2a72fdc9 Sync with sys/i386/isa/clock.c revision 1.138. 1999-06-28 13:11:16 +00:00
KATO Takenori
22001fd033 Sync with sys/i386/isa/clock.c revision 1.137. 1999-06-24 08:32:52 +00:00
KATO Takenori
f0828bf1b0 Sync with sys/i386/isa/clock.c revision 1.136. 1999-06-01 12:32:54 +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
482f0be026 Sync with sys/i386/isa/clock.c revision 1.132. 1999-04-28 08:06: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
22cd7960a2 The "easy" fixe for compiling the kernel -Wunused: remove unreferenced
local variable.
1999-01-28 11:36:22 +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
7f9848cd68 Sync with sys/i386/isa/clock.c revision 1.128. 1998-10-23 13:13:43 +00:00
KATO Takenori
854de3d138 Fix for wrap arround. 1998-10-13 03:24:01 +00:00
KATO Takenori
f1132a191e Implement TSC clock calibration for PC-98. 1998-10-13 02:33:21 +00:00
KATO Takenori
42d36a9a0b Sync with sys/i386/isa/clock.c revision 1.127. 1998-09-22 16:12:00 +00:00
KATO Takenori
e0029f2568 Sync with sys/i386/isa/clock.c revision 1.126. 1998-09-20 10:51:57 +00:00
KATO Takenori
9df3bd9208 Sync with sys/i386/isa/clock.c revision 1.125. 1998-09-08 09:47:46 +00:00
KATO Takenori
a06a8629ce Sync with sys/i386/isa/clock.c revision 1.124. 1998-06-10 08:25:23 +00:00
KATO Takenori
4dd125707d Sync with sys/i386/isa/clock.c revision 1.123. 1998-06-08 08:56:43 +00:00
KATO Takenori
4b71df3705 Sync with sys/i386/isa/clock.c revision 1.122. 1998-06-07 09:51:08 +00:00
KATO Takenori
35800bf56f Sync with sys/i386/isa/clock.c revision 1.121. 1998-05-28 13:51:39 +00:00
KATO Takenori
499579a474 Sync with sys/i386/isa/clock.c revision 1.120. 1998-05-20 13:38:42 +00:00
KATO Takenori
b30dab363b System clock speed is always detected automatically. 1998-05-04 07:47:33 +00:00
KATO Takenori
237d5c328a Sync with sys/i386/isa/clock.c revision 1.119. 1998-04-06 03:38:18 +00:00
KATO Takenori
2dbeac88d1 Sync with sys/i386/i386/trap.c revision 1.125 and sys/i386/isa/clock.c
revision 1.118.
1998-03-31 07:53:13 +00:00
KATO Takenori
b96ae93234 Sync with sys/i386/isa/clock.c revision 1.117. 1998-03-17 08:42:18 +00:00
KATO Takenori
d16238bcdd Sync with sys/i386/isa/clock.c revision 1.116. 1998-03-15 13:35:42 +00:00
KATO Takenori
546c9ed396 Sync with sys/i386/isa/clock.c revision 1.115. 1998-03-07 15:43:43 +00:00
KATO Takenori
55a5998a24 Sync with sys/i386/isa/clock.c revision 1.114. 1998-03-01 05:22:25 +00:00
KATO Takenori
9f3962f9bb Sync with sys/i386/isa/clock.c revision 1.113. 1998-02-23 12:24:27 +00:00
KATO Takenori
6dd95c2390 Sync with sys/i386/isa/clock.c revision 1.112. 1998-02-22 13:44:39 +00:00
KATO Takenori
7cd00cc31e Oops, previous commit was incomplete. 1998-02-21 15:54:23 +00:00
KATO Takenori
c2515e4e62 Sync with sys/i386/isa/clock.c revision 1.111. 1998-02-21 15:52:40 +00:00
KATO Takenori
a7378a5844 Sync with sys/i386/isa/clock.c revision 1.110. 1998-02-13 09:32:17 +00:00
KATO Takenori
cf43dcc13b Sync with sys/i386/isa/clock.c and spker.c revision 1.109 and 1.32,
resplectivley.
1998-02-09 15:05:44 +00:00
KATO Takenori
bbc4f6d526 Sync with sys/i386/isa/clock.c revision 1.108. 1998-01-28 12:25: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
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
9621c9ed58 Synchronize with sys/i386/isa/clock.c revision 1.104. 1997-11-19 11:35:22 +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
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
1d39bbefd2 Synchronize with sys/i386/isa/clock.c revision 1.99. 1997-08-21 08:23:52 +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
72561927af Synchronize with sys/i386/isa/clock.c revision up to 1.92. 1997-07-20 11:55:52 +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
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
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
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
f62f53e408 Synchronize with sys/i386/isa/clock.c revision 1.80. 1997-04-07 10:53:14 +00:00
KATO Takenori
85c57124b2 Synchronize with sys/i386/isa/clock.c revision 1.79. 1997-03-05 16:19:48 +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
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
d3e1120fab Synchronize with sys/i386/isa/clock.c revision 1.75. 1997-01-30 10:44:05 +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
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
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
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
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