Changeset f302586 in mainline for uspace/lib/c/generic

Timestamp:

2012-01-14T23:31:26Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3ea725e, 8989f2a7, a1347a7

Parents:

6d8455d

Message:

make sure the client_connection is explicitly set at most once
it is not a mutable variable, it is a weak symbol

Location:

uspace/lib/c/generic

Files:

• async.c (modified) (3 diffs)
• devman.c (modified) (2 diffs)
• loc.c (modified) (2 diffs)

uspace/lib/c/generic/async.c

@@ -257 +257 @@
 void async_set_client_data_constructor(async_client_data_ctor_t ctor)
 {
+        assert(async_client_data_create == default_client_data_constructor);
         async_client_data_create = ctor;
 }
@@ -262 +263 @@
 void async_set_client_data_destructor(async_client_data_dtor_t dtor)
 {
+        assert(async_client_data_destroy == default_client_data_destructor);
         async_client_data_destroy = dtor;
 }
@@ -303 +305 @@
 void async_set_client_connection(async_client_conn_t conn)
 {
+        assert(client_connection == default_client_connection);
         client_connection = conn;
 }

uspace/lib/c/generic/devman.c

@@ -177 +177 @@
 
 /** Register running driver with device manager. */
-int devman_driver_register(const char *name, async_client_conn_t conn)
+int devman_driver_register(const char *name)
 {
         async_exch_t *exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
@@ -192 +192 @@
         }
         
-        async_set_client_connection(conn);
-        
         exch = devman_exchange_begin(DEVMAN_DRIVER);
-        async_connect_to_me(exch, 0, 0, 0, conn, NULL);
+        async_connect_to_me(exch, 0, 0, 0, NULL, NULL);
         devman_exchange_end(exch);
         

uspace/lib/c/generic/loc.c

@@ -242 +242 @@
 
 /** Register new driver with loc. */
-int loc_server_register(const char *name, async_client_conn_t conn)
+int loc_server_register(const char *name)
 {
         async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER);
@@ -256 +256 @@
                 return retval;
         }
-        
-        async_set_client_connection(conn);
         
         exch = loc_exchange_begin(LOC_PORT_SUPPLIER);