Changeset 2b3dd78 in mainline for uspace/drv/bus

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

Location:

uspace/drv/bus

Files:

• isa/isa.c (modified) (1 diff)
• usb/vhc/hub/virthub.c (modified) (2 diffs)

uspace/drv/bus/isa/isa.c

@@ -279 +279 @@
         errno_t rc;
         size_t nread;
-        struct stat st;
+        vfs_stat_t st;
 
         rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);

uspace/drv/bus/usb/vhc/hub/virthub.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <ddf/driver.h>
 
@@ -155 +156 @@
         dev->descriptors = &descriptors;
         dev->address = 0;
-        dev->name = str_dup(name);
-        if (!dev->name)
+
+        char *n = str_dup(name);
+        if (!n)
                 return ENOMEM;
 
         hub_t *hub = malloc(sizeof(hub_t));
         if (hub == NULL) {
-                free(dev->name);
+                free(n);
                 return ENOMEM;
         }
 
+        dev->name = n;
         hub_init(hub);
         dev->device_data = hub;