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

Timestamp:

2011-04-07T09:46:11Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6639ae1

Parents:

f6bffee (diff), 8e80d3f (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/generic

Files:

• adt/measured_strings.c (modified) (1 diff)
• async.c (modified) (2 diffs)
• devman.c (modified) (3 diffs)
• io/log.c (added)
• net/packet.c (modified) (1 diff)
• net/socket_client.c (modified) (1 diff)
• vfs/vfs.c (modified) (3 diffs)

uspace/lib/c/generic/adt/measured_strings.c

@@ -74 +74 @@
         new->length = length;
         new->value = ((uint8_t *) new) + sizeof(measured_string_t);
-        // append terminating zero explicitly - to be safe
+        /* Append terminating zero explicitly - to be safe */
         memcpy(new->value, string, new->length);
         new->value[new->length] = '\0';

uspace/lib/c/generic/async.c

@@ -1578 +1578 @@
  */
 int
-async_data_read_start_flexible(int phoneid, void *dst, size_t size, int flags)
+async_data_read_start_generic(int phoneid, void *dst, size_t size, int flags)
 {
         return async_req_3_0(phoneid, IPC_M_DATA_READ, (sysarg_t) dst,
@@ -1677 +1677 @@
  */
 int
-async_data_write_start_flexible(int phoneid, const void *src, size_t size,
+async_data_write_start_generic(int phoneid, const void *src, size_t size,
     int flags)
 {

uspace/lib/c/generic/devman.c

@@ -147 +147 @@
                 ret = devman_send_match_id(phone, match_id);
                 if (ret != EOK) {
-                        printf("Driver failed to send match id, error %d\n",
-                            ret);
                         return ret;
                 }
@@ -195 +193 @@
         }
         
-        devman_send_match_ids(phone, match_ids);
-        
-        async_wait_for(req, &retval);
-        
-        async_serialize_end();
-        
+        int match_ids_rc = devman_send_match_ids(phone, match_ids);
+        
+        async_wait_for(req, &retval);
+        
+        async_serialize_end();
+        
+        /* Prefer the answer to DEVMAN_ADD_FUNCTION in case of errors. */
+        if ((match_ids_rc != EOK) && (retval == EOK)) {
+                retval = match_ids_rc;
+        }
+
         if (retval == EOK)
                 fun_handle = (int) IPC_GET_ARG1(answer);
@@ -326 +329 @@
 }
 
+int devman_device_get_handle_by_class(const char *classname,
+    const char *devname, devman_handle_t *handle, unsigned int flags)
+{
+        int phone = devman_get_phone(DEVMAN_CLIENT, flags);
+
+        if (phone < 0)
+                return phone;
+
+        async_serialize_start();
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(phone, DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
+            flags, &answer);
+
+        sysarg_t retval = async_data_write_start(phone, classname,
+            str_size(classname));
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                return retval;
+        }
+        retval = async_data_write_start(phone, devname,
+            str_size(devname));
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
+
+        async_serialize_end();
+
+        if (retval != EOK) {
+                if (handle != NULL)
+                        *handle = (devman_handle_t) -1;
+                return retval;
+        }
+
+        if (handle != NULL)
+                *handle = (devman_handle_t) IPC_GET_ARG1(answer);
+
+        return retval;
+}
+
 
 /** @}

uspace/lib/c/generic/net/packet.c

@@ -190 +190 @@
                 }
         }
-        gpm_destroy(&pm_globals.packet_map);
+        gpm_destroy(&pm_globals.packet_map, free);
         /* leave locked */
 }

uspace/lib/c/generic/net/socket_client.c

@@ -749 +749 @@
         dyn_fifo_destroy(&socket->received);
         dyn_fifo_destroy(&socket->accepted);
-        sockets_exclude(socket_get_sockets(), socket->socket_id);
+        sockets_exclude(socket_get_sockets(), socket->socket_id, free);
 }
 

uspace/lib/c/generic/vfs/vfs.c

@@ -378 +378 @@
         
         req = async_send_1(vfs_phone, VFS_IN_READ, fildes, &answer);
-        rc = async_data_read_start_flexible(vfs_phone, (void *) buf, nbyte,
+        rc = async_data_read_start_generic(vfs_phone, (void *) buf, nbyte,
             IPC_XF_RESTRICT);
         if (rc != EOK) {
@@ -408 +408 @@
         
         req = async_send_1(vfs_phone, VFS_IN_WRITE, fildes, &answer);
-        rc = async_data_write_start_flexible(vfs_phone, (void *) buf, nbyte,
+        rc = async_data_write_start_generic(vfs_phone, (void *) buf, nbyte,
             IPC_XF_RESTRICT);
         if (rc != EOK) {
@@ -758 +758 @@
 {
         struct stat stat;
-        int rc;
-
-        rc = fstat(fildes, &stat);
-
+        
+        int rc = fstat(fildes, &stat);
+        if (rc != 0)
+                return rc;
+        
         if (!stat.device)
                 return -1;