Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Prefix structure members to protect them against clashes wit...
details: https://anonhg.NetBSD.org/src/rev/92acff51f4da
branches: trunk
changeset: 522521:92acff51f4da
user: christos <christos%NetBSD.org@localhost>
date: Wed Feb 20 20:30:12 2002 +0000
description:
Prefix structure members to protect them against clashes with eg. c++ keywords.
Suggested by Alfred Perlstein, from FreeBSD, ok'd by augustss
diffstat:
lib/libusbhid/descr.c | 6 +-
sys/dev/usb/ugen.c | 88 +++++++++++++++++++++--------------------
sys/dev/usb/uhid.c | 24 +++++-----
sys/dev/usb/usb.c | 16 +++---
sys/dev/usb/usb.h | 98 +++++++++++++++++++++++-----------------------
sys/dev/usb/usb_subr.c | 46 ++++++++++----------
sys/dev/usb/usbdi.c | 6 +-
usr.bin/usbhidctl/usbhid.c | 14 +++---
8 files changed, 150 insertions(+), 148 deletions(-)
diffs (truncated from 710 to 300 lines):
diff -r 84326d5d61db -r 92acff51f4da lib/libusbhid/descr.c
--- a/lib/libusbhid/descr.c Wed Feb 20 20:28:18 2002 +0000
+++ b/lib/libusbhid/descr.c Wed Feb 20 20:30:12 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: descr.c,v 1.1 2001/12/28 17:45:27 augustss Exp $ */
+/* $NetBSD: descr.c,v 1.2 2002/02/20 20:31:07 christos Exp $ */
/*
* Copyright (c) 1999 Lennart Augustsson <augustss%netbsd.org@localhost>
@@ -47,11 +47,11 @@
_DIAGASSERT(fd != -1);
- rep.size = 0;
+ rep.ucrd_size = 0;
if (ioctl(fd, USB_GET_REPORT_DESC, &rep) < 0)
return (NULL);
- return hid_use_report_desc(rep.data, (unsigned int)rep.size);
+ return hid_use_report_desc(rep.ucrd_data, (unsigned int)rep.ucrd_size);
}
report_desc_t
diff -r 84326d5d61db -r 92acff51f4da sys/dev/usb/ugen.c
--- a/sys/dev/usb/ugen.c Wed Feb 20 20:28:18 2002 +0000
+++ b/sys/dev/usb/ugen.c Wed Feb 20 20:30:12 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.57 2002/02/11 15:11:49 augustss Exp $ */
+/* $NetBSD: ugen.c,v 1.58 2002/02/20 20:30:12 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.57 2002/02/11 15:11:49 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.58 2002/02/20 20:30:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1078,37 +1078,39 @@
case USB_GET_ALTINTERFACE:
ai = (struct usb_alt_interface *)addr;
err = usbd_device2interface_handle(sc->sc_udev,
- ai->interface_index, &iface);
+ ai->uai_interface_index, &iface);
if (err)
return (EINVAL);
idesc = usbd_get_interface_descriptor(iface);
if (idesc == NULL)
return (EIO);
- ai->alt_no = idesc->bAlternateSetting;
+ ai->uai_alt_no = idesc->bAlternateSetting;
break;
case USB_SET_ALTINTERFACE:
if (!(flag & FWRITE))
return (EPERM);
ai = (struct usb_alt_interface *)addr;
err = usbd_device2interface_handle(sc->sc_udev,
- ai->interface_index, &iface);
+ ai->uai_interface_index, &iface);
if (err)
return (EINVAL);
- err = ugen_set_interface(sc, ai->interface_index, ai->alt_no);
+ err = ugen_set_interface(sc, ai->uai_interface_index,
+ ai->uai_alt_no);
if (err)
return (EINVAL);
break;
case USB_GET_NO_ALT:
ai = (struct usb_alt_interface *)addr;
- cdesc = ugen_get_cdesc(sc, ai->config_index, 0);
+ cdesc = ugen_get_cdesc(sc, ai->uai_config_index, 0);
if (cdesc == NULL)
return (EINVAL);
- idesc = usbd_find_idesc(cdesc, ai->interface_index, 0);
+ idesc = usbd_find_idesc(cdesc, ai->uai_interface_index, 0);
if (idesc == NULL) {
free(cdesc, M_TEMP);
return (EINVAL);
}
- ai->alt_no = usbd_get_no_alts(cdesc, idesc->bInterfaceNumber);
+ ai->uai_alt_no = usbd_get_no_alts(cdesc,
+ idesc->bInterfaceNumber);
free(cdesc, M_TEMP);
break;
case USB_GET_DEVICE_DESC:
@@ -1117,47 +1119,47 @@
break;
case USB_GET_CONFIG_DESC:
cd = (struct usb_config_desc *)addr;
- cdesc = ugen_get_cdesc(sc, cd->config_index, 0);
+ cdesc = ugen_get_cdesc(sc, cd->ucd_config_index, 0);
if (cdesc == NULL)
return (EINVAL);
- cd->desc = *cdesc;
+ cd->ucd_desc = *cdesc;
free(cdesc, M_TEMP);
break;
case USB_GET_INTERFACE_DESC:
id = (struct usb_interface_desc *)addr;
- cdesc = ugen_get_cdesc(sc, id->config_index, 0);
+ cdesc = ugen_get_cdesc(sc, id->uid_config_index, 0);
if (cdesc == NULL)
return (EINVAL);
- if (id->config_index == USB_CURRENT_CONFIG_INDEX &&
- id->alt_index == USB_CURRENT_ALT_INDEX)
- alt = ugen_get_alt_index(sc, id->interface_index);
+ if (id->uid_config_index == USB_CURRENT_CONFIG_INDEX &&
+ id->uid_alt_index == USB_CURRENT_ALT_INDEX)
+ alt = ugen_get_alt_index(sc, id->uid_interface_index);
else
- alt = id->alt_index;
- idesc = usbd_find_idesc(cdesc, id->interface_index, alt);
+ alt = id->uid_alt_index;
+ idesc = usbd_find_idesc(cdesc, id->uid_interface_index, alt);
if (idesc == NULL) {
free(cdesc, M_TEMP);
return (EINVAL);
}
- id->desc = *idesc;
+ id->uid_desc = *idesc;
free(cdesc, M_TEMP);
break;
case USB_GET_ENDPOINT_DESC:
ed = (struct usb_endpoint_desc *)addr;
- cdesc = ugen_get_cdesc(sc, ed->config_index, 0);
+ cdesc = ugen_get_cdesc(sc, ed->ued_config_index, 0);
if (cdesc == NULL)
return (EINVAL);
- if (ed->config_index == USB_CURRENT_CONFIG_INDEX &&
- ed->alt_index == USB_CURRENT_ALT_INDEX)
- alt = ugen_get_alt_index(sc, ed->interface_index);
+ if (ed->ued_config_index == USB_CURRENT_CONFIG_INDEX &&
+ ed->ued_alt_index == USB_CURRENT_ALT_INDEX)
+ alt = ugen_get_alt_index(sc, ed->ued_interface_index);
else
- alt = ed->alt_index;
- edesc = usbd_find_edesc(cdesc, ed->interface_index,
- alt, ed->endpoint_index);
+ alt = ed->ued_alt_index;
+ edesc = usbd_find_edesc(cdesc, ed->ued_interface_index,
+ alt, ed->ued_endpoint_index);
if (edesc == NULL) {
free(cdesc, M_TEMP);
return (EINVAL);
}
- ed->desc = *edesc;
+ ed->ued_desc = *edesc;
free(cdesc, M_TEMP);
break;
case USB_GET_FULL_DESC:
@@ -1168,10 +1170,10 @@
struct usb_full_desc *fd = (struct usb_full_desc *)addr;
int error;
- cdesc = ugen_get_cdesc(sc, fd->config_index, &len);
- if (len > fd->size)
- len = fd->size;
- iov.iov_base = (caddr_t)fd->data;
+ cdesc = ugen_get_cdesc(sc, fd->ufd_config_index, &len);
+ if (len > fd->ufd_size)
+ len = fd->ufd_size;
+ iov.iov_base = (caddr_t)fd->ufd_data;
iov.iov_len = len;
uio.uio_iov = &iov;
uio.uio_iovcnt = 1;
@@ -1186,15 +1188,15 @@
}
case USB_GET_STRING_DESC:
si = (struct usb_string_desc *)addr;
- err = usbd_get_string_desc(sc->sc_udev, si->string_index,
- si->language_id, &si->desc);
+ err = usbd_get_string_desc(sc->sc_udev, si->usd_string_index,
+ si->usd_language_id, &si->usd_desc);
if (err)
return (EINVAL);
break;
case USB_DO_REQUEST:
{
struct usb_ctl_request *ur = (void *)addr;
- int len = UGETW(ur->request.wLength);
+ int len = UGETW(ur->ucr_request.wLength);
struct iovec iov;
struct uio uio;
void *ptr = 0;
@@ -1204,18 +1206,18 @@
if (!(flag & FWRITE))
return (EPERM);
/* Avoid requests that would damage the bus integrity. */
- if ((ur->request.bmRequestType == UT_WRITE_DEVICE &&
- ur->request.bRequest == UR_SET_ADDRESS) ||
- (ur->request.bmRequestType == UT_WRITE_DEVICE &&
- ur->request.bRequest == UR_SET_CONFIG) ||
- (ur->request.bmRequestType == UT_WRITE_INTERFACE &&
- ur->request.bRequest == UR_SET_INTERFACE))
+ if ((ur->ucr_request.bmRequestType == UT_WRITE_DEVICE &&
+ ur->ucr_request.bRequest == UR_SET_ADDRESS) ||
+ (ur->ucr_request.bmRequestType == UT_WRITE_DEVICE &&
+ ur->ucr_request.bRequest == UR_SET_CONFIG) ||
+ (ur->ucr_request.bmRequestType == UT_WRITE_INTERFACE &&
+ ur->ucr_request.bRequest == UR_SET_INTERFACE))
return (EINVAL);
if (len < 0 || len > 32767)
return (EINVAL);
if (len != 0) {
- iov.iov_base = (caddr_t)ur->data;
+ iov.iov_base = (caddr_t)ur->ucr_data;
iov.iov_len = len;
uio.uio_iov = &iov;
uio.uio_iovcnt = 1;
@@ -1223,7 +1225,7 @@
uio.uio_offset = 0;
uio.uio_segflg = UIO_USERSPACE;
uio.uio_rw =
- ur->request.bmRequestType & UT_READ ?
+ ur->ucr_request.bmRequestType & UT_READ ?
UIO_READ : UIO_WRITE;
uio.uio_procp = p;
ptr = malloc(len, M_TEMP, M_WAITOK);
@@ -1234,8 +1236,8 @@
}
}
sce = &sc->sc_endpoints[endpt][IN];
- err = usbd_do_request_flags(sc->sc_udev, &ur->request,
- ptr, ur->flags, &ur->actlen, sce->timeout);
+ err = usbd_do_request_flags(sc->sc_udev, &ur->ucr_request,
+ ptr, ur->ucr_flags, &ur->ucr_actlen, sce->timeout);
if (err) {
error = EIO;
goto ret;
diff -r 84326d5d61db -r 92acff51f4da sys/dev/usb/uhid.c
--- a/sys/dev/usb/uhid.c Wed Feb 20 20:28:18 2002 +0000
+++ b/sys/dev/usb/uhid.c Wed Feb 20 20:30:12 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.49 2002/01/02 20:55:58 augustss Exp $ */
+/* $NetBSD: uhid.c,v 1.50 2002/02/20 20:30:12 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.49 2002/01/02 20:55:58 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.50 2002/02/20 20:30:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -438,9 +438,9 @@
case USB_GET_REPORT_DESC:
uhidev_get_report_desc(sc->sc_hdev.sc_parent, &desc, &size);
rd = (struct usb_ctl_report_desc *)addr;
- size = min(size, sizeof rd->data);
- rd->size = size;
- memcpy(rd->data, desc, size);
+ size = min(size, sizeof rd->ucrd_data);
+ rd->ucrd_size = size;
+ memcpy(rd->ucrd_data, desc, size);
break;
case USB_SET_IMMED:
@@ -458,7 +458,7 @@
case USB_GET_REPORT:
re = (struct usb_ctl_report *)addr;
- switch (re->report) {
+ switch (re->ucr_report) {
case UHID_INPUT_REPORT:
size = sc->sc_isize;
break;
@@ -472,17 +472,17 @@
return (EINVAL);
}
extra = sc->sc_hdev.sc_report_id != 0;
- err = uhidev_get_report(&sc->sc_hdev, re->report, re->data,
- size+extra);
+ err = uhidev_get_report(&sc->sc_hdev, re->ucr_report,
+ re->ucr_data, size + extra);
if (extra)
- memcpy(re->data, re->data+1, size);
+ memcpy(re->ucr_data, re->ucr_data+1, size);
if (err)
return (EIO);
break;
case USB_SET_REPORT:
re = (struct usb_ctl_report *)addr;
- switch (re->report) {
+ switch (re->ucr_report) {
case UHID_INPUT_REPORT:
size = sc->sc_isize;
break;
@@ -495,8 +495,8 @@
default:
return (EINVAL);
}
- err = uhidev_set_report(&sc->sc_hdev, re->report, re->data,
Home |
Main Index |
Thread Index |
Old Index