Commit Graph

969 Commits

Author SHA1 Message Date
KATO Takenori
674d08dbc0 Oops, delete extra push %edi and push %esi in memsize().
Submitted by:	Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
1997-01-03 16:21:08 +00:00
KATO Takenori
c4948ba6a1 Change IMR of master PIC from 0x7f into 0xff in isa_defaultirq().
This is a 2.2 candidate.
1997-01-03 07:45:41 +00:00
KATO Takenori
134223b928 Synchronize with sys/i386/isa/npx.c revision 1.35 (disable
i586-optimized copyin and copyout).
1996-12-29 08:14:02 +00:00
KATO Takenori
cbecba19cc Synchronize with sys/i386/i386/machdep.c revision 1.223 (clean-up of
useracc call).
1996-12-29 08:10:30 +00:00
KATO Takenori
2cc3289940 Staticize dmapageport and isa_dmarangecheck. 1996-12-27 13:06:31 +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
eb94d127fd Synchronize with sys/i386/i386/userconfig.c revision 1.79 (cosmetic
change).
1996-12-24 11:44:33 +00:00
KATO Takenori
92098ddad4 Improve probe routine for CONTEC C-NET(98) card. I/O port and memory
window addresses don't need to be set as default values.

Submitted by:	Yoshimasa Ohnishi <ohnishi@isc.kyutech.ac.jp>
1996-12-21 14:32:35 +00:00
KATO Takenori
1ffb3da27a Add `#include <pc98/pc98/pc98.h>'. 1996-12-20 12:25:13 +00:00
KATO Takenori
5e5acca867 Synchronize with sys/i386/isa/mse.c revision 1.29 (test in mseopen). 1996-12-20 10:59:37 +00:00
KATO Takenori
451cbc3eff Synchronize with sys/i386/isa/syscons.c revision 1.192 (fix typo). 1996-12-20 10:49:23 +00:00
KATO Takenori
d2db0031ba Add `ep' driver support.
Submitted by:	Naoki Hamada <nao@sbl.cl.nec.co.jp>
1996-12-19 15:48:55 +00:00
KATO Takenori
ed933d0050 Synchronize with sys/i386/i386/trap.c revision 1.84 (handle
copyin/out/etc code).
1996-12-19 08:27:33 +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
KATO Takenori
c463389910 Delete comment for "sbic" driver.
2.2 candidate.
1996-12-18 20:54:22 +00:00
KATO Takenori
1dbf6ded7b Sync with sys/i386/i386/userconfig.c revision 1.78 (amd driver entry). 1996-12-18 20:52:31 +00:00
KATO Takenori
a3e2897cd4 Sync with sys/i386/i386/machdep.c revision 1.222 (move printing of
BIOS geometry).
1996-12-18 20:50:44 +00:00
KATO Takenori
a8d9c79cf8 (1) Fix typo.
(2) Change I/O port addresses of ed3(MELCO LGY) and ed9(CONTEC C-NET).
1996-12-17 14:37:43 +00:00
KATO Takenori
aacc3ca391 Sync with i386/i386/userconfig.c revision 1.77 (I/O port limit). 1996-12-17 13:29:05 +00:00
KATO Takenori
f605549c19 Sync with i386/i386/machdep.c revision 1.221 (fix nbuf calculation). 1996-12-17 13:26:17 +00:00
KATO Takenori
e5ff55e4d8 Synchronize with sys/i386/i386/userconfig.s revision 1.76 (update
comment for "ncr" SCSI controllers).
1996-12-16 17:36:48 +00:00
KATO Takenori
c9cfeed054 Fix typo. 1996-12-15 10:07:09 +00:00
KATO Takenori
7c9e95434e Synchronize with sys/i386/i386/userconfig.c revison 1.74.
Definite 2.2 candidate.
1996-12-15 09:37:43 +00:00
KATO Takenori
fbec974b94 Synchronize with sys/i386/i386/userconfig.c revision 1.72 and 1.73. 1996-12-15 09:35:49 +00:00
KATO Takenori
2248a5a700 Synchronize with sys/i386/boot/rawboot/Makefile revison 1.4. 1996-12-15 09:22:52 +00:00
KATO Takenori
cc48749980 Synchronize with sys/i386/i386/machdep.c revision 1.220.
Definite 2.2 candidate.
1996-12-15 09:18:48 +00:00
KATO Takenori
e03ccd3078 Synchronize with if_ed.c revision 1.111 and if_fe.c revision 1.22. 1996-12-15 09:14:48 +00:00
KATO Takenori
f41f7d4617 Synchronize with Makefile.i386 revison 1.91. 1996-12-15 09:09:53 +00:00
KATO Takenori
54c5d00f71 Synchronize with sys/i386/i386/machdep.c revision 1.219.
2.2 candidate.
1996-12-12 13:10:50 +00:00
KATO Takenori
9e4ccf430e Sync with sys/i386/boot/biosboot/disk.c revision 1.23. 1996-12-11 16:58:01 +00:00
KATO Takenori
8b3e08191a Sync with sys/i386/isa/if_ed.c revision 1.110.
It's not 2.2 candidate.
1996-12-11 16:55:27 +00:00
KATO Takenori
0a44b61dc5 Sync with sys/i386/i386/machdep.c revision 1.218.
It's not 2.2 candidate.
1996-12-11 16:51:15 +00:00
KATO Takenori
7efdf00874 Synchronize with IBM-PC's userconfig.c revision 1.71.
Should not be in 2.2 until original change is merged into 2.2.
1996-12-09 15:21:04 +00:00
KATO Takenori
6f1344579b Synchronize with sys/i386/isa/syscons.c revision 1.191. This change
just keeps appearance, and no effect on the PC98.

2.2 candidate.
1996-12-08 16:27:26 +00:00
KATO Takenori
c918e9eece Synchronize with sys/i386/isa/if_ed.c revision 1.09.
It's a 2.2 candidate.
1996-12-07 13:04:21 +00:00
KATO Takenori
91a8839315 Change obsolete SBIC55 into SCSI in a comment line.
Definite 2.2 candidate.
1996-12-07 12:59:36 +00:00
KATO Takenori
b0c23b0c8e Synchronize with sys/i386/i386/machdep.c revision 1.217.
This should not be in 2.2 until original change is merged.
1996-12-06 19:51:49 +00:00
Satoshi Asami
7a8e4111ee Syncronize.
Submitted by: The FreeBSD(98) Development Team
1996-12-04 04:36:59 +00:00
Satoshi Asami
778128e3f9 Replace sbic driver (WD33C93 SCSI card driver) with new bs driver.
Submitted by: The FreeBSD(98) Development Team
Obtained from: NetBSD/pc98 based on NetBSD 1.2
1996-12-04 04:32:52 +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
Bruce Evans
4eb73cdaff Removed all references to b_cylinder (aka b_cylin). It was evil and
hasn't been used for a year or two since disksort() started sorting
on b_pblkno.
1996-12-01 16:34:41 +00:00
Satoshi Asami
7c219eac8f Some more updates.
wdreg.h: Delete wd_ctlr macro.  PC98 version of wd.c treats it as a
variable.

GENERIC98: Delete ep0 entry. Current ep driver write I/O port 0x100.
This clobbers ICW of i8259, because upper 8bits of address line is not
masked on mother board.

if_fe.c: Merge from revision 1.18 of sys/i386/isa/if_fe.c.

pc98.c: Globalize dmapageport, because SCSI driver use this
variable.

wd82371.c: Yet another merge.

These are 2.2 candidates.

Submitted by:	The FreeBSD(98) Development Team
1996-11-14 08:46:21 +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
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
634e26af7a (1) Update
(2) Don't depend on BOOTSEG

(3) Change BOOTSEG from 0x9000 to 0x1000

Should be in 2.2.

Submitted by:	FreeBSD(98) Development Team
1996-11-09 00:18:25 +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
07aacf5723 Back out typo introduced by latest commit.
Corrected by:	Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
1996-09-12 11:36:09 +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
Poul-Henning Kamp
bfbb029d87 Remove devconf, it never grew up to be of any use. 1996-09-06 23:09:20 +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
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
Bruce Evans
c5294719c3 Eliminated sloppy common-style declarations. Now there are no duplicated
common labels for LINT.  There are still some common declarations for the
!KERNEL case in tcp_debug.h and spx_debug.h.  trpt depends on the ones in
tcp_debug.h.
1996-04-13 12:45:57 +00:00
Mike Pritchard
6c5e9bbdf5 Fix a bunch of spelling errors in the comment fields of
a bunch of system include files.
1996-01-30 23:02:38 +00:00
Bruce Evans
512fef80a9 Completed function declarations and/or added prototypes. 1995-11-21 12:55:26 +00:00
David Greenman
9b3e7ec49d Latest fixes from Serge:
I tried to solve the problem of IDE probing compatibility in this version.
When compiled without an ATAPI option, the wd driver is
fully backward compatible with 2.0.5.  With ATAPI option,
the wdprobe becomes strictly weaker.  That is, if wdprobe works
without ATAPI option, it will always work with it too.

Another problem was with the CD-ROM drive attached as a slave
in the IDE bus, where there is no master.  All IDE CD-ROM
drives are shipped in slave configuration, and most users
just plug them in, never thinking about jumpers.
It works fine with ms-dos and ms-windows, and this
version of the driver supports it as well.

The eject op can now load disks.  Just repeat it twice,
and the disk will be ejected and then loaded back.

The disc cannot be ejected if it is mounted.

Submitted by:	Serge Vakulenko, <vak@cronyx.ru>
1995-10-14 15:41:10 +00:00
Jordan K. Hubbard
5f614f1df9 Bring IDE CDROM support up to latest version (1.8a?) from Serge.
Submitted by:	vak@cronyx.ru
1995-09-30 00:11:19 +00:00
Jordan K. Hubbard
6788ce49a0 Bring in Serge Vakulenko's IDE CDROM (ATAPI) driver. A number of
people have now indicated to me that it's working more than well
enough to bring into -current.
Submitted by:	Serge Vakulenko <vak@cronyx.ru>
1995-08-18 11:26:35 +00:00