Changeset ea186c6 in mainline for uspace/lib/c

Timestamp:

2011-08-18T20:27:26Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

921b84f

Parents:

1f44b056 (diff), ef7052ec (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.

Location:

uspace/lib/c

Files:

• generic/devman.c (modified) (1 diff)
• generic/loc.c (modified) (4 diffs)
• include/devman.h (modified) (1 diff)
• include/ipc/devman.h (modified) (1 diff)
• include/loc.h (modified) (1 diff)

uspace/lib/c/generic/devman.c

@@ -308 +308 @@
 }
 
+/** Remove function from device.
+ *
+ * Request devman to remove function owned by this driver task.
+ * @param funh      Devman handle of the function
+ *
+ * @return EOK on success or negative error code.
+ */
+int devman_remove_function(devman_handle_t funh)
+{
+        async_exch_t *exch;
+        sysarg_t retval;
+        
+        exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
+        retval = async_req_1_0(exch, DEVMAN_REMOVE_FUNCTION, (sysarg_t) funh);
+        devman_exchange_end(exch);
+        
+        return (int) retval;
+}
+
 async_sess_t *devman_parent_device_connect(exch_mgmt_t mgmt,
     devman_handle_t handle, unsigned int flags)

uspace/lib/c/generic/loc.c

@@ -267 +267 @@
 }
 
-/** Register new device.
- *
- * The @p interface is used when forwarding connection to the driver.
+/** Register new service.
+ *
+ * The @p interface is used when forwarding connection to the server.
  * If not 0, the first argument is the interface and the second argument
  * is the service ID.
@@ -276 +276 @@
  * the handle (to ensure backward compatibility).
  *
- * @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)
+ * @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)
 {
         async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER);
@@ -289 +289 @@
         aid_t req = async_send_2(exch, LOC_SERVICE_REGISTER, interface, 0,
             &answer);
-        sysarg_t retval = async_data_write_start(exch, fqdn, str_size(fqdn));
+        sysarg_t retval = async_data_write_start(exch, fqsn, str_size(fqsn));
         
         loc_exchange_end(exch);
@@ -301 +301 @@
         
         if (retval != EOK) {
-                if (handle != NULL)
-                        *handle = -1;
-                
-                return retval;
-        }
-        
-        if (handle != NULL)
-                *handle = (service_id_t) IPC_GET_ARG1(answer);
+                if (sid != NULL)
+                        *sid = -1;
+                
+                return retval;
+        }
+        
+        if (sid != NULL)
+                *sid = (service_id_t) IPC_GET_ARG1(answer);
         
         return 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);
+/** 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;
 }
 

uspace/lib/c/include/devman.h

@@ -49 +49 @@
 extern int devman_add_function(const char *, fun_type_t, match_id_list_t *,
     devman_handle_t, devman_handle_t *);
+extern int devman_remove_function(devman_handle_t);
 
 extern async_sess_t *devman_device_connect(exch_mgmt_t, devman_handle_t,

uspace/lib/c/include/ipc/devman.h

@@ -138 +138 @@
         DEVMAN_ADD_FUNCTION,
         DEVMAN_ADD_MATCH_ID,
-        DEVMAN_ADD_DEVICE_TO_CATEGORY
-
+        DEVMAN_ADD_DEVICE_TO_CATEGORY,
+        DEVMAN_REMOVE_FUNCTION
 } driver_to_devman_t;
 

uspace/lib/c/include/loc.h

@@ -50 +50 @@
 extern int loc_service_register_with_iface(const char *, service_id_t *,
     sysarg_t);
+extern int loc_service_unregister(service_id_t);
 extern int loc_service_add_to_cat(service_id_t, category_id_t);