Fix a bunch of -Wcast-qual warnings in sys/dev/usb/input/uhid.c, by

using __DECONST.  No functional change.

Reviewed by:	hselasky
Differential Revision: https://reviews.freebsd.org/D1743
This commit is contained in:
dim 2015-01-31 14:18:46 +00:00
parent 1442547d3b
commit 910074fb93

View File

@ -734,7 +734,7 @@ uhid_attach(device_t dev)
if (uaa->info.idProduct == USB_PRODUCT_WACOM_GRAPHIRE) { if (uaa->info.idProduct == USB_PRODUCT_WACOM_GRAPHIRE) {
sc->sc_repdesc_size = sizeof(uhid_graphire_report_descr); sc->sc_repdesc_size = sizeof(uhid_graphire_report_descr);
sc->sc_repdesc_ptr = (void *)&uhid_graphire_report_descr; sc->sc_repdesc_ptr = __DECONST(void *, &uhid_graphire_report_descr);
sc->sc_flags |= UHID_FLAG_STATIC_DESC; sc->sc_flags |= UHID_FLAG_STATIC_DESC;
} else if (uaa->info.idProduct == USB_PRODUCT_WACOM_GRAPHIRE3_4X5) { } else if (uaa->info.idProduct == USB_PRODUCT_WACOM_GRAPHIRE3_4X5) {
@ -755,7 +755,7 @@ uhid_attach(device_t dev)
usbd_errstr(error)); usbd_errstr(error));
} }
sc->sc_repdesc_size = sizeof(uhid_graphire3_4x5_report_descr); sc->sc_repdesc_size = sizeof(uhid_graphire3_4x5_report_descr);
sc->sc_repdesc_ptr = (void *)&uhid_graphire3_4x5_report_descr; sc->sc_repdesc_ptr = __DECONST(void *, &uhid_graphire3_4x5_report_descr);
sc->sc_flags |= UHID_FLAG_STATIC_DESC; sc->sc_flags |= UHID_FLAG_STATIC_DESC;
} }
} else if ((uaa->info.bInterfaceClass == UICLASS_VENDOR) && } else if ((uaa->info.bInterfaceClass == UICLASS_VENDOR) &&
@ -775,7 +775,7 @@ uhid_attach(device_t dev)
} }
/* the Xbox 360 gamepad has no report descriptor */ /* the Xbox 360 gamepad has no report descriptor */
sc->sc_repdesc_size = sizeof(uhid_xb360gp_report_descr); sc->sc_repdesc_size = sizeof(uhid_xb360gp_report_descr);
sc->sc_repdesc_ptr = (void *)&uhid_xb360gp_report_descr; sc->sc_repdesc_ptr = __DECONST(void *, &uhid_xb360gp_report_descr);
sc->sc_flags |= UHID_FLAG_STATIC_DESC; sc->sc_flags |= UHID_FLAG_STATIC_DESC;
} }
if (sc->sc_repdesc_ptr == NULL) { if (sc->sc_repdesc_ptr == NULL) {