Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 18 Sep 2008 20:49:43 GMT
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 150049 for review
Message-ID:  <200809182049.m8IKnhsG062074@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
http://perforce.freebsd.org/chv.cgi?CH=150049

Change 150049 by hselasky@hselasky_laptop001 on 2008/09/18 20:49:39

	
	Style change by "usb_style.sh". Forgot to run the script before last commit.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#5 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#10 edit

Differences ...

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

@@ -231,7 +231,6 @@
 	if (command_pre_func) {
 		(command_pre_func) (ctd->p_softc, (void *)(pi + 1), command_ref);
 	}
-
 	if (command_sync == USB2_CONFIG_TD_SYNC) {
 		usb2_proc_mwait(&ctd->usb2_proc, pi_0, pi_1);
 	}
@@ -301,22 +300,20 @@
 uint8_t
 usb2_config_td_sync(struct usb2_config_td *ctd)
 {
-  if (usb2_config_td_is_gone(ctd)) {
-	return (1);
-  }
+	if (usb2_config_td_is_gone(ctd)) {
+		return (1);
+	}
+	usb2_config_td_queue_command(ctd, NULL,
+	    &usb2_config_td_sync_cb, USB2_CONFIG_TD_SYNC, 0);
 
-  usb2_config_td_queue_command(ctd, NULL, 
-       &usb2_config_td_sync_cb, USB2_CONFIG_TD_SYNC, 0);
-
-  if (usb2_config_td_is_gone(ctd)) {
-	return (1);
-  }
-
-  return (0);
+	if (usb2_config_td_is_gone(ctd)) {
+		return (1);
+	}
+	return (0);
 }
 
 static void
-usb2_config_td_sync_cb(struct usb2_config_td_softc *sc, 
+usb2_config_td_sync_cb(struct usb2_config_td_softc *sc,
     struct usb2_config_td_cc *cc, uint16_t ref)
 {
 	return;

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#5 (text+ko) ====

@@ -30,7 +30,7 @@
 struct usb2_config_td_softc;
 struct usb2_config_td_cc;
 
-#define USB2_CONFIG_TD_SYNC 0xFFFF /* magic value */
+#define	USB2_CONFIG_TD_SYNC 0xFFFF	/* magic value */
 
 typedef void (usb2_config_td_command_t)(struct usb2_config_td_softc *sc, struct usb2_config_td_cc *cc, uint16_t reference);
 typedef void (usb2_config_td_end_of_commands_t)(struct usb2_config_td_softc *sc);

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

@@ -350,14 +350,15 @@
 			TAILQ_REMOVE(&up->up_qhead, pm1, pm_qentry);
 			pm1->pm_qentry.tqe_prev = NULL;
 		}
-	} else while (pm0->pm_qentry.tqe_prev ||
-	    pm1->pm_qentry.tqe_prev) {
-		/* check if config thread is gone */
-		if (up->up_gone)
-			break;
-		up->up_dsleep = 1;
-		usb2_cv_wait(&up->up_drain, up->up_mtx);
-	}
+	} else
+		while (pm0->pm_qentry.tqe_prev ||
+		    pm1->pm_qentry.tqe_prev) {
+			/* check if config thread is gone */
+			if (up->up_gone)
+				break;
+			up->up_dsleep = 1;
+			usb2_cv_wait(&up->up_drain, up->up_mtx);
+		}
 	return;
 }
 
@@ -410,7 +411,7 @@
 		up->up_dsleep = 0;
 		usb2_cv_broadcast(&up->up_drain);
 		DPRINTF("WARNING: Someone is waiting "
-		  "for USB process drain!\n");
+		    "for USB process drain!\n");
 	}
 	mtx_unlock(up->up_mtx);
 	return;

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