Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/wscons White space changes only;
details: https://anonhg.NetBSD.org/src/rev/117fab237be7
branches: trunk
changeset: 567134:117fab237be7
user: christos <christos%NetBSD.org@localhost>
date: Tue Jun 01 18:58:51 2004 +0000
description:
White space changes only;
1. put value defines under the fields that they refer too, all the time
not just in some of the ioctls.
2. use #define<tab>value consistently.
diffstat:
sys/dev/wscons/wsconsio.h | 308 ++++++++++++++++++++++-----------------------
1 files changed, 152 insertions(+), 156 deletions(-)
diffs (truncated from 503 to 300 lines):
diff -r 7d9993f9783a -r 117fab237be7 sys/dev/wscons/wsconsio.h
--- a/sys/dev/wscons/wsconsio.h Tue Jun 01 18:49:46 2004 +0000
+++ b/sys/dev/wscons/wsconsio.h Tue Jun 01 18:58:51 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.63 2004/06/01 18:49:46 christos Exp $ */
+/* $NetBSD: wsconsio.h,v 1.64 2004/06/01 18:58:51 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -79,37 +79,36 @@
/* Get keyboard type. */
#define WSKBDIO_GTYPE _IOR('W', 0, u_int)
-#define WSKBD_TYPE_LK201 1 /* lk-201 */
-#define WSKBD_TYPE_LK401 2 /* lk-401 */
-#define WSKBD_TYPE_PC_XT 3 /* PC-ish, XT scancode */
-#define WSKBD_TYPE_PC_AT 4 /* PC-ish, AT scancode */
-#define WSKBD_TYPE_USB 5 /* USB, XT scancode */
-#define WSKBD_TYPE_NEXT 6 /* NeXT keyboard */
-#define WSKBD_TYPE_HPC_KBD 7 /* HPC bultin keyboard */
-#define WSKBD_TYPE_HPC_BTN 8 /* HPC/PsPC buttons */
-#define WSKBD_TYPE_ARCHIMEDES 9 /* Archimedes keyboard */
-#define WSKBD_TYPE_RISCPC 10 /* RiscPC keyboard, resembling AT codes */
-#define WSKBD_TYPE_ADB 11 /* ADB */
-#define WSKBD_TYPE_HIL 12 /* HIL keyboard */
-#define WSKBD_TYPE_AMIGA 13 /* Amiga keyboard */
-#define WSKBD_TYPE_MAPLE 14 /* Dreamcast Maple keyboard */
-#define WSKBD_TYPE_ATARI 15 /* Atari keyboard */
-#define WSKBD_TYPE_SUN 16 /* Sun Type3/4 */
-#define WSKBD_TYPE_SUN5 17 /* Sun Type5 */
+#define WSKBD_TYPE_LK201 1 /* lk-201 */
+#define WSKBD_TYPE_LK401 2 /* lk-401 */
+#define WSKBD_TYPE_PC_XT 3 /* PC-ish, XT scancode */
+#define WSKBD_TYPE_PC_AT 4 /* PC-ish, AT scancode */
+#define WSKBD_TYPE_USB 5 /* USB, XT scancode */
+#define WSKBD_TYPE_NEXT 6 /* NeXT keyboard */
+#define WSKBD_TYPE_HPC_KBD 7 /* HPC bultin keyboard */
+#define WSKBD_TYPE_HPC_BTN 8 /* HPC/PsPC buttons */
+#define WSKBD_TYPE_ARCHIMEDES 9 /* Archimedes keyboard */
+#define WSKBD_TYPE_RISCPC 10 /* RiscPC keyboard, resembling AT codes */
+#define WSKBD_TYPE_ADB 11 /* ADB */
+#define WSKBD_TYPE_HIL 12 /* HIL keyboard */
+#define WSKBD_TYPE_AMIGA 13 /* Amiga keyboard */
+#define WSKBD_TYPE_MAPLE 14 /* Dreamcast Maple keyboard */
+#define WSKBD_TYPE_ATARI 15 /* Atari keyboard */
+#define WSKBD_TYPE_SUN 16 /* Sun Type3/4 */
+#define WSKBD_TYPE_SUN5 17 /* Sun Type5 */
/* Manipulate the keyboard bell. */
struct wskbd_bell_data {
u_int which; /* values to get/set */
+#define WSKBD_BELL_DOPITCH 0x1 /* get/set pitch */
+#define WSKBD_BELL_DOPERIOD 0x2 /* get/set period */
+#define WSKBD_BELL_DOVOLUME 0x4 /* get/set volume */
+#define WSKBD_BELL_DOALL 0x7 /* all of the above */
u_int pitch; /* pitch, in Hz */
u_int period; /* period, in milliseconds */
u_int volume; /* percentage of max volume */
};
-#define WSKBD_BELL_DOPITCH 0x1 /* get/set pitch */
-#define WSKBD_BELL_DOPERIOD 0x2 /* get/set period */
-#define WSKBD_BELL_DOVOLUME 0x4 /* get/set volume */
-#define WSKBD_BELL_DOALL 0x7 /* all of the above */
-
#define WSKBDIO_BELL _IO('W', 1)
#define WSKBDIO_COMPLEXBELL _IOW('W', 2, struct wskbd_bell_data)
#define WSKBDIO_SETBELL _IOW('W', 3, struct wskbd_bell_data)
@@ -120,12 +119,12 @@
/* Manipulate the emulation key repeat settings. */
struct wskbd_keyrepeat_data {
u_int which; /* values to get/set */
+#define WSKBD_KEYREPEAT_DODEL1 0x1 /* get/set del1 */
+#define WSKBD_KEYREPEAT_DODELN 0x2 /* get/set delN */
+#define WSKBD_KEYREPEAT_DOALL 0x3 /* all of the above */
u_int del1; /* delay before first, ms */
u_int delN; /* delay before rest, ms */
};
-#define WSKBD_KEYREPEAT_DODEL1 0x1 /* get/set del1 */
-#define WSKBD_KEYREPEAT_DODELN 0x2 /* get/set delN */
-#define WSKBD_KEYREPEAT_DOALL 0x3 /* all of the above */
#define WSKBDIO_SETKEYREPEAT _IOW('W', 7, struct wskbd_keyrepeat_data)
#define WSKBDIO_GETKEYREPEAT _IOR('W', 8, struct wskbd_keyrepeat_data)
@@ -133,10 +132,10 @@
#define WSKBDIO_GETDEFAULTKEYREPEAT _IOR('W', 10, struct wskbd_keyrepeat_data)
/* Get/set keyboard leds */
-#define WSKBD_LED_CAPS 0x01
-#define WSKBD_LED_NUM 0x02
-#define WSKBD_LED_SCROLL 0x04
-#define WSKBD_LED_COMPOSE 0x08
+#define WSKBD_LED_CAPS 0x01
+#define WSKBD_LED_NUM 0x02
+#define WSKBD_LED_SCROLL 0x04
+#define WSKBD_LED_COMPOSE 0x08
#define WSKBDIO_SETLEDS _IOW('W', 11, int)
#define WSKBDIO_GETLEDS _IOR('W', 12, int)
@@ -144,19 +143,19 @@
/* Manipulate keysym groups. */
struct wskbd_map_data {
u_int maplen; /* number of entries in map */
-#define WSKBDIO_MAXMAPLEN 65536
+#define WSKBDIO_MAXMAPLEN 65536
struct wscons_keymap *map; /* map to get or set */
};
-#define WSKBDIO_GETMAP _IOWR('W', 13, struct wskbd_map_data)
-#define WSKBDIO_SETMAP _IOW('W', 14, struct wskbd_map_data)
-#define WSKBDIO_GETENCODING _IOR('W', 15, kbd_t)
-#define WSKBDIO_SETENCODING _IOW('W', 16, kbd_t)
+#define WSKBDIO_GETMAP _IOWR('W', 13, struct wskbd_map_data)
+#define WSKBDIO_SETMAP _IOW('W', 14, struct wskbd_map_data)
+#define WSKBDIO_GETENCODING _IOR('W', 15, kbd_t)
+#define WSKBDIO_SETENCODING _IOW('W', 16, kbd_t)
/* internal use only */
-#define WSKBDIO_SETMODE _IOW('W', 19, int)
-#define WSKBDIO_GETMODE _IOR('W', 20, int)
-#define WSKBD_TRANSLATED 0
-#define WSKBD_RAW 1
+#define WSKBDIO_SETMODE _IOW('W', 19, int)
+#define WSKBDIO_GETMODE _IOR('W', 20, int)
+#define WSKBD_TRANSLATED 0
+#define WSKBD_RAW 1
#define WSKBDIO_SETKEYCLICK _IOW('W', 21, int)
#define WSKBDIO_GETKEYCLICK _IOR('W', 22, int)
@@ -164,17 +163,15 @@
/* Manipulate the scrolling modifiers and mode */
struct wskbd_scroll_data {
u_int which;
+#define WSKBD_SCROLL_DOMODIFIER 0x01
+#define WSKBD_SCROLL_DOMODE 0x02
+#define WSKBD_SCROLL_DOALL 0x03
u_int mode;
+#define WSKBD_SCROLL_MODE_NORMAL 0x00
+#define WSKBD_SCROLL_MODE_HOLD 0x01
u_int modifier;
};
-#define WSKBD_SCROLL_DOMODIFIER 0x01
-#define WSKBD_SCROLL_DOMODE 0x02
-#define WSKBD_SCROLL_DOALL 0x03
-
-#define WSKBD_SCROLL_MODE_NORMAL 0x00
-#define WSKBD_SCROLL_MODE_HOLD 0x01
-
#define WSKBDIO_GETSCROLL _IOR('W', 23, struct wskbd_scroll_data)
#define WSKBDIO_SETSCROLL _IOW('W', 24, struct wskbd_scroll_data)
@@ -184,37 +181,37 @@
/* Get mouse type */
#define WSMOUSEIO_GTYPE _IOR('W', 32, u_int)
-#define WSMOUSE_TYPE_VSXXX 1 /* DEC serial */
-#define WSMOUSE_TYPE_PS2 2 /* PS/2-compatible */
-#define WSMOUSE_TYPE_USB 3 /* USB mouse */
-#define WSMOUSE_TYPE_LMS 4 /* Logitech busmouse */
-#define WSMOUSE_TYPE_MMS 5 /* Microsoft InPort mouse */
-#define WSMOUSE_TYPE_TPANEL 6 /* Generic Touch Panel */
-#define WSMOUSE_TYPE_NEXT 7 /* NeXT mouse */
-#define WSMOUSE_TYPE_ARCHIMEDES 8 /* Archimedes mouse */
-#define WSMOUSE_TYPE_HIL 9 /* HIL mouse */
-#define WSMOUSE_TYPE_AMIGA 10 /* Amiga mouse */
-#define WSMOUSE_TYPE_MAXINE 11 /* DEC maxine mouse */
-#define WSMOUSE_TYPE_MAPLE 12 /* Dreamcast Maple mouse */
+#define WSMOUSE_TYPE_VSXXX 1 /* DEC serial */
+#define WSMOUSE_TYPE_PS2 2 /* PS/2-compatible */
+#define WSMOUSE_TYPE_USB 3 /* USB mouse */
+#define WSMOUSE_TYPE_LMS 4 /* Logitech busmouse */
+#define WSMOUSE_TYPE_MMS 5 /* Microsoft InPort mouse */
+#define WSMOUSE_TYPE_TPANEL 6 /* Generic Touch Panel */
+#define WSMOUSE_TYPE_NEXT 7 /* NeXT mouse */
+#define WSMOUSE_TYPE_ARCHIMEDES 8 /* Archimedes mouse */
+#define WSMOUSE_TYPE_HIL 9 /* HIL mouse */
+#define WSMOUSE_TYPE_AMIGA 10 /* Amiga mouse */
+#define WSMOUSE_TYPE_MAXINE 11 /* DEC maxine mouse */
+#define WSMOUSE_TYPE_MAPLE 12 /* Dreamcast Maple mouse */
/* Set resolution. Not applicable to all mouse types. */
#define WSMOUSEIO_SRES _IOW('W', 33, u_int)
-#define WSMOUSE_RES_MIN 0
-#define WSMOUSE_RES_DEFAULT 75
-#define WSMOUSE_RES_MAX 100
+#define WSMOUSE_RES_MIN 0
+#define WSMOUSE_RES_DEFAULT 75
+#define WSMOUSE_RES_MAX 100
/* Set scale factor (num / den). Not applicable to all mouse types. */
#define WSMOUSEIO_SSCALE _IOW('W', 34, u_int[2])
/* Set sample rate. Not applicable to all mouse types. */
#define WSMOUSEIO_SRATE _IOW('W', 35, u_int)
-#define WSMOUSE_RATE_MIN 0
-#define WSMOUSE_RATE_DEFAULT 50
-#define WSMOUSE_RATE_MAX 100
+#define WSMOUSE_RATE_MIN 0
+#define WSMOUSE_RATE_DEFAULT 50
+#define WSMOUSE_RATE_MAX 100
/* Set/get sample coordinates for calibration */
-#define WSMOUSE_CALIBCOORDS_MAX 16
-#define WSMOUSE_CALIBCOORDS_RESET -1
+#define WSMOUSE_CALIBCOORDS_MAX 16
+#define WSMOUSE_CALIBCOORDS_RESET -1
struct wsmouse_calibcoords {
int minx, miny; /* minimum value of X/Y */
int maxx, maxy; /* maximum value of X/Y */
@@ -229,11 +226,11 @@
#define WSMOUSEIO_GCALIBCOORDS _IOR('W', 37, struct wsmouse_calibcoords)
/* get device id for calibration */
-#define WSMOUSE_ID_TYPE_UIDSTR 0 /* ID string (null terminated) */
-#define WSMOUSE_ID_MAXLEN 256
struct wsmouse_id {
u_int type;
+#define WSMOUSE_ID_TYPE_UIDSTR 0 /* ID string (null terminated) */
u_int length;
+#define WSMOUSE_ID_MAXLEN 256
u_char data[WSMOUSE_ID_MAXLEN];
};
#define WSMOUSEIO_GETID _IOWR('W', 38, struct wsmouse_id)
@@ -244,46 +241,46 @@
/* Get display type */
#define WSDISPLAYIO_GTYPE _IOR('W', 64, u_int)
-#define WSDISPLAY_TYPE_UNKNOWN 0 /* unknown */
-#define WSDISPLAY_TYPE_PM_MONO 1 /* DEC [23]100 mono */
-#define WSDISPLAY_TYPE_PM_COLOR 2 /* DEC [23]100 color */
-#define WSDISPLAY_TYPE_CFB 3 /* DEC TC CFB (CX) */
-#define WSDISPLAY_TYPE_XCFB 4 /* DEC `maxine' onboard fb */
-#define WSDISPLAY_TYPE_MFB 5 /* DEC TC MFB (MX) */
-#define WSDISPLAY_TYPE_SFB 6 /* DEC TC SFB (HX) */
-#define WSDISPLAY_TYPE_ISAVGA 7 /* (generic) ISA VGA */
-#define WSDISPLAY_TYPE_PCIVGA 8 /* (generic) PCI VGA */
-#define WSDISPLAY_TYPE_TGA 9 /* DEC PCI TGA */
-#define WSDISPLAY_TYPE_SFBP 10 /* DEC TC SFB+ (HX+) */
-#define WSDISPLAY_TYPE_PCIMISC 11 /* (generic) PCI misc. disp. */
-#define WSDISPLAY_TYPE_NEXTMONO 12 /* NeXT mono display */
-#define WSDISPLAY_TYPE_PX 13 /* DEC TC PX */
-#define WSDISPLAY_TYPE_PXG 14 /* DEC TC PXG */
-#define WSDISPLAY_TYPE_TX 15 /* DEC TC TX */
-#define WSDISPLAY_TYPE_HPCFB 16 /* Handheld/PalmSize PC */
-#define WSDISPLAY_TYPE_VIDC 17 /* Acorn/ARM VIDC */
-#define WSDISPLAY_TYPE_SPX 18 /* DEC SPX (VS3100/VS4000) */
-#define WSDISPLAY_TYPE_GPX 19 /* DEC GPX (uVAX/VS2K/VS3100 */
-#define WSDISPLAY_TYPE_LCG 20 /* DEC LCG (VS4000) */
-#define WSDISPLAY_TYPE_VAX_MONO 21 /* DEC VS2K/VS3100 mono */
-#define WSDISPLAY_TYPE_SB_P9100 22 /* Tadpole SPARCbook P9100 */
-#define WSDISPLAY_TYPE_EGA 23 /* (generic) EGA */
-#define WSDISPLAY_TYPE_DCPVR 24 /* Dreamcast PowerVR */
-#define WSDISPLAY_TYPE_GATOR 25 /* HP Gator */
-#define WSDISPLAY_TYPE_TOPCAT 26 /* HP TopCat */
-#define WSDISPLAY_TYPE_RENAISSANCE 27 /* HP Renaissance */
-#define WSDISPLAY_TYPE_CATSEYE 28 /* HP CatsEye */
-#define WSDISPLAY_TYPE_DAVINCI 29 /* HP DaVinci */
-#define WSDISPLAY_TYPE_TIGER 30 /* HP Tiger */
-#define WSDISPLAY_TYPE_HYPERION 31 /* HP Hyperion */
-#define WSDISPLAY_TYPE_AMIGACC 32 /* Amiga custom chips */
-#define WSDISPLAY_TYPE_SUN24 33 /* Sun 24 bit framebuffers */
-#define WSDISPLAY_TYPE_NEWPORT 34 /* SGI Newport */
-#define WSDISPLAY_TYPE_GR2 35 /* SGI GR2 */
-#define WSDISPLAY_TYPE_SUNCG12 36 /* Sun cgtwelve */
-#define WSDISPLAY_TYPE_SUNCG14 37 /* Sun cgfourteen */
-#define WSDISPLAY_TYPE_SUNTCX 38 /* Sun TCX */
-#define WSDISPLAY_TYPE_SUNFFB 39 /* Sun creator FFB */
+#define WSDISPLAY_TYPE_UNKNOWN 0 /* unknown */
+#define WSDISPLAY_TYPE_PM_MONO 1 /* DEC [23]100 mono */
+#define WSDISPLAY_TYPE_PM_COLOR 2 /* DEC [23]100 color */
+#define WSDISPLAY_TYPE_CFB 3 /* DEC TC CFB (CX) */
+#define WSDISPLAY_TYPE_XCFB 4 /* DEC `maxine' onboard fb */
+#define WSDISPLAY_TYPE_MFB 5 /* DEC TC MFB (MX) */
+#define WSDISPLAY_TYPE_SFB 6 /* DEC TC SFB (HX) */
+#define WSDISPLAY_TYPE_ISAVGA 7 /* (generic) ISA VGA */
+#define WSDISPLAY_TYPE_PCIVGA 8 /* (generic) PCI VGA */
+#define WSDISPLAY_TYPE_TGA 9 /* DEC PCI TGA */
+#define WSDISPLAY_TYPE_SFBP 10 /* DEC TC SFB+ (HX+) */
+#define WSDISPLAY_TYPE_PCIMISC 11 /* (generic) PCI misc. disp. */
+#define WSDISPLAY_TYPE_NEXTMONO 12 /* NeXT mono display */
+#define WSDISPLAY_TYPE_PX 13 /* DEC TC PX */
+#define WSDISPLAY_TYPE_PXG 14 /* DEC TC PXG */
+#define WSDISPLAY_TYPE_TX 15 /* DEC TC TX */
+#define WSDISPLAY_TYPE_HPCFB 16 /* Handheld/PalmSize PC */
+#define WSDISPLAY_TYPE_VIDC 17 /* Acorn/ARM VIDC */
+#define WSDISPLAY_TYPE_SPX 18 /* DEC SPX (VS3100/VS4000) */
+#define WSDISPLAY_TYPE_GPX 19 /* DEC GPX (uVAX/VS2K/VS3100 */
+#define WSDISPLAY_TYPE_LCG 20 /* DEC LCG (VS4000) */
+#define WSDISPLAY_TYPE_VAX_MONO 21 /* DEC VS2K/VS3100 mono */
+#define WSDISPLAY_TYPE_SB_P9100 22 /* Tadpole SPARCbook P9100 */
+#define WSDISPLAY_TYPE_EGA 23 /* (generic) EGA */
+#define WSDISPLAY_TYPE_DCPVR 24 /* Dreamcast PowerVR */
+#define WSDISPLAY_TYPE_GATOR 25 /* HP Gator */
+#define WSDISPLAY_TYPE_TOPCAT 26 /* HP TopCat */
+#define WSDISPLAY_TYPE_RENAISSANCE 27 /* HP Renaissance */
+#define WSDISPLAY_TYPE_CATSEYE 28 /* HP CatsEye */
+#define WSDISPLAY_TYPE_DAVINCI 29 /* HP DaVinci */
+#define WSDISPLAY_TYPE_TIGER 30 /* HP Tiger */
+#define WSDISPLAY_TYPE_HYPERION 31 /* HP Hyperion */
+#define WSDISPLAY_TYPE_AMIGACC 32 /* Amiga custom chips */
Home |
Main Index |
Thread Index |
Old Index