Changeset 9ed3e1a in mainline


Ignore:
Timestamp:
2013-11-12T08:37:39Z (10 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a070eff
Parents:
9f9450b (diff), 34cb6c8 (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

Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r9f9450b r9ed3e1a  
    4848        (((pte_t *) (pte))->l0.descriptor_type != 0)
    4949#define PTE_GET_FRAME_ARCH(pte) \
    50         (((pte_t *) (pte))->l1.frame_base_addr << FRAME_WIDTH)
     50        (((uintptr_t) ((pte_t *) (pte))->l1.frame_base_addr) << FRAME_WIDTH)
    5151#define PTE_WRITABLE_ARCH(pte) \
    5252        (((pte_t *) (pte))->l1.access_permission_0 == PTE_AP_USER_RW_KERNEL_RW)

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

    r9f9450b r9ed3e1a  
    4848        (((pte_t *) (pte))->l0.descriptor_type != 0)
    4949#define PTE_GET_FRAME_ARCH(pte) \
    50         (((pte_t *) (pte))->l1.frame_base_addr << FRAME_WIDTH)
     50        (((uintptr_t) ((pte_t *) (pte))->l1.frame_base_addr) << FRAME_WIDTH)
    5151#define PTE_WRITABLE_ARCH(pte) \
    5252        (((pte_t *) (pte))->l1.access_permission_1 != PTE_AP1_RO)

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

    r9f9450b r9ed3e1a  
    9393module_t *module_find(const char *name)
    9494{
    95         module_t *m;
    9695        const char *p, *soname;
    9796
    … …  
    107106
    108107        /* Traverse list of all modules. Not extremely fast, but simple */
    109         list_foreach(runtime_env->modules, cur) {
    110                 DPRINTF("cur = %p\n", cur);
    111                 m = list_get_instance(cur, module_t, modules_link);
     108        list_foreach(runtime_env->modules, modules_link, module_t, m) {
     109                DPRINTF("m = %p\n", m);
    112110                if (str_cmp(m->dyn.soname, soname) == 0) {
    113111                        return m; /* Found */
    … …  
    245243void modules_process_relocs(module_t *start)
    246244{
    247         module_t *m;
    248 
    249         list_foreach(runtime_env->modules, cur) {
    250                 m = list_get_instance(cur, module_t, modules_link);
    251 
     245        list_foreach(runtime_env->modules, modules_link, module_t, m) {
    252246                /* Skip rtld, since it has already been processed */
    253247                if (m != &runtime_env->rtld) {
    … …  
    261255void modules_untag(void)
    262256{
    263         module_t *m;
    264 
    265         list_foreach(runtime_env->modules, cur) {
    266                 m = list_get_instance(cur, module_t, modules_link);
     257        list_foreach(runtime_env->modules, modules_link, module_t, m) {
    267258                m->bfs_tag = false;
    268259        }

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

    r9f9450b r9ed3e1a  
    742742}
    743743
     744int remove(const char *path)
     745{
     746        return unlink(path);
     747}
     748
    744749int chdir(const char *path)
    745750{

  • uspace/lib/c/include/stdio.h

    r9f9450b r9ed3e1a  
    151151/* Misc file functions */
    152152extern int rename(const char *, const char *);
     153extern int remove(const char *);
    153154
    154155#endif

  • uspace/lib/gui/window.c

    r9f9450b r9ed3e1a  
    529529}
    530530
    531 window_t *window_open(char *winreg, bool is_main, bool is_decorated,
     531window_t *window_open(const char *winreg, bool is_main, bool is_decorated,
    532532    const char *caption, sysarg_t x_offset, sysarg_t y_offset)
    533533{

  • uspace/lib/gui/window.h

    r9f9450b r9ed3e1a  
    6666 * If the window is declared as main, its closure causes termination of the
    6767 * whole application. Note that opened window does not have any surface yet. */
    68 extern window_t *window_open(char *, bool, bool, const char *, sysarg_t, sysarg_t);
     68extern window_t *window_open(const char *, bool, bool, const char *, sysarg_t,
     69    sysarg_t);
    6970
    7071/**

  • uspace/srv/fs/ext4fs/Makefile

    r9f9450b r9ed3e1a  
    3131EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX) -I$(LIBEXT4_PREFIX)
    3232BINARY = ext4fs
     33STATIC_NEEDED = y
    3334
    3435SOURCES = \

  • uspace/srv/fs/locfs/Makefile

    r9f9450b r9ed3e1a  
    3232EXTRA_CFLAGS += -I$(LIBFS_PREFIX)
    3333BINARY = locfs
    34 STATIC_NEEDED = y
    3534
    3635SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.