Changeset af2a76c in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2014-07-13T17:25:15Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

7493e7b

Parents:

b8e75319 (diff), 78192cc7 (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/srv/hid/compositor/compositor.c (modified) (7 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -55 +55 @@
 #include <async.h>
 #include <loc.h>
-#include <devman.h>
 
 #include <event.h>
-#include <graph_iface.h>
 #include <io/keycode.h>
 #include <io/mode.h>
@@ -1149 +1147 @@
 }
 
-static async_sess_t *vsl_connect(const char *svc)
+static async_sess_t *vsl_connect(service_id_t sid, const char *svc)
 {
         int rc;
         async_sess_t *sess;
-        service_id_t dsid;
-        devman_handle_t handle;
-
-        rc = loc_service_get_id(svc, &dsid, 0);
-        if (rc != EOK) {
+
+        sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0);
+        if (sess == NULL) {
+                printf("%s: Unable to connect to visualizer %s\n", NAME, svc);
                 return NULL;
         }
 
-        rc = devman_fun_sid_to_handle(dsid, &handle);
-        if (rc == EOK) {
-                sess = devman_device_connect(EXCHANGE_SERIALIZE, handle, 0);
-                if (sess == NULL) {
-                        printf("%s: Unable to connect to visualizer %s\n", NAME, svc);
-                        return NULL;
-                }
-                rc = graph_dev_connect(sess);
-                if (rc != EOK) {
-                        return NULL;
-                }
-        } else if (rc == ENOENT) {
-                sess = loc_service_connect(EXCHANGE_SERIALIZE, dsid, 0);
-                if (sess == NULL) {
-                        printf("%s: Unable to connect to visualizer %s\n", NAME, svc);
-                        return NULL;
-                }
-        } else {
-                return NULL;
-        }
-
         async_exch_t *exch = async_exchange_begin(sess);
-        rc = async_connect_to_me(exch, dsid, 0, 0, vsl_notifications, NULL);
+        rc = async_connect_to_me(exch, sid, 0, 0, vsl_notifications, NULL);
         async_exchange_end(exch);
 
@@ -1196 +1172 @@
 }
 
-static viewport_t *viewport_create(const char *vsl_name)
+static viewport_t *viewport_create(service_id_t sid)
 {
         int rc;
-
-        viewport_t *vp = (viewport_t *) malloc(sizeof(viewport_t));
-        if (!vp) {
-                return NULL;
-        }
+        char *vsl_name = NULL;
+        viewport_t *vp = NULL;
+        bool claimed = false;
+
+        rc = loc_service_get_name(sid, &vsl_name);
+        if (rc != EOK)
+                goto error;
+
+        vp = (viewport_t *) calloc(1, sizeof(viewport_t));
+        if (!vp)
+                goto error;
 
         link_initialize(&vp->link);
@@ -1210 +1192 @@
 
         /* Establish output bidirectional connection. */
-        vp->sess = vsl_connect(vsl_name);
-        rc = loc_service_get_id(vsl_name, &vp->dsid, 0);
-        if (vp->sess == NULL || rc != EOK) {
-                free(vp);
-                return NULL;
-        }
+        vp->dsid = sid;
+        vp->sess = vsl_connect(sid, vsl_name);
+        if (vp->sess == NULL)
+                goto error;
 
         /* Claim the given visualizer. */
         rc = visualizer_claim(vp->sess, 0);
         if (rc != EOK) {
-                async_hangup(vp->sess);
-                free(vp);
                 printf("%s: Unable to claim visualizer (%s)\n", NAME, str_error(rc));
-                return NULL;
-        }
+                goto error;
+        }
+
+        claimed = true;
 
         /* Retrieve the default mode. */
         rc = visualizer_get_default_mode(vp->sess, &vp->mode);
         if (rc != EOK) {
-                visualizer_yield(vp->sess);
-                async_hangup(vp->sess);
-                free(vp);
                 printf("%s: Unable to retrieve mode (%s)\n", NAME, str_error(rc));
-                return NULL;
+                goto error;
         }
 
@@ -1240 +1217 @@
             NULL, SURFACE_FLAG_SHARED);
         if (vp->surface == NULL) {
-                visualizer_yield(vp->sess);
-                async_hangup(vp->sess);
-                free(vp);
                 printf("%s: Unable to create surface (%s)\n", NAME, str_error(rc));
-                return NULL;
+                goto error;
         }
 
@@ -1251 +1225 @@
                 vp->mode.index, vp->mode.version, surface_direct_access(vp->surface));
         if (rc != EOK) {
+                printf("%s: Unable to set mode (%s)\n", NAME, str_error(rc));
+                goto error;
+        }
+
+        return vp;
+error:
+        if (claimed)
                 visualizer_yield(vp->sess);
-                surface_destroy(vp->surface);
+        if (vp->sess != NULL)
                 async_hangup(vp->sess);
-                free(vp);
-                printf("%s: Unable to set mode (%s)\n", NAME, str_error(rc));
-                return NULL;
-        }
-
-        return vp;
+        free(vp);
+        free(vsl_name);
+        return NULL;
 }
 
@@ -2190 +2168 @@
                         continue;
                 
-                char *svc_name;
-                rc = loc_service_get_name(svcs[i], &svc_name);
-                if (rc == EOK) {
-                        viewport_t *vp = viewport_create(svc_name);
-                        if (vp != NULL) {
-                                list_append(&vp->link, &viewport_list);
-                        }
-                }
+                viewport_t *vp = viewport_create(svcs[i]);
+                if (vp != NULL)
+                        list_append(&vp->link, &viewport_list);
         }
         fibril_mutex_unlock(&viewport_list_mtx);