Sat Jan 23 01:15:23 2016 UTC ()
Use correct include guard.


(dholland)
diff -r1.14 -r1.15 src/sys/dev/usb/usbhid.h
cvs diff -r1.14 -r1.15 src/sys/dev/usb/usbhid.h (expand / switch to unified diff)

--- src/sys/dev/usb/usbhid.h 2012/01/17 03:49:20 1.14
+++ src/sys/dev/usb/usbhid.h 2016/01/23 01:15:23 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: usbhid.h,v 1.14 2012/01/17 03:49:20 christos Exp $ */ 1/* $NetBSD: usbhid.h,v 1.15 2016/01/23 01:15:23 dholland Exp $ */
2/* $FreeBSD: src/sys/dev/usb/usbhid.h,v 1.7 1999/11/17 22:33:51 n_hibma Exp $ */ 2/* $FreeBSD: src/sys/dev/usb/usbhid.h,v 1.7 1999/11/17 22:33:51 n_hibma Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 1998 The NetBSD Foundation, Inc. 5 * Copyright (c) 1998 The NetBSD Foundation, Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This code is derived from software contributed to The NetBSD Foundation 8 * This code is derived from software contributed to The NetBSD Foundation
9 * by Lennart Augustsson (lennart@augustsson.net) at 9 * by Lennart Augustsson (lennart@augustsson.net) at
10 * Carlstedt Research & Technology. 10 * Carlstedt Research & Technology.
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:
@@ -22,28 +22,28 @@ @@ -22,28 +22,28 @@
22 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 22 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
23 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 23 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
24 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 24 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 * POSSIBILITY OF SUCH DAMAGE. 31 * POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33 33
34 34
35#ifndef _USBHID_H_ 35#ifndef _DEV_USB_USBHID_H_
36#define _USBHID_H_ 36#define _DEV_USB_USBHID_H_
37 37
38#define UR_GET_HID_DESCRIPTOR 0x06 38#define UR_GET_HID_DESCRIPTOR 0x06
39#define UDESC_HID 0x21 39#define UDESC_HID 0x21
40#define UDESC_REPORT 0x22 40#define UDESC_REPORT 0x22
41#define UDESC_PHYSICAL 0x23 41#define UDESC_PHYSICAL 0x23
42#define UR_SET_HID_DESCRIPTOR 0x07 42#define UR_SET_HID_DESCRIPTOR 0x07
43#define UR_GET_REPORT 0x01 43#define UR_GET_REPORT 0x01
44#define UR_SET_REPORT 0x09 44#define UR_SET_REPORT 0x09
45#define UR_GET_IDLE 0x02 45#define UR_GET_IDLE 0x02
46#define UR_SET_IDLE 0x0a 46#define UR_SET_IDLE 0x0a
47#define UR_GET_PROTOCOL 0x03 47#define UR_GET_PROTOCOL 0x03
48#define UR_SET_PROTOCOL 0x0b 48#define UR_SET_PROTOCOL 0x0b
49 49
@@ -182,14 +182,14 @@ typedef struct usb_hid_descriptor { @@ -182,14 +182,14 @@ typedef struct usb_hid_descriptor {
182#define HCOLL_LOGICAL 2 182#define HCOLL_LOGICAL 2
183 183
184/* Bits in the input/output/feature items */ 184/* Bits in the input/output/feature items */
185#define HIO_CONST 0x001 185#define HIO_CONST 0x001
186#define HIO_VARIABLE 0x002 186#define HIO_VARIABLE 0x002
187#define HIO_RELATIVE 0x004 187#define HIO_RELATIVE 0x004
188#define HIO_WRAP 0x008 188#define HIO_WRAP 0x008
189#define HIO_NONLINEAR 0x010 189#define HIO_NONLINEAR 0x010
190#define HIO_NOPREF 0x020 190#define HIO_NOPREF 0x020
191#define HIO_NULLSTATE 0x040 191#define HIO_NULLSTATE 0x040
192#define HIO_VOLATILE 0x080 192#define HIO_VOLATILE 0x080
193#define HIO_BUFBYTES 0x100 193#define HIO_BUFBYTES 0x100
194 194
195#endif /* _USBHID_H_ */ 195#endif /* _DEV_USB_USBHID_H_ */