diff options
| author | Joshua Stein <jcs@cvs.openbsd.org> | 2016-01-09 02:01:07 +0000 |
|---|---|---|
| committer | Joshua Stein <jcs@cvs.openbsd.org> | 2016-01-09 02:01:07 +0000 |
| commit | 8c30db8d07153a77c6206fd77dc51f5b15728f03 (patch) | |
| tree | 615cd0acb4fff7a784434d72f4a15b63f24e1e4b /sys/dev/usb | |
| parent | fe7f2e9e7412d1c4b442a922219479ddf710e09a (diff) | |
move UHID_* definitions back to usbhid.h where they were before the
HID separation
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/uhidev.h | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usbhid.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/uhidev.h b/sys/dev/usb/uhidev.h index 761d278b962..43020fb9803 100644 --- a/sys/dev/usb/uhidev.h +++ b/sys/dev/usb/uhidev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.h,v 1.23 2016/01/08 15:54:14 jcs Exp $ */ +/* $OpenBSD: uhidev.h,v 1.24 2016/01/09 02:01:06 jcs Exp $ */ /* $NetBSD: uhidev.h,v 1.3 2002/10/08 09:56:17 dan Exp $ */ /* @@ -37,10 +37,6 @@ #define uhidevcf_reportid cf_loc[UHIDBUSCF_REPORTID] #define UHIDEV_UNK_REPORTID UHIDBUSCF_REPORTID_DEFAULT -#define UHID_INPUT_REPORT 0x01 -#define UHID_OUTPUT_REPORT 0x02 -#define UHID_FEATURE_REPORT 0x03 - struct uhidev_softc { struct device sc_dev; /* base device */ struct usbd_device *sc_udev; diff --git a/sys/dev/usb/usbhid.h b/sys/dev/usb/usbhid.h index f6a17d798d2..fe7d46285fd 100644 --- a/sys/dev/usb/usbhid.h +++ b/sys/dev/usb/usbhid.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usbhid.h,v 1.19 2016/01/08 15:54:14 jcs Exp $ */ +/* $OpenBSD: usbhid.h,v 1.20 2016/01/09 02:01:06 jcs Exp $ */ /* $NetBSD: usbhid.h,v 1.11 2001/12/28 00:20:24 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbhid.h,v 1.7 1999/11/17 22:33:51 n_hibma Exp $ */ @@ -61,4 +61,8 @@ struct usb_hid_descriptor { } __packed; #define USB_HID_DESCRIPTOR_SIZE(n) (9+(n)*3) +#define UHID_INPUT_REPORT 0x01 +#define UHID_OUTPUT_REPORT 0x02 +#define UHID_FEATURE_REPORT 0x03 + #endif /* _USBHID_H_ */ |