diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-09-16 07:52:36 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-09-16 07:52:36 +0000 |
| commit | d47f22b331e16fe906bf53b00014036076b06589 (patch) | |
| tree | 7d5ae6c42a20f57a1f50040925a235c23a02069d /sys/arch | |
| parent | 61244d6413ce85a5efd6cabfbcdddf7c975c62ad (diff) | |
no need to include sys/ioccom.h; guy@netapp.com
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/include/apmvar.h | 10 | ||||
| -rw-r--r-- | sys/arch/i386/include/ioctl_fd.h | 4 | ||||
| -rw-r--r-- | sys/arch/i386/include/joystick.h | 13 | ||||
| -rw-r--r-- | sys/arch/i386/include/pctr.h | 13 |
4 files changed, 22 insertions, 18 deletions
diff --git a/sys/arch/i386/include/apmvar.h b/sys/arch/i386/include/apmvar.h index 75dfd2c155d..05ae5cbb721 100644 --- a/sys/arch/i386/include/apmvar.h +++ b/sys/arch/i386/include/apmvar.h @@ -30,6 +30,8 @@ #ifndef __I386_APM_H__ #define __I386_APM_H__ +#include <sys/ioccom.h> + /* Advanced Power Management (v1.0 and v1.1 specification) * functions/defines/etc. */ @@ -199,10 +201,10 @@ /* filled in by apmcall */ struct apmregs { - u_short ax; - u_short bx; - u_short cx; - u_short dx; + u_short ax; + u_short bx; + u_short cx; + u_short dx; }; struct apm_connect_info { diff --git a/sys/arch/i386/include/ioctl_fd.h b/sys/arch/i386/include/ioctl_fd.h index 86fe263ed20..4d5b07f2964 100644 --- a/sys/arch/i386/include/ioctl_fd.h +++ b/sys/arch/i386/include/ioctl_fd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ioctl_fd.h,v 1.2 1996/06/20 07:56:10 downsj Exp $ */ +/* $OpenBSD: ioctl_fd.h,v 1.3 1997/09/16 07:52:31 deraadt Exp $ */ /* from: ioctl_fd.h,v 1.4 1995/06/29 03:49:32 jtk Exp */ /* @@ -33,6 +33,8 @@ #ifndef _I386_IOCTL_FD_H_ #define _I386_IOCTL_FD_H_ +#include <sys/ioccom.h> + #define FD_FORMAT_VERSION 110 /* used to validate before formatting */ #define FD_MAX_NSEC 36 /* highest known number of spt - allow for */ /* 2.88 MB drives */ diff --git a/sys/arch/i386/include/joystick.h b/sys/arch/i386/include/joystick.h index 4b1bce47583..1447d7adf6c 100644 --- a/sys/arch/i386/include/joystick.h +++ b/sys/arch/i386/include/joystick.h @@ -1,17 +1,16 @@ -/* $OpenBSD: joystick.h,v 1.3 1996/05/30 09:30:10 deraadt Exp $ */ +/* $OpenBSD: joystick.h,v 1.4 1997/09/16 07:52:33 deraadt Exp $ */ /* $NetBSD: joystick.h,v 1.1 1996/03/27 19:18:56 perry Exp $ */ #ifndef _JOY_IOCTL_H_ #define _JOY_IOCTL_H_ -#include <sys/types.h> -#include <sys/ioctl.h> +#include <sys/ioccom.h> struct joystick { - int x; - int y; - int b1; - int b2; + int x; + int y; + int b1; + int b2; }; #define JOY_SETTIMEOUT _IOW('J', 1, int) /* set timeout */ diff --git a/sys/arch/i386/include/pctr.h b/sys/arch/i386/include/pctr.h index 06458b6007a..fd667b09196 100644 --- a/sys/arch/i386/include/pctr.h +++ b/sys/arch/i386/include/pctr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pctr.h,v 1.7 1997/09/08 21:21:42 dm Exp $ */ +/* $OpenBSD: pctr.h,v 1.8 1997/09/16 07:52:35 deraadt Exp $ */ /* * Pentium performance counter driver for OpenBSD. @@ -13,15 +13,17 @@ #ifndef _I386_PCTR_H_ #define _I386_PCTR_H_ +#include <sys/ioccom.h> + typedef u_quad_t pctrval; #define PCTR_NUM 2 struct pctrst { - u_int pctr_fn[PCTR_NUM]; /* Current settings of hardware counters */ - pctrval pctr_tsc; /* Free-running 64-bit cycle counter */ - pctrval pctr_hwc[PCTR_NUM]; /* Values of the hardware counters */ - pctrval pctr_idl; /* Iterations of the idle loop */ + u_int pctr_fn[PCTR_NUM]; /* Current settings of hardware counters */ + pctrval pctr_tsc; /* Free-running 64-bit cycle counter */ + pctrval pctr_hwc[PCTR_NUM]; /* Values of the hardware counters */ + pctrval pctr_idl; /* Iterations of the idle loop */ }; /* Bit values in fn fields and PIOCS ioctl's */ @@ -52,7 +54,6 @@ struct pctrst { #define _PATH_PCTR "/dev/pctr" - #define __cpuid() \ ({ \ pctrval id; \ |