aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ed/if_ed.c50
-rw-r--r--sys/dev/fdc/fdc.c14
-rw-r--r--sys/dev/fdc/fdcreg.h4
-rw-r--r--sys/dev/ie/if_ie.c56
-rw-r--r--sys/dev/mcd/mcd.c34
-rw-r--r--sys/dev/mse/mse.c24
-rw-r--r--sys/dev/sio/sio.c32
-rw-r--r--sys/dev/speaker/spkr.c20
-rw-r--r--sys/dev/syscons/syscons.c53
9 files changed, 144 insertions, 143 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 71d8a30339a0..bca7f31cb1a3 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -13,7 +13,7 @@
* the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
* and a variety of similar clones.
*
- * $Id: if_ed.c,v 1.42 1994/08/08 16:45:11 jkh Exp $
+ * $Id: if_ed.c,v 1.43 1994/08/12 06:36:51 davidg Exp $
*/
#include "ed.h"
@@ -21,42 +21,42 @@
/* bpfilter included here in case it is needed in future net includes */
#include "bpfilter.h"
-#include "param.h"
-#include "systm.h"
-#include "errno.h"
-#include "ioctl.h"
-#include "mbuf.h"
-#include "socket.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/ioctl.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/syslog.h>
-#include "net/if.h"
-#include "net/if_dl.h"
-#include "net/if_types.h"
+#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"
+#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 NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
#endif
#if NBPFILTER > 0
-#include "net/bpf.h"
-#include "net/bpfdesc.h"
+#include <net/bpf.h>
+#include <net/bpfdesc.h>
#endif
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/if_edreg.h"
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/if_edreg.h>
-#include "i386/include/pio.h"
+#include <i386/include/pio.h>
/* For backwards compatibility */
#ifndef IFF_ALTPHYS
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 259d451b7b5f..518aa38b11e7 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.24 1994/03/08 16:25:29 nate Exp $
+ * $Id: fd.c,v 1.26 1994/05/25 08:58:39 rgrimes Exp $
*
*/
@@ -60,12 +60,12 @@
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/fdreg.h"
-#include "i386/isa/fdc.h"
-#include "i386/isa/icu.h"
-#include "i386/isa/rtc.h"
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/fdreg.h>
+#include <i386/isa/fdc.h>
+#include <i386/isa/icu.h>
+#include <i386/isa/rtc.h>
#if NFT > 0
extern int ftopen(), ftintr(), ftattach(), ftclose(), ftioctl();
diff --git a/sys/dev/fdc/fdcreg.h b/sys/dev/fdc/fdcreg.h
index 5deb02cce8b3..d0d69e283a88 100644
--- a/sys/dev/fdc/fdcreg.h
+++ b/sys/dev/fdc/fdcreg.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)fdreg.h 7.1 (Berkeley) 5/9/91
- * $Id: fdreg.h,v 1.3 1994/02/07 04:27:10 alm Exp $
+ * $Id: fdreg.h,v 1.4 1994/02/07 22:12:42 alm Exp $
*/
/*
@@ -39,7 +39,7 @@
*/
/* uses NEC765 controller */
-#include "../i386/isa/ic/nec765.h"
+#include <i386/isa/ic/nec765.h>
/* registers */
#define fdout 2 /* Digital Output Register (W) */
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 348be728465e..2fbf28998f94 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -39,7 +39,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ie.c,v 1.7 1994/08/08 13:33:15 davidg Exp $
+ * $Id: if_ie.c,v 1.8 1994/08/12 06:06:19 davidg Exp $
*/
/*
@@ -103,46 +103,46 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
#include "ie.h"
#if NIE > 0
-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "ioctl.h"
-#include "errno.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/errno.h>
+#include <sys/syslog.h>
-#include "net/if.h"
-#include "net/if_types.h"
-#include "net/if_dl.h"
-#include "net/route.h"
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/if_dl.h>
+#include <net/route.h>
#include "bpfilter.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"
+#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 NS
-#include "netns/ns.h"
-#include "netns/ns_if.h"
+#include <netns/ns.h>
+#include <netns/ns_if.h>
#endif
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/ic/i82586.h"
-#include "i386/isa/if_iereg.h"
-#include "i386/isa/icu.h"
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/ic/i82586.h>
+#include <i386/isa/if_iereg.h>
+#include <i386/isa/icu.h>
-#include "vm/vm.h"
+#include <vm/vm.h>
#if NBPFILTER > 0
-#include "net/bpf.h"
-#include "net/bpfdesc.h"
+#include <net/bpf.h>
+#include <net/bpfdesc.h>
#endif
#if (NBPFILTER > 0) || defined(MULTICAST)
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 683b0e1798c2..6722c5a26ab4 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -39,28 +39,28 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: mcd.c,v 1.15 1994/04/20 07:06:41 davidg Exp $
+ * $Id: mcd.c,v 1.17 1994/05/25 08:59:30 rgrimes Exp $
*/
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
#include "mcd.h"
#if NMCD > 0
-#include "types.h"
-#include "param.h"
-#include "systm.h"
-#include "conf.h"
-#include "file.h"
-#include "buf.h"
-#include "stat.h"
-#include "uio.h"
-#include "ioctl.h"
-#include "cdio.h"
-#include "errno.h"
-#include "dkbad.h"
-#include "disklabel.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "mcdreg.h"
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/buf.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
+#include <sys/ioctl.h>
+#include <sys/cdio.h>
+#include <sys/errno.h>
+#include <sys/dkbad.h>
+#include <sys/disklabel.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/mcdreg.h>
/* user definable options */
/*#define MCD_TO_WARNING_ON*/ /* define to get timeout messages */
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 3653610371b4..5ce5c030e331 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
- * $Id$
+ * $Id: mse.c,v 1.5 1994/08/02 07:39:39 davidg Exp $
*/
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -44,18 +44,18 @@
#include "mse.h"
#if NMSE > 0
-#include "param.h"
-#include "proc.h"
-#include "user.h"
-#include "buf.h"
-#include "systm.h"
-#include "kernel.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "uio.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/uio.h>
-#include "i386/isa/isa_device.h"
-#include "i386/isa/icu.h"
+#include <i386/isa/isa_device.h>
+#include <i386/isa/icu.h>
static int mseprobe(struct isa_device *);
static int mseattach(struct isa_device *);
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index dd4ee55cfcf0..de95e90b74ef 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.44 1994/04/03 12:25:57 ache Exp $
+ * $Id: sio.c,v 1.47 1994/05/26 13:31:40 rgrimes Exp $
*/
#include "sio.h"
@@ -43,22 +43,22 @@
* Works for National Semiconductor NS8250-NS16550AF UARTs.
* COM driver, based on HP dca driver.
*/
-#include "param.h"
-#include "systm.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "proc.h"
-#include "user.h"
-#include "conf.h"
-#include "file.h"
-#include "uio.h"
-#include "kernel.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/sioreg.h"
-#include "i386/isa/ic/ns16550.h"
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/sioreg.h>
+#include <i386/isa/ic/ns16550.h>
#define FAKE_DCD(unit) ((unit) == comconsole)
#define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index d273f31104b9..4f9f2faff10c 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,22 +4,22 @@
* v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
* modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
*
- * $Id: spkr.c,v 1.7 1994/01/25 23:04:27 ache Exp $
+ * $Id: spkr.c,v 1.8 1994/04/21 14:21:50 sos Exp $
*/
#include "speaker.h"
#if NSPEAKER > 0
-#include "param.h"
-#include "systm.h"
-#include "kernel.h"
-#include "errno.h"
-#include "buf.h"
-#include "uio.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/timerreg.h"
-#include "machine/speaker.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/errno.h>
+#include <sys/buf.h>
+#include <sys/uio.h>
+#include <i386/isa/isa.h>
+#include <i386/isa/timerreg.h>
+#include <machine/speaker.h>
/**************** MACHINE DEPENDENT PART STARTS HERE *************************
*
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index a2a931c6c2b6..ce391cdd1973 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -35,40 +35,41 @@
* SUCH DAMAGE.
*
* from:@(#)syscons.c 1.3 940129
- * $Id: syscons.c,v 1.46 1994/05/25 08:59:56 rgrimes Exp $
+ * $Id: syscons.c,v 1.47 1994/08/01 10:38:19 davidg Exp $
*
*/
+#include "sc.h"
+
+#if NSC > 0
+
#if !defined(__FreeBSD__)
#define FAT_CURSOR
#endif
-#include "param.h"
+#include <sys/param.h>
#include <sys/systm.h>
-#include "conf.h"
-#include "ioctl.h"
-#include "proc.h"
-#include "user.h"
-#include "tty.h"
-#include "uio.h"
-#include "callout.h"
-#include "kernel.h"
-#include "syslog.h"
-#include "errno.h"
-#include "malloc.h"
-#include "i386/isa/isa.h"
-#include "i386/isa/isa_device.h"
-#include "i386/isa/timerreg.h"
-#include "i386/i386/cons.h"
-#include "machine/console.h"
-#include "machine/psl.h"
-#include "machine/frame.h"
-#include "machine/pc/display.h"
-#include "iso8859.font"
-#include "kbdtables.h"
-#include "sc.h"
-
-#if NSC > 0
+#include <sys/conf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/user.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>
+#include <i386/isa/isa.h>
+#include <i386/isa/isa_device.h>
+#include <i386/isa/timerreg.h>
+#include <i386/i386/cons.h>
+#include <machine/console.h>
+#include <machine/psl.h>
+#include <machine/frame.h>
+#include <machine/pc/display.h>
+#include <i386/isa/iso8859.font>
+#include <i386/isa/kbdtables.h>
#if !defined(NCONS)
#define NCONS 12
generated by cgit v1.3 (git 2.53.0) at 2026-07-31 15:41:37 +0000