From owner-svn-src-all@FreeBSD.ORG Sun Apr 5 18:19:20 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A13E11065861; Sun, 5 Apr 2009 18:19:20 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4A5518FC0A; Sun, 5 Apr 2009 18:19:20 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n35IJKJH027592; Sun, 5 Apr 2009 18:19:20 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n35IJKWS027589; Sun, 5 Apr 2009 18:19:20 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200904051819.n35IJKWS027589@svn.freebsd.org> From: Andrew Thompson Date: Sun, 5 Apr 2009 18:19:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190727 - head/sys/dev/usb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2009 18:19:22 -0000 Author: thompsa Date: Sun Apr 5 18:19:19 2009 New Revision: 190727 URL: http://svn.freebsd.org/changeset/base/190727 Log: MFp4 //depot/projects/usb@159811 First patch in a series of memory save patches. Submitted by: Hans Petter Selasky Modified: head/sys/dev/usb/usb_device.c head/sys/dev/usb/usb_request.c head/sys/dev/usb/usb_request.h Modified: head/sys/dev/usb/usb_device.c ============================================================================== --- head/sys/dev/usb/usb_device.c Sun Apr 5 18:19:10 2009 (r190726) +++ head/sys/dev/usb/usb_device.c Sun Apr 5 18:19:19 2009 (r190727) @@ -504,8 +504,9 @@ usb2_free_iface_data(struct usb2_device } /* free "cdesc" after "ifaces", if any */ - if (udev->cdesc) { - free(udev->cdesc, M_USB); + if (udev->cdesc != NULL) { + if (udev->flags.usb2_mode != USB_MODE_DEVICE) + free(udev->cdesc, M_USB); udev->cdesc = NULL; } /* set unconfigured state */ @@ -569,8 +570,14 @@ usb2_set_config_index(struct usb2_device goto done; } /* get the full config descriptor */ - err = usb2_req_get_config_desc_full(udev, - NULL, &cdp, M_USB, index); + if (udev->flags.usb2_mode == USB_MODE_DEVICE) { + /* save some memory */ + err = usb2_req_get_config_desc_ptr(udev, &cdp, index); + } else { + /* normal request */ + err = usb2_req_get_config_desc_full(udev, + NULL, &cdp, M_USB, index); + } if (err) { goto done; } @@ -1713,10 +1720,9 @@ repeat_set_config: udev->ugen_symlink = usb2_alloc_symlink(udev->ugen_name); /* Announce device */ -#if USB_HAVE_STRINGS printf("%s: <%s> at %s\n", udev->ugen_name, udev->manufacturer, device_get_nameunit(udev->bus->bdev)); -#endif + usb2_notify_addq("+", udev); #endif done: @@ -1851,10 +1857,8 @@ usb2_free_device(struct usb2_device *ude #if USB_HAVE_UGEN usb2_notify_addq("-", udev); -#if USB_HAVE_STRINGS printf("%s: <%s> at %s (disconnected)\n", udev->ugen_name, udev->manufacturer, device_get_nameunit(bus->bdev)); -#endif /* Destroy UGEN symlink, if any */ if (udev->ugen_symlink) { Modified: head/sys/dev/usb/usb_request.c ============================================================================== --- head/sys/dev/usb/usb_request.c Sun Apr 5 18:19:10 2009 (r190726) +++ head/sys/dev/usb/usb_request.c Sun Apr 5 18:19:19 2009 (r190727) @@ -833,6 +833,40 @@ usb2_req_get_string_desc(struct usb2_dev } /*------------------------------------------------------------------------* + * usb2_req_get_config_desc_ptr + * + * This function is used in device side mode to retrieve the pointer + * to the generated config descriptor. This saves allocating space for + * an additional config descriptor when setting the configuration. + * + * Returns: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +usb2_error_t +usb2_req_get_config_desc_ptr(struct usb2_device *udev, + struct usb2_config_descriptor **ppcd, uint8_t config_index) +{ + uint16_t len; + + struct usb2_device_request req; + + if (udev->flags.usb2_mode != USB_MODE_DEVICE) + return (USB_ERR_INVAL); + + req.bmRequestType = UT_READ_CLASS_DEVICE; + req.bRequest = UR_GET_DESCRIPTOR; + USETW2(req.wValue, UDESC_CONFIG, config_index); + USETW(req.wIndex, 0); + USETW(req.wLength, 0); + + (usb2_temp_get_desc_p) (udev, &req, + __DECONST(const void **, ppcd), &len); + + return (*ppcd ? USB_ERR_NORMAL_COMPLETION : USB_ERR_INVAL); +} + +/*------------------------------------------------------------------------* * usb2_req_get_config_desc * * Returns: Modified: head/sys/dev/usb/usb_request.h ============================================================================== --- head/sys/dev/usb/usb_request.h Sun Apr 5 18:19:10 2009 (r190726) +++ head/sys/dev/usb/usb_request.h Sun Apr 5 18:19:19 2009 (r190727) @@ -44,6 +44,8 @@ usb2_error_t usb2_req_get_alt_interface_ uint8_t iface_index); usb2_error_t usb2_req_get_config(struct usb2_device *udev, struct mtx *mtx, uint8_t *pconf); +usb2_error_t usb2_req_get_config_desc_ptr(struct usb2_device *udev, + struct usb2_config_descriptor **ppcd, uint8_t config_index); usb2_error_t usb2_req_get_config_desc(struct usb2_device *udev, struct mtx *mtx, struct usb2_config_descriptor *d, uint8_t conf_index); usb2_error_t usb2_req_get_config_desc_full(struct usb2_device *udev,