Changeset a35b458 in mainline for uspace/drv/bus/usb

Timestamp:

2018-03-02T20:10:49Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

Location:

uspace/drv/bus/usb

Files:

• ehci/ehci_bus.h (modified) (1 diff)
• ohci/hc.h (modified) (1 diff)
• ohci/ohci_rh.c (modified) (1 diff)
• usbhub/port.c (modified) (1 diff)
• usbmid/explore.c (modified) (1 diff)
• vhc/conndev.c (modified) (4 diffs)
• vhc/hub/virthubops.c (modified) (2 diffs)
• vhc/transfer.c (modified) (1 diff)
• xhci/debug.c (modified) (1 diff)
• xhci/rh.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_bus.h

@@ -51 +51 @@
         /** EHCI endpoint descriptor, backed by dma_buffer */
         qh_t *qh;
-        
+
         dma_buffer_t dma_buffer;
 

uspace/drv/bus/usb/ohci/hc.h

@@ -64 +64 @@
         /** Memory mapped I/O registers area */
         ohci_regs_t *registers;
-        
+
         /** Host controller communication area structure */
         hcca_t *hcca;

uspace/drv/bus/usb/ohci/ohci_rh.c

@@ -409 +409 @@
         TEST_SIZE_INIT(0, port, hub);
         const unsigned feature = uint16_usb2host(setup_packet->value);
-        
+
         switch (feature) {
         case USB_HUB_FEATURE_PORT_POWER:   /*8*/
                 {
                         const uint32_t rhda = OHCI_RD(hub->registers->rh_desc_a);
-                        
+
                         /* No power switching */
                         if (rhda & RHDA_NPS_FLAG)
                                 return EOK;
-                        
+
                         /* Ganged power switching, one port powers all */
                         if (!(rhda & RHDA_PSM_FLAG)) {

uspace/drv/bus/usb/usbhub/port.c

@@ -87 +87 @@
                 return;
         }
-        
+
         const errno_t err = usbhc_device_remove(exch, port->port_number);
         if (err)

uspace/drv/bus/usb/usbmid/explore.c

@@ -164 +164 @@
                 return rc;
         }
-        
+
         /* Create driver soft-state. */
         usb_mid_t *usb_mid = usb_device_data_alloc(dev, sizeof(usb_mid_t));

uspace/drv/bus/usb/vhc/conndev.c

@@ -57 +57 @@
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        
+
         aid_t opening_request = async_send_0(exch, IPC_M_USBVIRT_GET_NAME, NULL);
         if (opening_request == 0) {
@@ -63 +63 @@
                 return;
         }
-        
+
         ipc_call_t data_request_call;
         aid_t data_request = async_data_read(exch, plugged_device_name,
              PLUGGED_DEVICE_NAME_MAXLEN, &data_request_call);
-        
+
         async_exchange_end(exch);
-        
+
         if (data_request == 0) {
                 async_forget(opening_request);
                 return;
         }
-        
+
         errno_t data_request_rc;
         errno_t opening_request_rc;
         async_wait_for(data_request, &data_request_rc);
         async_wait_for(opening_request, &opening_request_rc);
-        
+
         if ((data_request_rc != EOK) || (opening_request_rc != EOK))
                 return;
-        
+
         size_t len = IPC_GET_ARG2(data_request_call);
         plugged_device_name[len] = 0;
@@ -97 +97 @@
 {
         vhc_data_t *vhc = ddf_fun_data_get(fun);
-        
+
         async_sess_t *callback =
             async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
-        
+
         if (callback) {
                 errno_t rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
@@ -108 +108 @@
                         return;
                 }
-                
+
                 async_answer_0(icallid, EOK);
-                
+
                 receive_device_name(callback);
-                
+
                 usb_log_info("New virtual device `%s' (id: %" PRIxn ").",
                     plugged_device_name, plugged_device_handle);

uspace/drv/bus/usb/vhc/hub/virthubops.c

@@ -73 +73 @@
                 return ESTALL;
         }
-        
+
         hub_t *hub = dev->device_data;
 
@@ -94 +94 @@
                 *actual_size = 0;
         }
-        
+
         hub->signal_changes = false;
 

uspace/drv/bus/usb/vhc/transfer.c

@@ -228 +228 @@
 
         fibril_mutex_unlock(&vhc->guard);
-        
+
         if (targets > 1)
                 usb_log_warning("Transfer would be accepted by more devices!");

uspace/drv/bus/usb/xhci/debug.c

@@ -301 +301 @@
         static const char speed_exp [] = " KMG";
         static const char *psi_types [] = { "", " rsvd", " RX", " TX" };
-        
+
         usb_log_debug("Speed %u%s: %5u %cb/s, %s",
             XHCI_REG_RD(psi, XHCI_PSI_PSIV),

uspace/drv/bus/usb/xhci/rh.c

@@ -273 +273 @@
                 if (status != 0)
                         usb_log_debug("RH port %u change not handled: 0x%x", port_id, status);
-                
+
                 /* Make sure that PSCEG is 0 before exiting the loop. */
                 status = XHCI_REG_RD_FIELD(&port->regs->portsc, 32);