Date: Sun, 3 Oct 2010 08:08:16 +0000 (UTC) From: Weongyo Jeong <weongyo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r213378 - in user/weongyo/usb/sys/dev/usb: . controller input misc net quirk serial storage wlan Message-ID: <201010030808.o9388Gdm068187@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: weongyo Date: Sun Oct 3 08:08:16 2010 New Revision: 213378 URL: http://svn.freebsd.org/changeset/base/213378 Log: Removes unnecessary spaces and style(9) 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/ehci_pci.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/usb_controller.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/uep.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/misc/udbp.c user/weongyo/usb/sys/dev/usb/net/if_aue.c user/weongyo/usb/sys/dev/usb/net/if_axe.c user/weongyo/usb/sys/dev/usb/net/if_cdce.c user/weongyo/usb/sys/dev/usb/net/if_cue.c user/weongyo/usb/sys/dev/usb/net/if_kue.c user/weongyo/usb/sys/dev/usb/net/if_rue.c user/weongyo/usb/sys/dev/usb/net/if_udav.c user/weongyo/usb/sys/dev/usb/net/uhso.c user/weongyo/usb/sys/dev/usb/quirk/usb_quirk.c user/weongyo/usb/sys/dev/usb/serial/u3g.c user/weongyo/usb/sys/dev/usb/serial/uark.c user/weongyo/usb/sys/dev/usb/serial/ubsa.c user/weongyo/usb/sys/dev/usb/serial/ubser.c user/weongyo/usb/sys/dev/usb/serial/uchcom.c user/weongyo/usb/sys/dev/usb/serial/ucycom.c user/weongyo/usb/sys/dev/usb/serial/ufoma.c user/weongyo/usb/sys/dev/usb/serial/uftdi.c user/weongyo/usb/sys/dev/usb/serial/ugensa.c user/weongyo/usb/sys/dev/usb/serial/uipaq.c user/weongyo/usb/sys/dev/usb/serial/ulpt.c user/weongyo/usb/sys/dev/usb/serial/umct.c user/weongyo/usb/sys/dev/usb/serial/umodem.c user/weongyo/usb/sys/dev/usb/serial/umoscom.c user/weongyo/usb/sys/dev/usb/serial/uplcom.c user/weongyo/usb/sys/dev/usb/serial/uslcom.c user/weongyo/usb/sys/dev/usb/serial/uvisor.c user/weongyo/usb/sys/dev/usb/serial/uvscom.c user/weongyo/usb/sys/dev/usb/storage/umass.c user/weongyo/usb/sys/dev/usb/storage/urio.c user/weongyo/usb/sys/dev/usb/storage/ustorage_fs.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_device.c user/weongyo/usb/sys/dev/usb/usb_generic.c user/weongyo/usb/sys/dev/usb/usb_handle_request.c user/weongyo/usb/sys/dev/usb/usb_hid.c user/weongyo/usb/sys/dev/usb/usb_hub.c user/weongyo/usb/sys/dev/usb/usb_lookup.c user/weongyo/usb/sys/dev/usb/usb_msctest.c user/weongyo/usb/sys/dev/usb/usb_request.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_uath.c user/weongyo/usb/sys/dev/usb/wlan/if_ural.c user/weongyo/usb/sys/dev/usb/wlan/if_zyd.c Modified: user/weongyo/usb/sys/dev/usb/controller/at91dci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/at91dci.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/controller/at91dci.c Sun Oct 3 08:08:16 2010 (r213378) @@ -1738,7 +1738,6 @@ at91dci_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_WRITE_DEVICE: switch (req->bRequest) { case UR_SET_ADDRESS: @@ -1754,7 +1753,6 @@ at91dci_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_WRITE_ENDPOINT: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1783,7 +1781,6 @@ at91dci_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_READ_ENDPOINT: switch (req->bRequest) { case UR_GET_STATUS: @@ -1792,7 +1789,6 @@ at91dci_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_WRITE_INTERFACE: switch (req->bRequest) { case UR_SET_INTERFACE: @@ -1804,7 +1800,6 @@ at91dci_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_READ_INTERFACE: switch (req->bRequest) { case UR_GET_INTERFACE: @@ -1815,17 +1810,14 @@ at91dci_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_WRITE_CLASS_INTERFACE: case UT_WRITE_VENDOR_INTERFACE: /* XXX forward */ break; - case UT_READ_CLASS_INTERFACE: case UT_READ_VENDOR_INTERFACE: /* XXX forward */ break; - case UT_WRITE_CLASS_DEVICE: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1837,7 +1829,6 @@ at91dci_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_WRITE_CLASS_OTHER: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1853,7 +1844,6 @@ at91dci_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_READ_CLASS_OTHER: switch (req->bRequest) { case UR_GET_TT_STATE: @@ -1864,7 +1854,6 @@ at91dci_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_READ_CLASS_DEVICE: switch (req->bRequest) { case UR_GET_DESCRIPTOR: @@ -1971,11 +1960,9 @@ tr_handle_clear_port_feature: case UHF_PORT_SUSPEND: at91dci_wakeup_peer(sc); break; - case UHF_PORT_ENABLE: sc->sc_flags.port_enabled = 0; break; - case UHF_PORT_TEST: case UHF_PORT_INDICATOR: case UHF_C_PORT_ENABLE: Modified: user/weongyo/usb/sys/dev/usb/controller/atmegadci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/atmegadci.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/controller/atmegadci.c Sun Oct 3 08:08:16 2010 (r213378) @@ -1587,7 +1587,6 @@ atmegadci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_DEVICE: switch (req->bRequest) { case UR_SET_ADDRESS: @@ -1603,7 +1602,6 @@ atmegadci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_ENDPOINT: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1632,7 +1630,6 @@ atmegadci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_ENDPOINT: switch (req->bRequest) { case UR_GET_STATUS: @@ -1641,7 +1638,6 @@ atmegadci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_INTERFACE: switch (req->bRequest) { case UR_SET_INTERFACE: @@ -1653,7 +1649,6 @@ atmegadci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_INTERFACE: switch (req->bRequest) { case UR_GET_INTERFACE: @@ -1664,17 +1659,14 @@ atmegadci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_CLASS_INTERFACE: case UT_WRITE_VENDOR_INTERFACE: /* XXX forward */ break; - case UT_READ_CLASS_INTERFACE: case UT_READ_VENDOR_INTERFACE: /* XXX forward */ break; - case UT_WRITE_CLASS_DEVICE: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1686,7 +1678,6 @@ atmegadci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_CLASS_OTHER: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1702,7 +1693,6 @@ atmegadci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_CLASS_OTHER: switch (req->bRequest) { case UR_GET_TT_STATE: @@ -1713,7 +1703,6 @@ atmegadci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_CLASS_DEVICE: switch (req->bRequest) { case UR_GET_DESCRIPTOR: @@ -1820,11 +1809,9 @@ tr_handle_clear_port_feature: case UHF_PORT_SUSPEND: atmegadci_wakeup_peer(sc); break; - case UHF_PORT_ENABLE: sc->sc_flags.port_enabled = 0; break; - case UHF_PORT_TEST: case UHF_PORT_INDICATOR: case UHF_C_PORT_ENABLE: Modified: user/weongyo/usb/sys/dev/usb/controller/avr32dci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/avr32dci.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/controller/avr32dci.c Sun Oct 3 08:08:16 2010 (r213378) @@ -1520,7 +1520,6 @@ avr32dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_DEVICE: switch (req->bRequest) { case UR_SET_ADDRESS: @@ -1536,7 +1535,6 @@ avr32dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_ENDPOINT: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1565,7 +1563,6 @@ avr32dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_ENDPOINT: switch (req->bRequest) { case UR_GET_STATUS: @@ -1574,7 +1571,6 @@ avr32dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_INTERFACE: switch (req->bRequest) { case UR_SET_INTERFACE: @@ -1586,7 +1582,6 @@ avr32dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_INTERFACE: switch (req->bRequest) { case UR_GET_INTERFACE: @@ -1597,17 +1592,14 @@ avr32dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_CLASS_INTERFACE: case UT_WRITE_VENDOR_INTERFACE: /* XXX forward */ break; - case UT_READ_CLASS_INTERFACE: case UT_READ_VENDOR_INTERFACE: /* XXX forward */ break; - case UT_WRITE_CLASS_DEVICE: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1619,7 +1611,6 @@ avr32dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_CLASS_OTHER: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1635,7 +1626,6 @@ avr32dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_CLASS_OTHER: switch (req->bRequest) { case UR_GET_TT_STATE: @@ -1646,7 +1636,6 @@ avr32dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_CLASS_DEVICE: switch (req->bRequest) { case UR_GET_DESCRIPTOR: @@ -1683,12 +1672,10 @@ tr_handle_get_descriptor: len = sizeof(avr32dci_langtab); ptr = (const void *)&avr32dci_langtab; goto tr_valid; - case 1: /* Vendor */ len = sizeof(avr32dci_vendor); ptr = (const void *)&avr32dci_vendor; goto tr_valid; - case 2: /* Product */ len = sizeof(avr32dci_product); ptr = (const void *)&avr32dci_product; @@ -1753,11 +1740,9 @@ tr_handle_clear_port_feature: case UHF_PORT_SUSPEND: avr32dci_wakeup_peer(sc); break; - case UHF_PORT_ENABLE: sc->sc_flags.port_enabled = 0; break; - case UHF_PORT_TEST: case UHF_PORT_INDICATOR: case UHF_C_PORT_ENABLE: Modified: user/weongyo/usb/sys/dev/usb/controller/ehci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/ehci.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/controller/ehci.c Sun Oct 3 08:08:16 2010 (r213378) @@ -3057,7 +3057,6 @@ ehci_roothub_exec(struct usb_device *ude len = sizeof(ehci_odevd); ptr = (const void *)&ehci_odevd; break; - case UDESC_CONFIG: if ((value & 0xff) != 0) { err = USB_ERR_IOERROR; @@ -3066,21 +3065,17 @@ ehci_roothub_exec(struct usb_device *ude len = sizeof(ehci_confd); ptr = (const void *)&ehci_confd; break; - case UDESC_STRING: switch (value & 0xff) { case 0: /* Language table */ str_ptr = "\001"; break; - case 1: /* Vendor */ str_ptr = sc->sc_vendor; break; - case 2: /* Product */ str_ptr = "EHCI root HUB"; break; - default: str_ptr = ""; break; @@ -3345,21 +3340,17 @@ ehci_roothub_exec(struct usb_device *ude DPRINTF("ehci port %d reset, status = 0x%08x\n", index, v); break; - case UHF_PORT_POWER: DPRINTFN(3, "set port power %d\n", index); EOWRITE4(sc, port, v | EHCI_PS_PP); break; - case UHF_PORT_TEST: DPRINTFN(3, "set port test %d\n", index); break; - case UHF_PORT_INDICATOR: DPRINTFN(3, "set port ind %d\n", index); EOWRITE4(sc, port, v | EHCI_PS_PIC); break; - default: err = USB_ERR_IOERROR; goto done; Modified: user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c Sun Oct 3 08:08:16 2010 (r213378) @@ -316,7 +316,7 @@ ehci_pci_attach(device_t self) * some common cases. */ device_printf(self, "pre-2.0 USB revision (ignored)\n"); - /* fallthrough */ + /* FALLTHROUGH */ case PCI_USB_REV_2_0: break; default: @@ -429,11 +429,9 @@ ehci_pci_attach(device_t self) break; } break; - case PCI_EHCI_VENDORID_VIA: ehci_pci_via_quirk(self); break; - default: break; } Modified: user/weongyo/usb/sys/dev/usb/controller/musb_otg.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/musb_otg.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/controller/musb_otg.c Sun Oct 3 08:08:16 2010 (r213378) @@ -2195,7 +2195,6 @@ musbotg_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_WRITE_DEVICE: switch (req->bRequest) { case UR_SET_ADDRESS: @@ -2211,7 +2210,6 @@ musbotg_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_WRITE_ENDPOINT: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -2240,7 +2238,6 @@ musbotg_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_READ_ENDPOINT: switch (req->bRequest) { case UR_GET_STATUS: @@ -2249,7 +2246,6 @@ musbotg_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_WRITE_INTERFACE: switch (req->bRequest) { case UR_SET_INTERFACE: @@ -2261,7 +2257,6 @@ musbotg_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_READ_INTERFACE: switch (req->bRequest) { case UR_GET_INTERFACE: @@ -2272,17 +2267,14 @@ musbotg_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_WRITE_CLASS_INTERFACE: case UT_WRITE_VENDOR_INTERFACE: /* XXX forward */ break; - case UT_READ_CLASS_INTERFACE: case UT_READ_VENDOR_INTERFACE: /* XXX forward */ break; - case UT_WRITE_CLASS_DEVICE: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -2294,7 +2286,6 @@ musbotg_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_WRITE_CLASS_OTHER: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -2310,7 +2301,6 @@ musbotg_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_READ_CLASS_OTHER: switch (req->bRequest) { case UR_GET_TT_STATE: @@ -2321,7 +2311,6 @@ musbotg_roothub_exec(struct usb_device * goto tr_stalled; } break; - case UT_READ_CLASS_DEVICE: switch (req->bRequest) { case UR_GET_DESCRIPTOR: @@ -2428,11 +2417,9 @@ tr_handle_clear_port_feature: case UHF_PORT_SUSPEND: musbotg_wakeup_peer(sc); break; - case UHF_PORT_ENABLE: sc->sc_flags.port_enabled = 0; break; - case UHF_PORT_TEST: case UHF_PORT_INDICATOR: case UHF_C_PORT_ENABLE: Modified: user/weongyo/usb/sys/dev/usb/controller/ohci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/ohci.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/controller/ohci.c Sun Oct 3 08:08:16 2010 (r213378) @@ -2107,7 +2107,6 @@ ohci_roothub_exec(struct usb_device *ude len = sizeof(ohci_devd); ptr = (const void *)&ohci_devd; break; - case UDESC_CONFIG: if ((value & 0xff) != 0) { err = USB_ERR_IOERROR; @@ -2116,21 +2115,17 @@ ohci_roothub_exec(struct usb_device *ude len = sizeof(ohci_confd); ptr = (const void *)&ohci_confd; break; - case UDESC_STRING: switch (value & 0xff) { case 0: /* Language table */ str_ptr = "\001"; break; - case 1: /* Vendor */ str_ptr = sc->sc_vendor; break; - case 2: /* Product */ str_ptr = "OHCI root HUB"; break; - default: str_ptr = ""; break; @@ -2141,7 +2136,6 @@ ohci_roothub_exec(struct usb_device *ude sizeof(sc->sc_hub_desc.temp), str_ptr); break; - default: err = USB_ERR_IOERROR; goto done; @@ -2268,7 +2262,6 @@ ohci_roothub_exec(struct usb_device *ude 8 + ((sc->sc_noport + 7) / 8); len = sc->sc_hub_desc.hubd.bDescLength; break; - case C(UR_GET_STATUS, UT_READ_CLASS_DEVICE): len = 16; bzero(sc->sc_hub_desc.temp, 16); Modified: user/weongyo/usb/sys/dev/usb/controller/uhci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/uhci.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/controller/uhci.c Sun Oct 3 08:08:16 2010 (r213378) @@ -2428,7 +2428,6 @@ uhci_roothub_exec(struct usb_device *ude len = sizeof(uhci_devd); ptr = (const void *)&uhci_devd; break; - case UDESC_CONFIG: if ((value & 0xff) != 0) { err = USB_ERR_IOERROR; @@ -2437,21 +2436,17 @@ uhci_roothub_exec(struct usb_device *ude len = sizeof(uhci_confd); ptr = (const void *)&uhci_confd; break; - case UDESC_STRING: switch (value & 0xff) { case 0: /* Language table */ str_ptr = "\001"; break; - case 1: /* Vendor */ str_ptr = sc->sc_vendor; break; - case 2: /* Product */ str_ptr = "UHCI root HUB"; break; - default: str_ptr = ""; break; @@ -2462,7 +2457,6 @@ uhci_roothub_exec(struct usb_device *ude sizeof(sc->sc_hub_desc.temp), str_ptr); break; - default: err = USB_ERR_IOERROR; goto done; Modified: user/weongyo/usb/sys/dev/usb/controller/usb_controller.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/usb_controller.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/controller/usb_controller.c Sun Oct 3 08:08:16 2010 (r213378) @@ -310,22 +310,18 @@ usb_bus_attach(void *arg, int npending) speed = USB_SPEED_FULL; device_printf(bus->bdev, "12Mbps Full Speed USB v1.0\n"); break; - case USB_REV_1_1: speed = USB_SPEED_FULL; device_printf(bus->bdev, "12Mbps Full Speed USB v1.1\n"); break; - case USB_REV_2_0: speed = USB_SPEED_HIGH; device_printf(bus->bdev, "480Mbps High Speed USB v2.0\n"); break; - case USB_REV_2_5: speed = USB_SPEED_VARIABLE; device_printf(bus->bdev, "480Mbps Wireless USB v2.5\n"); break; - default: device_printf(bus->bdev, "Unsupported USB revision\n"); return; Modified: user/weongyo/usb/sys/dev/usb/controller/uss820dci.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/controller/uss820dci.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/controller/uss820dci.c Sun Oct 3 08:08:16 2010 (r213378) @@ -1795,7 +1795,6 @@ uss820dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_DEVICE: switch (req->bRequest) { case UR_SET_ADDRESS: @@ -1811,7 +1810,6 @@ uss820dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_ENDPOINT: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1840,7 +1838,6 @@ uss820dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_ENDPOINT: switch (req->bRequest) { case UR_GET_STATUS: @@ -1849,7 +1846,6 @@ uss820dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_INTERFACE: switch (req->bRequest) { case UR_SET_INTERFACE: @@ -1861,7 +1857,6 @@ uss820dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_INTERFACE: switch (req->bRequest) { case UR_GET_INTERFACE: @@ -1872,17 +1867,14 @@ uss820dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_CLASS_INTERFACE: case UT_WRITE_VENDOR_INTERFACE: /* XXX forward */ break; - case UT_READ_CLASS_INTERFACE: case UT_READ_VENDOR_INTERFACE: /* XXX forward */ break; - case UT_WRITE_CLASS_DEVICE: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1894,7 +1886,6 @@ uss820dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_WRITE_CLASS_OTHER: switch (req->bRequest) { case UR_CLEAR_FEATURE: @@ -1910,7 +1901,6 @@ uss820dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_CLASS_OTHER: switch (req->bRequest) { case UR_GET_TT_STATE: @@ -1921,7 +1911,6 @@ uss820dci_roothub_exec(struct usb_device goto tr_stalled; } break; - case UT_READ_CLASS_DEVICE: switch (req->bRequest) { case UR_GET_DESCRIPTOR: @@ -2028,11 +2017,9 @@ tr_handle_clear_port_feature: case UHF_PORT_SUSPEND: uss820dci_wakeup_peer(sc); break; - case UHF_PORT_ENABLE: sc->sc_flags.port_enabled = 0; break; - case UHF_PORT_TEST: case UHF_PORT_INDICATOR: case UHF_C_PORT_ENABLE: Modified: user/weongyo/usb/sys/dev/usb/input/atp.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/input/atp.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/input/atp.c Sun Oct 3 08:08:16 2010 (r213378) @@ -531,7 +531,6 @@ atp_reset_callback(struct usb_xfer *xfer usbd_xfer_set_frames(xfer, 2); usbd_transfer_submit(xfer); break; - case USB_ST_TRANSFERRED: default: break; @@ -730,7 +729,6 @@ atp_interpret_sensor_data(const int8_t * if (axis == X && num > 16) arr[i+16] = sensor_data[di+40]; } - break; case ATP_PROT_GEYSER2: case ATP_PROT_GEYSER3: @@ -814,14 +812,12 @@ atp_detect_pspans(int *p, u_int num_sens state = ATP_PSPAN_INCREASING; maxp = p[i]; break; - case ATP_PSPAN_INCREASING: if (p[i] > maxp) maxp = p[i]; else if (p[i] <= (maxp >> 1)) state = ATP_PSPAN_DECREASING; break; - case ATP_PSPAN_DECREASING: if (p[i] > p[i - 1]) { /* @@ -1931,7 +1927,7 @@ atp_intr(struct usb_xfer *xfer, usb_erro } } else sc->sc_idlecount = 0; - + /* FALLTHROUGH */ case USB_ST_SETUP: tr_setup: /* check if we can put more data into the FIFO */ @@ -1942,7 +1938,6 @@ atp_intr(struct usb_xfer *xfer, usb_erro usbd_transfer_submit(xfer); } break; - default: /* Error */ if (error != USB_ERR_CANCELLED) { /* try clear stall first */ Modified: user/weongyo/usb/sys/dev/usb/input/uep.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/input/uep.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/input/uep.c Sun Oct 3 08:08:16 2010 (r213378) @@ -257,6 +257,7 @@ uep_intr_callback(struct usb_xfer *xfer, len -= pkt_len; } } + /* FALLTHROUGH */ case USB_ST_SETUP: tr_setup: /* check if we can put more data into the FIFO */ @@ -266,7 +267,6 @@ uep_intr_callback(struct usb_xfer *xfer, usbd_transfer_submit(xfer); } break; - default: if (error != USB_ERR_CANCELLED) { /* try clear stall first */ Modified: user/weongyo/usb/sys/dev/usb/input/uhid.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/input/uhid.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/input/uhid.c Sun Oct 3 08:08:16 2010 (r213378) @@ -182,7 +182,7 @@ uhid_intr_callback(struct usb_xfer *xfer /* ignore it */ DPRINTF("ignored transfer, %d bytes\n", actlen); } - + /* FALLTHROUGH */ case USB_ST_SETUP: re_submit: if (usb_fifo_put_bytes_max( @@ -191,7 +191,6 @@ re_submit: usbd_transfer_submit(xfer); } return; - default: /* Error */ if (error != USB_ERR_CANCELLED) { /* try to clear stall first */ @@ -273,7 +272,6 @@ uhid_write_callback(struct usb_xfer *xfe usbd_transfer_submit(xfer); } return; - default: tr_error: /* bomb out */ @@ -296,9 +294,7 @@ uhid_read_callback(struct usb_xfer *xfer usb_fifo_put_data(sc->sc_fifo.fp[USB_FIFO_RX], pc, sizeof(req), sc->sc_isize, 1); return; - case USB_ST_SETUP: - if (usb_fifo_put_bytes_max(sc->sc_fifo.fp[USB_FIFO_RX]) > 0) { uhid_fill_get_report (&req, sc->sc_iface_no, UHID_INPUT_REPORT, @@ -312,7 +308,6 @@ uhid_read_callback(struct usb_xfer *xfer usbd_transfer_submit(xfer); } return; - default: /* Error */ /* bomb out */ usb_fifo_put_data_error(sc->sc_fifo.fp[USB_FIFO_RX]); @@ -504,7 +499,6 @@ uhid_ioctl(struct usb_fifo *fifo, u_long break; /* descriptor length only */ error = copyout(sc->sc_repdesc_ptr, ugd->ugd_data, size); break; - case USB_SET_IMMED: if (!(fflags & FREAD)) { error = EPERM; @@ -525,7 +519,6 @@ uhid_ioctl(struct usb_fifo *fifo, u_long mtx_unlock(&sc->sc_mtx); } break; - case USB_GET_REPORT: if (!(fflags & FREAD)) { error = EPERM; @@ -551,7 +544,6 @@ uhid_ioctl(struct usb_fifo *fifo, u_long error = uhid_get_report(sc, ugd->ugd_report_type, id, NULL, ugd->ugd_data, size); break; - case USB_SET_REPORT: if (!(fflags & FWRITE)) { error = EPERM; @@ -577,11 +569,9 @@ uhid_ioctl(struct usb_fifo *fifo, u_long error = uhid_set_report(sc, ugd->ugd_report_type, id, NULL, ugd->ugd_data, size); break; - case USB_GET_REPORT_ID: *(int *)addr = 0; /* XXX: we only support reportid 0? */ break; - default: error = EINVAL; break; Modified: user/weongyo/usb/sys/dev/usb/input/ukbd.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/input/ukbd.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/input/ukbd.c Sun Oct 3 08:08:16 2010 (r213378) @@ -630,6 +630,7 @@ ukbd_intr_callback(struct usb_xfer *xfer ukbd_start_timer(sc); } } + /* FALLTHROUGH */ case USB_ST_SETUP: tr_setup: if (sc->sc_inputs < UKBD_IN_BUF_FULL) { @@ -638,7 +639,6 @@ tr_setup: } else DPRINTF("input queue is full!\n"); break; - default: /* Error */ DPRINTF("error=%s\n", usbd_errstr(error)); @@ -699,7 +699,6 @@ ukbd_set_leds_callback(struct usb_xfer * usbd_transfer_submit(xfer); } break; - default: /* Error */ DPRINTFN(1, "error=%s\n", usbd_errstr(error)); break; @@ -1348,25 +1347,21 @@ next_code: sc->sc_composed_char *= 10; sc->sc_composed_char += keycode - 0x40; goto check_composed; - case 0x4B: case 0x4C: case 0x4D: /* keypad 4,5,6 */ sc->sc_composed_char *= 10; sc->sc_composed_char += keycode - 0x47; goto check_composed; - case 0x4F: case 0x50: case 0x51: /* keypad 1,2,3 */ sc->sc_composed_char *= 10; sc->sc_composed_char += keycode - 0x4E; goto check_composed; - case 0x52: /* keypad 0 */ sc->sc_composed_char *= 10; goto check_composed; - /* key released, no interest here */ case SCAN_RELEASE | 0x47: case SCAN_RELEASE | 0x48: @@ -1379,10 +1374,8 @@ next_code: case SCAN_RELEASE | 0x51: /* keypad 1,2,3 */ case SCAN_RELEASE | 0x52: /* keypad 0 */ goto next_code; - case 0x38: /* left alt key */ break; - default: if (sc->sc_composed_char > 0) { sc->sc_flags &= ~UKBD_FLAG_COMPOSE; @@ -1478,7 +1471,6 @@ ukbd_ioctl(keyboard_t *kbd, u_long cmd, return (EINVAL); } break; - case KDGETLED: /* get keyboard LED */ *(int *)arg = KBD_LED_VAL(kbd); break; @@ -1524,7 +1516,6 @@ ukbd_ioctl(keyboard_t *kbd, u_long cmd, /* set LEDs and quit */ return (ukbd_ioctl(kbd, KDSETLED, arg)); - case KDSETREPEAT: /* set keyboard repeat rate (new * interface) */ if (!KBD_HAS_DEVICE(kbd)) @@ -1539,7 +1530,6 @@ ukbd_ioctl(keyboard_t *kbd, u_long cmd, kbd->kb_delay1 = ((int *)arg)[0]; kbd->kb_delay2 = ((int *)arg)[1]; return (0); - #if defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD5) || \ defined(COMPAT_FREEBSD4) || defined(COMPAT_43) case _IO('K', 67): @@ -1550,7 +1540,6 @@ ukbd_ioctl(keyboard_t *kbd, u_long cmd, case KDSETRAD: /* set keyboard repeat rate (old * interface) */ return (ukbd_set_typematic(kbd, *(int *)arg)); - case PIO_KEYMAP: /* set keyboard translation table */ case PIO_KEYMAPENT: /* set keyboard translation table * entry */ Modified: user/weongyo/usb/sys/dev/usb/input/ums.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/input/ums.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/input/ums.c Sun Oct 3 08:08:16 2010 (r213378) @@ -320,6 +320,7 @@ ums_intr_callback(struct usb_xfer *xfer, ums_put_queue(sc, dx, dy, dz, dt, buttons); } } + /* FALLTHROUGH */ case USB_ST_SETUP: tr_setup: /* check if we can put more data into the FIFO */ @@ -329,7 +330,6 @@ tr_setup: usbd_transfer_submit(xfer); } break; - default: /* Error */ if (error != USB_ERR_CANCELLED) { /* try clear stall first */ @@ -808,11 +808,9 @@ ums_ioctl(struct usb_fifo *fifo, u_long case MOUSE_GETHWINFO: *(mousehw_t *)addr = sc->sc_hw; break; - case MOUSE_GETMODE: *(mousemode_t *)addr = sc->sc_mode; break; - case MOUSE_SETMODE: mode = *(mousemode_t *)addr; @@ -848,11 +846,9 @@ ums_ioctl(struct usb_fifo *fifo, u_long } ums_reset_buf(sc); break; - case MOUSE_GETLEVEL: *(int *)addr = sc->sc_mode.level; break; - case MOUSE_SETLEVEL: if (*(int *)addr < 0 || *(int *)addr > 1) { error = EINVAL; @@ -881,7 +877,6 @@ ums_ioctl(struct usb_fifo *fifo, u_long } ums_reset_buf(sc); break; - case MOUSE_GETSTATUS:{ mousestatus_t *status = (mousestatus_t *)addr; Modified: user/weongyo/usb/sys/dev/usb/misc/udbp.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/misc/udbp.c Sun Oct 3 04:33:58 2010 (r213377) +++ user/weongyo/usb/sys/dev/usb/misc/udbp.c Sun Oct 3 08:08:16 2010 (r213378) @@ -275,11 +275,9 @@ udbp_modload(module_t mod, int event, vo NG_UDBP_NODE_TYPE, error); } break; - case MOD_UNLOAD: error = ng_rmtype(&ng_udbp_typestruct); break; - default: error = EOPNOTSUPP; break; @@ -409,7 +407,6 @@ udbp_bulk_read_callback(struct usb_xfer switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - /* allocate new mbuf */ MGETHDR(m, M_DONTWAIT, MT_DATA); @@ -429,7 +426,7 @@ udbp_bulk_read_callback(struct usb_xfer *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010030808.o9388Gdm068187>