Commit Graph

308 Commits

Author SHA1 Message Date
Yoshihiro Takahashi
cbf0618984 Fix ordering. 1999-08-28 16:20:53 +00:00
Peter Wemm
c3aac50f28 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
KATO Takenori
a0abbb38fb Merge from sys/i386/conf/files.i386 revision 1.259. 1999-08-18 08:20:28 +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
ffd6f0c6a7 Sync with sys/i386/conf/files.i386 revision 1.257. 1999-08-08 11:12:00 +00:00
KATO Takenori
a5d4842f09 Removed apm_setup.s. 1999-07-30 11:40:55 +00:00
KATO Takenori
9365d83b9c Sync with sys/i386/conf/files.i386 revision 1.254. 1999-07-26 12:12:58 +00:00
KATO Takenori
6962200fc8 Removed device-dirver flags. 1999-07-09 13:19:35 +00:00
KATO Takenori
4b148932c7 PC98 part of the second phase of syscons reorganization.
Submitted by:	yokota
1999-06-24 10:51:40 +00:00
KATO Takenori
875a15da41 Sync with sys/i386/conf/files.i386 revision 1.247. 1999-06-21 11:11:39 +00:00
KATO Takenori
fe85f176c7 New parallel port support for PC98. Old PC98s which have
uni-directional parallel port should use olpt driver instead of lpt
driver.

Files ppc.c and ppcreg.h are copied form i386/isa directory with PC98
change.

Submitted by:	Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
1999-06-18 14:48:28 +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
848f97e37d Removed ucmpdi2.c 1999-05-17 12:07:00 +00:00
KATO Takenori
5eb7d0b887 Sync with sys/i386/conf/files.i386 revision 1.241. 1999-05-14 10:03:48 +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
58d78bbe43 Sync with sys/i386/conf/files.i386 revision 1.238. 1999-05-09 04:27:30 +00:00
KATO Takenori
bb0992d7ab Sync with sys/i386/conf/files.i386 revision 1.237. 1999-05-06 09:13:56 +00:00
KATO Takenori
742958ce9d Commented out adv_isa.c. 1999-04-24 04:22:57 +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
6b21bf93e7 Sync with sys/i386/conf/files.i386 revision 1.233. 1999-04-10 04:42:46 +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
3ba4fb4098 Sync with sys/i386/conf/files.i386 revision up to 1.232. 1999-04-01 13:40:47 +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
82a9512c46 Sync with sys/i386/conf/files.i386 revision up to 1.227. 1999-03-10 13:59:20 +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
dc461a09bb Merge with sys/i386/conf/files.i386 revision 1.224. 1999-03-02 14:03:21 +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
38d2964075 Remove 'alog'. 1999-01-20 08:31:56 +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
47badd2e6f Sync with sys/i386/conf/files.i386 revision up to 1.217. 1999-01-04 08:07:47 +00:00
KATO Takenori
bce191bf65 Enables snd driver. 1998-12-31 11:38:52 +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
3ab80a8e63 Sync with sys/i386/conf/files.i386 revision 1.207. 1998-12-25 09:04:11 +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
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
9e1e84578a Sync with sys/i386/conf/files.i386 revision 1.206. 1998-10-11 15:02:49 +00:00
KATO Takenori
47d002cf75 Sync with sys/i386/conf/files.i386 revision 1.205. 1998-09-20 10:50:18 +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
2663a4af57 Sync with sys/i386/conf/files.i386 revision 1.202. 1998-09-09 14:39:56 +00:00
KATO Takenori
2bfe25d193 Sync with sys/i386/conf/files.i386 revision 1.201. 1998-09-05 02:36:18 +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
fd3ae2d6b0 Sync with sys/i386/conf/files.i386 revision 1.199. 1998-07-21 12:07:02 +00:00
KATO Takenori
14f155eeb0 Sync with sys/i386/isa/conf/files.i386 revision 1.198. 1998-06-17 09:26:23 +00:00
KATO Takenori
68b675d4af Deleted unused item. 1998-05-05 13:19:34 +00:00
KATO Takenori
b4e7319708 Commented out ide_pci.c.
Reviewed by:	kato
Submitted by:	Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
1998-04-20 13:54:47 +00:00
KATO Takenori
47c5d70acc Sync with sys/i386/conf/files.i386 revision 1.197. 1998-04-20 13:52:13 +00:00
KATO Takenori
74a64e52c9 Sync with sys/i386/conf/files.i386 revision 1.196. 1998-04-07 09:08:27 +00:00
KATO Takenori
2d6b7367bc - Use existing file (psm.c) though the driver does not work under
PC-98 arch.
- Merge the change in sys/i386/conf/files.i386 revision from 1.187 to
1.188.
1998-03-30 12:36:16 +00:00
KATO Takenori
469057f93e Sync with sys/i386/conf/files.i386 revision 1.195. 1998-03-24 08:26:02 +00:00
KATO Takenori
8fb62a4f93 Sync with sys/i386/conf/files.i386 revision 1.194. 1998-03-14 02:31:00 +00:00
KATO Takenori
95b31a1d26 Sync with sys/i386/conf/files.i386 revision 1.193. 1998-02-26 03:21:41 +00:00
KATO Takenori
eb564225af Sync with sys/i386/conf/files.i386 revision 1.192. 1998-02-21 15:49:03 +00:00
KATO Takenori
5783aeff4d Sync with sys/i386/conf/files.i386 revision 1.191. 1998-02-19 08:42:57 +00:00
KATO Takenori
dc4179fd63 Sync with sys/i386/conf/files.i386 revision 1.190. 1998-02-18 12:34:01 +00:00
KATO Takenori
3ddaa5931a Sync with sys/i386/conf/files.i386 revision 1.189. 1998-02-16 09:38:37 +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
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
43a0695fdf Sync with sys/i386/conf/files.i386 revision 1.186. 1998-01-18 15:09:34 +00:00
KATO Takenori
7cd3361aa5 Sync with sys/i386/conf/files.i386 revision 1.185. 1998-01-15 15:09:00 +00:00
KATO Takenori
98e7f9ea42 Sync with sys/i386/conf/files.i386 revision 1.184. 1998-01-09 08:49:43 +00:00
KATO Takenori
232e69fdfa Sync with sys/i386/conf/files.i386 revision 1.183. 1998-01-06 13:47:54 +00:00
KATO Takenori
162c095232 Sync with sys/i386/conf/files.i386 revision 1.182. 1997-12-14 12:30:54 +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
769d22ee8b Sync with sys/i386/conf/files.i386 revision 1.180. 1997-12-02 08:20:34 +00:00
KATO Takenori
2a0c056dc0 Sync with sys/i386/conf/files.i386 revision 1.179. 1997-11-27 10:14:54 +00:00
KATO Takenori
47d57b2340 Synchronize with sys/i386/conf/files.i386 revision 1.178. 1997-10-28 14:29:23 +00:00
KATO Takenori
b0db572e2d Commented out entries of Luigi's sound driver. The name `pcm' is
conflict with sys/isa/sound/pcm86.c.

Pointed out by:	Mitsuru IWASAKI <iwasaki@pc.jaring.my>
1997-09-24 16:41:18 +00:00
KATO Takenori
727fd58620 Synchronize with sys/i386/conf/files.i386 revision 1.177. 1997-09-22 12:18:52 +00:00
KATO Takenori
b91a9de202 Synchronize with sys/i386/conf/files.i386 revision 1.176. 1997-09-15 04:00:32 +00:00
KATO Takenori
eba56748e7 Synchronize with sys/i386/conf/files.i386 revision 1.175. 1997-09-10 08:05:46 +00:00
KATO Takenori
47e05c0b61 Synchronize with sys/i386/conf/files.i386 revision 1.174. 1997-09-03 12:40:10 +00:00
KATO Takenori
4c7bdfd64b Synchronize with sys/i386/conf/files.i386 and sys/i386/i386/trap.c
revisions 1.173 and 1.109, respectively.
1997-08-29 08:15:57 +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
17c008220e Use existing path, even though PC-98 doesn't support each device driver. 1997-08-27 08:47:03 +00:00
KATO Takenori
e7e37fb1a0 Synchronize with sys/i386/conf/files.i386 revision 1.171. 1997-08-16 01:31:22 +00:00
KATO Takenori
7bb6fb1df2 Synchronize with sys/i386/conf/files.i386 revision 1.170. 1997-08-02 06:58:53 +00:00
KATO Takenori
7ae53134ce Synchronize with sys/i386/conf/files.i386 and sys/i386/isa/wd.c
revisions 1.169 and 1.133, respectively.
1997-07-31 13:10:54 +00:00
KATO Takenori
4b73f65291 Synchronize with sys/i386/conf/files.i386 revision 1.168. 1997-07-26 01:34:33 +00:00
KATO Takenori
bce20da1b3 Synchronize with sys/i386/conf/Makefile.i386 and files.i386 revisions
1.100 and 1.166, respectively.
1997-06-30 09:57:33 +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
fe626266ae Synchronize with sys/i386/conf/files.i386 revision up to 1.164. 1997-06-02 09:22:55 +00:00
KATO Takenori
4e97ca1849 Synchronize with sys/i386/conf/files.i386 revision 1.162. 1997-05-31 12:39:57 +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
e1ee467aaf Merge SMP code from IBM-PC tree into PC-98 tree. 1997-04-27 13:22:09 +00:00
KATO Takenori
6cf4f7c45c Synchronize with sys/i386/conf/files.i386 revision 1.159. 1997-04-15 11:43:10 +00:00
KATO Takenori
5eba6c71a9 Enables lnc driver on PC-98 to support NEC SV-98/2-B06 PCI card.
Cascade mode of DMA is disabled when PC98 is defined because PC-98
doesn't support it.
1997-04-08 10:33:24 +00:00
KATO Takenori
8c5ac22f9b Synchronize with sys/i386/confi/files.i386 revision 1.158. 1997-04-03 09:55:26 +00:00
KATO Takenori
507cf9c96e Merge PC-98 code int i386/isa/ft.c. 1997-03-24 07:20:35 +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
2f284f07f8 Synchronize with sys/i386/conf/files.i386 revision 1.156. 1997-03-19 16:14:25 +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
75ef4c3a5a Synchronize with sys/i386/conf/files.i386 (revision 1.151). 1997-01-18 10:29:55 +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
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
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
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
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
30cb1d45ae More merge.
(1) Remove mk30line (moved to /usr/sbin, but not in our source tree yet)

(2) Delete unneeded (well, harmful now :) code to prohibit #including
    of isa_device.h from PC98 sources.

(3) Remove files now equal to their ISA/PC-AT counterparts.

Submitted by:	The FreeBSD(98) Development Team
1996-09-04 09:52:31 +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
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