Changeset 241f1985 in mainline for uspace/srv/devman

Timestamp:

2019-08-31T10:45:17Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

Location:

uspace/srv/devman

Files:

• Makefile (modified) (1 diff)
• driver.c (modified) (1 diff)
• drv_conn.c (modified) (2 diffs)

uspace/srv/devman/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBSYSMAN_PREFIX)/libsysman.a
-EXTRA_CFLAGS += -I$(LIBSYSMAN_PREFIX)/include
+LIBS = sysman
 BINARY = devman
 STATIC_NEEDED = y

uspace/srv/devman/driver.c

@@ -34 +34 @@
 #include <dirent.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <io/log.h>
 #include <vfs/vfs.h>
+#include <dirent.h>
 #include <loc.h>
 #include <stdio.h>
 #include <str_error.h>
-#include <sys/stat.h>
 #include <sysman/ctl.h>
 #include <task.h>

uspace/srv/devman/drv_conn.c

@@ -41 +41 @@
 #include <io/log.h>
 #include <ipc/devman.h>
-#include <ipc/driver.h>
 #include <ipc/services.h>
 #include <loc.h>
@@ -111 +110 @@
         if (rc != EOK) {
                 fibril_mutex_unlock(&driver->driver_mutex);
-                async_answer_0(callid, rc);
+                async_answer_0(call, rc);
                 return NULL;
         }
-        sysman_main_exposee_added(unit_name, call->in_task_id);
+        sysman_main_exposee_added(unit_name, call->task_id);
         free(unit_name);