Changeset b7fd2a0 in mainline for uspace/drv/nic/ne2k

Timestamp:

2018-01-13T03:10:29Z (8 years ago)

Author:

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

Branches:

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

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:

uspace/drv/nic/ne2k

Files:

• dp8390.c (modified) (2 diffs)
• dp8390.h (modified) (1 diff)
• ne2k.c (modified) (11 diffs)

uspace/drv/nic/ne2k/dp8390.c

@@ -194 +194 @@
  *
  */
-int ne2k_probe(ne2k_t *ne2k)
+errno_t ne2k_probe(ne2k_t *ne2k)
 {
         unsigned int i;
@@ -250 +250 @@
  *
  */
-int ne2k_up(ne2k_t *ne2k)
+errno_t ne2k_up(ne2k_t *ne2k)
 {
         if (!ne2k->probed)

uspace/drv/nic/ne2k/dp8390.h

@@ -265 +265 @@
 } ne2k_t;
 
-extern int ne2k_probe(ne2k_t *);
-extern int ne2k_up(ne2k_t *);
+extern errno_t ne2k_probe(ne2k_t *);
+extern errno_t ne2k_up(ne2k_t *);
 extern void ne2k_down(ne2k_t *);
 extern void ne2k_send(nic_t *, void *, size_t);

uspace/drv/nic/ne2k/ne2k.c

@@ -124 +124 @@
 static void ne2k_interrupt_handler(ipc_call_t *, ddf_dev_t *);
 
-static int ne2k_register_interrupt(nic_t *nic_data, cap_handle_t *handle)
+static errno_t ne2k_register_interrupt(nic_t *nic_data, cap_handle_t *handle)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -178 +178 @@
 }
 
-static int ne2k_dev_init(nic_t *nic_data)
+static errno_t ne2k_dev_init(nic_t *nic_data)
 {
         /* Get HW resources */
@@ -184 +184 @@
         hw_res_list_parsed_init(&hw_res_parsed);
         
-        int rc = nic_get_resources(nic_data, &hw_res_parsed);
+        errno_t rc = nic_get_resources(nic_data, &hw_res_parsed);
         
         if (rc != EOK)
@@ -243 +243 @@
 }
 
-static int ne2k_on_activating(nic_t *nic_data)
+static errno_t ne2k_on_activating(nic_t *nic_data)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
 
         if (!ne2k->up) {
-                int rc = ne2k_up(ne2k);
+                errno_t rc = ne2k_up(ne2k);
                 if (rc != EOK)
                         return rc;
@@ -261 +261 @@
 }
 
-static int ne2k_on_stopping(nic_t *nic_data)
+static errno_t ne2k_on_stopping(nic_t *nic_data)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -271 +271 @@
 }
 
-static int ne2k_set_address(ddf_fun_t *fun, const nic_address_t *address)
+static errno_t ne2k_set_address(ddf_fun_t *fun, const nic_address_t *address)
 {
         nic_t *nic_data = DRIVER_DATA(ddf_fun_get_dev(fun));
-        int rc = nic_report_address(nic_data, address);
+        errno_t rc = nic_report_address(nic_data, address);
         if (rc != EOK) {
                 return EINVAL;
@@ -286 +286 @@
 }
 
-static int ne2k_on_unicast_mode_change(nic_t *nic_data,
+static errno_t ne2k_on_unicast_mode_change(nic_t *nic_data,
         nic_unicast_mode_t new_mode,
         const nic_address_t *address_list, size_t address_count)
@@ -313 +313 @@
 }
 
-static int ne2k_on_multicast_mode_change(nic_t *nic_data,
+static errno_t ne2k_on_multicast_mode_change(nic_t *nic_data,
         nic_multicast_mode_t new_mode,
         const nic_address_t *address_list, size_t address_count)
@@ -339 +339 @@
 }
 
-static int ne2k_on_broadcast_mode_change(nic_t *nic_data,
+static errno_t ne2k_on_broadcast_mode_change(nic_t *nic_data,
         nic_broadcast_mode_t new_mode)
 {
@@ -355 +355 @@
 }
 
-static int ne2k_dev_add(ddf_dev_t *dev)
+static errno_t ne2k_dev_add(ddf_dev_t *dev)
 {
         ddf_fun_t *fun;
@@ -387 +387 @@
         }
         
-        int rc = ne2k_dev_init(nic_data);
+        errno_t rc = ne2k_dev_init(nic_data);
         if (rc != EOK) {
                 ne2k_dev_cleanup(dev);