cbd30dee28
src/usr.bin/usbhidctl/usbhid.c src/sys/dev/usb2/include/usb2_hid.h src/sys/dev/usb2/input/uhid2.c src/lib/libusbhid/Makefile src/lib/libusbhid/descr.c src/lib/libusbhid/descr_compat.c src/lib/libusbhid/usbhid.3 src/lib/libusbhid/usbhid.h src/lib/libusbhid/usbvar.h Patches to make libusbhid and HID userland utilities compatible with the new USB stack. All HID ioctls should go through the libusbhid library to ensure compatibility. I have found at least one piece of software in /usr/ports which needs to get updated before USB HID devices will work. This is the X joystick input driver. Reported and tested by: Daichi GOTO and Masanori OZAWA. src/sys/dev/usb2/core/usb2_process.c Correct USB process names. Reported by: Andre Guibert de Bruet src/sys/dev/usb2/serial/uftdi2.c Integrate changes from old USB stack. Submitted by: hps
142 lines
3.3 KiB
C
142 lines
3.3 KiB
C
/* $NetBSD: descr.c,v 1.9 2000/09/24 02:13:24 augustss Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/time.h>
|
|
#include <sys/ioctl.h>
|
|
|
|
#include <dev/usb2/include/usb2_ioctl.h>
|
|
|
|
#include "usbhid.h"
|
|
#include "usbvar.h"
|
|
|
|
int
|
|
hid_set_immed(int fd, int enable)
|
|
{
|
|
int ret;
|
|
ret = ioctl(fd, USB_SET_IMMED, &enable);
|
|
if (ret < 0)
|
|
ret = hid_set_immed_compat7(fd, enable);
|
|
return (ret);
|
|
}
|
|
|
|
int
|
|
hid_get_report_id(int fd)
|
|
{
|
|
int temp = -1;
|
|
int ret;
|
|
|
|
ret = ioctl(fd, USB_GET_REPORT_ID, &temp);
|
|
if (ret < 0)
|
|
ret = hid_get_report_id_compat7(fd);
|
|
else
|
|
ret = temp;
|
|
|
|
return (ret);
|
|
}
|
|
|
|
report_desc_t
|
|
hid_get_report_desc(int fd)
|
|
{
|
|
struct usb2_gen_descriptor ugd;
|
|
report_desc_t rep;
|
|
void *data;
|
|
|
|
memset(&ugd, 0, sizeof(ugd));
|
|
|
|
/* get actual length first */
|
|
ugd.ugd_data = NULL;
|
|
ugd.ugd_maxlen = 65535;
|
|
if (ioctl(fd, USB_GET_REPORT_DESC, &ugd) < 0) {
|
|
/* could not read descriptor */
|
|
/* try FreeBSD 7 compat code */
|
|
return (hid_get_report_desc_compat7(fd));
|
|
}
|
|
|
|
/*
|
|
* NOTE: The kernel will return a failure if
|
|
* "ugd_actlen" is zero.
|
|
*/
|
|
data = malloc(ugd.ugd_actlen);
|
|
if (data == NULL)
|
|
return (NULL);
|
|
|
|
/* fetch actual descriptor */
|
|
ugd.ugd_data = data;
|
|
ugd.ugd_maxlen = ugd.ugd_actlen;
|
|
if (ioctl(fd, USB_GET_REPORT_DESC, &ugd) < 0) {
|
|
/* could not read descriptor */
|
|
free(data);
|
|
return (NULL);
|
|
}
|
|
|
|
/* check END_COLLECTION */
|
|
if (((unsigned char *)ugd.ugd_data)[ugd.ugd_actlen -1] != 0xC0) {
|
|
/* invalid end byte */
|
|
free(data);
|
|
return (NULL);
|
|
}
|
|
|
|
rep = hid_use_report_desc(data, ugd.ugd_actlen);
|
|
|
|
free(data);
|
|
|
|
return (rep);
|
|
}
|
|
|
|
report_desc_t
|
|
hid_use_report_desc(unsigned char *data, unsigned int size)
|
|
{
|
|
report_desc_t r;
|
|
|
|
r = malloc(sizeof(*r) + size);
|
|
if (r == 0) {
|
|
errno = ENOMEM;
|
|
return (NULL);
|
|
}
|
|
r->size = size;
|
|
memcpy(r->data, data, size);
|
|
return (r);
|
|
}
|
|
|
|
void
|
|
hid_dispose_report_desc(report_desc_t r)
|
|
{
|
|
|
|
free(r);
|
|
}
|