Commit Graph

1429 Commits

Author SHA1 Message Date
Poul-Henning Kamp
d8b47cbb70 Stop isadma from abusing the B_READ, B_RAW and B_WRITE flags.
Define ISADMA_{READ,WRITE,RAW} macros with the same numeric
values as the B_{READ,WRITE,RAW} and use them instead throughout.
2000-03-13 10:19:32 +00:00
KATO Takenori
5a9a82e820 Merged from sys/isa/sio.c revision 1.291. 2000-03-12 13:14:51 +00:00
KATO Takenori
e299a9db22 Merged from sys/isa/sio.c revisions 1.289 and 1.290. 2000-03-10 10:34:36 +00:00
KATO Takenori
f1b7989974 Merged from sys/i386/isa/isa_compat.h revision 1.27. 2000-03-01 08:56:47 +00:00
KATO Takenori
bb8a9f4d25 Merged from sys/i386/i386/userconfig.c revision 1.174. 2000-03-01 08:55:23 +00:00
KATO Takenori
ce4274863e Merged from sys/i386/i386/machdep.c revisions 1.384 and 1.385. 2000-03-01 08:53:59 +00:00
KATO Takenori
9c675e3c19 Merged from sys/i386/conf/GENERIC revisions 1.243, 1.244 and 1.245. 2000-03-01 08:52:28 +00:00
KATO Takenori
df16ced79a Merged from sys/isa/sio.c rev 1.288. 2000-02-17 15:09:12 +00:00
KATO Takenori
baf67f3c77 Synced with sys/i386/i386/userconfig.c rev 1.173. 2000-02-17 14:45:05 +00:00
Peter Wemm
242c5536ea Clean up some loose ends in the network code, including the X.25 and ISO
#ifdefs.  Clean out unused netisr's and leftover netisr linker set gunk.
Tested on x86 and alpha, including world.

Approved by:	jkh
2000-02-13 03:32:07 +00:00
KATO Takenori
6ccd04a652 Synced with sys/dev/syscons/syscons.c rev 1.336. 2000-02-11 08:54:56 +00:00
KATO Takenori
2611194fd9 Synced with sys/dev/syscons/scterm-sc.c rev 1.4. 2000-02-11 08:54:16 +00:00
KATO Takenori
48ca6b1019 Synced with sys/i386/conf/GENERIC revision 1.241.
Approved by:	jkh
2000-02-05 00:43:04 +00:00
KATO Takenori
3c21e97804 Synced with sys/i386/conf/GENERIC rev 1.240.
Approved by:	jkh
2000-02-03 10:46:28 +00:00
KATO Takenori
c03afedeb6 Synced with sys/i386/isa/isa_compat.h rev 1.18.
Approved by:	jkh
2000-02-01 09:00:09 +00:00
KATO Takenori
fbaefbb0a1 Synced with sys/i386/isa/wd.c revision 1.219.
Approved by:	jkh
2000-02-01 08:57:21 +00:00
KATO Takenori
2c46e1df9d Synced with sys/i386/isa/mse.c, npx.c and spkr.c revisions 1.49, 1.80
and 1.45, respectively.

Approved by:	jkh
2000-02-01 08:54:14 +00:00
Peter Wemm
68b538c712 Remove 'conflicts' token - it has been effectively doing absolutely
nothing for quite some time.  The only thing that cared was userconfig,
but it was for one invisible device so we never saw it's effects.
2000-01-29 18:07:07 +00:00
Peter Wemm
af88e209a2 Zap isa_device -> id_conflicts. The sole user of it (userconfig) never
actually used it since the only device that specified it (vga0) was marked
as "FLG_INVISIBLE" in userconfig and therefore never shown.

Suggested by:	bde
2000-01-29 18:01:10 +00:00
Peter Wemm
e27c1addaa Remove #if NFOO > 0 (it's not required in most cases) and also where it
isn't used as a result, remove #include "foo.h".  Many of these drivers
still use NFOO for softc struct sizing etc however.
2000-01-29 16:00:34 +00:00
KATO Takenori
85c5708bab Synced with sys/isa/ppc.c rev 1.26. 2000-01-29 14:30:28 +00:00
KATO Takenori
7c315a1e4f Synced with sys/kern/subr_diskmbr.c rev 1.44. 2000-01-29 14:21:04 +00:00
KATO Takenori
f8dc9ee050 Synced with sys/kern/subr_diskmbr.c rev 1.43. 2000-01-29 14:00:58 +00:00
KATO Takenori
28788b9a91 Synced with sys/isa/ppc.c rev 1.25.
Reminded by:	nyan
2000-01-29 13:40:17 +00:00
KATO Takenori
2e1b2d7571 Cosmetic changes.
- Fixed order of include files.
 - Fixed white spaces.
2000-01-29 07:36:46 +00:00
KATO Takenori
6dbccd6e00 Synced with sys/isa/sio.c rev 1.287. 2000-01-29 04:47:22 +00:00
KATO Takenori
c95e192ba7 Synced with sys/i386/isa/wd.c rev 1.218. 2000-01-29 04:42:49 +00:00
KATO Takenori
930ba557d5 Merged with sys/i386/conf/GENERIC rev 1.238. 2000-01-28 07:15:23 +00:00
Yoshihiro Takahashi
78bd1e8a57 Merge from sys/i386/conf/GENERIC revision 1.231, 1.232 and 1.235. 2000-01-28 01:07:48 +00:00
KATO Takenori
cd1d380722 Synced with sys/i386/isa/isa_compat.h and pcaudio.c revisions 1.26 and
1.58, respectively.
2000-01-26 11:23:51 +00:00
KATO Takenori
3c7aa0b427 Synced with sys/i386/isa/npx.c rev 1.79. 2000-01-26 11:16:14 +00:00
Peter Wemm
d224cddc38 Copy i386/isa/atapi-cd.[ch] to a new name so that it doesn't have the
same object file (atapi-cd.o) as the ata drivers. I'd have called it
wcd.[ch], but there's already one of those in the Attic that we can't
clobber - the good names are taken.
Fix building so that it can be compiled into LINT alongside ata.

Requested by:	bde
2000-01-24 17:16:03 +00:00
KATO Takenori
fa7f776c1a Merged from sys/i386/conf/GENERIC rev 1.236. 2000-01-24 14:02:34 +00:00
KATO Takenori
ca4aa7abe0 Synced with sys/i386/isa/isa_compat.h rev 1.25. 2000-01-24 13:58:18 +00:00
Peter Wemm
d0cde06dd3 Remove some no-op "port ?" and "irq ?" declarations. 2000-01-24 08:52:29 +00:00
KATO Takenori
69d4b82b48 Return ENXIO on error.
Submitted by:	n_hibma
2000-01-24 08:20:54 +00:00
Peter Wemm
3fc005f656 Drop 'at ppbus?' and trailing '0' from ppbus children. 2000-01-23 14:47:58 +00:00
Peter Wemm
ea46992cd9 Remove useless trailing digit from pci and other unwired devices. 2000-01-23 12:20:09 +00:00
Peter Wemm
1816634e49 Clean up some more loose ends..
isa_device->id_ri_flags and RI_FAST were not implemented and did nothing.
The two drivers that were mistakenly thinking this was working were
cy.c and loran.c - these should be converted to newbus.
GC (garbage collect) isa_device->id_alive
GC userconfig.c references to isa_device->id_scsiid (!).
2000-01-23 11:50:43 +00:00
Peter Wemm
a8f8e0bd03 GC isa_device->id_reconfig - it's not referenced anywhere anymore.
GC reconfig_isadev() - it's not used anymore.
2000-01-23 11:26:49 +00:00
Yoshihiro Takahashi
450a74c2bb - Merge from sys/i386/conf/GENERIC rev 1.224, 1.225 and 1.226.
- Reorder network interfaces.
2000-01-21 13:22:07 +00:00
KATO Takenori
2945c302da Synced with the sc driver in the sys/dev/syscons directory.
Submitted by:	yokota
2000-01-20 15:16:49 +00:00
Yoshihiro Takahashi
3f681c0c41 Fixed typo. 2000-01-20 12:37:06 +00:00
KATO Takenori
21e10b2d88 Synced with sys/isa/sio.c rev 1.285. 2000-01-20 08:37:54 +00:00
KATO Takenori
6d7f3c6331 Synced with sys/i386/i386/userconfig.c rev 1.169. 2000-01-20 08:35:32 +00:00
KATO Takenori
c818f7b9de Synced with sys/i386/conf/GENERIC rev 1.230. 2000-01-20 08:34:40 +00:00
KATO Takenori
290fb50e67 Port of the PC-98 ppc to the newbus system. 2000-01-20 00:58:49 +00:00
KATO Takenori
64a0195e51 Synced with sys/i386/isa/isa_compat.h rev 1.24. 2000-01-14 13:10:22 +00:00
KATO Takenori
e852ba82d4 Synced with sys/i386/i386/userconfig.c rev 1.168. 2000-01-14 13:07:16 +00:00
KATO Takenori
85a13e4332 Synced with sys/i386/conf/GENERIC rev 1.228. 2000-01-14 13:05:33 +00:00