Changeset 850fd32 in mainline for uspace/drv/nic

Timestamp:

2018-03-11T01:21:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

84239b1, f0e825d

Parents:

338d54a7

Message:

Fix mischievious semicolons.

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (1 diff)
• rtl8139/driver.c (modified) (12 diffs)
• rtl8139/general.c (modified) (2 diffs)
• rtl8169/driver.c (modified) (1 diff)

uspace/drv/nic/e1k/e1k.c

@@ -511 +511 @@
 
         return EOK;
-};
+}
 
 /** Set acceptance of weird frames

uspace/drv/nic/rtl8139/driver.c

@@ -231 +231 @@
         *mac0_dest = pio_read_32(rtl8139->io_port + MAC0);
         *mac4_dest = pio_read_16(rtl8139->io_port + MAC0 + 4);
-};
+}
 
 /** Set MAC address to the device
@@ -423 +423 @@
 err_size:
         return;
-};
+}
 
 
@@ -612 +612 @@
         rtl8139_rx_reset(rtl8139);
         return frames;
-};
+}
 
 
@@ -833 +833 @@
         /* Turn the interrupts on again */
         rtl8139_hw_int_set(rtl8139);
-};
+}
 
 /** Register interrupt handler for the card in the system
@@ -1039 +1039 @@
                 ddf_msg(LVL_ERROR, "%s device: unexpected irq count", ddf_dev_get_name(dev));
                 return EINVAL;
-        };
+        }
         if (hw_resources->io_ranges.count != 1) {
                 ddf_msg(LVL_ERROR, "%s device: unexpected io ranges count", ddf_dev_get_name(dev));
@@ -1331 +1331 @@
         rtl8139_dev_cleanup(dev);
         return rc;
-};
+}
 
 /** Set card MAC address
@@ -1526 +1526 @@
 
         return EOK;
-};
+}
 
 /** Set current pause frame configuration
@@ -1562 +1562 @@
         }
         return EOK;
-};
+}
 
 /** Set operation mode of the device
@@ -1937 +1937 @@
 
         return EOK;
-};
+}
 
 /** Set acceptance of weird frames
@@ -1967 +1967 @@
         fibril_mutex_unlock(&rtl8139->rx_lock);
         return EOK;
-};
+}
 
 
@@ -2006 +2006 @@
         default:
                 return EINVAL;
-        };
+        }
         if(rtl8139->pm.active++ == 0)
                 rtl8139_hw_pmen_set(rtl8139, 1);
@@ -2042 +2042 @@
         default:
                 return;
-        };
+        }
         rtl8139->pm.active--;
         if (rtl8139->pm.active == 0)

uspace/drv/nic/rtl8139/general.c

@@ -114 +114 @@
         ta->last_run = 1;
         return EOK;
-};
+}
 
 
@@ -147 +147 @@
 
         return expired;
-};
+}
 

uspace/drv/nic/rtl8169/driver.c

@@ -208 +208 @@
                 ddf_msg(LVL_ERROR, "%s device: unexpected irq count", ddf_dev_get_name(dev));
                 return EINVAL;
-        };
+        }
 
         if (hw_resources->io_ranges.count != 1) {