Changeset db71e2a in mainline for uspace/lib/drv

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

Location:

uspace/lib/drv

Files:

• generic/remote_nic.c (modified) (10 diffs)
• include/ddf/log.h (modified) (1 diff)

uspace/lib/drv/generic/remote_nic.c

@@ -104 +104 @@
         
         nic_address_t address;
-        bzero(&address, sizeof(nic_address_t));
+        memset(&address, 0, sizeof(nic_address_t));
         
         int rc = nic_iface->get_address(dev, &address);
@@ -173 +173 @@
         
         nic_device_stats_t stats;
-        bzero(&stats, sizeof(nic_device_stats_t));
+        memset(&stats, 0, sizeof(nic_device_stats_t));
         
         int rc = nic_iface->get_stats(dev, &stats);
@@ -208 +208 @@
         
         nic_device_info_t info;
-        bzero(&info, sizeof(nic_device_info_t));
+        memset(&info, 0, sizeof(nic_device_info_t));
         
         int rc = nic_iface->get_device_info(dev, &info);
@@ -399 +399 @@
         }
         
-        bzero(address_list, max_count * sizeof(nic_address_t));
+        memset(address_list, 0, max_count * sizeof(nic_address_t));
         nic_unicast_mode_t mode = NIC_UNICAST_DEFAULT;
         size_t address_count = 0;
@@ -503 +503 @@
         }
         
-        bzero(address_list, max_count * sizeof(nic_address_t));
+        memset(address_list, 0, max_count * sizeof(nic_address_t));
         nic_multicast_mode_t mode = NIC_MULTICAST_BLOCKED;
         size_t address_count = 0;
@@ -667 +667 @@
         }
         
-        bzero(address_list, max_count * sizeof(nic_address_t));
+        memset(address_list, 0, max_count * sizeof(nic_address_t));
         size_t address_count = 0;
         
@@ -759 +759 @@
         
         nic_vlan_mask_t vlan_mask;
-        bzero(&vlan_mask, sizeof(nic_vlan_mask_t));
+        memset(&vlan_mask, 0, sizeof(nic_vlan_mask_t));
         
         int rc = nic_iface->vlan_get_mask(dev, &vlan_mask);
@@ -932 +932 @@
         }
         
-        bzero(data, max_length);
+        memset(data, 0, max_length);
         
         int rc = nic_iface->wol_virtue_probe(dev, id, &type, max_length,
@@ -982 +982 @@
         }
         
-        bzero(id_list, max_count * sizeof (nic_wv_id_t));
+        memset(id_list, 0, max_count * sizeof (nic_wv_id_t));
         
         int rc = nic_iface->wol_virtue_list(dev, type, max_count, id_list,
@@ -1047 +1047 @@
         }
         
-        bzero(data, max_length);
+        memset(data, 0, max_length);
         
         int rc = nic_iface->wol_load_info(dev, &type, max_length, data,

uspace/lib/drv/include/ddf/log.h

@@ -44 +44 @@
     size_t);
 
+#define ddf_log_fatal(msg...) ddf_msg(LVL_FATAL, msg)
+#define ddf_log_error(msg...) ddf_msg(LVL_ERROR, msg)
+#define ddf_log_warning(msg...) ddf_msg(LVL_WARN, msg)
+#define ddf_log_note(msg...) ddf_msg(LVL_NOTE, msg)
+#define ddf_log_debug(msg...) ddf_msg(LVL_DEBUG, msg)
+#define ddf_log_verbose(msg...) ddf_msg(LVL_DEBUG2, msg)
+
 #endif