Commit Graph

417 Commits

Author SHA1 Message Date
KATO Takenori
8e6361044d Synchronize with following files:
>  Revision  Changes    Path
>  1.65      +3 -3      src/sys/i386/boot/biosboot/boot.c
>  1.18      +1 -5      src/sys/i386/boot/biosboot/boot.h
>  1.26      +7 -6      src/sys/i386/boot/biosboot/disk.c
>  1.22      +4 -2      src/sys/i386/boot/biosboot/io.c
>  1.20      +12 -9     src/sys/i386/boot/biosboot/sys.c
1997-05-28 09:23:00 +00:00
KATO Takenori
912c83ac3b Synchronize with sys/i386/isa/wd.c revision 1.130. 1997-05-28 09:19:35 +00:00
KATO Takenori
9988df5a2b Synchronize with sys/i386/isa/isa.c revision 1.85. 1997-05-28 09:18:23 +00:00
KATO Takenori
93a6f2b1bf Synchronize with sys/i386/i386/machdep.c revision up to 1.245. 1997-05-28 09:16:19 +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
a52949433c Synchronize with sys/i386/i386/machdep.c revision 1.242. 1997-05-23 10:17:05 +00:00
KATO Takenori
be03094652 Synchronize with sys/i386/conf/Makefile.i386 revision 1.97. 1997-05-23 10:12:10 +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
beaea33867 Synchronize with sys/i386/isa/sio.c revison 1.167. 1997-05-19 12:39:42 +00:00
KATO Takenori
655d6f9bfa Synchronize with sys/i386/boot/biosboot/bios.S and
sys/i386/boot/biosboot/serial.S revisions 1.10 and 1.7, respectively.
1997-05-18 12:28:38 +00:00
KATO Takenori
2a9da86c19 Synchronize with sys/i386/isa/syscons.c and sys/i386/isa/syscons.h
revisions 1.216 and 1.29, respectively.
1997-05-17 11:52:26 +00:00
KATO Takenori
fff65794d9 Synchronize with sys/i386/i386/machdep.c revision 1.241. 1997-05-12 12:56:50 +00:00
KATO Takenori
9f70eea59b Synchronize with sys/i386/i386/machdep.c revision 1.240. 1997-05-08 09:34:16 +00:00
KATO Takenori
d6c4281f11 Synchronize with sys/i386/i386/trap.c revision 1.95. 1997-05-08 09:31:08 +00:00
KATO Takenori
bf7df4cf6a Synchronize with sys/i386/isa/syscons.c revision 1.215. 1997-05-08 09:22:32 +00:00
KATO Takenori
ba23eebe8c Synchronize with sys/i386/isa/npx.c revision 1.43. 1997-05-08 09:19:56 +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
ce5f95ee24 Synchronize with sys/i386/conf/Makefile.pc98 revision 1.96. 1997-05-08 09:13:40 +00:00
KATO Takenori
d5c1f97e79 Synchronize with sys/i386/isa/syscons.c revision 1.214. 1997-05-07 14:17:38 +00:00
KATO Takenori
7831f8aee1 Synchronize with sys/i386/isa/isa.c revision 1.84. 1997-05-07 14:15:11 +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
a98486e305 Synchronize with sys/i386/i386/trap.c revision 1.94. 1997-05-05 13:12:52 +00:00
KATO Takenori
d41c4b458b Synchronize with sys/i386/isa/syscons.c up to revision 1.213. 1997-05-01 11:28:49 +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
e17f70a00d Synchronize with sys/i386/isa/isa.c revision 1.83. 1997-04-28 15:51:15 +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
4c59a618e7 Synchronize with sys/i386/conf/Makefile.i386 revision 1.95. 1997-04-28 15:48:49 +00:00
KATO Takenori
589ede60a1 Delete opt_ddb.h. 1997-04-27 13:41:08 +00:00
KATO Takenori
fb2d1dd12a Synchronize with sys/i386/isa/syscons.c revision 1.211. 1997-04-27 13:23:29 +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
fc8cbbc9b7 Synchronize with sys/i386/boot/biosboot/Makefile and
sys/i386/boot/rawboot/Makefile revsions 1.56 and 1.7, respectively.
1997-04-26 04:00:25 +00:00
KATO Takenori
aae8fb345f Synchronize with sys/i386/conf/Makefile.i386, sys/i386/i386/machdep.c
and sys/i386/isa/npx.c revisions 1.94, 1.238 and 1.41, respectively.
1997-04-22 12:20:50 +00:00
KATO Takenori
9d0f090d75 Synchronize with sys/i386/isa/lpt.c revision 1.60. 1997-04-21 12:33:26 +00:00
KATO Takenori
3f0906a547 Synchronize with sys/i386/isa/syscons.c.revision 1.210. 1997-04-21 12:31:31 +00:00
KATO Takenori
1a256e98e8 Synchronize with sys/i386/isa/diskslice_machdep.c revision 1.25. 1997-04-20 05:16:06 +00:00
KATO Takenori
3238d14c9e Synchronize with sys/i386/isa/sio.c revision 1.163. 1997-04-19 14:54:32 +00:00
KATO Takenori
ebcf3d327b Synchronize with sys/i386/i386/trap.c revision 1.92. 1997-04-15 11:49:00 +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
a6a8345e27 Synchronize with sys/i386/i386/machdep.c revision 1.237. 1997-04-13 06:02:52 +00:00
KATO Takenori
c252025416 Deleted ddb_inb and ddb_outb functions that provide I/O access
routines as function for DDB.  The inb and outb are provided as
functions in machdep.c when DDB is defined.
1997-04-11 12:29:51 +00:00
KATO Takenori
4af17b77ec Synchronize with sys/i386/isa/syscons.c revision 1.209. 1997-04-11 07:41:22 +00:00
KATO Takenori
79ee3e29b8 Added lnc driver. 1997-04-08 12:01:11 +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
2083cff23d Synchronize with sys/i386/i386{machdep.c,trap.c} revisions 1.236 and
1.91, respectively.
1997-04-07 11:00:48 +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
90bdaac7f9 Synchronize with sys/i386/i386/trap.c revision 1.89. 1997-04-06 11:49:46 +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
083af2b396 Synchronize with sys/i386/isa/sioreg.h revision 1.8. 1997-04-05 15:05:16 +00:00
KATO Takenori
5b6bca02c7 Synchronize with sys/i386/isa/sio.c revision 1.162. 1997-04-05 15:04:32 +00:00
KATO Takenori
67c09274a3 Synchronize with sys/i386/isa/syscons.c revision 1.208. 1997-04-04 15:23:55 +00:00
KATO Takenori
1964ed8cde Synchronize with sys/i386/isa/wd.c revision 1.128. 1997-04-04 15:22:59 +00:00
KATO Takenori
a7379b84f5 Removed <mv/lock.h> and <mv/vm_map.h>. 1997-04-03 09:59:03 +00:00
KATO Takenori
8c5ac22f9b Synchronize with sys/i386/confi/files.i386 revision 1.158. 1997-04-03 09:55:26 +00:00
David Greenman
9caaadb63a Changed the way that the exec image header is read to be filesystem-
centric rather than VM-centric to fix a problem with errors not being
detectable when the header is read.
Killed exech_map as a result of these changes.
There appears to be no performance difference with this change.
1997-03-31 11:11:26 +00:00
KATO Takenori
529016f9e7 Synchronize with sys/i386/conf/GENERIC revision 1.89. 1997-03-31 08:27:05 +00:00
KATO Takenori
f37dd3ba03 Synchronize with sys/i386/i386/machdep.c revision 1.233. 1997-03-29 02:48:49 +00:00
KATO Takenori
66b1f423ac Synchronize with sys/i386/isa/syscons.c revision 1.207. 1997-03-29 02:46:28 +00:00
KATO Takenori
a07ac8e453 Synchronize with sys/i386/isa/isa.c revision 1.80. 1997-03-29 02:43:49 +00:00
KATO Takenori
e0762592a1 Synchronize with sys/i386/i386/machdep.c revision 1.232. 1997-03-26 07:03:30 +00:00
KATO Takenori
a8032951a0 Fixed reset port address for PC-9801-108 card. 1997-03-25 10:06:41 +00:00
KATO Takenori
e41d6d04fc Synchronize with sys/i386/isa/isa.c revision 1.79. 1997-03-25 10:04:50 +00:00
Bruce Evans
3a32c6706b Don't include <sys/ioctl.h> in the kernel. Stage 9: same changes
in pc98 as in isa.
1997-03-24 12:29:48 +00:00
KATO Takenori
507cf9c96e Merge PC-98 code int i386/isa/ft.c. 1997-03-24 07:20:35 +00:00
KATO Takenori
d1dd81c99f Fixed corrupted CFLAGS definition. (Deleted harmful backslash.)
Submitted by:	H. Nokubi <h-nokubi@nmit.mt.nec.co.jp>
1997-03-24 02:38:48 +00:00
Bruce Evans
fe10481de8 Don't #include <sys/fcntl.h> in <sys/file.h> if KERNEL is defined.
Fixed everything that depended on getting fcntl.h stuff from the wrong
place.  Most things don't depend on file.h stuff at all.
1997-03-23 03:49:00 +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
KATO Takenori
3abc0e5cd9 Synchronize with sys/i386/boot/biosboot/sys.c revision 1.19. 1997-03-16 10:57:54 +00:00
KATO Takenori
dfbc54730c Synchronize with sys/i386/conf/GNERIC revision up to 1.88. 1997-03-15 15:58:43 +00:00
KATO Takenori
38f8e5fbc7 Synchronize with sys/i386/i386/userconfig.c revision 1.85. 1997-03-15 15:44:05 +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
b5ff11dbb6 Synchronize with sys/i386/isa/wd.c revision 1.126. 1997-03-13 17:00:27 +00:00
KATO Takenori
77fd6eeaf8 Synchronize with sys/i386/boot/biosboot/boot.c revision 1.64. 1997-03-13 16:58:15 +00:00
KATO Takenori
c4d420eee3 Added `\' (backslash) at the end of line in the CFLAGS definition.
Submitted by:	H. Nokubi <h-nokubi@nmit.mt.nec.co.jp>
1997-03-13 02:04:47 +00:00
KATO Takenori
078e650eb4 Synchronize with sys/i386/i386/userconfig.c revision 1.84. 1997-03-11 16:19:55 +00:00
KATO Takenori
ef5c2a7815 Synchronize with sys/i386/conf/majors.i386 revision 1.14. 1997-03-11 16:18:08 +00:00
KATO Takenori
593b35ace1 Synchronize with sys/i386/boot/biosboot/Makefile revision 1.55. 1997-03-08 15:46:59 +00:00
KATO Takenori
b95c15c20f Added missing i8251 code.
Submitted by:	H. Nokubi <h-nokubi@nmit.mt.nec.co.jp>
1997-03-06 15:07:04 +00:00
KATO Takenori
85c57124b2 Synchronize with sys/i386/isa/clock.c revision 1.79. 1997-03-05 16:19:48 +00:00
KATO Takenori
5db523b1d5 Fixed devfs code. Old code remained in pc98 tree.
Submitted by:	URATA Shuichiro <s-urata@nmit.tmg.nec.co.jp>
1997-03-04 06:39:02 +00:00
KATO Takenori
541de8d9a5 Synchronize with sys/i386/isa/syscons.c revision 1.205. 1997-03-04 06:25:54 +00:00
KATO Takenori
7f247c74a9 Synchronize with sys/i386/conf/options.i386 revision 1.36. 1997-03-01 11:06:41 +00:00
KATO Takenori
070c946661 Synchronize with sys/i386/isa/syscons.c up to revision 1.204. 1997-03-01 10:53:07 +00:00
KATO Takenori
f3af5d6cd0 Synchronize with sys/i386/i386/machdep.c revision 1.229. 1997-02-25 16:36: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
655c4c9dab Synchronize with sys/i386/isa/wd.c revision 1.124. 1997-02-19 13:19:08 +00:00
KATO Takenori
b18cdf97dd Synchronize with sys/i386/boot/biosboot/boot.h revision 1.16. 1997-02-19 13:06:03 +00:00
KATO Takenori
def9b7665d Synchronize with sys/i386/isa/syscons.c revision 1.201. 1997-02-13 18:43:50 +00:00
KATO Takenori
8ea8b7549d Synchronize with sys/i386/boot/biosboot/boot.c revision 1.62. 1997-02-13 18:41:03 +00:00
KATO Takenori
2f0fdf5504 Added check routine for memory window configuration. The probe
routine of C-NET(98) returns 0 when isa_dev->id_maddr == 0 or
isa_dev->id_msize == 0.
1997-02-12 13:39:24 +00:00
KATO Takenori
39a0888f8a Added memory addres and size of d8 (C-NET(98) network card). 1997-02-12 13:32:58 +00:00
KATO Takenori
1c3ae72914 Deleted prototypes. They are in pc98_machdep.h. 1997-02-11 14:59:54 +00:00
KATO Takenori
33a262b0dc Synchronize with sys/i386/isa/if_ed.c revision 1.114. 1997-02-11 13:55:36 +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
6ed46f82d8 Synchronize with Lite/2 commit: i386/i386/machdep.c, i386/i386/trap.c,
i386/isa/fd.c and i386/isa/wd.c revisions 1.227, 1.87, 1.96 and 1.123,
respectively.
1997-02-10 11:53:20 +00:00
KATO Takenori
77720af4dd Replaced hardcoded unit number with ftu. 1997-02-08 09:59:27 +00:00
KATO Takenori
5007dce7da Synchronize with sys/i386/conf/majors.i386 revision 1.11. 1997-02-08 07:39:07 +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
f97a606a78 Enabled pccard code which was disabled by mistake.
Reminded by:	Masahiro Sekiguchi <seki@sysrap.cs.fujitsu.co.jp>
1997-02-07 19:02:41 +00:00
KATO Takenori
8716a6359b Deleted ioskip member of the structure pc98_edregister. The member
port is always used for accessing PAR and MAR instead of constant
interval of I/O address.
1997-02-06 14:16:52 +00:00
KATO Takenori
a43de6bdb2 Cosmetic change. Sorted by function, added `1997' to copyright
notice,  and added comment.
1997-02-06 13:38:04 +00:00
KATO Takenori
487c0bf139 Changed document encoding system from JIS X 0208 to EUC. 1997-02-05 16:52:51 +00:00
KATO Takenori
ed39d36d27 Moved PC-98 routine in sd_get_parms() to pc98_machdep.c. 1997-02-04 22:27:09 +00:00
KATO Takenori
860f44565e Changed return value of ed_probe (= number of I/O ports). Because
I/O port address of most devices is not contiguos, a return value of
probe routine is not so useful for detecting conflict.  The return
value was too big, and kernel sometimes detected conflict even though
two devices are not conflict in I/O address between them.

Suggested by:	Chiharu Shibata <chi@rd.njk.co.jp>
1997-02-03 14:19:01 +00:00
KATO Takenori
59e8efa110 Synchronize with sys/i386/isa/sio.c revision 1.158. 1997-02-02 08:09:41 +00:00
KATO Takenori
b8586e15da - KNFized pc98 specific files.
- Disabled unuseinit_cpu_accel_mem() which doesn't work now.
- Deleted extra space at the end of line.
1997-01-31 17:38:58 +00:00
KATO Takenori
7546bbf82e Synchronize with sys/i386/isa/syscons.c revision 1.200. 1997-01-31 11:24:01 +00:00
KATO Takenori
0e5d7a6941 Synchronize with sys/i386/i386/locore.s revision 1.80. 1997-01-31 11:23:18 +00:00
KATO Takenori
da2c67c4aa Synchronize with sys/i386/isa/sio.c revision 1.157. 1997-01-30 10:48:06 +00:00
KATO Takenori
d44a313ca1 Synchronize with sys/i386/isa/npx.c revision 1.38. 1997-01-30 10:45:36 +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
b3136a8709 Fixed reset port address of PC-9801-108.
Submitted by:	Chiharu Shibata <chi@rd.njk.co.jp>
1997-01-29 12:42:41 +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
6d5d69845a Change default I/O recovery time for Cyrix 5x86 to 0. The BIOS
Writers Guide mentions that IORT should be 0 for errata fix.
1997-01-25 10:37:03 +00:00
KATO Takenori
1817f78ea0 Synchronize with sys/i386/i386/machdep.c rev. 1.226. 1997-01-25 06:42:19 +00:00
KATO Takenori
d8750fa79b Synchronize with sys/i386/isa/syscons.{c,h} rev. 1.199 and 1.27,
respectively.
1997-01-25 06:38:14 +00:00
KATO Takenori
2410185246 Synchronize with sys/i386/isa/if_fe.c rev. 1.26. 1997-01-25 06:33:24 +00:00
KATO Takenori
30fcb6026c Synchronize with sys/i386/i386/trap.c revision 1.86. 1997-01-23 08:39:59 +00:00
KATO Takenori
2ffc5777b7 Synchronize with sys/i386/isa/syscons.c revision 1.198. 1997-01-21 07:11:14 +00:00
KATO Takenori
7aa571fe7e Synchronize with sys/i386/isa/syscons.c revision 1.197. 1997-01-20 12:26:04 +00:00
KATO Takenori
86c07de1d7 Synchronize with sys/i386/isa/syscons.c revision 1.196. 1997-01-19 07:46:28 +00:00
KATO Takenori
f533d5bfe1 Re-construct PC-98 code of device_infor[] entries. Enabled all
devices which was #ifndef PC98'ed.  This makes diff small between
i386/i386/userconfig.c and pc98/i386/userconfig.c.
1997-01-18 15:59:46 +00:00
KATO Takenori
c59a3dbd01 - Changed retry count from 1000000 to 10000 (same as IBM-PC's).
- Deleted unnecessary DELAY().
- Deleted space character at the end of line.
1997-01-18 15:51: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
58e44cc813 Synchronize with sys/i386/isa/syscons.c (revision 1.195). 1997-01-18 10:26:43 +00:00
KATO Takenori
b1c7657eef Synchronize with sys/i386/isa/clock.c (revision 1.74). 1997-01-18 10:25:04 +00:00
KATO Takenori
ece9035f43 Synchronize with sys/i386/i386/machdep.c (revision 1.225). 1997-01-18 10:21:45 +00:00
KATO Takenori
caff639262 Synchronize with sys/i386/i386/userconfig.s (revision 1.82). 1997-01-18 10:16:02 +00:00
KATO Takenori
9124cd1f10 Disabled LPC_ENA related I/O access. This I/O access clobbers i8255
mode register on PC98.
1997-01-17 14:43:34 +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
KATO Takenori
0c6d0cce02 Re-enable ds_subtype, and ds_name (included in #ifdef PC98).
Userland programs which access partition information require
ds_subtype and ds_name on PC98.
1997-01-16 05:27:10 +00:00
KATO Takenori
8df4619996 Synchronize with sys/i386/isa/if_ed.c revision 1.112 and
sys/i386/isa/if_fe.c revision 1.23 (new if_multiaddrs list).
1997-01-14 12:37:32 +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
14c138a505 Synchronize with sys/i386/i386/userconfig.c revision 1.80. 1997-01-13 12:32:09 +00:00
KATO Takenori
97fcf1ddb2 Fix typo. 1997-01-11 08:59:45 +00:00
KATO Takenori
079e6754a1 Change initialize routine of Cyrix 5x86 CPU.
- Turn off BTB (Branch Target Buffer) because the BTB makes system
  unstable on some machines. The BTB feature can be enabled if
  "options BTB_EN" is added in kernel a configuration file.
- Change comment.
- Reorder `orb XX,%al's.
- Reset NMI F/F (mask NMI) before setting registers, and set it after
  setting them. Normally, this change has no effect.
1997-01-11 07:14:35 +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
be832e6c07 Synchronize with sys/i386/isa/ft.c revision 1.29 (fix ft driver
panics).
1997-01-10 06:50:47 +00:00
KATO Takenori
fbb488e831 Synchronize with sys/i386/isa/isa.c rev. 1.75. 1997-01-09 13:13:38 +00:00
KATO Takenori
a4e2f35f5a Synchronize with sys/i386/isa/npx.c revision 1.36 (reenable
i586_optimized_copyin/out).
1997-01-05 05:05:43 +00:00
KATO Takenori
c6ee180260 Fix collapse code included in #ifdef WDDEBUG: add `;' at the end of the
line, and `"' at the end of first argument of printf().

Submitted by:	Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
1997-01-04 20:13:41 +00:00
KATO Takenori
d01d65d47a Fix cursor address calculation.
Submitted by:	Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
1997-01-04 18:02:18 +00:00
KATO Takenori
55c32b9f4f Delete collapse code to avoid overflow of the number of cylinders.
This should be in 2.2 after src/sys/i386/isa/wdreg.h revsion 1.15
(short -> u_short change) is merged.
1997-01-04 10:57:45 +00:00
KATO Takenori
0000fd92fd (1) Change iomem of SMIT transfer mode from 0xdd000 (BIOS ROM base
address+0x1000) into 0xdc000 (BIOS ROM base address).
(2) Add sample line for Logitec LHA-20x SCSI card.
(3) Change I/O port address of ed8 (C-NET(98) card) from 0x00d0 into
0x03d0 (vendor default).

Submitted by:	Michio "Karl" Jibo <karl@marcer.nagaokaut.ac.jp>
1997-01-04 09:01:57 +00:00
KATO Takenori
d3191c67bf Clean-up.
Submitted by:	Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
1997-01-04 08:32:33 +00:00
KATO Takenori
f825359008 Staticize dma_bouncebuf. This variable was kept global because sbic
driver used it.  The sbic driver has been obsoleted now, so the
variable can be static as that in isa.c.
This is a 2.2 candidate.
1997-01-04 06:48:28 +00:00
KATO Takenori
1cd7883776 Correct I/O port address table for ELECOM LD-BDN ethernet card.
Should be in 2.2.
1997-01-04 06:42:43 +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
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