Changeset 72d120e in mainline for uspace/lib/c

Timestamp:

2014-06-16T20:17:44Z (12 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

5a78e4e

Parents:

9d653e3 (diff), 334bf28 (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:

Integrate from mainline.

Location:

uspace/lib/c

Files:

• Makefile (modified) (1 diff)
• arch/ia64/Makefile.common (modified) (1 diff)
• arch/sparc64/_link.ld.in (modified) (2 diffs)
• generic/ddi.c (modified) (4 diffs)
• generic/device/clock_dev.c (modified) (1 diff)
• generic/device/led_dev.c (added)
• generic/time.c (modified) (1 diff)
• include/device/led_dev.h (added)
• include/ipc/dev_iface.h (modified) (1 diff)

uspace/lib/c/Makefile

@@ -65 +65 @@
         generic/device/pio_window.c \
         generic/device/clock_dev.c \
+        generic/device/led_dev.c \
         generic/dhcp.c \
         generic/dnsr.c \

uspace/lib/c/arch/ia64/Makefile.common

@@ -27 +27 @@
 #
 
-#
-# FIXME:
-#
-# The -fno-selective-scheduling and -fno-selective-scheduling2 options
-# should be removed as soon as a bug in GCC concerning unchecked
-# speculative loads is fixed.
-#
-# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53975 for reference.
-#
-
-GCC_CFLAGS += -fno-unwind-tables -fno-selective-scheduling -fno-selective-scheduling2
+GCC_CFLAGS += -fno-unwind-tables
 
 ENDIANESS = LE

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

@@ -10 +10 @@
 #endif
         data PT_LOAD FLAGS(6);
+        debug PT_NOTE;
 }
 
@@ -63 +64 @@
         } :data
         
+#ifdef CONFIG_LINE_DEBUG
+        .comment 0 : { *(.comment); } :debug
+        .debug_abbrev 0 : { *(.debug_abbrev); } :debug
+        .debug_aranges 0 : { *(.debug_aranges); } :debug
+        .debug_info 0 : { *(.debug_info); } :debug
+        .debug_line 0 : { *(.debug_line); } :debug
+        .debug_loc 0 : { *(.debug_loc); } :debug
+        .debug_pubnames 0 : { *(.debug_pubnames); } :debug
+        .debug_pubtypes 0 : { *(.debug_pubtypes); } :debug
+        .debug_ranges 0 : { *(.debug_ranges); } :debug
+        .debug_str 0 : { *(.debug_str); } :debug
+#endif
+        
         /DISCARD/ : {
                 *(*);

uspace/lib/c/generic/ddi.c

@@ -71 +71 @@
  * @param flags Flags for the new address space area.
  * @param virt  Virtual address of the starting page.
- *
- * @return EOK on success
- * @return EPERM if the caller lacks the CAP_MEM_MANAGER capability
- * @return ENOENT if there is no task with specified ID
+ *              If set to AS_AREA_ANY ((void *) -1), a suitable value
+ *              is found by the kernel, otherwise the kernel tries to
+ *              obey the desired value.
+ *
+ * @return EOK on success.
+ * @return EPERM if the caller lacks the CAP_MEM_MANAGER capability.
  * @return ENOMEM if there was some problem in creating
  *         the address space area.
@@ -85 +87 @@
 }
 
+/** Lock a piece physical memory for DMA transfers.
+ *
+ * The mapping of the specified virtual memory address
+ * to physical memory address is locked in order to
+ * make it safe for DMA transferts.
+ *
+ * Caller of this function must have the CAP_MEM_MANAGER capability.
+ *
+ * @param virt      Virtual address of the memory to be locked.
+ * @param size      Number of bytes to lock.
+ * @param map_flags Desired virtual memory area flags.
+ * @param flags     Flags for the physical memory address.
+ * @param phys      Locked physical memory address.
+ *
+ * @return EOK on success.
+ * @return EPERM if the caller lacks the CAP_MEM_MANAGER capability.
+ * @return ENOMEM if there was some problem in creating
+ *         the address space area.
+ *
+ */
 int dmamem_map(void *virt, size_t size, unsigned int map_flags,
     unsigned int flags, uintptr_t *phys)
@@ -93 +115 @@
 }
 
+/** Map a piece of physical memory suitable for DMA transfers.
+ *
+ * Caller of this function must have the CAP_MEM_MANAGER capability.
+ *
+ * @param size       Number of bytes to map.
+ * @param constraint Bit mask defining the contraint on the physical
+ *                   address to be mapped.
+ * @param map_flags  Desired virtual memory area flags.
+ * @param flags      Flags for the physical memory address.
+ * @param virt       Virtual address of the starting page.
+ *                   If set to AS_AREA_ANY ((void *) -1), a suitable value
+ *                   is found by the kernel, otherwise the kernel tries to
+ *                   obey the desired value.
+ *
+ * @return EOK on success.
+ * @return EPERM if the caller lacks the CAP_MEM_MANAGER capability.
+ * @return ENOMEM if there was some problem in creating
+ *         the address space area.
+ *
+ */
 int dmamem_map_anonymous(size_t size, uintptr_t constraint,
     unsigned int map_flags, unsigned int flags, uintptr_t *phys, void **virt)
@@ -221 +263 @@
         size_t pages = SIZE2PAGES(offset + size);
         
-        void *virt_page;
+        void *virt_page = AS_AREA_ANY;
         int rc = physmem_map(phys_frame, pages,
             AS_AREA_READ | AS_AREA_WRITE, &virt_page);

uspace/lib/c/generic/device/clock_dev.c

@@ -27 +27 @@
  */
 
- /** @addtogroup libc
+/** @addtogroup libc
  * @{
  */

uspace/lib/c/generic/time.c

@@ -555 +555 @@
                 }
                 
-                void *addr;
+                void *addr = AS_AREA_ANY;
                 rc = physmem_map(faddr, 1, AS_AREA_READ | AS_AREA_CACHEABLE,
                     &addr);

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

@@ -65 +65 @@
         CLOCK_DEV_IFACE,
 
+        /** Interface provided by LED devices */
+        LED_DEV_IFACE,
+
         /** Interface provided by battery powered devices */
         BATTERY_DEV_IFACE,