svn commit: r213397 - in user/weongyo/usb/sys/dev/usb: . controller
input net serial storage template wlan
Weongyo Jeong
weongyo at FreeBSD.org
Mon Oct 4 05:56:30 UTC 2010
Author: weongyo
Date: Mon Oct 4 05:56:29 2010
New Revision: 213397
URL: http://svn.freebsd.org/changeset/base/213397
Log:
Removes unnecessary spaces.
Modified:
user/weongyo/usb/sys/dev/usb/controller/at91dci.c
user/weongyo/usb/sys/dev/usb/controller/atmegadci.c
user/weongyo/usb/sys/dev/usb/controller/avr32dci.c
user/weongyo/usb/sys/dev/usb/controller/ehci.c
user/weongyo/usb/sys/dev/usb/controller/musb_otg.c
user/weongyo/usb/sys/dev/usb/controller/ohci.c
user/weongyo/usb/sys/dev/usb/controller/uhci.c
user/weongyo/usb/sys/dev/usb/controller/uss820dci.c
user/weongyo/usb/sys/dev/usb/input/atp.c
user/weongyo/usb/sys/dev/usb/input/uhid.c
user/weongyo/usb/sys/dev/usb/input/ukbd.c
user/weongyo/usb/sys/dev/usb/input/ums.c
user/weongyo/usb/sys/dev/usb/net/if_aue.c
user/weongyo/usb/sys/dev/usb/net/if_cdce.c
user/weongyo/usb/sys/dev/usb/net/uhso.c
user/weongyo/usb/sys/dev/usb/serial/ubser.c
user/weongyo/usb/sys/dev/usb/serial/ucycom.c
user/weongyo/usb/sys/dev/usb/storage/umass.c
user/weongyo/usb/sys/dev/usb/template/usb_template.c
user/weongyo/usb/sys/dev/usb/usb_busdma.c
user/weongyo/usb/sys/dev/usb/usb_compat_linux.c
user/weongyo/usb/sys/dev/usb/usb_dev.c
user/weongyo/usb/sys/dev/usb/usb_generic.c
user/weongyo/usb/sys/dev/usb/usb_hub.c
user/weongyo/usb/sys/dev/usb/usb_msctest.c
user/weongyo/usb/sys/dev/usb/usb_transfer.c
user/weongyo/usb/sys/dev/usb/wlan/if_rum.c
user/weongyo/usb/sys/dev/usb/wlan/if_run.c
user/weongyo/usb/sys/dev/usb/wlan/if_ural.c
Modified: user/weongyo/usb/sys/dev/usb/controller/at91dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/at91dci.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/controller/at91dci.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -926,7 +926,6 @@ at91dci_setup_standard_chain(struct usb_
if (temp.len == 0) {
/* make sure that we send an USB packet */
temp.short_pkt = 0;
-
} else {
/* regular data transfer */
if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
@@ -1104,7 +1103,6 @@ at91dci_standard_done_sub(struct usb_xfe
/* this USB frame is complete */
error = 0;
break;
-
} while (0);
/* update transfer cache */
@@ -2103,16 +2101,12 @@ at91dci_xfer_setup(struct usb_setup_para
if (parm->methods == &at91dci_device_ctrl_methods) {
ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC 1 */
+ 1 /* SYNC 2 */ ;
-
} else if (parm->methods == &at91dci_device_bulk_methods) {
ntd = xfer->nframes + 1 /* SYNC */ ;
-
} else if (parm->methods == &at91dci_device_intr_methods) {
ntd = xfer->nframes + 1 /* SYNC */ ;
-
} else if (parm->methods == &at91dci_device_isoc_fs_methods) {
ntd = xfer->nframes + 1 /* SYNC */ ;
-
} else
ntd = 0;
Modified: user/weongyo/usb/sys/dev/usb/controller/atmegadci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/atmegadci.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/controller/atmegadci.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -839,7 +839,6 @@ atmegadci_setup_standard_chain(struct us
if (temp.len == 0) {
/* make sure that we send an USB packet */
temp.short_pkt = 0;
-
} else {
/* regular data transfer */
if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
@@ -997,7 +996,6 @@ atmegadci_standard_done_sub(struct usb_x
/* this USB frame is complete */
error = 0;
break;
-
} while (0);
/* update transfer cache */
Modified: user/weongyo/usb/sys/dev/usb/controller/avr32dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/avr32dci.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/controller/avr32dci.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -810,7 +810,6 @@ avr32dci_setup_standard_chain(struct usb
if (temp.len == 0) {
/* make sure that we send an USB packet */
temp.short_pkt = 0;
-
} else {
/* regular data transfer */
if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
@@ -971,7 +970,6 @@ avr32dci_standard_done_sub(struct usb_xf
/* this USB frame is complete */
error = 0;
break;
-
} while (0);
/* update transfer cache */
Modified: user/weongyo/usb/sys/dev/usb/controller/ehci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -1612,7 +1612,6 @@ restart:
/* send a Zero Length Packet, ZLP, last */
temp->shortpkt = 1;
average = 0;
-
} else {
average = temp->average;
@@ -1655,7 +1654,6 @@ restart:
td->qtd_buffer[1] = 0;
td->qtd_buffer_hi[1] = 0;
-
} else {
uint8_t x;
@@ -1857,7 +1855,6 @@ ehci_setup_standard_chain(struct usb_xfe
if (temp.len == 0) {
/* make sure that we send an USB packet */
temp.shortpkt = 0;
-
} else {
/* regular data transfer */
if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
@@ -3434,7 +3431,6 @@ ehci_xfer_setup(struct usb_setup_params
nqh = 1;
nqtd = ((2 * xfer->nframes) + 1 /* STATUS */
+ (xfer->max_data_length / xfer->max_hc_frame_size));
-
} else if (parm->methods == &ehci_device_bulk_methods) {
parm->hc_max_packet_size = 0x400;
parm->hc_max_packet_count = 1;
@@ -3446,7 +3442,6 @@ ehci_xfer_setup(struct usb_setup_params
nqh = 1;
nqtd = ((2 * xfer->nframes)
+ (xfer->max_data_length / xfer->max_hc_frame_size));
-
} else if (parm->methods == &ehci_device_intr_methods) {
if (parm->speed == USB_SPEED_HIGH) {
parm->hc_max_packet_size = 0x400;
@@ -3467,7 +3462,6 @@ ehci_xfer_setup(struct usb_setup_params
nqh = 1;
nqtd = ((2 * xfer->nframes)
+ (xfer->max_data_length / xfer->max_hc_frame_size));
-
} else if (parm->methods == &ehci_device_isoc_fs_methods) {
parm->hc_max_packet_size = 0x3FF;
parm->hc_max_packet_count = 1;
@@ -3477,7 +3471,6 @@ ehci_xfer_setup(struct usb_setup_params
usbd_transfer_setup_sub(parm);
nsitd = xfer->nframes;
-
} else if (parm->methods == &ehci_device_isoc_hs_methods) {
parm->hc_max_packet_size = 0x400;
parm->hc_max_packet_count = 3;
@@ -3488,7 +3481,6 @@ ehci_xfer_setup(struct usb_setup_params
nitd = ((xfer->nframes + 7) / 8) <<
usbd_xfer_get_fps_shift(xfer);
-
} else {
parm->hc_max_packet_size = 0x400;
parm->hc_max_packet_count = 1;
Modified: user/weongyo/usb/sys/dev/usb/controller/musb_otg.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/musb_otg.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/controller/musb_otg.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -1161,7 +1161,6 @@ musbotg_setup_standard_chain(struct usb_
if (temp.len == 0) {
/* make sure that we send an USB packet */
temp.short_pkt = 0;
-
} else {
/* regular data transfer */
if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
@@ -1244,7 +1243,6 @@ musbotg_ep_int_set(struct usb_xfer *xfer
else
temp &= ~MUSB2_MASK_EPINT(ep_no);
MUSB2_WRITE_2(sc, MUSB2_REG_INTRXE, temp);
-
} else {
temp = MUSB2_READ_2(sc, MUSB2_REG_INTTXE);
if (on)
@@ -1345,7 +1343,6 @@ musbotg_standard_done_sub(struct usb_xfe
/* this USB frame is complete */
error = 0;
break;
-
} while (0);
/* update transfer cache */
@@ -2566,16 +2563,12 @@ musbotg_xfer_setup(struct usb_setup_para
*/
if (parm->methods == &musbotg_device_ctrl_methods) {
ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC */ ;
-
} else if (parm->methods == &musbotg_device_bulk_methods) {
ntd = xfer->nframes + 1 /* SYNC */ ;
-
} else if (parm->methods == &musbotg_device_intr_methods) {
ntd = xfer->nframes + 1 /* SYNC */ ;
-
} else if (parm->methods == &musbotg_device_isoc_methods) {
ntd = xfer->nframes + 1 /* SYNC */ ;
-
} else
ntd = 0;
Modified: user/weongyo/usb/sys/dev/usb/controller/ohci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -1281,7 +1281,6 @@ restart:
/* send a Zero Length Packet, ZLP, last */
temp->shortpkt = 1;
average = 0;
-
} else {
average = temp->average;
@@ -1319,7 +1318,6 @@ restart:
td->td_cbp = 0;
td->td_be = 0;
td->len = 0;
-
} else {
usbd_get_page(temp->pc, buf_offset, &buf_res);
td->td_cbp = htole32(buf_res.physaddr);
@@ -1473,7 +1471,6 @@ ohci_setup_standard_chain(struct usb_xfe
if (temp.len == 0) {
/* make sure that we send an USB packet */
temp.shortpkt = 0;
-
} else {
/* regular data transfer */
if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
@@ -2368,7 +2365,6 @@ ohci_xfer_setup(struct usb_setup_params
ntd = ((2 * xfer->nframes) + 1 /* STATUS */
+ (xfer->max_data_length / xfer->max_hc_frame_size));
nqh = 1;
-
} else if (parm->methods == &ohci_device_bulk_methods) {
xfer->status |= XFER_STATUS_DMAENABLE;
@@ -2378,7 +2374,6 @@ ohci_xfer_setup(struct usb_setup_params
ntd = ((2 * xfer->nframes)
+ (xfer->max_data_length / xfer->max_hc_frame_size));
nqh = 1;
-
} else if (parm->methods == &ohci_device_intr_methods) {
xfer->status |= XFER_STATUS_DMAENABLE;
@@ -2388,7 +2383,6 @@ ohci_xfer_setup(struct usb_setup_params
ntd = ((2 * xfer->nframes)
+ (xfer->max_data_length / xfer->max_hc_frame_size));
nqh = 1;
-
} else if (parm->methods == &ohci_device_isoc_methods) {
xfer->status |= XFER_STATUS_DMAENABLE;
@@ -2399,7 +2393,6 @@ ohci_xfer_setup(struct usb_setup_params
1 /* EXTRA */ );
ntd = 0;
nqh = 1;
-
} else {
usbd_transfer_setup_sub(parm);
Modified: user/weongyo/usb/sys/dev/usb/controller/uhci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uhci.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/controller/uhci.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -238,7 +238,6 @@ uhci_mem_layout_fixup(struct uhci_mem_la
htole32(UHCI_TD_PID_IN)) {
td->fix_pc = ml->fix_pc;
usb_pc_cpu_invalidate(ml->fix_pc);
-
} else {
td->fix_pc = NULL;
@@ -251,7 +250,6 @@ uhci_mem_layout_fixup(struct uhci_mem_la
/* prepare next fixup */
ml->fix_pc++;
-
} else {
td->td_buffer = htole32(ml->buf_res.physaddr);
td->fix_pc = NULL;
@@ -1076,7 +1074,6 @@ uhci_non_isoc_done_sub(struct usb_xfer *
DPRINTF("Invalid status length, "
"0x%04x/0x%04x bytes\n", len, td->len);
status |= UHCI_TD_STALLED;
-
} else if ((xfer->aframes != xfer->nframes) && (len > 0)) {
if (td->fix_pc) {
usbd_get_page(td->fix_pc, 0, &res);
@@ -1504,7 +1501,6 @@ restart:
temp->shortpkt = 1;
temp->td_token |= htole32(UHCI_TD_SET_MAXLEN(0));
average = 0;
-
} else {
average = temp->average;
@@ -1540,7 +1536,6 @@ restart:
td->len = 0;
td->td_buffer = 0;
td->fix_pc = NULL;
-
} else {
/* update remaining length */
temp->len -= average;
@@ -1688,7 +1683,6 @@ uhci_setup_standard_chain(struct usb_xfe
if (temp.len == 0) {
/* make sure that we send an USB packet */
temp.shortpkt = 0;
-
} else {
/* regular data transfer */
if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
@@ -2137,11 +2131,9 @@ uhci_device_isoc_enter(struct usb_xfer *
*/
td->td_buffer = 0;
td->fix_pc = NULL;
-
} else {
/* fill out buffer pointer and do fixup, if any */
uhci_mem_layout_fixup(&ml, td);
-
}
/* update status */
@@ -2622,7 +2614,6 @@ uhci_roothub_exec(struct usb_device *ude
usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 500);
sc->sc_isresumed |= (1 << index);
-
} else if (x & UHCI_PORTSC_SUSP)
status |= UPS_SUSPEND;
status |= UPS_PORT_POWER;
@@ -2752,7 +2743,6 @@ uhci_xfer_setup(struct usb_setup_params
nqh = 1;
ntd = ((2 * xfer->nframes) + 1 /* STATUS */
+ (xfer->max_data_length / xfer->max_frame_size));
-
} else if (parm->methods == &uhci_device_bulk_methods) {
xfer->status |= XFER_STATUS_DMAENABLE;
xfer->status |= XFER_STATUS_DMA_NOPOSTSYNC;
@@ -2762,7 +2752,6 @@ uhci_xfer_setup(struct usb_setup_params
nqh = 1;
ntd = ((2 * xfer->nframes)
+ (xfer->max_data_length / xfer->max_frame_size));
-
} else if (parm->methods == &uhci_device_intr_methods) {
xfer->status |= XFER_STATUS_DMAENABLE;
xfer->status |= XFER_STATUS_DMA_NOPOSTSYNC;
@@ -2772,7 +2761,6 @@ uhci_xfer_setup(struct usb_setup_params
nqh = 1;
ntd = ((2 * xfer->nframes)
+ (xfer->max_data_length / xfer->max_frame_size));
-
} else if (parm->methods == &uhci_device_isoc_methods) {
xfer->status |= XFER_STATUS_DMAENABLE;
xfer->status |= XFER_STATUS_DMA_NOPOSTSYNC;
@@ -2781,7 +2769,6 @@ uhci_xfer_setup(struct usb_setup_params
nqh = 0;
ntd = xfer->nframes;
-
} else {
usbd_transfer_setup_sub(parm);
Modified: user/weongyo/usb/sys/dev/usb/controller/uss820dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uss820dci.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/controller/uss820dci.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -894,7 +894,6 @@ uss820dci_setup_standard_chain(struct us
if (temp.len == 0) {
/* make sure that we send an USB packet */
temp.short_pkt = 0;
-
} else {
/* regular data transfer */
if ((xfer->flags & USBD_FORCE_SHORT_XFER) != 0)
@@ -1092,7 +1091,6 @@ uss820dci_standard_done_sub(struct usb_x
/* this USB frame is complete */
error = 0;
break;
-
} while (0);
/* update transfer cache */
@@ -2147,16 +2145,12 @@ uss820dci_xfer_setup(struct usb_setup_pa
*/
if (parm->methods == &uss820dci_device_ctrl_methods) {
ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC */ ;
-
} else if (parm->methods == &uss820dci_device_bulk_methods) {
ntd = xfer->nframes + 1 /* SYNC */ ;
-
} else if (parm->methods == &uss820dci_device_intr_methods) {
ntd = xfer->nframes + 1 /* SYNC */ ;
-
} else if (parm->methods == &uss820dci_device_isoc_fs_methods) {
ntd = xfer->nframes + 1 /* SYNC */ ;
-
} else
ntd = 0;
Modified: user/weongyo/usb/sys/dev/usb/input/atp.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/atp.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/input/atp.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -267,7 +267,6 @@ static const struct usb_device_id atp_de
/* 17 inch PowerBook */
{ USB_VPI(USB_VENDOR_APPLE, 0x020d, ATP_DEV_PARAMS_PBOOK_17) },
-
};
/*
Modified: user/weongyo/usb/sys/dev/usb/input/uhid.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/uhid.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/input/uhid.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -246,7 +246,6 @@ uhid_write_callback(struct usb_xfer *xfe
if (actlen != 1)
goto tr_error;
usbd_copy_out(pc, 0, &id, 1);
-
} else
return;
if (size)
@@ -635,7 +634,6 @@ uhid_attach(device_t dev)
sc->sc_repdesc_size = sizeof(uhid_graphire_report_descr);
sc->sc_repdesc_ptr = &uhid_graphire_report_descr;
sc->sc_flags |= UHID_FLAG_STATIC_DESC;
-
} else if (uaa->info.idProduct == USB_PRODUCT_WACOM_GRAPHIRE3_4X5) {
static uint8_t reportbuf[] = {2, 2, 2};
Modified: user/weongyo/usb/sys/dev/usb/input/ukbd.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/ukbd.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/input/ukbd.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -1753,7 +1753,6 @@ ukbd_key2scan(struct ukbd_softc *sc, int
return ((code & SCAN_PREFIX_E0) ? 0xe0 : 0xe1);
}
return (code);
-
}
#endif /* UKBD_EMULATE_ATSCANCODE */
Modified: user/weongyo/usb/sys/dev/usb/input/ums.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/input/ums.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/input/ums.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -225,7 +225,6 @@ ums_intr_callback(struct usb_xfer *xfer,
len--;
buf++;
-
} else {
id = 0;
if (sc->sc_info[0].sc_flags & UMS_FLAG_SBU) {
@@ -569,7 +568,6 @@ ums_attach(device_t dev)
/* Announce device */
device_printf(dev, "3 buttons and [XYZ] "
"coordinates ID=0\n");
-
} else {
/* Search the HID descriptor and announce device */
for (i = 0; i < UMS_INFO_MAX; i++)
@@ -750,7 +748,6 @@ ums_put_queue(struct ums_softc *sc, int3
}
usb_fifo_put_data_linear(sc->sc_fifo.fp[USB_FIFO_RX], buf,
sc->sc_mode.packetsize, 1);
-
} else
DPRINTF("Buffer full, discarded packet\n");
}
Modified: user/weongyo/usb/sys/dev/usb/net/if_aue.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_aue.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/net/if_aue.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -920,7 +920,6 @@ tr_setup:
usbd_xfer_set_frame_len(xfer, 0, m->m_pkthdr.len);
usbd_m_copy_in(pc, 0, m, 0, m->m_pkthdr.len);
-
} else {
usbd_xfer_set_frame_len(xfer, 0, (m->m_pkthdr.len + 2));
Modified: user/weongyo/usb/sys/dev/usb/net/if_cdce.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/if_cdce.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/net/if_cdce.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -546,7 +546,6 @@ alloc_transfers:
sc->sc_eaddr[0] = 0x2a;
memcpy(&sc->sc_eaddr[1], &ticks, sizeof(uint32_t));
sc->sc_eaddr[5] = device_get_unit(dev);
-
} else {
bzero(sc->sc_eaddr, sizeof(sc->sc_eaddr));
Modified: user/weongyo/usb/sys/dev/usb/net/uhso.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/net/uhso.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/net/uhso.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -1492,7 +1492,6 @@ uhso_ucom_start_write(struct ucom_softc
&sc->sc_tty[ucom->sc_local_unit]);
usbd_transfer_start(
sc->sc_tty[ucom->sc_local_unit].ht_xfer[UHSO_CTRL_WRITE]);
-
}
else if (UHSO_IFACE_USB_TYPE(sc->sc_type) & UHSO_IF_BULK)
usbd_transfer_start(sc->sc_xfer[UHSO_BULK_ENDPT_WRITE]);
Modified: user/weongyo/usb/sys/dev/usb/serial/ubser.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/ubser.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/serial/ubser.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -403,7 +403,6 @@ tr_setup:
break;
}
ubser_inc_tx_unit(sc);
-
} while (sc->sc_curr_tx_unit != first_unit);
return;
default: /* Error */
Modified: user/weongyo/usb/sys/dev/usb/serial/ucycom.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/serial/ucycom.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/serial/ucycom.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -555,7 +555,6 @@ tr_setup:
goto tr_setup;
}
return;
-
}
}
Modified: user/weongyo/usb/sys/dev/usb/storage/umass.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/storage/umass.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/storage/umass.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -965,7 +965,6 @@ umass_attach(device_t dev)
/* skip reset first time */
sc->sc_last_xfer_index = UMASS_T_BBB_COMMAND;
-
} else if (sc->sc_proto & (UMASS_PROTO_CBI | UMASS_PROTO_CBI_I)) {
err = usbd_transfer_setup(uaa->device,
&uaa->info.bIfaceIndex, sc->sc_xfer, umass_cbi_config,
@@ -973,7 +972,6 @@ umass_attach(device_t dev)
/* skip reset first time */
sc->sc_last_xfer_index = UMASS_T_CBI_COMMAND;
-
} else
err = USB_ERR_INVAL;
@@ -1295,7 +1293,6 @@ umass_t_bbb_command_callback(struct usb_
default: /* Error */
umass_tr_error(xfer, error);
return;
-
}
}
@@ -1733,7 +1730,6 @@ tr_transferred:
default: /* Error */
umass_tr_error(xfer, error);
break;
-
}
}
Modified: user/weongyo/usb/sys/dev/usb/template/usb_template.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/template/usb_template.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/template/usb_template.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -740,7 +740,6 @@ handle_endpoint_desc:
ed->bEndpointAddress =
ep_curr->hw_endpoint_out;
}
-
} else {
/* compute the maximum frame size */
if (ep_curr->max_frame_size < wMaxPacketSize)
@@ -825,7 +824,6 @@ usb_hw_ep_resolve(struct usb_device *ude
}
dd->bMaxPacketSize = mps;
-
} else {
/* We only have one choice */
if (mps == 255)
Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_busdma.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/usb_busdma.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -908,7 +908,6 @@ usb_bdma_work_loop(struct usb_xfer_queue
pg += (xfer->frlengths[nframes] / USB_PAGE_SIZE);
pg += 2;
}
-
}
if (info->dma_error) {
USB_BUS_LOCK(info->bus);
Modified: user/weongyo/usb/sys/dev/usb/usb_compat_linux.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_compat_linux.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/usb_compat_linux.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -1557,7 +1557,6 @@ tr_setup:
/* setup data transfer direction and length */
urb->bsd_isread = (ptr[0] & UT_READ) ? 1 : 0;
urb->bsd_length_rem = ptr[6] | (ptr[7] << 8);
-
} else {
/* setup data transfer direction */
Modified: user/weongyo/usb/sys/dev/usb/usb_dev.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_dev.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/usb_dev.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -1395,7 +1395,6 @@ usb_write(struct cdev *dev, struct uio *
f->flag_have_fragment = 1;
USB_IF_PREPEND(&f->free_q, m);
}
-
} while (uio->uio_resid > 0);
done:
mtx_unlock(f->priv_mtx);
Modified: user/weongyo/usb/sys/dev/usb/usb_generic.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_generic.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/usb_generic.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -669,7 +669,6 @@ ugen_get_cdesc(struct usb_fifo *f, struc
if (cdesc == NULL)
return (ENXIO);
free_data = 0;
-
} else {
if (usbd_req_get_config_desc_full(udev,
NULL, &cdesc, M_USBDEV,
@@ -1072,7 +1071,6 @@ ugen_fs_copy_in(struct usb_fifo *f, uint
isread = 0;
n = 1;
offset = sizeof(*req);
-
} else {
/* Device and Host mode */
if (USB_GET_DATA_ISREAD(xfer))
Modified: user/weongyo/usb/sys/dev/usb/usb_hub.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_hub.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/usb_hub.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -1403,7 +1403,6 @@ usbd_fs_isoc_schedule_isoc_time_expand(s
usbd_fs_isoc_schedule_init_sub(fss_a);
fss_a++;
}
-
} else {
*pp_start = NULL;
*pp_end = NULL;
@@ -2044,7 +2043,6 @@ repeat:
temp = usbd_get_dma_delay(udev);
if (temp != 0)
usb_pause_mtx(NULL, USB_MS_TO_TICKS(temp));
-
}
/* suspend current port */
err = usbd_req_set_port_feature(udev->parent_hub,
Modified: user/weongyo/usb/sys/dev/usb/usb_msctest.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_msctest.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/usb_msctest.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -391,7 +391,6 @@ bbb_data_write_callback(struct usb_xfer
else
bbb_transfer_start(sc, ST_DATA_WR_CS);
return;
-
}
}
Modified: user/weongyo/usb/sys/dev/usb/usb_transfer.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_transfer.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/usb_transfer.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -480,12 +480,10 @@ usbd_transfer_setup_sub(struct usb_setup
xfer->max_packet_count = 1;
parm->bufsize = 0; /* automatic setup length */
usbd_update_max_frame_size(xfer);
-
} else {
parm->err = USB_ERR_ZERO_MAXP;
goto done;
}
-
} else
zmps = 0;
@@ -1237,7 +1235,6 @@ usbd_setup_ctrl_transfer(struct usb_xfer
}
/* get data length */
len = xfer->sumlen;
-
} else {
/* the size of the SETUP structure is hardcoded ! */
if (xfer->frlengths[0] != sizeof(struct usb_device_request)) {
@@ -1956,7 +1953,6 @@ usbd_callback_ss_done_defer(struct usb_x
pq->recurse_2 = 0;
}
return;
-
}
/*------------------------------------------------------------------------*
@@ -2653,12 +2649,10 @@ usb_command_wrapper(struct usb_xfer_queu
DPRINTFN(6, "cb %p (enter)\n", pq->curr);
(pq->command) (pq);
DPRINTFN(6, "cb %p (leave)\n", pq->curr);
-
} while (!pq->recurse_2);
/* clear first recurse flag */
pq->recurse_1 = 0;
-
} else {
/* clear second recurse flag */
pq->recurse_2 = 0;
Modified: user/weongyo/usb/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/wlan/if_rum.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/wlan/if_rum.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -2256,7 +2256,6 @@ rum_scan_start(struct ieee80211com *ic)
rum_write(sc, RT2573_TXRX_CSR9, tmp & ~0x00ffffff);
rum_set_bssid(sc, ifp->if_broadcastaddr);
RUM_UNLOCK(sc);
-
}
static void
@@ -2268,7 +2267,6 @@ rum_scan_end(struct ieee80211com *ic)
rum_enable_tsf_sync(sc);
rum_set_bssid(sc, sc->sc_bssid);
RUM_UNLOCK(sc);
-
}
static void
Modified: user/weongyo/usb/sys/dev/usb/wlan/if_run.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/wlan/if_run.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/wlan/if_run.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -2171,7 +2171,6 @@ run_key_delete(struct ieee80211vap *vap,
k0->wk_pad = k->wk_pad;
ieee80211_runtask(ic, &sc->cmdq_task);
return (1); /* return fake success */
-
}
static void
@@ -4279,7 +4278,6 @@ run_rt3070_rf_init(struct run_softc *sc)
run_read(sc, RT3070_LDO_CFG0, &tmp);
tmp = (tmp & ~0x0f000000) | 0x0d000000;
run_write(sc, RT3070_LDO_CFG0, tmp);
-
} else if (sc->mac_ver == 0x3071) {
run_rt3070_rf_read(sc, 6, &rf);
run_rt3070_rf_write(sc, 6, rf | 0x40);
@@ -4296,7 +4294,6 @@ run_rt3070_rf_init(struct run_softc *sc)
/* patch LNA_PE_G1 */
run_read(sc, RT3070_GPIO_SWITCH, &tmp);
run_write(sc, RT3070_GPIO_SWITCH, tmp & ~0x20);
-
} else if (sc->mac_ver == 0x3572) {
run_rt3070_rf_read(sc, 6, &rf);
run_rt3070_rf_write(sc, 6, rf | 0x40);
@@ -4479,7 +4476,6 @@ run_rt3070_rf_setup(struct run_softc *sc
run_rt3070_rf_read(sc, 16, &rf);
rf = (rf & ~0x07) | sc->txmixgain_2ghz;
run_rt3070_rf_write(sc, 16, rf);
-
} else if (sc->mac_ver == 0x3071) {
/* enable DC filter */
if (sc->mac_rev >= 0x0201)
@@ -4504,7 +4500,6 @@ run_rt3070_rf_setup(struct run_softc *sc
sc->patch_dac ? 0x2c : 0x0f);
} else
run_write(sc, RT2860_TX_SW_CFG2, 0);
-
} else if (sc->mac_ver == 0x3070) {
if (sc->mac_rev >= 0x0201) {
/* enable DC filter */
Modified: user/weongyo/usb/sys/dev/usb/wlan/if_ural.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/wlan/if_ural.c Mon Oct 4 02:40:20 2010 (r213396)
+++ user/weongyo/usb/sys/dev/usb/wlan/if_ural.c Mon Oct 4 05:56:29 2010 (r213397)
@@ -1597,7 +1597,6 @@ ural_scan_end(struct ieee80211com *ic)
ural_enable_tsf_sync(sc);
ural_set_bssid(sc, sc->sc_bssid);
RAL_UNLOCK(sc);
-
}
static void
More information about the svn-src-user
mailing list