Changeset 84239b1 in mainline for uspace/drv

Timestamp:

2018-03-11T19:39:11Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f3d47c97

Parents:

850fd32

Message:

And there was much fixing.

Location:

uspace/drv

Files:

• bus/usb/ehci/ehci_rh.c (modified) (1 diff)
• bus/usb/ehci/hc.c (modified) (1 diff)
• bus/usb/uhci/uhci_rh.c (modified) (1 diff)
• nic/e1k/e1k.c (modified) (2 diffs)
• nic/rtl8169/driver.c (modified) (3 diffs)
• platform/amdm37x/amdm37x.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/ehci_rh.c

@@ -339 +339 @@
             USB_PORTSC_PORT_RESET_FLAG) {
                 async_usleep(1);
-        };
+        }
         usb_log_debug("RH(%p-%u): Reset complete", job->hub, job->port);
         /* Handle port ownership, if the port is not enabled

uspace/drv/bus/usb/ehci/hc.c

@@ -210 +210 @@
         dma_buffer_free(&hc->dma_buffer);
         return EOK;
-};
+}
 
 void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep)

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -252 +252 @@
             hub->reset_changed[port] ? "-reset" : "");
         memcpy(data, &status, sizeof(status));
-        *act_size = sizeof(status);;
+        *act_size = sizeof(status);
         return EOK;
 }

uspace/drv/nic/e1k/e1k.c

@@ -544 +544 @@
         fibril_mutex_unlock(&e1000->rx_lock);
         return rc;
-};
+}
 
 /** Write receive address to RA registr
@@ -2281 +2281 @@
         fibril_mutex_unlock(&e1000->rx_lock);
         return EOK;
-};
+}
 
 /** Set card MAC address

uspace/drv/nic/rtl8169/driver.c

@@ -34 +34 @@
 #include <byteorder.h>
 #include <libarch/barrier.h>
+#include <stdbool.h>
 
 #include <as.h>
@@ -674 +675 @@
         unsigned int i = first;
 
-        for (;;) {
+        while (true) {
                 descr = &rtl8169->rx_ring[i];
                 buff_phys = rtl8169->rx_buff_phys + (BUFFER_SIZE * i);
@@ -991 +992 @@
         tail = rtl8169->rx_tail;
 
-        for (;;) {
+        while (true) {
                 descr = &rtl8169->rx_ring[tail];
 

uspace/drv/platform/amdm37x/amdm37x.c

@@ -282 +282 @@
                             "freq: %d, div: %d", base_freq, div);
                         return;
-                };
+                }
                 assert(div <= 127);