PERFORCE change 130967 for review

[Hans Petter Selasky]

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

Change 130967 by hselasky at hselasky_laptop001 on 2007/12/15 18:20:13

	
	Style change by "usb_style.sh".

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ucom.c#27 edit

Differences ...

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

@@ -1060,20 +1060,20 @@
 
 	while (len != 0) {
 
-                       usbd_get_page(pc, offset, &res);
-       
-                       if (res.length > len) {
-                               res.length = len;
-                       }
-                       cnt = q_to_b(&(tp->t_outq), res.buffer, res.length);
+		usbd_get_page(pc, offset, &res);
+
+		if (res.length > len) {
+			res.length = len;
+		}
+		cnt = q_to_b(&(tp->t_outq), res.buffer, res.length);
+
+		offset += cnt;
+		len -= cnt;
 
-               offset += cnt;
-                       len -= cnt;
-       
-                       if (cnt < res.length) {
-                               /* end of buffer */
-                               break;
-                       }
+		if (cnt < res.length) {
+			/* end of buffer */
+			break;
+		}
 	}
 
 	actlen[0] = offset - offset_orig;
@@ -1112,62 +1112,61 @@
 	/* set a flag to prevent recursation ? */
 
 	while (len > 0) {
-       
-                       usbd_get_page(pc, offset, &res);
-       
-                       if (res.length > len) {
-                               res.length = len;
-                      }
-                       len -= res.length;
-                       offset += res.length;
 
-	if (tp->t_state & TS_CAN_BYPASS_L_RINT) {
+		usbd_get_page(pc, offset, &res);
 
-		if (((tp->t_rawq.c_cc + res.length) > tp->t_ihiwat) &&
-		    ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) ||
-		    (tp->t_iflag & IXOFF)) &&
-		    (!(tp->t_state & TS_TBLOCK))) {
-			ttyblock(tp);
+		if (res.length > len) {
+			res.length = len;
 		}
+		len -= res.length;
+		offset += res.length;
 
-		cnt = b_to_q(res.buffer, res.length, &(tp->t_rawq));
+		if (tp->t_state & TS_CAN_BYPASS_L_RINT) {
+
+			if (((tp->t_rawq.c_cc + res.length) > tp->t_ihiwat) &&
+			    ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) ||
+			    (tp->t_iflag & IXOFF)) &&
+			    (!(tp->t_state & TS_TBLOCK))) {
+				ttyblock(tp);
+			}
+			cnt = b_to_q(res.buffer, res.length, &(tp->t_rawq));
 
-		tp->t_rawcc += res.length;
+			tp->t_rawcc += res.length;
 
-		ttwakeup(tp);
+			ttwakeup(tp);
 
-		if ((tp->t_state & TS_TTSTOP) &&
-		    ((tp->t_iflag & IXANY) ||
-		    (tp->t_cc[VSTART] == tp->t_cc[VSTOP]))) {
-			tp->t_state &= ~TS_TTSTOP;
-			tp->t_lflag &= ~FLUSHO;
-			ucom_start_write(tp);
-		}
-		if (cnt > 0) {
-			DPRINTF(0, "tp=%p, lost %d "
-			    "chars\n", tp, cnt);
-		}
-	} else {
+			if ((tp->t_state & TS_TTSTOP) &&
+			    ((tp->t_iflag & IXANY) ||
+			    (tp->t_cc[VSTART] == tp->t_cc[VSTOP]))) {
+				tp->t_state &= ~TS_TTSTOP;
+				tp->t_lflag &= ~FLUSHO;
+				ucom_start_write(tp);
+			}
+			if (cnt > 0) {
+				DPRINTF(0, "tp=%p, lost %d "
+				    "chars\n", tp, cnt);
+			}
+		} else {
 
-	  uint8_t *buf;
+			uint8_t *buf;
 
-		/* pass characters to tty layer */
+			/* pass characters to tty layer */
 
-	  buf = res.buffer;
+			buf = res.buffer;
 
-		for (cnt = 0; cnt != res.length; cnt++) {
+			for (cnt = 0; cnt != res.length; cnt++) {
 
-			if (ttyld_rint(tp, buf[cnt]) == -1) {
+				if (ttyld_rint(tp, buf[cnt]) == -1) {
 
-				/* XXX what should we do? */
+					/* XXX what should we do? */
 
-				DPRINTF(0, "tp=%p, lost %d "
-				    "chars\n", tp, res.length - cnt);
-				break;
+					DPRINTF(0, "tp=%p, lost %d "
+					    "chars\n", tp, res.length - cnt);
+					break;
+				}
 			}
 		}
 	}
-	}
 
 	if ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) &&
 	    (!(sc->sc_mcr & SER_RTS)) &&