From owner-p4-projects@FreeBSD.ORG Thu Nov 6 08:16:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 976A81065673; Thu, 6 Nov 2008 08:16:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B15B106564A for ; Thu, 6 Nov 2008 08:16:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 48B738FC1D for ; Thu, 6 Nov 2008 08:16:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA68GNfF005689 for ; Thu, 6 Nov 2008 08:16:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA68GNFr005687 for perforce@freebsd.org; Thu, 6 Nov 2008 08:16:23 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 6 Nov 2008 08:16:23 GMT Message-Id: <200811060816.mA68GNFr005687@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 152556 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Nov 2008 08:16:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=152556 Change 152556 by hselasky@hselasky_laptop001 on 2008/11/06 08:16:00 libusb20: Fix many compile warnings when using "make WARN=4". Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#6 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.h#3 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#4 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#4 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#9 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#6 (text+ko) ==== @@ -194,13 +194,13 @@ } int -usb_get_string(usb_dev_handle * dev, int index, +usb_get_string(usb_dev_handle * dev, int strindex, int langid, char *buf, size_t buflen) { int err; err = libusb20_dev_req_string_sync((void *)dev, - index, langid, buf, buflen); + strindex, langid, buf, buflen); if (err) return (-1); @@ -209,13 +209,13 @@ } int -usb_get_string_simple(usb_dev_handle * dev, int index, +usb_get_string_simple(usb_dev_handle * dev, int strindex, char *buf, size_t buflen) { int err; err = libusb20_dev_req_string_simple_sync((void *)dev, - index, buf, buflen); + strindex, buf, buflen); if (err) return (-1); @@ -225,23 +225,23 @@ int usb_get_descriptor_by_endpoint(usb_dev_handle * udev, int ep, uint8_t type, - uint8_t index, void *buf, int size) + uint8_t ep_index, void *buf, int size) { memset(buf, 0, size); return (usb_control_msg(udev, ep | USB_ENDPOINT_IN, - USB_REQ_GET_DESCRIPTOR, (type << 8) + index, 0, + USB_REQ_GET_DESCRIPTOR, (type << 8) + ep_index, 0, buf, size, 1000)); } int -usb_get_descriptor(usb_dev_handle * udev, uint8_t type, uint8_t index, +usb_get_descriptor(usb_dev_handle * udev, uint8_t type, uint8_t desc_index, void *buf, int size) { memset(buf, 0, size); return (usb_control_msg(udev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR, - (type << 8) + index, 0, buf, size, 1000)); + (type << 8) + desc_index, 0, buf, size, 1000)); } int @@ -646,7 +646,7 @@ int usb_control_msg(usb_dev_handle * dev, int requesttype, int request, - int value, int index, char *bytes, int size, int timeout) + int value, int wIndex, char *bytes, int size, int timeout) { struct LIBUSB20_CONTROL_SETUP_DECODED req; int err; @@ -657,7 +657,7 @@ req.bmRequestType = requesttype; req.bRequest = request; req.wValue = value; - req.wIndex = index; + req.wIndex = wIndex; req.wLength = size; err = libusb20_dev_request_sync((void *)dev, &req, bytes, @@ -758,7 +758,7 @@ return (0); } -char * +const char * usb_strerror(void) { /* TODO */ ==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.h#3 (text+ko) ==== @@ -291,7 +291,7 @@ int usb_resetep(usb_dev_handle * dev, unsigned int ep); int usb_clear_halt(usb_dev_handle * dev, unsigned int ep); int usb_reset(usb_dev_handle * dev); -char *usb_strerror(void); +const char *usb_strerror(void); void usb_init(void); void usb_set_debug(int level); int usb_find_busses(void); ==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#4 (text+ko) ==== @@ -84,8 +84,8 @@ /* get "wTotalLength" and setup "pcdesc" */ pcdesc.ptr = LIBUSB20_ADD_BYTES(config_desc, 0); pcdesc.len = - ((uint8_t *)config_desc)[2] | - (((uint8_t *)config_desc)[3] << 8); + ((const uint8_t *)config_desc)[2] | + (((const uint8_t *)config_desc)[3] << 8); pcdesc.type = LIBUSB20_ME_IS_RAW; /* descriptor pre-scan */ @@ -238,7 +238,7 @@ libusb20_desc_foreach(const struct libusb20_me_struct *pdesc, const uint8_t *psubdesc) { - void *end; + const void *end; if (pdesc == NULL) { return (NULL); @@ -250,8 +250,8 @@ } else { psubdesc = LIBUSB20_ADD_BYTES(psubdesc, psubdesc[0]); } - return (((((void *)psubdesc) >= ((void *)(pdesc->ptr))) && - (((void *)psubdesc) < end) && + return (((((const void *)psubdesc) >= ((void *)(pdesc->ptr))) && + (((const void *)psubdesc) < end) && (LIBUSB20_ADD_BYTES(psubdesc, psubdesc[0]) >= ((void *)(pdesc->ptr))) && (LIBUSB20_ADD_BYTES(psubdesc, psubdesc[0]) <= end) && (psubdesc[0] >= 3)) ? psubdesc : NULL); @@ -306,7 +306,7 @@ len_old = len; buf = ptr; pd_offset = sizeof(void *); - pf = (*((struct libusb20_me_format **)pd))->format; + pf = (*((struct libusb20_me_format *const *)pd))->format; /* scan */ ==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#4 (text+ko) ==== @@ -63,7 +63,7 @@ #define LIBUSB20_MIN(a,b) (((a) < (b)) ? (a) : (b)) #define LIBUSB20_ADD_BYTES(ptr,off) \ - ((void *)(((const uint8_t *)(ptr)) + (off))) + ((void *)(((const uint8_t *)(ptr)) + (off) - ((const uint8_t *)0))) /* basic message elements */ enum { ==== //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#9 (text+ko) ==== @@ -311,7 +311,7 @@ ugen20_open_device(struct libusb20_device *pdev, uint16_t nMaxTransfer) { struct usb2_fs_endpoint *pfse = NULL; - struct usb2_fs_init fs_init = { /* zero */ }; + struct usb2_fs_init fs_init; uint32_t size; uint32_t plugtime; char buf[64]; @@ -319,6 +319,8 @@ int g; int error; + memset(&fs_init, 0, sizeof(fs_init)); + snprintf(buf, sizeof(buf), "/dev/ugen%u.%u", pdev->bus_number, pdev->device_address); @@ -384,9 +386,11 @@ static int ugen20_close_device(struct libusb20_device *pdev) { - struct usb2_fs_uninit fs_uninit = { /* zero */ }; + struct usb2_fs_uninit fs_uninit; int error = 0; + memset(&fs_uninit, 0, sizeof(fs_uninit)); + if (pdev->privBeData) { if (ioctl(pdev->file, USB_FS_UNINIT, &fs_uninit)) { error = LIBUSB20_ERROR_OTHER; @@ -412,12 +416,14 @@ ugen20_get_config_desc_full(struct libusb20_device *pdev, uint8_t **ppbuf, uint16_t *plen, uint8_t cfg_index) { - struct usb2_gen_descriptor gen_desc = { /* zero */ }; + struct usb2_gen_descriptor gen_desc; struct usb2_config_descriptor cdesc; uint8_t *ptr; uint16_t len; int error; + memset(&gen_desc, 0, sizeof(gen_desc)); + gen_desc.ugd_data = &cdesc; gen_desc.ugd_maxlen = sizeof(cdesc); gen_desc.ugd_config_index = cfg_index; @@ -502,7 +508,9 @@ ugen20_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index) { - struct usb2_alt_interface alt_iface = { /* zero */ }; + struct usb2_alt_interface alt_iface; + + memset(&alt_iface, 0, sizeof(alt_iface)); alt_iface.uai_interface_index = iface_index; alt_iface.uai_alt_index = alt_index; @@ -615,7 +623,9 @@ struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags) { - struct usb2_ctl_request req = { /* zero */ }; + struct usb2_ctl_request req; + + memset(&req, 0, sizeof(req)); req.ucr_data = data; if (!(flags & LIBUSB20_TRANSFER_SINGLE_SHORT_NOT_OK)) { @@ -689,9 +699,11 @@ ugen20_tr_open(struct libusb20_transfer *xfer, uint32_t MaxBufSize, uint32_t MaxFrameCount, uint8_t ep_no) { - struct usb2_fs_open temp = { /* zero */ }; + struct usb2_fs_open temp; struct usb2_fs_endpoint *fsep; + memset(&temp, 0, sizeof(temp)); + fsep = xfer->pdev->privBeData; fsep += xfer->trIndex; @@ -720,7 +732,9 @@ static int ugen20_tr_close(struct libusb20_transfer *xfer) { - struct usb2_fs_close temp = { /* zero */ }; + struct usb2_fs_close temp; + + memset(&temp, 0, sizeof(temp)); temp.ep_index = xfer->trIndex; @@ -733,7 +747,9 @@ static int ugen20_tr_clear_stall_sync(struct libusb20_transfer *xfer) { - struct usb2_fs_clear_stall_sync temp = { /* zero */ }; + struct usb2_fs_clear_stall_sync temp; + + memset(&temp, 0, sizeof(temp)); /* if the transfer is active, an error will be returned */ @@ -748,9 +764,11 @@ static void ugen20_tr_submit(struct libusb20_transfer *xfer) { - struct usb2_fs_start temp = { /* zero */ }; + struct usb2_fs_start temp; struct usb2_fs_endpoint *fsep; + memset(&temp, 0, sizeof(temp)); + fsep = xfer->pdev->privBeData; fsep += xfer->trIndex; @@ -781,7 +799,9 @@ static void ugen20_tr_cancel_async(struct libusb20_transfer *xfer) { - struct usb2_fs_stop temp = { /* zero */ }; + struct usb2_fs_stop temp; + + memset(&temp, 0, sizeof(temp)); temp.ep_index = xfer->trIndex; @@ -817,9 +837,11 @@ uint8_t dev, uint8_t iface, uid_t *uid, gid_t *gid, mode_t *mode) { - struct usb2_dev_perm perm = { /* zero */ }; + struct usb2_dev_perm perm; int error; + memset(&perm, 0, sizeof(perm)); + perm.bus_index = bus; perm.dev_index = dev; perm.iface_index = iface;