Changeset ec7f8b1 in mainline for uspace/lib/c

Timestamp:

2011-08-21T15:35:03Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

bb74dabe

Parents:

c4a8e4a (diff), 5935c079 (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:

• arch/ia32/include/ddi.h (modified) (9 diffs)
• generic/async.c (modified) (1 diff)
• generic/devman.c (modified) (2 diffs)
• generic/ns.c (modified) (2 diffs)
• generic/str.c (modified) (2 diffs)
• include/async.h (modified) (1 diff)
• include/str.h (modified) (1 diff)

uspace/lib/c/arch/ia32/include/ddi.h

@@ -43 +43 @@
         if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
                 uint8_t val;
+                
                 asm volatile (
                         "inb %w[port], %b[val]\n"
@@ -48 +49 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint8_t) *port;
-        }
 }
 
@@ -58 +59 @@
         if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
                 uint16_t val;
+                
                 asm volatile (
                         "inw %w[port], %w[val]\n"
@@ -63 +65 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint16_t) *port;
-        }
 }
 
@@ -73 +75 @@
         if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
                 uint32_t val;
+                
                 asm volatile (
                         "inl %w[port], %[val]\n"
@@ -78 +81 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint32_t) *port;
-        }
 }
 
@@ -91 +94 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );      
-        } else {
+        } else
                 *port = val;
-        }
 }
 
@@ -103 +105 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );
-        } else {
+        } else
                 *port = val;
-        }
 }
 
@@ -115 +116 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );
-        } else {
+        } else
                 *port = val;
-        }
 }
 

uspace/lib/c/generic/async.c

@@ -1656 +1656 @@
         
         return sess;
+}
+
+/** Set arguments for new connections.
+ *
+ * FIXME This is an ugly hack to work around the problem that parallel
+ * exchanges are implemented using parallel connections. When we create
+ * a callback session, the framework does not know arguments for the new
+ * connections.
+ *
+ * The proper solution seems to be to implement parallel exchanges using
+ * tagging.
+ */
+void async_sess_args_set(async_sess_t *sess, sysarg_t arg1, sysarg_t arg2,
+    sysarg_t arg3)
+{
+        sess->arg1 = arg1;
+        sess->arg2 = arg2;
+        sess->arg3 = arg3;
 }
 

uspace/lib/c/generic/devman.c

@@ -89 +89 @@
                         if (devman_driver_block_sess == NULL)
                                 devman_driver_block_sess =
-                                    service_connect_blocking(EXCHANGE_SERIALIZE,
+                                    service_connect_blocking(EXCHANGE_PARALLEL,
                                     SERVICE_DEVMAN, DEVMAN_DRIVER, 0);
                 }
@@ -138 +138 @@
                 if (devman_driver_sess == NULL)
                         devman_driver_sess =
-                            service_connect(EXCHANGE_SERIALIZE, SERVICE_DEVMAN,
+                            service_connect(EXCHANGE_PARALLEL, SERVICE_DEVMAN,
                             DEVMAN_DRIVER, 0);
                 

uspace/lib/c/generic/ns.c

@@ -56 +56 @@
         async_exchange_end(exch);
         
+        /*
+         * FIXME Ugly hack to work around limitation of implementing
+         * parallel exchanges using multiple connections. Shift out
+         * first argument for non-initial connections.
+         */
+        async_sess_args_set(sess, arg2, arg3, 0);
+        
         return sess;
 }
@@ -66 +73 @@
             async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3);
         async_exchange_end(exch);
+        
+        /*
+         * FIXME Ugly hack to work around limitation of implementing
+         * parallel exchanges using multiple connections. Shift out
+         * first argument for non-initial connections.
+         */
+        async_sess_args_set(sess, arg2, arg3, 0);
         
         return sess;

uspace/lib/c/generic/str.c

@@ -2 +2 @@
  * Copyright (c) 2005 Martin Decky
  * Copyright (c) 2008 Jiri Svoboda
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
  *
@@ -718 +719 @@
 
         dest[dlen - 1] = '\0';
+}
+
+/** Convert string to wide string.
+ *
+ * Convert string @a src to wide string. A new wide NULL-terminated
+ * string will be allocated on the heap.
+ *
+ * @param src   Source string.
+ */
+wchar_t *str_to_awstr(const char *str)
+{
+        size_t len = str_length(str);
+        
+        wchar_t *wstr = calloc(len+1, sizeof(wchar_t));
+        if (wstr == NULL)
+                return NULL;
+        
+        str_to_wstr(wstr, len + 1, str);
+        return wstr;
 }
 

uspace/lib/c/include/async.h

@@ -337 +337 @@
 
 /*
+ * FIXME These functions just work around problems with parallel exchange
+ * management. Proper solution needs to be implemented.
+ */
+void async_sess_args_set(async_sess_t *sess, sysarg_t, sysarg_t, sysarg_t);
+
+/*
  * User-friendly wrappers for async_share_in_start().
  */

uspace/lib/c/include/str.h

@@ -83 +83 @@
 extern char *wstr_to_astr(const wchar_t *src);
 extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
+extern wchar_t *str_to_awstr(const char *src);
 
 extern char *str_chr(const char *str, wchar_t ch);