Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 13 Nov 2010 21:59:20 +0000 (UTC)
From:      Weongyo Jeong <weongyo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r215264 - user/weongyo/usb/sys/dev/usb
Message-ID:  <201011132159.oADLxKF3061107@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011132159.oADLxKF3061107>