PERFORCE change 120884 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=120884

Change 120884 by hselasky at hselasky_mini_itx on 2007/06/04 07:13:18

	Some nits here and there.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ufm.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ufm.c#10 (text+ko) ====

@@ -207,7 +207,7 @@
         sc->sc_cdev.sc_ioctl = &ufm_ioctl;
 
         error = usb_cdev_attach(&(sc->sc_cdev), sc, &(sc->sc_mtx), p_buf,
-                                UID_ROOT, GID_OPERATOR, 0644, 1, 1, 1, 1);
+                                UID_ROOT, GID_OPERATOR, 0644, 0, 0, 0, 0);
         if (error) {
             goto detach;
         }

==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#18 (text+ko) ====

@@ -541,7 +541,7 @@
 
 	ufoma_cfg_do_request(sc, &req, sc->sc_modetable);
 
-	error = mtx_sleep(&(sc->sc_currentmode), &Giant, PZERO, "ufoma_link", hz);
+	error = mtx_sleep(&(sc->sc_currentmode), &Giant, 0, "ufoma_link", hz);
 
 	if(error){
 		DPRINTF(sc, 0, "NO response\n");
@@ -563,7 +563,8 @@
 
 	ufoma_cfg_do_request(sc, &req, NULL);
 	
-	error = mtx_sleep(&(sc->sc_currentmode), &Giant, PZERO, "fmaact", (UFOMA_MAX_TIMEOUT*hz));
+	error = mtx_sleep(&(sc->sc_currentmode), &Giant, 0,
+			  "fmaact", (UFOMA_MAX_TIMEOUT*hz));
 	if(error){
 		DPRINTF(sc, 0, "No response\n");
 	}

==== //depot/projects/usb/src/sys/dev/usb/ugen.c#17 (text+ko) ====

@@ -514,6 +514,7 @@
 	struct ugen_softc *sc = DEV2SC(dev);
 	struct ugen_endpoint *sce = DEV2SCE(dev);
 	struct usbd_xfer *temp_xfer[4];
+	int32_t error;
 
 	PRINTFN(5, ("flag=%d, mode=%d\n", flag, mode));
 
@@ -547,7 +548,7 @@
 			}
 
 			/* wait for routine(s) to exit */
-			mtx_sleep(sce, &sc->sc_mtx, PRIBIO, "ugensync", 0);
+			error = mtx_sleep(sce, &sc->sc_mtx, 0, "ugensync", 0);
 		}
 
 		/* free all memory after that one has
@@ -1021,8 +1022,8 @@
 
 			    sce->state |= (UGEN_RD_SLP|UGEN_RD_WUP);
 
-			    error = mtx_sleep(sce, &sc->sc_mtx, (PZERO|PCATCH),
-					   "ugen wait callback", 0);
+			    error = mtx_sleep(sce, &sc->sc_mtx, PCATCH,
+					      "ugen wait callback", 0);
 
 			    sce->state &= ~(UGEN_RD_SLP|UGEN_RD_WUP);
 
@@ -1245,8 +1246,8 @@
 
 				sce->state |= (UGEN_WR_SLP|UGEN_WR_WUP);
 
-				error = mtx_sleep(sce, &sc->sc_mtx, (PZERO|PCATCH),
-					       "ugen wait callback", 0);
+				error = mtx_sleep(sce, &sc->sc_mtx, PCATCH,
+						  "ugen wait callback", 0);
 
 				sce->state &= ~(UGEN_WR_SLP|UGEN_WR_WUP);
 
@@ -1875,7 +1876,7 @@
 #define si ((struct usb_string_desc *)addr)
 		if(usbreq_get_string_desc
 		   (sc->sc_udev, si->usd_string_index,
-		    si->usd_language_id, &si->usd_desc, &len))
+		    si->usd_language_id, &si->usd_desc, NULL))
 		{
 			error = EINVAL;
 			break;

==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#17 (text+ko) ====

@@ -461,7 +461,7 @@
  tr_error:
 	/* bomb out */
 	sc->sc_flags &= ~UKBD_FLAG_INTR_STALL;
-	DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error));
+	DPRINTF(-1, "error=%s\n", usbd_errstr(xfer->error));
 	return;
 }
 
@@ -546,7 +546,7 @@
 	return;
 
  tr_error:
-	DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error));
+	DPRINTF(-1, "error=%s\n", usbd_errstr(xfer->error));
 	return;
 }
 

==== //depot/projects/usb/src/sys/dev/usb/umodem.c#20 (text+ko) ====

@@ -130,8 +130,8 @@
 	struct ucom_super_softc	sc_super_ucom;
 	struct ucom_softc	sc_ucom;
 
-	struct usbd_xfer *	sc_xfer_data[UMODEM_N_DATA_TRANSFER];
-	struct usbd_xfer *	sc_xfer_intr[UMODEM_N_INTR_TRANSFER];
+	struct usbd_xfer	*sc_xfer_data[UMODEM_N_DATA_TRANSFER];
+	struct usbd_xfer	*sc_xfer_intr[UMODEM_N_INTR_TRANSFER];
 	struct usbd_device	*sc_udev;
 
 	u_int16_t		sc_line;

==== //depot/projects/usb/src/sys/dev/usb/ums.c#18 (text+ko) ====

@@ -175,7 +175,7 @@
  tr_error:
 	/* bomb out */
 	sc->sc_flags &= ~UMS_FLAG_INTR_STALL;
-	DPRINTF(0, "clear stall failed, error=%s!\n",
+	DPRINTF(-1, "clear stall failed, error=%s!\n",
 		usbd_errstr(xfer->error));
 	return;
 }
@@ -537,7 +537,7 @@
 	err = usb_cdev_attach(&(sc->sc_cdev), sc, &(sc->sc_mtx), p_buf,
 			      UID_ROOT, GID_OPERATOR, 0644, 
 			      UMS_BUF_SIZE, UMS_IFQ_MAXLEN,
-			      1, 1 /* dummy write buffer */);
+			      0, 0);
 	if (err) {
 	    goto detach;
 	}