Changeset 00aece0 in mainline for uspace/lib/drv/generic/dev_iface.c

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/drv/generic/dev_iface.c (modified) (3 diffs)

uspace/lib/drv/generic/dev_iface.c

@@ -41 +41 @@
 #include "remote_hw_res.h"
 #include "remote_char_dev.h"
+#include "remote_nic.h"
 #include "remote_usb.h"
 #include "remote_usbhc.h"
@@ -46 +47 @@
 #include "remote_pci.h"
 
-#include <stdio.h>
-
 static iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
                 &remote_hw_res_iface,
                 &remote_char_dev_iface,
+                &remote_nic_iface,
                 &remote_pci_iface,
                 &remote_usb_iface,
@@ -68 +68 @@
 get_remote_method(remote_iface_t *rem_iface, sysarg_t iface_method_idx)
 {
-        if (iface_method_idx >= rem_iface->method_count) {
+        if (iface_method_idx >= rem_iface->method_count)
                 return NULL;
-        }
-
+        
         return rem_iface->methods[iface_method_idx];
 }