Changeset f3e2663 in mainline for uspace/lib/c

Timestamp:

2011-04-03T11:17:45Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

106743d

Parents:

10eb754 (diff), b2a081ae (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:

• Makefile (modified) (1 diff)
• arch/abs32le/_link.ld.in (modified) (1 diff)
• arch/amd64/_link.ld.in (modified) (1 diff)
• arch/arm32/_link.ld.in (modified) (1 diff)
• arch/ia32/_link.ld.in (modified) (1 diff)
• arch/ia64/_link.ld.in (modified) (2 diffs)
• arch/mips32/_link.ld.in (modified) (1 diff)
• arch/ppc32/_link.ld.in (modified) (1 diff)
• arch/sparc64/_link.ld.in (modified) (1 diff)
• generic/adt/measured_strings.c (modified) (1 diff)
• generic/devman.c (modified) (3 diffs)
• generic/io/log.c (added)
• generic/vfs/vfs.c (modified) (1 diff)
• include/devman.h (modified) (1 diff)
• include/io/log.h (moved) (moved from kernel/arch/amd64/include/memstr.h ) (2 diffs)
• include/ipc/devman.h (modified) (1 diff)

uspace/lib/c/Makefile

@@ -76 +76 @@
         generic/io/io.c \
         generic/io/printf.c \
+        generic/io/log.c \
         generic/io/klog.c \
         generic/io/snprintf.c \

uspace/lib/c/arch/abs32le/_link.ld.in

@@ -11 +11 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/lib/c/arch/amd64/_link.ld.in

@@ -16 +16 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/lib/c/arch/arm32/_link.ld.in

@@ -15 +15 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/lib/c/arch/ia32/_link.ld.in

@@ -16 +16 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/lib/c/arch/ia64/_link.ld.in

@@ -15 +15 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         
@@ -23 +23 @@
         .got : {
                 _gp = .;
-                *(.got*);
+                *(.got .got.*);
         } :data
         

uspace/lib/c/arch/mips32/_link.ld.in

@@ -15 +15 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/lib/c/arch/ppc32/_link.ld.in

@@ -15 +15 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/lib/c/arch/sparc64/_link.ld.in

@@ -15 +15 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

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/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/vfs/vfs.c

@@ -756 +756 @@
 {
         struct stat stat;
-        int rc;
-
-        rc = fstat(fildes, &stat);
-
+        
+        int rc = fstat(fildes, &stat);
+        if (rc != 0)
+                return rc;
+        
         if (!stat.device)
                 return -1;

uspace/lib/c/include/devman.h

@@ -53 +53 @@
 extern int devman_device_get_handle(const char *, devman_handle_t *,
     unsigned int);
+extern int devman_device_get_handle_by_class(const char *, const char *,
+    devman_handle_t *, unsigned int);
 
 extern int devman_add_device_to_class(devman_handle_t, const char *);

uspace/lib/c/include/io/log.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Sergey Bondari
+ * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup amd64
+/** @addtogroup libc
  * @{
  */
-/** @file
- */
 
-#ifndef KERN_amd64_MEMSTR_H_
-#define KERN_amd64_MEMSTR_H_
+#ifndef LIBC_IO_LOG_H_
+#define LIBC_IO_LOG_H_
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+#include <stdarg.h>
 
-extern void memsetw(void *, size_t, uint16_t);
-extern void memsetb(void *, size_t, uint8_t);
+typedef enum {
+        LVL_FATAL,
+        LVL_ERROR,
+        LVL_WARN,
+        LVL_NOTE,
+        LVL_DEBUG,
+        LVL_DEBUG2,
+
+        /** For checking range of values */
+        LVL_LIMIT
+} log_level_t;
+
+extern int log_init(const char *, log_level_t);
+extern void log_msg(log_level_t, const char *, ...);
+extern void log_msgv(log_level_t, const char *, va_list);
 
 #endif

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

@@ -148 +148 @@
 
 typedef enum {
-        DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD
+        DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
+        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS
 } client_to_devman_t;