From owner-p4-projects@FreeBSD.ORG Sun Dec 2 01:04:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AB0F16A41B; Sun, 2 Dec 2007 01:04:48 +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 50B7B16A419 for ; Sun, 2 Dec 2007 01:04:48 +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 3FAA913C447 for ; Sun, 2 Dec 2007 01:04:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB214mpp021754 for ; Sun, 2 Dec 2007 01:04:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB214mCb021751 for perforce@freebsd.org; Sun, 2 Dec 2007 01:04:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Dec 2007 01:04:48 GMT Message-Id: <200712020104.lB214mCb021751@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 129940 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: Sun, 02 Dec 2007 01:04:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=129940 Change 129940 by hselasky@hselasky_laptop001 on 2007/12/02 01:04:07 "usbd_set_frame_data()" does no longer set the length, only the buffer pointer. The USB P4 project should compile again after this. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#63 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#56 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#63 (text+ko) ==== @@ -764,7 +764,7 @@ void usbd_transfer_start(struct usbd_xfer *xfer); void usbd_transfer_stop(struct usbd_xfer *xfer); void usbd_transfer_drain(struct usbd_xfer *xfer); -void usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t len, uint32_t frindex); +void usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t frindex); void usbd_set_frame_offset(struct usbd_xfer *xfer, uint32_t offset, uint32_t frindex); void usbd_callback_wrapper(struct usbd_xfer *xfer); void usbd_do_callback(struct usbd_xfer **pp_xfer, struct thread *td); ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#56 (text+ko) ==== @@ -1893,18 +1893,16 @@ /*------------------------------------------------------------------------* * usbd_set_frame_data * - * This function sets the pointer and length of data that should + * This function sets the pointer of the buffer that should * loaded directly into DMA for the given USB frame. Passing "ptr" - * equal to NULL while "len" is greater than zero gives undefined - * results! + * equal to NULL while the corresponding "frlength" is greater + * than zero gives undefined results! *------------------------------------------------------------------------*/ void -usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t len, - uint32_t frindex) +usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t frindex) { /* set virtual address to load and length */ xfer->frbuffers[frindex].buffer = ptr; - xfer->frlengths[frindex] = len; return; }