Changes in uspace/lib/c/generic/loc.c [0fe52ef:45058baa] in mainline

File:

• uspace/lib/c/generic/loc.c (modified) (11 diffs)

uspace/lib/c/generic/loc.c

@@ -45 +45 @@
 static FIBRIL_MUTEX_INITIALIZE(loc_consumer_mutex);
 
-static FIBRIL_MUTEX_INITIALIZE(loc_callback_mutex);
-static bool loc_callback_created = false;
-
 static async_sess_t *loc_supp_block_sess = NULL;
 static async_sess_t *loc_cons_block_sess = NULL;
@@ -54 +51 @@
 static async_sess_t *loc_consumer_sess = NULL;
 
-static loc_cat_change_cb_t cat_change_cb = NULL;
-
-static void loc_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-        loc_cat_change_cb_t cb_fun;
-        
-        while (true) {
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                if (!IPC_GET_IMETHOD(call)) {
-                        /* TODO: Handle hangup */
-                        return;
-                }
-                
-                int retval;
-                
-                switch (IPC_GET_IMETHOD(call)) {
-                case LOC_EVENT_CAT_CHANGE:
-                        fibril_mutex_lock(&loc_callback_mutex);
-                        cb_fun = cat_change_cb;
-                        if (cb_fun != NULL) {
-                                (*cb_fun)();
-                        }
-                        fibril_mutex_unlock(&loc_callback_mutex);
-                        retval = 0;
-                        break;
-                default:
-                        retval = ENOTSUP;
-                }
-                
-                async_answer_0(callid, retval);
-        }
-}
-
-
 static void clone_session(fibril_mutex_t *mtx, async_sess_t *src,
     async_sess_t **dst)
@@ -99 +60 @@
         
         fibril_mutex_unlock(mtx);
-}
-
-static int loc_callback_create(void)
-{
-        async_exch_t *exch;
-        sysarg_t retval;
-        int rc = EOK;
-
-        fibril_mutex_lock(&loc_callback_mutex);
-        
-        if (!loc_callback_created) {
-                exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
-                
-                ipc_call_t answer;
-                aid_t req = async_send_0(exch, LOC_CALLBACK_CREATE, &answer);
-                async_connect_to_me(exch, 0, 0, 0, loc_cb_conn, NULL);
-                loc_exchange_end(exch);
-                
-                async_wait_for(req, &retval);
-                if (rc != EOK)
-                        goto done;
-                
-                if (retval != EOK) {
-                        rc = retval;
-                        goto done;
-                }
-                
-                loc_callback_created = true;
-        }
-        
-        rc = EOK;
-done:
-        fibril_mutex_unlock(&loc_callback_mutex);
-        return rc;
 }
 
@@ -267 +194 @@
 }
 
-/** Register new service.
- *
- * The @p interface is used when forwarding connection to the server.
+/** Register new device.
+ *
+ * The @p interface is used when forwarding connection to the driver.
  * If not 0, the first argument is the interface and the second argument
  * is the service ID.
@@ -276 +203 @@
  * the handle (to ensure backward compatibility).
  *
- * @param      fqsn      Fully qualified service name
- * @param[out] sid       Service ID of new service
- * @param      interface Interface when forwarding
- *
- */
-int loc_service_register_with_iface(const char *fqsn,
-    service_id_t *sid, sysarg_t interface)
+ * @param      fqdn      Fully qualified device name.
+ * @param[out] handle    Handle to the created instance of device.
+ * @param      interface Interface when forwarding.
+ *
+ */
+int loc_service_register_with_iface(const char *fqdn,
+    service_id_t *handle, sysarg_t interface)
 {
         async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER);
@@ -289 +216 @@
         aid_t req = async_send_2(exch, LOC_SERVICE_REGISTER, interface, 0,
             &answer);
-        sysarg_t retval = async_data_write_start(exch, fqsn, str_size(fqsn));
+        sysarg_t retval = async_data_write_start(exch, fqdn, str_size(fqdn));
         
         loc_exchange_end(exch);
@@ -301 +228 @@
         
         if (retval != EOK) {
-                if (sid != NULL)
-                        *sid = -1;
-                
-                return retval;
-        }
-        
-        if (sid != NULL)
-                *sid = (service_id_t) IPC_GET_ARG1(answer);
+                if (handle != NULL)
+                        *handle = -1;
+                
+                return retval;
+        }
+        
+        if (handle != NULL)
+                *handle = (service_id_t) IPC_GET_ARG1(answer);
         
         return retval;
 }
 
-/** Register new service.
- *
- * @param fqsn Fully qualified service name
- * @param sid  Output: ID of new service
- *
- */
-int loc_service_register(const char *fqdn, service_id_t *sid)
-{
-        return loc_service_register_with_iface(fqdn, sid, 0);
-}
-
-/** Unregister service.
- *
- * @param sid   Service ID
- */
-int loc_service_unregister(service_id_t sid)
-{
-        async_exch_t *exch;
-        sysarg_t retval;
-        
-        exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER);
-        retval = async_req_1_0(exch, LOC_SERVICE_UNREGISTER, sid);
-        loc_exchange_end(exch);
-        
-        return (int)retval;
+/** Register new device.
+ *
+ * @param fqdn   Fully qualified device name.
+ * @param handle Output: Handle to the created instance of device.
+ *
+ */
+int loc_service_register(const char *fqdn, service_id_t *handle)
+{
+        return loc_service_register_with_iface(fqdn, handle, 0);
 }
 
@@ -380 +291 @@
 }
 
-/** Get object name.
- *
- * Provided ID of an object, return its name.
- *
- * @param method        IPC method
- * @param id            Object ID
+/** Get service name.
+ *
+ * Provided ID of a service, return its name.
+ *
+ * @param svc_id        Service ID
  * @param name          Place to store pointer to new string. Caller should
  *                      free it using free().
  * @return              EOK on success or negative error code
  */
-static int loc_get_name_internal(sysarg_t method, sysarg_t id, char **name)
+int loc_service_get_name(service_id_t svc_id, char **name)
 {
         async_exch_t *exch;
@@ -402 +312 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_1(exch, method, id, &answer);
+        aid_t req = async_send_1(exch, LOC_SERVICE_GET_NAME, svc_id, &answer);
         aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN,
             &dreply);
@@ -431 +341 @@
 }
 
-/** Get category name.
- *
- * Provided ID of a service, return its name.
- *
- * @param cat_id        Category ID
- * @param name          Place to store pointer to new string. Caller should
- *                      free it using free().
- * @return              EOK on success or negative error code
- */
-int loc_category_get_name(category_id_t cat_id, char **name)
-{
-        return loc_get_name_internal(LOC_CATEGORY_GET_NAME, cat_id, name);
-}
-
-/** Get service name.
- *
- * Provided ID of a service, return its name.
- *
- * @param svc_id        Service ID
- * @param name          Place to store pointer to new string. Caller should
- *                      free it using free().
- * @return              EOK on success or negative error code
- */
-int loc_service_get_name(service_id_t svc_id, char **name)
-{
-        return loc_get_name_internal(LOC_SERVICE_GET_NAME, svc_id, name);
-}
 
 int loc_namespace_get_id(const char *name, service_id_t *handle,
@@ -866 +749 @@
             data, count);
 }
-
-int loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun)
-{
-        if (loc_callback_create() != EOK)
-                return EIO;
-
-        cat_change_cb = cb_fun;
-        return EOK;
-}