d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronize with sys/i386/isa/fd.c, if_ed.c, if_fe.c, lpt.c, mse.c,

Browse Source 
npx.c, isa.c, sio.c, syscons.c and wd.c revisions 1.100, 1.117, 1.29,
1.61, 1.33, 1.48, 1.95, 1.173, 1.226 and 1.132, respectively.
This commit is contained in:
KATO Takenori 1997-07-21 13:11:16 +00:00
parent 2463359bc9
commit 062569821c
12 changed files with 12 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/pc98/cbus/fdc.c
View File

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.18 1997/03/23 03:48:59 bde Exp $
* $Id: fd.c,v 1.19 1997/03/24 12:29:23 bde Exp $
*
*/
@ -64,7 +64,6 @@
#include <machine/ioctl_fd.h>
#include <sys/disklabel.h>
#include <sys/buf.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/syslog.h>

3
sys/pc98/cbus/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.29 1997/07/17 10:35:43 kato Exp $
* $Id: sio.c,v 1.30 1997/07/20 11:59:48 kato Exp $
*/
#include "opt_comconsole.h"
@ -125,7 +125,6 @@
#include <sys/conf.h>
#include <sys/dkstat.h>
#include <sys/fcntl.h>
#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/syslog.h>

3
sys/pc98/pc98/fd.c
View File

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.18 1997/03/23 03:48:59 bde Exp $
* $Id: fd.c,v 1.19 1997/03/24 12:29:23 bde Exp $
*
*/
@ -64,7 +64,6 @@
#include <machine/ioctl_fd.h>
#include <sys/disklabel.h>
#include <sys/buf.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/syslog.h>

13
sys/pc98/pc98/if_ed.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.25 1997/06/16 09:54:30 kato Exp $
* $Id: if_ed.c,v 1.26 1997/06/16 09:56:57 kato Exp $
*/
/*
@ -64,7 +64,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/errno.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
@ -73,21 +72,12 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_mib.h>
#include <net/if_types.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
#include <netinet/ip.h>
#include <netinet/if_ether.h>
#endif
#ifdef IPX
#include <netipx/ipx.h>
#include <netipx/ipx_if.h>
#endif
#ifdef NS
#include <netns/ns.h>
#include <netns/ns_if.h>
@ -95,7 +85,6 @@
#if NBPFILTER > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
#endif
#include <machine/clock.h>

14
sys/pc98/pc98/if_fe.c
View File

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.21 1997/03/24 12:29:30 bde Exp $
* $Id: if_fe.c,v 1.22 1997/06/17 11:26:50 kato Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
@ -75,7 +75,6 @@
* o To test IPX codes.
*/
#include "isa.h"
#include "fe.h"
#include "crd.h"
#include "bpfilter.h"
@ -85,7 +84,6 @@
#include <sys/conf.h>
#include <sys/errno.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
@ -93,13 +91,9 @@
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
#include <netinet/ip.h>
#include <netinet/if_ether.h>
#endif
@ -123,16 +117,10 @@
#if NBPFILTER > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
#endif
#include <machine/clock.h>
#ifdef PC98
#include <pc98/pc98/pc98.h>
#else
#include <i386/isa/isa.h>
#endif
#include <i386/isa/isa_device.h>
#include <i386/isa/icu.h>

8
sys/pc98/pc98/lpt.c
View File

@ -46,7 +46,7 @@
* SUCH DAMAGE.
*
* from: unknown origin, 386BSD 0.1
* $Id: lpt.c,v 1.11 1997/03/24 12:29:33 bde Exp $
* $Id: lpt.c,v 1.12 1997/04/21 12:33:26 kato Exp $
*/
/*
@ -106,7 +106,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/kernel.h>
#include <sys/uio.h>
@ -138,16 +137,11 @@
#include <net/if.h>
#include <net/if_types.h>
#include <net/netisr.h>
#include <net/route.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
#include <netinet/ip.h>
#include <netinet/if_ether.h>
#include "bpfilter.h"
#if NBPFILTER > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
#endif
#endif /* INET */

3
sys/pc98/pc98/mse.c
View File

@ -11,7 +11,7 @@
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
* $Id: mse.c,v 1.9 1997/02/22 09:43:40 peter Exp $
* $Id: mse.c,v 1.10 1997/03/24 12:29:37 bde Exp $
*/
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@ -50,7 +50,6 @@
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/kernel.h>
#include <sys/uio.h>
#ifdef DEVFS

5
sys/pc98/pc98/npx.c
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
* $Id: npx.c,v 1.21 1997/06/23 09:35:47 kato Exp $
* $Id: npx.c,v 1.22 1997/07/17 10:35:01 kato Exp $
*/
#include "npx.h"
@ -40,14 +40,12 @@
#include "opt_cpu.h"
#include "opt_math_emulate.h"
#include "opt_smp.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/proc.h>
#ifdef NPX_DEBUG
#include <sys/syslog.h>
@ -59,7 +57,6 @@
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/pcb.h>
#include <machine/trap.h>
#include <machine/clock.h>
#include <machine/specialreg.h>
#if defined(APIC_IO)

6
sys/pc98/pc98/pc98.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: pc98.c,v 1.32 1997/06/26 14:49:25 kato Exp $
* $Id: pc98.c,v 1.33 1997/07/10 10:22:34 kato Exp $
*/
/*
@ -55,11 +55,9 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/syslog.h>
#include <sys/malloc.h>
#include <machine/ipl.h>
#include <machine/md_var.h>
#include <machine/segments.h>
#ifdef APIC_IO
#include <machine/smp.h>
#include <machine/apic.h>
@ -77,9 +75,7 @@
#else
#include <i386/isa/isa.h>
#endif
#include <i386/isa/icu.h>
#include <i386/isa/ic/i8237.h>
#include "vector.h"
#include <sys/interrupt.h>

3
sys/pc98/pc98/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.29 1997/07/17 10:35:43 kato Exp $
* $Id: sio.c,v 1.30 1997/07/20 11:59:48 kato Exp $
*/
#include "opt_comconsole.h"
@ -125,7 +125,6 @@
#include <sys/conf.h>
#include <sys/dkstat.h>
#include <sys/fcntl.h>
#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/syslog.h>

6
sys/pc98/pc98/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.47 1997/07/14 12:35:04 kato Exp $
* $Id: syscons.c,v 1.48 1997/07/16 13:55:58 kato Exp $
*/
#include "sc.h"
@ -40,11 +40,7 @@
#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/tty.h>
#include <sys/uio.h>
#include <sys/callout.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
#include <sys/errno.h>
#include <sys/malloc.h>
#ifdef DEVFS
#include <sys/devfsext.h>

7
sys/pc98/pc98/wd.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.24 1997/05/28 09:19:35 kato Exp $
* $Id: wd.c,v 1.25 1997/07/02 11:01:37 kato Exp $
*/
/* TODO:
@ -71,13 +71,9 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/disklabel.h>
#include <sys/diskslice.h>
#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#ifdef DEVFS
#include <sys/devfsext.h>
@ -98,7 +94,6 @@
#include <sys/syslog.h>
#include <sys/dkstat.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/vm_prot.h>
#include <vm/pmap.h>