svn commit: r184610 - in head: lib/libusb20 share/man/man4 sys/conf sys/dev/sound/pcm sys/dev/usb2 sys/dev/usb2/bluetooth sys/dev/usb2/controller sys/dev/usb2/core sys/dev/usb2/ethernet sys/dev/usb...

Giorgos Keramidas keramida at ceid.upatras.gr
Tue Nov 4 01:46:59 PST 2008


On Tue, 4 Nov 2008 02:31:04 +0000 (UTC), Alfred Perlstein <alfred at freebsd.org> wrote:
> Author: alfred
> Date: Tue Nov  4 02:31:03 2008
> New Revision: 184610
> URL: http://svn.freebsd.org/changeset/base/184610
>
> Log:
>   Bring in USB4BSD, Hans Petter Selasky rework of the USB stack
>   that includes significant features and SMP safety.

The tinderbox complains about `if_zyd2.c' on i386/pc98 and powerpc; we
may have to commit something like:

%%%
--- if_zyd2.c.orig	2008-11-04 11:25:45.000000000 +0200
+++ if_zyd2.c	2008-11-04 11:31:24.000000000 +0200
@@ -378,6 +378,7 @@
 	struct zyd_softc *sc = xfer->priv_sc;
 	struct zyd_cmd *cmd = &sc->sc_intr_ibuf;
 	uint32_t actlen;
+	uint16_t code;
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
@@ -392,14 +393,14 @@
 		usb2_copy_out(xfer->frbuffers, 0,
 		    &sc->sc_intr_ibuf, actlen);
 
-		switch (cmd->code) {
-		case htole16(ZYD_NOTIF_RETRYSTATUS):
+		code = le16toh(cmd->code);
+		switch (code) {
+		case ZYD_NOTIF_RETRYSTATUS:
 			goto handle_notif_retrystatus;
-		case htole16(ZYD_NOTIF_IORD):
+		case ZYD_NOTIF_IORD:
 			goto handle_notif_iord;
 		default:
-			DPRINTFN(2, "unknown indication: 0x%04x\n",
-			    le16toh(cmd->code));
+			DPRINTFN(2, "unknown indication: 0x%04x\n", code);
 		}
 
 		/* fallthrough */
%%%



More information about the svn-src-head mailing list