Changeset f2f4c00 in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2014-08-03T15:54:44Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8e77b12f

Parents:

251d4dd (diff), 1f1fa64 (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 the rtl8169 driver and improvements to the nic utility from
lp:~nufcia/helenos/rtl8169.

• Revert the disabling of the ISA devices using IRQ 5.
• Two minor build fixes for 64-bit platforms.

File:

• uspace/lib/nic/src/nic_driver.c (modified) (2 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -47 +47 @@
 #include <ops/nic.h>
 #include <errno.h>
+
+#include <io/log.h>
 
 #include "nic_driver.h"
@@ -436 +438 @@
                 int rc = nic_ev_addr_changed(nic_data->client_session,
                     address);
+                log_msg(LOG_DEFAULT, LVL_WARN, "rc=%d", rc);
+
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);