Changeset c05642d in mainline for uspace/lib/c

Timestamp:

2011-09-07T00:03: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:

5081276

Parents:

bb74dabe (diff), 038b289 (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/async.c (modified) (1 diff)
• generic/devman.c (modified) (2 diffs)
• generic/io/printf_core.c (modified) (3 diffs)
• generic/str.c (modified) (5 diffs)
• generic/sysinfo.c (modified) (1 diff)
• include/bool.h (modified) (1 diff)
• include/devman.h (modified) (2 diffs)
• include/errno.h (modified) (1 diff)
• include/ipc/bd.h (modified) (1 diff)
• include/ipc/devman.h (modified) (2 diffs)
• include/str.h (modified) (3 diffs)
• include/sysinfo.h (modified) (1 diff)
• include/task.h (modified) (1 diff)
• include/thread.h (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -1777 +1777 @@
 int async_hangup(async_sess_t *sess)
 {
+        async_exch_t *exch;
+        
         assert(sess);
         
         if (atomic_get(&sess->refcnt) > 0)
                 return EBUSY;
+        
+        fibril_mutex_lock(&async_sess_mutex);
         
         int rc = async_hangup_internal(sess->phone);
         if (rc == EOK)
                 free(sess);
+        
+        while (!list_empty(&sess->exch_list)) {
+                exch = (async_exch_t *)
+                    list_get_instance(list_first(&sess->exch_list),
+                    async_exch_t, sess_link);
+                
+                list_remove(&exch->sess_link);
+                list_remove(&exch->global_link);
+                async_hangup_internal(exch->phone);
+                free(exch);
+        }
+        
+        fibril_mutex_unlock(&async_sess_mutex);
         
         return rc;

uspace/lib/c/generic/devman.c

@@ -327 +327 @@
 }
 
+int devman_drv_fun_online(devman_handle_t funh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_DRIVER);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        sysarg_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_ONLINE, funh);
+        
+        devman_exchange_end(exch);
+        return (int) retval;
+}
+
+int devman_drv_fun_offline(devman_handle_t funh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_DRIVER);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        sysarg_t retval = async_req_1_0(exch, DEVMAN_DRV_FUN_OFFLINE, 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)
@@ -430 +454 @@
 }
 
+int devman_fun_online(devman_handle_t funh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        sysarg_t retval = async_req_1_0(exch, DEVMAN_FUN_ONLINE, funh);
+        
+        devman_exchange_end(exch);
+        return (int) retval;
+}
+
+int devman_fun_offline(devman_handle_t funh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        sysarg_t retval = async_req_1_0(exch, DEVMAN_FUN_OFFLINE, funh);
+        
+        devman_exchange_end(exch);
+        return (int) retval;
+}
+
 static int devman_get_handles_once(sysarg_t method, sysarg_t arg1,
     devman_handle_t *handle_buf, size_t buf_size, size_t *act_size)

uspace/lib/c/generic/io/printf_core.c

@@ -73 +73 @@
  */
 #define PRINT_NUMBER_BUFFER_SIZE  (64 + 5)
+
+/** Get signed or unsigned integer argument */
+#define PRINTF_GET_INT_ARGUMENT(type, ap, flags) \
+        ({ \
+                unsigned type res; \
+                \
+                if ((flags) & __PRINTF_FLAG_SIGNED) { \
+                        signed type arg = va_arg((ap), signed type); \
+                        \
+                        if (arg < 0) { \
+                                res = -arg; \
+                                (flags) |= __PRINTF_FLAG_NEGATIVE; \
+                        } else \
+                                res = arg; \
+                } else \
+                        res = va_arg((ap), unsigned type); \
+                \
+                res; \
+        })
 
 /** Enumeration of possible arguments types.
@@ -831 +850 @@
                         size_t size;
                         uint64_t number;
+                        
                         switch (qualifier) {
                         case PrintfQualifierByte:
                                 size = sizeof(unsigned char);
-                                number = (uint64_t) va_arg(ap, unsigned int);
+                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
                                 break;
                         case PrintfQualifierShort:
                                 size = sizeof(unsigned short);
-                                number = (uint64_t) va_arg(ap, unsigned int);
+                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
                                 break;
                         case PrintfQualifierInt:
                                 size = sizeof(unsigned int);
-                                number = (uint64_t) va_arg(ap, unsigned int);
+                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
                                 break;
                         case PrintfQualifierLong:
                                 size = sizeof(unsigned long);
-                                number = (uint64_t) va_arg(ap, unsigned long);
+                                number = PRINTF_GET_INT_ARGUMENT(long, ap, flags);
                                 break;
                         case PrintfQualifierLongLong:
                                 size = sizeof(unsigned long long);
-                                number = (uint64_t) va_arg(ap, unsigned long long);
+                                number = PRINTF_GET_INT_ARGUMENT(long long, ap, flags);
                                 break;
                         case PrintfQualifierPointer:
@@ -865 +885 @@
                                 counter = -counter;
                                 goto out;
-                        }
-                        
-                        if (flags & __PRINTF_FLAG_SIGNED) {
-                                if (number & (0x1 << (size * 8 - 1))) {
-                                        flags |= __PRINTF_FLAG_NEGATIVE;
-                                        
-                                        if (size == sizeof(uint64_t)) {
-                                                number = -((int64_t) number);
-                                        } else {
-                                                number = ~number;
-                                                number &=
-                                                    ~(0xFFFFFFFFFFFFFFFFll <<
-                                                    (size * 8));
-                                                number++;
-                                        }
-                                }
                         }
                         

uspace/lib/c/generic/str.c

@@ -3 +3 @@
  * Copyright (c) 2008 Jiri Svoboda
  * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -550 +551 @@
  *
  * Common legacy text encoding in hardware is 7-bit ASCII fitted into
- * a fixed-with byte buffer (bit 7 always zero), right-padded with spaces
+ * a fixed-width byte buffer (bit 7 always zero), right-padded with spaces
  * (ASCII 0x20). Convert space-padded ascii to string representation.
  *
@@ -639 +640 @@
         dest[dest_off] = '\0';
 }
+
+/** Convert UTF16 string to string.
+ *
+ * Convert utf16 string @a src to string. The output is written to the buffer
+ * specified by @a dest and @a size. @a size must be non-zero and the string
+ * written will always be well-formed. Surrogate pairs also supported.
+ *
+ * @param dest  Destination buffer.
+ * @param size  Size of the destination buffer.
+ * @param src   Source utf16 string.
+ *
+ * @return EOK, if success, negative otherwise.
+ */
+int utf16_to_str(char *dest, size_t size, const uint16_t *src)
+{
+        size_t idx = 0, dest_off = 0;
+        wchar_t ch;
+        int rc = EOK;
+
+        /* There must be space for a null terminator in the buffer. */
+        assert(size > 0);
+
+        while (src[idx]) {
+                if ((src[idx] & 0xfc00) == 0xd800) {
+                        if (src[idx + 1] && (src[idx + 1] & 0xfc00) == 0xdc00) {
+                                ch = 0x10000;
+                                ch += (src[idx] & 0x03FF) << 10;
+                                ch += (src[idx + 1] & 0x03FF);
+                                idx += 2;
+                        }
+                        else
+                                break;
+                } else {
+                        ch = src[idx];
+                        idx++;
+                }
+                rc = chr_encode(ch, dest, &dest_off, size - 1);
+                if (rc != EOK)
+                        break;
+        }
+        dest[dest_off] = '\0';
+        return rc;
+}
+
+int str_to_utf16(uint16_t *dest, size_t size, const char *src)
+{
+        int rc = EOK;
+        size_t offset = 0;
+        size_t idx = 0;
+        wchar_t c;
+
+        assert(size > 0);
+        
+        while ((c = str_decode(src, &offset, STR_NO_LIMIT)) != 0) {
+                if (c > 0x10000) {
+                        if (idx + 2 >= size - 1) {
+                                rc = EOVERFLOW;
+                                break;
+                        }
+                        c = (c - 0x10000);
+                        dest[idx] = 0xD800 | (c >> 10);
+                        dest[idx + 1] = 0xDC00 | (c & 0x3FF);
+                        idx++;
+                } else {
+                         dest[idx] = c;
+                }
+
+                idx++;
+                if (idx >= size - 1) {
+                        rc = EOVERFLOW;
+                        break;
+                }
+        }
+
+        dest[idx] = '\0';
+        return rc;
+}
+
 
 /** Convert wide string to new string.
@@ -1036 +1115 @@
         return dest;
 }
-
 
 /** Convert initial part of string to unsigned long according to given base.
@@ -1213 +1291 @@
 }
 
+/** Convert string to uint8_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+int str_uint8_t(const char *nptr, char **endptr, unsigned int base,
+    bool strict, uint8_t *result)
+{
+        assert(result != NULL);
+        
+        bool neg;
+        char *lendptr;
+        uint64_t res;
+        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        
+        if (endptr != NULL)
+                *endptr = (char *) lendptr;
+        
+        if (ret != EOK)
+                return ret;
+        
+        /* Do not allow negative values */
+        if (neg)
+                return EINVAL;
+        
+        /* Check whether we are at the end of
+           the string in strict mode */
+        if ((strict) && (*lendptr != 0))
+                return EINVAL;
+        
+        /* Check for overflow */
+        uint8_t _res = (uint8_t) res;
+        if (_res != res)
+                return EOVERFLOW;
+        
+        *result = _res;
+        
+        return EOK;
+}
+
+/** Convert string to uint16_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+int str_uint16_t(const char *nptr, char **endptr, unsigned int base,
+    bool strict, uint16_t *result)
+{
+        assert(result != NULL);
+        
+        bool neg;
+        char *lendptr;
+        uint64_t res;
+        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        
+        if (endptr != NULL)
+                *endptr = (char *) lendptr;
+        
+        if (ret != EOK)
+                return ret;
+        
+        /* Do not allow negative values */
+        if (neg)
+                return EINVAL;
+        
+        /* Check whether we are at the end of
+           the string in strict mode */
+        if ((strict) && (*lendptr != 0))
+                return EINVAL;
+        
+        /* Check for overflow */
+        uint16_t _res = (uint16_t) res;
+        if (_res != res)
+                return EOVERFLOW;
+        
+        *result = _res;
+        
+        return EOK;
+}
+
+/** Convert string to uint32_t.
+ *
+ * @param nptr   Pointer to string.
+ * @param endptr If not NULL, pointer to the first invalid character
+ *               is stored here.
+ * @param base   Zero or number between 2 and 36 inclusive.
+ * @param strict Do not allow any trailing characters.
+ * @param result Result of the conversion.
+ *
+ * @return EOK if conversion was successful.
+ *
+ */
+int str_uint32_t(const char *nptr, char **endptr, unsigned int base,
+    bool strict, uint32_t *result)
+{
+        assert(result != NULL);
+        
+        bool neg;
+        char *lendptr;
+        uint64_t res;
+        int ret = str_uint(nptr, &lendptr, base, &neg, &res);
+        
+        if (endptr != NULL)
+                *endptr = (char *) lendptr;
+        
+        if (ret != EOK)
+                return ret;
+        
+        /* Do not allow negative values */
+        if (neg)
+                return EINVAL;
+        
+        /* Check whether we are at the end of
+           the string in strict mode */
+        if ((strict) && (*lendptr != 0))
+                return EINVAL;
+        
+        /* Check for overflow */
+        uint32_t _res = (uint32_t) res;
+        if (_res != res)
+                return EOVERFLOW;
+        
+        *result = _res;
+        
+        return EOK;
+}
+
 /** Convert string to uint64_t.
  *

uspace/lib/c/generic/sysinfo.c

@@ -47 +47 @@
  *
  */
-sysinfo_item_tag_t sysinfo_get_tag(const char *path)
+sysinfo_item_val_type_t sysinfo_get_val_type(const char *path)
 {
-        return (sysinfo_item_tag_t) __SYSCALL2(SYS_SYSINFO_GET_TAG,
+        return (sysinfo_item_val_type_t) __SYSCALL2(SYS_SYSINFO_GET_VAL_TYPE,
             (sysarg_t) path, (sysarg_t) str_size(path));
 }

uspace/lib/c/include/bool.h

@@ -37 +37 @@
 
 #include <libarch/types.h>
+#include <abi/bool.h>
 
 #define false  0
 #define true   1
-
-typedef uint8_t bool;
 
 #endif

uspace/lib/c/include/devman.h

@@ -50 +50 @@
     devman_handle_t, devman_handle_t *);
 extern int devman_remove_function(devman_handle_t);
+extern int devman_drv_fun_online(devman_handle_t);
+extern int devman_drv_fun_offline(devman_handle_t);
 
 extern async_sess_t *devman_device_connect(exch_mgmt_t, devman_handle_t,
@@ -63 +65 @@
 extern int devman_fun_get_name(devman_handle_t, char *, size_t);
 extern int devman_fun_get_path(devman_handle_t, char *, size_t);
+extern int devman_fun_online(devman_handle_t);
+extern int devman_fun_offline(devman_handle_t);
 
 extern int devman_add_device_to_category(devman_handle_t, const char *);

uspace/lib/c/include/errno.h

@@ -55 +55 @@
 #define EIO           (-265)
 #define EMLINK        (-266)
+#define ENXIO         (-267)
 
 /** Bad checksum. */

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

@@ -42 +42 @@
         BD_GET_NUM_BLOCKS,
         BD_READ_BLOCKS,
-        BD_WRITE_BLOCKS
+        BD_WRITE_BLOCKS,
+        BD_READ_TOC
 } bd_request_t;
 

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

@@ -139 +139 @@
         DEVMAN_ADD_MATCH_ID,
         DEVMAN_ADD_DEVICE_TO_CATEGORY,
+        DEVMAN_DRV_FUN_ONLINE,
+        DEVMAN_DRV_FUN_OFFLINE,
         DEVMAN_REMOVE_FUNCTION
 } driver_to_devman_t;
 
 typedef enum {
-        DRIVER_ADD_DEVICE = IPC_FIRST_USER_METHOD
-
+        DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD,
+        DRIVER_DEV_REMOVE,
+        DRIVER_DEV_GONE,
+        DRIVER_FUN_ONLINE,
+        DRIVER_FUN_OFFLINE,
 } devman_to_driver_t;
 
@@ -152 +157 @@
         DEVMAN_FUN_GET_CHILD,
         DEVMAN_FUN_GET_NAME,
+        DEVMAN_FUN_ONLINE,
+        DEVMAN_FUN_OFFLINE,
         DEVMAN_FUN_GET_PATH,
         DEVMAN_FUN_SID_TO_HANDLE

uspace/lib/c/include/str.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -84 +85 @@
 extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
 extern wchar_t *str_to_awstr(const char *src);
+extern int utf16_to_str(char *dest, size_t size, const uint16_t *src);
+extern int str_to_utf16(uint16_t *dest, size_t size, const char *src);
 
 extern char *str_chr(const char *str, wchar_t ch);
@@ -94 +97 @@
 extern char *str_ndup(const char *, size_t max_size);
 
+extern int str_uint8_t(const char *, char **, unsigned int, bool, uint8_t *);
+extern int str_uint16_t(const char *, char **, unsigned int, bool, uint16_t *);
+extern int str_uint32_t(const char *, char **, unsigned int, bool, uint32_t *);
 extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);
 extern int str_size_t(const char *, char **, unsigned int, bool, size_t *);

uspace/lib/c/include/sysinfo.h

@@ -36 +36 @@
 #define LIBC_SYSINFO_H_
 
-#include <libc.h>
+#include <sys/types.h>
+#include <bool.h>
+#include <abi/sysinfo.h>
 
-/** Sysinfo value types
- *
- */
-typedef enum {
-        SYSINFO_VAL_UNDEFINED = 0,
-        SYSINFO_VAL_VAL = 1,
-        SYSINFO_VAL_DATA = 2
-} sysinfo_item_tag_t;
-
-extern sysinfo_item_tag_t sysinfo_get_tag(const char *);
+extern sysinfo_item_val_type_t sysinfo_get_val_type(const char *);
 extern int sysinfo_get_value(const char *, sysarg_t *);
 extern void *sysinfo_get_data(const char *, size_t *);

uspace/lib/c/include/task.h

@@ -37 +37 @@
 
 #include <sys/types.h>
-
-typedef uint64_t task_id_t;
+#include <abi/proc/task.h>
 
 typedef enum {

uspace/lib/c/include/thread.h

@@ -38 +38 @@
 #include <libarch/thread.h>
 #include <sys/types.h>
-
-typedef uint64_t thread_id_t;
+#include <abi/proc/thread.h>
 
 extern int thread_create(void (*)(void *), void *, const char *, thread_id_t *);