Changeset ea186c6 in mainline for uspace/lib/c/generic/loc.c

Timestamp:

2011-08-18T20:27:26Z (13 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.

File:

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

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;
 }