Tue Feb 26 10:30:28 2019 UTC ()
 Whitespace change.


(msaitoh)
diff -r1.6 -r1.7 src/sys/arch/arc/include/pccons.h
diff -r1.4 -r1.5 src/sys/dev/wscons/wsdisplay_usl_io.h
diff -r1.73 -r1.74 src/sys/net/bpf.h
cvs diff -r1.6 -r1.7 src/sys/arch/arc/include/pccons.h (expand / switch to unified diff)

--- src/sys/arch/arc/include/pccons.h 2001/06/13 15:05:47 1.6
+++ src/sys/arch/arc/include/pccons.h 2019/02/26 10:30:28 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pccons.h,v 1.6 2001/06/13 15:05:47 soda Exp $ */ 1/* $NetBSD: pccons.h,v 1.7 2019/02/26 10:30:28 msaitoh Exp $ */
2/* $OpenBSD: pccons.h,v 1.2 1996/09/01 16:50:12 deraadt Exp $ */ 2/* $OpenBSD: pccons.h,v 1.2 1996/09/01 16:50:12 deraadt Exp $ */
3/* NetBSD: pccons.h,v 1.4 1996/02/02 18:06:06 mycroft Exp */ 3/* NetBSD: pccons.h,v 1.4 1996/02/02 18:06:06 mycroft Exp */
4 4
5/* 5/*
6 * pccons.h -- pccons ioctl definitions 6 * pccons.h -- pccons ioctl definitions
7 */ 7 */
8 8
9#ifndef _PCCONS_H_ 9#ifndef _PCCONS_H_
10#define _PCCONS_H_ 10#define _PCCONS_H_
11 11
12#include <sys/ioctl.h> 12#include <sys/ioctl.h>
13 13
14/* key types -- warning: pccons.c depends on most values */ 14/* key types -- warning: pccons.c depends on most values */
@@ -26,21 +26,21 @@ @@ -26,21 +26,21 @@
26#define KB_NONE 0x0400 /* no function */ 26#define KB_NONE 0x0400 /* no function */
27 27
28#define KB_CODE_SIZE 4 /* Use a max of 4 for now... */ 28#define KB_CODE_SIZE 4 /* Use a max of 4 for now... */
29#define KB_NUM_KEYS 128 /* Number of scan codes */ 29#define KB_NUM_KEYS 128 /* Number of scan codes */
30typedef struct { 30typedef struct {
31 u_short type; 31 u_short type;
32 char unshift[KB_CODE_SIZE]; 32 char unshift[KB_CODE_SIZE];
33 char shift[KB_CODE_SIZE]; 33 char shift[KB_CODE_SIZE];
34 char ctl[KB_CODE_SIZE]; 34 char ctl[KB_CODE_SIZE];
35 char altgr[KB_CODE_SIZE]; 35 char altgr[KB_CODE_SIZE];
36 char shift_altgr[KB_CODE_SIZE]; 36 char shift_altgr[KB_CODE_SIZE];
37} pccons_keymap_t; 37} pccons_keymap_t;
38 38
39#define CONSOLE_X_MODE_ON _IO('t',121) 39#define CONSOLE_X_MODE_ON _IO('t', 121)
40#define CONSOLE_X_MODE_OFF _IO('t',122) 40#define CONSOLE_X_MODE_OFF _IO('t', 122)
41#define CONSOLE_X_BELL _IOW('t',123,int[2]) 41#define CONSOLE_X_BELL _IOW('t', 123, int[2])
42#define CONSOLE_SET_TYPEMATIC_RATE _IOW('t',124,u_char) 42#define CONSOLE_SET_TYPEMATIC_RATE _IOW('t', 124, u_char)
43#define CONSOLE_GET_KEYMAP _IOR('t',128,pccons_keymap_t[KB_NUM_KEYS]) 43#define CONSOLE_GET_KEYMAP _IOR('t', 128, pccons_keymap_t[KB_NUM_KEYS])
44#define CONSOLE_SET_KEYMAP _IOW('t',129,pccons_keymap_t[KB_NUM_KEYS]) 44#define CONSOLE_SET_KEYMAP _IOW('t', 129, pccons_keymap_t[KB_NUM_KEYS])
45 45
46#endif /* _PCCONS_H_ */ 46#endif /* _PCCONS_H_ */
cvs diff -r1.4 -r1.5 src/sys/dev/wscons/wsdisplay_usl_io.h (expand / switch to unified diff)

--- src/sys/dev/wscons/wsdisplay_usl_io.h 2015/09/06 06:01:01 1.4
+++ src/sys/dev/wscons/wsdisplay_usl_io.h 2019/02/26 10:30:28 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wsdisplay_usl_io.h,v 1.4 2015/09/06 06:01:01 dholland Exp $ */ 1/* $NetBSD: wsdisplay_usl_io.h,v 1.5 2019/02/26 10:30:28 msaitoh Exp $ */
2 2
3#ifndef _DEV_WSCONS_WSDISPLAY_USL_IO_H_ 3#ifndef _DEV_WSCONS_WSDISPLAY_USL_IO_H_
4#define _DEV_WSCONS_WSDISPLAY_USL_IO_H_ 4#define _DEV_WSCONS_WSDISPLAY_USL_IO_H_
5 5
6#include <sys/ioccom.h> 6#include <sys/ioccom.h>
7 7
8#define VT_OPENQRY _IOR('v', 1, int) 8#define VT_OPENQRY _IOR('v', 1, int)
9#define VT_SETMODE _IOW('v', 2, vtmode_t) 9#define VT_SETMODE _IOW('v', 2, vtmode_t)
10#define VT_GETMODE _IOR('v', 3, vtmode_t) 10#define VT_GETMODE _IOR('v', 3, vtmode_t)
11 11
12struct vt_mode { 12struct vt_mode {
13 char mode; 13 char mode;
14#define VT_AUTO 0 /* switching controlled by drvr */ 14#define VT_AUTO 0 /* switching controlled by drvr */
@@ -64,26 +64,26 @@ struct kbentry { @@ -64,26 +64,26 @@ struct kbentry {
64#define KB_84 1 64#define KB_84 1
65#define KB_101 2 65#define KB_101 2
66#define KB_OTHER 3 66#define KB_OTHER 3
67 67
68#define KDGETLED _IOR('K', 65, int) 68#define KDGETLED _IOR('K', 65, int)
69#define KDSETLED _IO('K', 66) 69#define KDSETLED _IO('K', 66)
70#define LED_CAP 1 70#define LED_CAP 1
71#define LED_NUM 2 71#define LED_NUM 2
72#define LED_SCR 4 72#define LED_SCR 4
73 73
74#define KDSETRAD _IO('K', 67) 74#define KDSETRAD _IO('K', 67)
75 75
76/* pcvt compatibility */ 76/* pcvt compatibility */
77#define VGAPCVTID _IOWR('V',113, struct pcvtid) /* get driver id */ 77#define VGAPCVTID _IOWR('V', 113, struct pcvtid) /* get driver id */
78 78
79struct pcvtid { 79struct pcvtid {
80#define PCVTIDNAMELN 16 /* driver id - string length */ 80#define PCVTIDNAMELN 16 /* driver id - string length */
81 char name[PCVTIDNAMELN]; /* driver name */ 81 char name[PCVTIDNAMELN]; /* driver name */
82 int rmajor; /* revision number, major */ 82 int rmajor; /* revision number, major */
83 int rminor; /* revision number, minor */ 83 int rminor; /* revision number, minor */
84}; 84};
85 85
86/* syscons compatibility */ 86/* syscons compatibility */
87#define CONS_GETVERS _IOR('c', 74, int) 87#define CONS_GETVERS _IOR('c', 74, int)
88 88
89#endif /* _DEV_WSCONS_WSDISPLAY_USL_IO_H_ */ 89#endif /* _DEV_WSCONS_WSDISPLAY_USL_IO_H_ */
cvs diff -r1.73 -r1.74 src/sys/net/bpf.h (expand / switch to unified diff)

--- src/sys/net/bpf.h 2018/09/03 15:16:11 1.73
+++ src/sys/net/bpf.h 2019/02/26 10:30:28 1.74
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: bpf.h,v 1.73 2018/09/03 15:16:11 christos Exp $ */ 1/* $NetBSD: bpf.h,v 1.74 2019/02/26 10:30:28 msaitoh Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1990, 1991, 1993 4 * Copyright (c) 1990, 1991, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * This code is derived from the Stanford/CMU enet packet filter, 7 * This code is derived from the Stanford/CMU enet packet filter,
8 * (net/enet.c) distributed as part of 4.3BSD, and code contributed 8 * (net/enet.c) distributed as part of 4.3BSD, and code contributed
9 * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence 9 * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
10 * Berkeley Laboratory. 10 * Berkeley Laboratory.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -111,55 +111,55 @@ struct bpf_version { @@ -111,55 +111,55 @@ struct bpf_version {
111 u_short bv_minor; 111 u_short bv_minor;
112}; 112};
113/* Current version number of filter architecture. */ 113/* Current version number of filter architecture. */
114#define BPF_MAJOR_VERSION 1 114#define BPF_MAJOR_VERSION 1
115#define BPF_MINOR_VERSION 1 115#define BPF_MINOR_VERSION 1
116 116
117/* 117/*
118 * BPF ioctls 118 * BPF ioctls
119 * 119 *
120 * The first set is for compatibility with Sun's pcc style 120 * The first set is for compatibility with Sun's pcc style
121 * header files. If your using gcc, we assume that you 121 * header files. If your using gcc, we assume that you
122 * have run fixincludes so the latter set should work. 122 * have run fixincludes so the latter set should work.
123 */ 123 */
124#define BIOCGBLEN _IOR('B',102, u_int) 124#define BIOCGBLEN _IOR('B', 102, u_int)
125#define BIOCSBLEN _IOWR('B',102, u_int) 125#define BIOCSBLEN _IOWR('B', 102, u_int)
126#define BIOCSETF _IOW('B',103, struct bpf_program) 126#define BIOCSETF _IOW('B', 103, struct bpf_program)
127#define BIOCFLUSH _IO('B',104) 127#define BIOCFLUSH _IO('B', 104)
128#define BIOCPROMISC _IO('B',105) 128#define BIOCPROMISC _IO('B', 105)
129#define BIOCGDLT _IOR('B',106, u_int) 129#define BIOCGDLT _IOR('B', 106, u_int)
130#define BIOCGETIF _IOR('B',107, struct ifreq) 130#define BIOCGETIF _IOR('B', 107, struct ifreq)
131#define BIOCSETIF _IOW('B',108, struct ifreq) 131#define BIOCSETIF _IOW('B', 108, struct ifreq)
132#ifdef COMPAT_50 132#ifdef COMPAT_50
133#include <compat/sys/time.h> 133#include <compat/sys/time.h>
134#define BIOCSORTIMEOUT _IOW('B',109, struct timeval50) 134#define BIOCSORTIMEOUT _IOW('B', 109, struct timeval50)
135#define BIOCGORTIMEOUT _IOR('B',110, struct timeval50) 135#define BIOCGORTIMEOUT _IOR('B', 110, struct timeval50)
136#endif 136#endif
137#define BIOCGSTATS _IOR('B',111, struct bpf_stat) 137#define BIOCGSTATS _IOR('B', 111, struct bpf_stat)
138#define BIOCGSTATSOLD _IOR('B',111, struct bpf_stat_old) 138#define BIOCGSTATSOLD _IOR('B', 111, struct bpf_stat_old)
139#define BIOCIMMEDIATE _IOW('B',112, u_int) 139#define BIOCIMMEDIATE _IOW('B', 112, u_int)
140#define BIOCVERSION _IOR('B',113, struct bpf_version) 140#define BIOCVERSION _IOR('B', 113, struct bpf_version)
141#define BIOCSTCPF _IOW('B',114, struct bpf_program) 141#define BIOCSTCPF _IOW('B', 114, struct bpf_program)
142#define BIOCSUDPF _IOW('B',115, struct bpf_program) 142#define BIOCSUDPF _IOW('B', 115, struct bpf_program)
143#define BIOCGHDRCMPLT _IOR('B',116, u_int) 143#define BIOCGHDRCMPLT _IOR('B', 116, u_int)
144#define BIOCSHDRCMPLT _IOW('B',117, u_int) 144#define BIOCSHDRCMPLT _IOW('B', 117, u_int)
145#define BIOCSDLT _IOW('B',118, u_int) 145#define BIOCSDLT _IOW('B', 118, u_int)
146#define BIOCGDLTLIST _IOWR('B',119, struct bpf_dltlist) 146#define BIOCGDLTLIST _IOWR('B', 119, struct bpf_dltlist)
147#define BIOCGDIRECTION _IOR('B',120, u_int) 147#define BIOCGDIRECTION _IOR('B', 120, u_int)
148#define BIOCSDIRECTION _IOW('B',121, u_int) 148#define BIOCSDIRECTION _IOW('B', 121, u_int)
149#define BIOCSRTIMEOUT _IOW('B',122, struct timeval) 149#define BIOCSRTIMEOUT _IOW('B', 122, struct timeval)
150#define BIOCGRTIMEOUT _IOR('B',123, struct timeval) 150#define BIOCGRTIMEOUT _IOR('B', 123, struct timeval)
151#define BIOCGFEEDBACK _IOR('B',124, u_int) 151#define BIOCGFEEDBACK _IOR('B', 124, u_int)
152#define BIOCSFEEDBACK _IOW('B',125, u_int) 152#define BIOCSFEEDBACK _IOW('B', 125, u_int)
153#define BIOCFEEDBACK BIOCSFEEDBACK /* FreeBSD name */ 153#define BIOCFEEDBACK BIOCSFEEDBACK /* FreeBSD name */
154 154
155/* Obsolete */ 155/* Obsolete */
156#define BIOCGSEESENT BIOCGDIRECTION 156#define BIOCGSEESENT BIOCGDIRECTION
157#define BIOCSSEESENT BIOCSDIRECTION 157#define BIOCSSEESENT BIOCSDIRECTION
158 158
159/* 159/*
160 * Packet directions. 160 * Packet directions.
161 * BPF_D_IN = 0, BPF_D_INOUT =1 for backward compatibility of BIOC[GS]SEESENT. 161 * BPF_D_IN = 0, BPF_D_INOUT =1 for backward compatibility of BIOC[GS]SEESENT.
162 */ 162 */
163#define BPF_D_IN 0 /* See incoming packets */ 163#define BPF_D_IN 0 /* See incoming packets */
164#define BPF_D_INOUT 1 /* See incoming and outgoing packets */ 164#define BPF_D_INOUT 1 /* See incoming and outgoing packets */
165#define BPF_D_OUT 2 /* See outgoing packets */ 165#define BPF_D_OUT 2 /* See outgoing packets */