From owner-svn-src-user@FreeBSD.ORG Sat Nov 13 21:59:20 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F6D01065675; Sat, 13 Nov 2010 21:59:20 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 747108FC15; Sat, 13 Nov 2010 21:59:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oADLxKkm061109; Sat, 13 Nov 2010 21:59:20 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oADLxKF3061107; Sat, 13 Nov 2010 21:59:20 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201011132159.oADLxKF3061107@svn.freebsd.org> From: Weongyo Jeong Date: Sat, 13 Nov 2010 21:59:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215264 - user/weongyo/usb/sys/dev/usb X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2010 21:59:20 -0000 Author: weongyo Date: Sat Nov 13 21:59:20 2010 New Revision: 215264 URL: http://svn.freebsd.org/changeset/base/215264 Log: Handles endians to fill usbpf_pkthdr structure that it's basically a little endian form. Modified: user/weongyo/usb/sys/dev/usb/usb_pf.c Modified: user/weongyo/usb/sys/dev/usb/usb_pf.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_pf.c Sat Nov 13 21:48:32 2010 (r215263) +++ user/weongyo/usb/sys/dev/usb/usb_pf.c Sat Nov 13 21:59:20 2010 (r215264) @@ -1698,37 +1698,36 @@ usbpf_xfertap(struct usb_xfer *xfer, int } end = buf + sizeof(struct usbpf_pkthdr) + (USB_PAGE_SIZE * 5); - /* XXX need to care big/little endians. */ bzero(ptr, sizeof(struct usbpf_pkthdr)); up = (struct usbpf_pkthdr *)ptr; - up->up_busunit = device_get_unit(bus->bdev); + up->up_busunit = htole32(device_get_unit(bus->bdev)); up->up_type = type; up->up_xfertype = ep->edesc->bmAttributes & UE_XFERTYPE; up->up_address = xfer->address; up->up_endpoint = xfer->endpointno; - up->up_flags = xfer->flags; - up->up_status = xfer->status; + up->up_flags = htole32(xfer->flags); + up->up_status = htole32(xfer->status); switch (type) { case USBPF_XFERTAP_SUBMIT: - up->up_length = xfer->sumlen; - up->up_frames = xfer->nframes; + up->up_length = htole32(xfer->sumlen); + up->up_frames = htole32(xfer->nframes); break; case USBPF_XFERTAP_DONE: - up->up_length = xfer->actlen; - up->up_frames = xfer->aframes; + up->up_length = htole32(xfer->actlen); + up->up_frames = htole32(xfer->aframes); break; default: panic("wrong usbpf type (%d)", type); } - up->up_error = xfer->error; - up->up_interval = xfer->interval; + up->up_error = htole32(xfer->error); + up->up_interval = htole32(xfer->interval); ptr += sizeof(struct usbpf_pkthdr); for (i = 0; i < up->up_frames; i++) { if (ptr + sizeof(u_int32_t) >= end) goto done; - *((u_int32_t *)ptr) = xfer->frlengths[i]; + *((u_int32_t *)ptr) = htole32(xfer->frlengths[i]); ptr += sizeof(u_int32_t); if (ptr + xfer->frlengths[i] >= end)