Changeset 03362fbd in mainline for uspace/lib/c/Makefile

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/lib/c/Makefile (modified) (6 diffs)

uspace/lib/c/Makefile

@@ -62 +62 @@
         generic/ddi.c \
         generic/as.c \
+        generic/bd.c \
+        generic/bd_srv.c \
         generic/cap.c \
         generic/cfg.c \
@@ -69 +71 @@
         generic/device/hw_res_parsed.c \
         generic/device/char_dev.c \
+        generic/device/clock_dev.c \
+        generic/device/battery_dev.c \
+        generic/device/graph_dev.c \
         generic/device/nic.c \
         generic/device/pci.c \
         generic/device/ahci.c \
+        generic/dlfcn.c \
         generic/elf/elf_load.c \
         generic/event.c \
@@ -92 +98 @@
         generic/inetping.c \
         generic/io/asprintf.c \
+        generic/io/input.c \
         generic/io/io.c \
+        generic/io/chargrid.c \
+        generic/io/output.c \
         generic/io/printf.c \
         generic/io/log.c \
+        generic/io/logctl.c \
         generic/io/klog.c \
         generic/io/snprintf.c \
@@ -100 +110 @@
         generic/io/vsnprintf.c \
         generic/io/printf_core.c \
+        generic/io/con_srv.c \
         generic/io/console.c \
+        generic/io/visualizer.c \
+        generic/io/window.c \
         generic/iplink.c \
         generic/iplink_srv.c \
+        generic/ieee_double.c \
+        generic/power_of_ten.c \
+        generic/double_to_str.c \
         generic/malloc.c \
         generic/sysinfo.c \
@@ -112 +128 @@
         generic/adt/list.c \
         generic/adt/hash_table.c \
-        generic/adt/hash_set.c \
         generic/adt/dynamic_fifo.c \
         generic/adt/char_map.c \
@@ -125 +140 @@
         generic/net/socket_client.c \
         generic/net/socket_parse.c \
+        generic/stack.c \
         generic/stacktrace.c \
         generic/arg_parse.c \
         generic/sort.c \
         generic/stats.c \
-        generic/assert.c
+        generic/assert.c \
+        generic/pio_trace.c
 
 ifeq ($(CONFIG_RTLD),y)
         GENERIC_SOURCES += \
-                generic/dlfcn.c \
                 generic/rtld/rtld.c \
                 generic/rtld/dynamic.c \