Commit Graph

1429 Commits

Author SHA1 Message Date
kato
c1bc26dd28 Merged from sys/isa/sio.c revisions 1.289 and 1.290. 2000-03-10 10:34:36 +00:00
kato
ea767b02ba Merged from sys/i386/isa/isa_compat.h revision 1.27. 2000-03-01 08:56:47 +00:00
kato
30154256b0 Merged from sys/i386/i386/userconfig.c revision 1.174. 2000-03-01 08:55:23 +00:00
kato
c4643718c0 Merged from sys/i386/i386/machdep.c revisions 1.384 and 1.385. 2000-03-01 08:53:59 +00:00
kato
be13bac0e8 Merged from sys/i386/conf/GENERIC revisions 1.243, 1.244 and 1.245. 2000-03-01 08:52:28 +00:00
kato
d245d0951c Merged from sys/isa/sio.c rev 1.288. 2000-02-17 15:09:12 +00:00
kato
129e4dc13f Synced with sys/i386/i386/userconfig.c rev 1.173. 2000-02-17 14:45:05 +00:00
peter
a5441090de 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
c939d4600a Synced with sys/dev/syscons/syscons.c rev 1.336. 2000-02-11 08:54:56 +00:00
kato
f62aca8d17 Synced with sys/dev/syscons/scterm-sc.c rev 1.4. 2000-02-11 08:54:16 +00:00
kato
974943ea45 Synced with sys/i386/conf/GENERIC revision 1.241.
Approved by:	jkh
2000-02-05 00:43:04 +00:00
kato
d85ed62d80 Synced with sys/i386/conf/GENERIC rev 1.240.
Approved by:	jkh
2000-02-03 10:46:28 +00:00
kato
cc8627266a Synced with sys/i386/isa/isa_compat.h rev 1.18.
Approved by:	jkh
2000-02-01 09:00:09 +00:00
kato
60a186b3e8 Synced with sys/i386/isa/wd.c revision 1.219.
Approved by:	jkh
2000-02-01 08:57:21 +00:00
kato
30a54f9992 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
c4b6cd7f5c 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
59db460dbc 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
53ed6e8650 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
c28482a132 Synced with sys/isa/ppc.c rev 1.26. 2000-01-29 14:30:28 +00:00
kato
e5c332c2a2 Synced with sys/kern/subr_diskmbr.c rev 1.44. 2000-01-29 14:21:04 +00:00
kato
6f105adabe Synced with sys/kern/subr_diskmbr.c rev 1.43. 2000-01-29 14:00:58 +00:00
kato
64d8e9b9e5 Synced with sys/isa/ppc.c rev 1.25.
Reminded by:	nyan
2000-01-29 13:40:17 +00:00
kato
b86abe9ca2 Cosmetic changes.
- Fixed order of include files.
 - Fixed white spaces.
2000-01-29 07:36:46 +00:00
kato
debd5713de Synced with sys/isa/sio.c rev 1.287. 2000-01-29 04:47:22 +00:00
kato
9af864f09a Synced with sys/i386/isa/wd.c rev 1.218. 2000-01-29 04:42:49 +00:00
kato
8d31907972 Merged with sys/i386/conf/GENERIC rev 1.238. 2000-01-28 07:15:23 +00:00
nyan
a6ded040ef Merge from sys/i386/conf/GENERIC revision 1.231, 1.232 and 1.235. 2000-01-28 01:07:48 +00:00
kato
8e057fffb8 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
c5a78336fe Synced with sys/i386/isa/npx.c rev 1.79. 2000-01-26 11:16:14 +00:00
peter
0053820449 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
d2024f75c9 Merged from sys/i386/conf/GENERIC rev 1.236. 2000-01-24 14:02:34 +00:00
kato
7898f6d9d6 Synced with sys/i386/isa/isa_compat.h rev 1.25. 2000-01-24 13:58:18 +00:00
peter
16f4eb83c1 Remove some no-op "port ?" and "irq ?" declarations. 2000-01-24 08:52:29 +00:00
kato
782470b16b Return ENXIO on error.
Submitted by:	n_hibma
2000-01-24 08:20:54 +00:00
peter
dbf4e19087 Drop 'at ppbus?' and trailing '0' from ppbus children. 2000-01-23 14:47:58 +00:00
peter
7028fa1315 Remove useless trailing digit from pci and other unwired devices. 2000-01-23 12:20:09 +00:00
peter
38391cb38a 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
e8782df8c9 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
nyan
9d2bd66eba - 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
e65ad563e9 Synced with the sc driver in the sys/dev/syscons directory.
Submitted by:	yokota
2000-01-20 15:16:49 +00:00
nyan
8732157b07 Fixed typo. 2000-01-20 12:37:06 +00:00
kato
b149cc0a07 Synced with sys/isa/sio.c rev 1.285. 2000-01-20 08:37:54 +00:00
kato
40c8b7d407 Synced with sys/i386/i386/userconfig.c rev 1.169. 2000-01-20 08:35:32 +00:00
kato
b8cfd16cdf Synced with sys/i386/conf/GENERIC rev 1.230. 2000-01-20 08:34:40 +00:00
kato
f9060bc85d Port of the PC-98 ppc to the newbus system. 2000-01-20 00:58:49 +00:00
kato
201865e21a Synced with sys/i386/isa/isa_compat.h rev 1.24. 2000-01-14 13:10:22 +00:00
kato
fd71cfb854 Synced with sys/i386/i386/userconfig.c rev 1.168. 2000-01-14 13:07:16 +00:00
kato
61386af7c7 Synced with sys/i386/conf/GENERIC rev 1.228. 2000-01-14 13:05:33 +00:00
kato
2809dee713 Synced with sys/dev/syscons/syscons.c rev 1.331. 2000-01-13 12:24:43 +00:00
kato
178aa32669 Synced with following changes:
>yokota      2000/01/11 05:39:06 PST
>
>  Modified files:
>    sys/dev/usb          ukbd.c
>    sys/dev/kbd          atkbd.c kbd.c kbdreg.h
>  Log:
>  Rework shifta/ctla/alta key handling.  It appears that there was
>  misunderstanding between the PR originator and me.  I hope I got it
>  right this time.
>
>  Revision  Changes    Path
>  1.22      +4 -1      src/sys/dev/usb/ukbd.c
>  1.21      +1 -8      src/sys/dev/kbd/atkbd.c
>  1.16      +19 -10    src/sys/dev/kbd/kbd.c
>  1.9       +2 -2      src/sys/dev/kbd/kbdreg.h

Submitted by:	yokota
2000-01-13 11:47:42 +00:00