Changes in / [9ed3e1a:9f9450b] in mainline

Files:

• kernel/arch/arm32/include/arch/mm/page_armv4.h (modified) (1 diff)
• kernel/arch/arm32/include/arch/mm/page_armv6.h (modified) (1 diff)
• uspace/lib/c/generic/rtld/module.c (modified) (4 diffs)
• uspace/lib/c/generic/vfs/vfs.c (modified) (1 diff)
• uspace/lib/c/include/stdio.h (modified) (1 diff)
• uspace/lib/gui/window.c (modified) (1 diff)
• uspace/lib/gui/window.h (modified) (1 diff)
• uspace/srv/fs/ext4fs/Makefile (modified) (1 diff)
• uspace/srv/fs/locfs/Makefile (modified) (1 diff)

kernel/arch/arm32/include/arch/mm/page_armv4.h

@@ -48 +48 @@
         (((pte_t *) (pte))->l0.descriptor_type != 0)
 #define PTE_GET_FRAME_ARCH(pte) \
-        (((uintptr_t) ((pte_t *) (pte))->l1.frame_base_addr) << FRAME_WIDTH)
+        (((pte_t *) (pte))->l1.frame_base_addr << FRAME_WIDTH)
 #define PTE_WRITABLE_ARCH(pte) \
         (((pte_t *) (pte))->l1.access_permission_0 == PTE_AP_USER_RW_KERNEL_RW)

kernel/arch/arm32/include/arch/mm/page_armv6.h

@@ -48 +48 @@
         (((pte_t *) (pte))->l0.descriptor_type != 0)
 #define PTE_GET_FRAME_ARCH(pte) \
-        (((uintptr_t) ((pte_t *) (pte))->l1.frame_base_addr) << FRAME_WIDTH)
+        (((pte_t *) (pte))->l1.frame_base_addr << FRAME_WIDTH)
 #define PTE_WRITABLE_ARCH(pte) \
         (((pte_t *) (pte))->l1.access_permission_1 != PTE_AP1_RO)

uspace/lib/c/generic/rtld/module.c

@@ -93 +93 @@
 module_t *module_find(const char *name)
 {
+        module_t *m;
         const char *p, *soname;
 
@@ -106 +107 @@
 
         /* Traverse list of all modules. Not extremely fast, but simple */
-        list_foreach(runtime_env->modules, modules_link, module_t, m) {
-                DPRINTF("m = %p\n", m);
+        list_foreach(runtime_env->modules, cur) {
+                DPRINTF("cur = %p\n", cur);
+                m = list_get_instance(cur, module_t, modules_link);
                 if (str_cmp(m->dyn.soname, soname) == 0) {
                         return m; /* Found */
@@ -243 +245 @@
 void modules_process_relocs(module_t *start)
 {
-        list_foreach(runtime_env->modules, modules_link, module_t, m) {
+        module_t *m;
+
+        list_foreach(runtime_env->modules, cur) {
+                m = list_get_instance(cur, module_t, modules_link);
+
                 /* Skip rtld, since it has already been processed */
                 if (m != &runtime_env->rtld) {
@@ -255 +261 @@
 void modules_untag(void)
 {
-        list_foreach(runtime_env->modules, modules_link, module_t, m) {
+        module_t *m;
+
+        list_foreach(runtime_env->modules, cur) {
+                m = list_get_instance(cur, module_t, modules_link);
                 m->bfs_tag = false;
         }

uspace/lib/c/generic/vfs/vfs.c

@@ -742 +742 @@
 }
 
-int remove(const char *path)
-{
-        return unlink(path);
-}
-
 int chdir(const char *path)
 {

uspace/lib/c/include/stdio.h

@@ -151 +151 @@
 /* Misc file functions */
 extern int rename(const char *, const char *);
-extern int remove(const char *);
 
 #endif

uspace/lib/gui/window.c

@@ -529 +529 @@
 }
 
-window_t *window_open(const char *winreg, bool is_main, bool is_decorated,
+window_t *window_open(char *winreg, bool is_main, bool is_decorated, 
     const char *caption, sysarg_t x_offset, sysarg_t y_offset)
 {

uspace/lib/gui/window.h

@@ -66 +66 @@
  * If the window is declared as main, its closure causes termination of the
  * whole application. Note that opened window does not have any surface yet. */
-extern window_t *window_open(const char *, bool, bool, const char *, sysarg_t,
-    sysarg_t);
+extern window_t *window_open(char *, bool, bool, const char *, sysarg_t, sysarg_t);
 
 /**

uspace/srv/fs/ext4fs/Makefile

@@ -31 +31 @@
 EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT4_PREFIX)
 BINARY = ext4fs
-STATIC_NEEDED = y
 
 SOURCES = \

uspace/srv/fs/locfs/Makefile

@@ -32 +32 @@
 EXTRA_CFLAGS += -I$(LIBFS_PREFIX)
 BINARY = locfs
+STATIC_NEEDED = y
 
 SOURCES = \