Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ic Remove all trailing whitespace
details: https://anonhg.NetBSD.org/src/rev/67942bceaa18
branches: trunk
changeset: 790150:67942bceaa18
user: skrll <skrll%NetBSD.org@localhost>
date: Sun Sep 22 06:54:35 2013 +0000
description:
Remove all trailing whitespace
diffstat:
sys/dev/ic/sl811hs.c | 262 ++++++++++++++++++++++++------------------------
sys/dev/ic/sl811hsreg.h | 12 +-
sys/dev/ic/sl811hsvar.h | 12 +-
3 files changed, 143 insertions(+), 143 deletions(-)
diffs (truncated from 879 to 300 lines):
diff -r d8de2ab2daa6 -r 67942bceaa18 sys/dev/ic/sl811hs.c
--- a/sys/dev/ic/sl811hs.c Sun Sep 22 06:52:11 2013 +0000
+++ b/sys/dev/ic/sl811hs.c Sun Sep 22 06:54:35 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.36 2013/09/22 06:52:11 skrll Exp $ */
+/* $NetBSD: sl811hs.c,v 1.37 2013/09/22 06:54:35 skrll Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.36 2013/09/22 06:52:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.37 2013/09/22 06:54:35 skrll Exp $");
#include "opt_slhci.h"
@@ -191,11 +191,11 @@
/*
* Maximum allowable reserved bus time. Since intr/isoc transfers have
- * unconditional priority, this is all that ensures control and bulk transfers
- * get a chance. It is a single value for all frames since all transfers can
- * use multiple consecutive frames if an error is encountered. Note that it
- * is not really possible to fill the bus with transfers, so this value should
- * be on the low side. Defaults to giving a warning unless SLHCI_NO_OVERTIME
+ * unconditional priority, this is all that ensures control and bulk transfers
+ * get a chance. It is a single value for all frames since all transfers can
+ * use multiple consecutive frames if an error is encountered. Note that it
+ * is not really possible to fill the bus with transfers, so this value should
+ * be on the low side. Defaults to giving a warning unless SLHCI_NO_OVERTIME
* is defined. Full time is 12000 - END_BUSTIME.
*/
#ifndef SLHCI_RESERVED_BUSTIME
@@ -204,7 +204,7 @@
/*
* Rate for "exceeds reserved bus time" warnings (default) or errors.
- * Warnings only happen when an endpoint open causes the time to go above
+ * Warnings only happen when an endpoint open causes the time to go above
* SLHCI_RESERVED_BUSTIME, not if it is already above.
*/
#ifndef SLHCI_OVERTIME_WARNING_RATE
@@ -233,8 +233,8 @@
/*
* This is an approximation of the USB worst-case timings presented on p. 54 of
- * the USB 1.1 spec translated to full speed bit times.
- * FS = full speed with handshake, FSII = isoc in, FSIO = isoc out,
+ * the USB 1.1 spec translated to full speed bit times.
+ * FS = full speed with handshake, FSII = isoc in, FSIO = isoc out,
* FSI = isoc (worst case), LS = low speed
*/
#define SLHCI_FS_CONST 114
@@ -618,8 +618,8 @@
#define DLOG(x, f, a, b, c, d) SLHCI_DEXEC(x, DDOLOG(f, a, b, c, d))
/*
* DLOGFLAG8 is a macro not a function so that flag name expressions are not
- * evaluated unless the flag bit is set (which could save a register read).
- * x is debug mask, y is flag identifier, z is flag variable,
+ * evaluated unless the flag bit is set (which could save a register read).
+ * x is debug mask, y is flag identifier, z is flag variable,
* a-h are flag names (must evaluate to string constants, msb first).
*/
#define DDOLOGFLAG8(y, z, a, b, c, d, e, f, g, h) do { uint8_t _DLF8 = (z); \
@@ -1003,10 +1003,10 @@
/*
* The goal of newbustime and newlen is to avoid bustime calculation
- * in the interrupt. The calculations are not too complex, but they
- * complicate the conditional logic somewhat and doing them all in the
- * same place shares constants. Index 0 is "short length" for bulk and
- * ctrl data and 1 is "full length" for ctrl data (bulk/intr are
+ * in the interrupt. The calculations are not too complex, but they
+ * complicate the conditional logic somewhat and doing them all in the
+ * same place shares constants. Index 0 is "short length" for bulk and
+ * ctrl data and 1 is "full length" for ctrl data (bulk/intr are
* already set to full length).
*/
if (spipe->pflags & PF_LS) {
@@ -1041,10 +1041,10 @@
/*
* The datasheet incorrectly indicates that DIRECTION is for
- * "transmit to host". It is for OUT and SETUP. The app note
+ * "transmit to host". It is for OUT and SETUP. The app note
* describes its use correctly.
*/
- if ((spipe->tregs[PID] & SL11_PID_BITS) != SL11_PID_IN)
+ if ((spipe->tregs[PID] & SL11_PID_BITS) != SL11_PID_IN)
spipe->control |= SL11_EPCTRL_DIRECTION;
slhci_start_entry(sc, spipe);
@@ -1095,7 +1095,7 @@
/*
* The endpoint descriptor will not have been set up yet in the case
- * of the standard control pipe, so the max packet checks are also
+ * of the standard control pipe, so the max packet checks are also
* necessary in start.
*/
@@ -1174,7 +1174,7 @@
/*
* Must be called before the ISR is registered. Interrupts can be shared so
- * slhci_intr could be called as soon as the ISR is registered.
+ * slhci_intr could be called as soon as the ISR is registered.
* Note max_current argument is actual current, but stored as current/2
*/
void
@@ -1406,9 +1406,9 @@
slhci_reset(sc);
/*
* We cannot call the calback directly since we could then be reset
- * again before finishing and need the callout delay for timing.
- * Scheduling the callout again before we exit would defeat the reap
- * mechanism since we could be unlocked while the reset flag is not
+ * again before finishing and need the callout delay for timing.
+ * Scheduling the callout again before we exit would defeat the reap
+ * mechanism since we could be unlocked while the reset flag is not
* set. The callback code will check the wait queue.
*/
slhci_callback_schedule(sc);
@@ -1744,8 +1744,8 @@
/*
* After calling waitintr it is necessary to either call slhci_callback or
- * schedule the callback if necessary. The callback cannot be called directly
- * from the hard interrupt since it interrupts at a high IPL and callbacks
+ * schedule the callback if necessary. The callback cannot be called directly
+ * from the hard interrupt since it interrupts at a high IPL and callbacks
* can do copyout and such.
*/
static void
@@ -1842,11 +1842,11 @@
/*
* SOFCHECK flags are cleared in tstart. Two flags are needed
- * since the first SOF interrupt processed after the transfer
- * is started might have been generated before the transfer
+ * since the first SOF interrupt processed after the transfer
+ * is started might have been generated before the transfer
* was started.
*/
- if (__predict_false(t->flags & F_SOFCHECK2 && t->flags &
+ if (__predict_false(t->flags & F_SOFCHECK2 && t->flags &
(F_AINPROG|F_BINPROG))) {
printf("%s: Missed transfer completion. halted\n",
SC_NAME(sc));
@@ -1916,7 +1916,7 @@
/*
* This happens when a low speed device is attached to
- * a hub with chip rev 1.5. SOF stops, but a few transfers
+ * a hub with chip rev 1.5. SOF stops, but a few transfers
* still work before causing this error.
*/
if (!(t->flags & (ab ? F_BINPROG : F_AINPROG))) {
@@ -2188,7 +2188,7 @@
spipe->pipe.interval;
/*
* If ack, we try to keep the
- * interrupt rate by using lastframe
+ * interrupt rate by using lastframe
* instead of the current frame.
*/
spipe->frame = spipe->lastframe +
@@ -2197,8 +2197,8 @@
/*
* Set the toggle for the next transfer. It
- * has already been toggled above, so the
- * current setting will apply to the next
+ * has already been toggled above, so the
+ * current setting will apply to the next
* transfer.
*/
if (spipe->control & SL11_EPCTRL_DATATOGGLE)
@@ -2263,8 +2263,8 @@
/*
* We have about 6 us to get from the bus time check to
- * starting the transfer or we might babble or the chip might fail to
- * signal transfer complete. This leaves no time for any other
+ * starting the transfer or we might babble or the chip might fail to
+ * signal transfer complete. This leaves no time for any other
* interrupts.
*/
s = splhigh();
@@ -2273,8 +2273,8 @@
/*
* Start one transfer only, clearing any aborted transfers that are
- * not yet in progress and skipping missed isoc. It is easier to copy
- * & paste most of the A/B sections than to make the logic work
+ * not yet in progress and skipping missed isoc. It is easier to copy
+ * & paste most of the A/B sections than to make the logic work
* otherwise and this allows better constant use.
*/
if (t->flags & F_AREADY) {
@@ -2328,14 +2328,14 @@
/* Check that this transfer can fit in the remaining memory. */
spipe, t))) {
LK_SLASSERT(spipe->xfer != NULL, sc, spipe, NULL, return);
- LK_SLASSERT(spipe->ptype != PT_ROOT_CTRL && spipe->ptype !=
+ LK_SLASSERT(spipe->ptype != PT_ROOT_CTRL && spipe->ptype !=
PT_ROOT_INTR, sc, spipe, NULL, return);
/* Check that this transfer can fit in the remaining memory. */
- if (t->len[A] + t->len[B] + spipe->tregs[LEN] + 1 >
+ if (t->len[A] + t->len[B] + spipe->tregs[LEN] + 1 >
SL11_MAX_PACKET_SIZE) {
DLOG(D_XFER, "Transfer does not fit. alen %d blen %d "
- "len %d", t->len[A], t->len[B], spipe->tregs[LEN],
+ "len %d", t->len[A], t->len[B], spipe->tregs[LEN],
0);
return;
}
@@ -2347,24 +2347,24 @@
spipe->tregs[ADR] = SL11_BUFFER_START;
} else {
ab = B;
- spipe->tregs[ADR] = SL11_BUFFER_END -
+ spipe->tregs[ADR] = SL11_BUFFER_END -
spipe->tregs[LEN];
}
t->len[ab] = spipe->tregs[LEN];
- if (spipe->tregs[LEN] && (spipe->tregs[PID] & SL11_PID_BITS)
+ if (spipe->tregs[LEN] && (spipe->tregs[PID] & SL11_PID_BITS)
!= SL11_PID_IN) {
- start_cc_time(&t_copy_to_dev,
+ start_cc_time(&t_copy_to_dev,
spipe->tregs[LEN]);
- slhci_write_multi(sc, spipe->tregs[ADR],
+ slhci_write_multi(sc, spipe->tregs[ADR],
spipe->buffer, spipe->tregs[LEN]);
stop_cc_time(&t_copy_to_dev);
- t->pend -= SLHCI_FS_CONST +
+ t->pend -= SLHCI_FS_CONST +
SLHCI_FS_DATA_TIME(spipe->tregs[LEN]);
}
- DLOG(D_MSG, "NEW TRANSFER %s flags %#x alen %d blen %d",
+ DLOG(D_MSG, "NEW TRANSFER %s flags %#x alen %d blen %d",
ab ? "B" : "A", t->flags, t->len[0], t->len[1]);
if (spipe->tregs[LEN])
@@ -2375,12 +2375,12 @@
for (; i <= 3; i++)
if (t->current_tregs[ab][i] != spipe->tregs[i]) {
t->current_tregs[ab][i] = spipe->tregs[i];
- slhci_write(sc, slhci_tregs[ab][i],
+ slhci_write(sc, slhci_tregs[ab][i],
spipe->tregs[i]);
}
- DLOG(D_SXFER, "Transfer len %d pid %#x dev %d type %s",
- spipe->tregs[LEN], spipe->tregs[PID], spipe->tregs[DEV],
+ DLOG(D_SXFER, "Transfer len %d pid %#x dev %d type %s",
+ spipe->tregs[LEN], spipe->tregs[PID], spipe->tregs[DEV],
pnames(spipe->ptype));
t->spipe[ab] = spipe;
@@ -2419,7 +2419,7 @@
xfer = t->rootintr;
goto do_callback;
}
- }
+ }
if (!DEQUEUED_CALLBACK(spipe, t))
@@ -2429,7 +2429,7 @@
LK_SLASSERT(xfer != NULL, sc, spipe, NULL, return);
spipe->xfer = NULL;
DLOG(D_XFER, "xfer callback length %d actlen %d spipe %x "
- "type %s", xfer->length, xfer->actlen, spipe,
+ "type %s", xfer->length, xfer->actlen, spipe,
pnames(spipe->ptype));
do_callback:
slhci_do_callback(sc, xfer, s);
@@ -2445,16 +2445,16 @@
SLHCI_MAINLOCKASSERT(sc);
- if (__predict_false(t->flags & F_DISABLED) ||
+ if (__predict_false(t->flags & F_DISABLED) ||
__predict_false(spipe->pflags & PF_GONE)) {
DLOG(D_MSG, "slhci_enter_xfer: DISABLED or GONE", 0,0,0,0);
- spipe->xfer->status = USBD_CANCELLED;
+ spipe->xfer->status = USBD_CANCELLED;
}
if (spipe->xfer->status == USBD_IN_PROGRESS) {
if (spipe->xfer->timeout) {
spipe->to_frame = t->frame + spipe->xfer->timeout;
Home |
Main Index |
Thread Index |
Old Index