diff options
| author | bde <bde@FreeBSD.org> | 1996-09-21 14:59:43 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-09-21 14:59:43 +0000 |
| commit | 9bcb122232e4319fd67ee59c7cd43611d5e2fc60 (patch) | |
| tree | e03f53db0e9dc53fdad8b0a593af598744be17da /sys/i386/include/console.h | |
| parent | 178a446971cddf750d684ed6f842b14faed1c64e (diff) | |
| download | FreeBSD-src-9bcb122232e4319fd67ee59c7cd43611d5e2fc60.zip FreeBSD-src-9bcb122232e4319fd67ee59c7cd43611d5e2fc60.tar.gz | |
Cleaned up all headers that include <sys/ioctl.h> or <sys/ioccom.h>:
- don't include <sys/ioctl.h> in any header. Include <sys/ioccom.h>
instead. This was already done in 4.4Lite for the most important
ioctl headers. Header spam currently increases kernel build
times by 10-20%. There are more than 30000 #includes (not counting
duplicates) for compiling LINT.
- include <sys/types.h> if and only it is necessary to make the header
almost self-sufficient (some ioctl headers still need structs from
elsewhere).
- uniformized idempotency ifdefs. Copied the style in the 4.4Lite
ioctl headers.
Diffstat (limited to 'sys/i386/include/console.h')
| -rw-r--r-- | sys/i386/include/console.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h index 43b70f0..9fc33d3 100644 --- a/sys/i386/include/console.h +++ b/sys/i386/include/console.h @@ -25,13 +25,15 @@ * (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: console.h,v 1.21 1996/06/14 11:00:57 asami Exp $ + * $Id: console.h,v 1.23 1996/06/25 08:54:34 sos Exp $ */ -#ifndef _CONSOLE_H_ -#define _CONSOLE_H_ +#ifndef _MACHINE_CONSOLE_H_ +#define _MACHINE_CONSOLE_H_ +#ifndef KERNEL #include <sys/types.h> +#endif #include <sys/ioccom.h> #define KDGKBMODE _IOR('K', 6, int) @@ -80,7 +82,7 @@ #ifdef PC98 #define ADJUST_CLOCK _IO('t',100) /* for 98note resume */ -#endif /* for PC98 */ +#endif #define VT_OPENQRY _IOR('v', 1, int) #define VT_SETMODE _IOW('v', 2, vtmode_t) @@ -336,7 +338,7 @@ typedef struct ssaver ssaver_t; #define M_HGC_P0 0xe0 /* hercules graphics - page 0 @ B0000 */ #define M_HGC_P1 0xe1 /* hercules graphics - page 1 @ B8000 */ #define M_MCA_MODE 0xff /* monochrome adapter mode */ -#endif +#endif /* PC98 */ #ifdef PC98 #define SW_PC98_80x25 _IO('S', M_PC98_80x25) @@ -378,6 +380,6 @@ typedef struct ssaver ssaver_t; #define SW_CG640x480 _IO('S', M_VGA12) #define SW_VGA13 _IO('S', M_VGA13) #define SW_VGA_CG320 _IO('S', M_VGA13) -#endif +#endif /* PC98 */ -#endif +#endif /* !_MACHINE_CONSOLE_H_ */ |
