Changeset 26e7d6d in mainline for kernel/arch/mips64/src/mm/page.c


Ignore:
Timestamp:
2011-09-19T16:31:00Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a347a11
Parents:
3842a955 (diff), 086290d (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

File:
1 moved

Legend:

Unmodified
Added
Removed
  • kernel/arch/mips64/src/mm/page.c

    r3842a955 r26e7d6d  
    11/*
    2  * Copyright (c) 2011 Martin Decky
     2 * Copyright (c) 2003-2004 Jakub Jermar
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup libc
     29/** @addtogroup mips64mm
    3030 * @{
    3131 */
     
    3333 */
    3434
    35 #include <async.h>
    36 #include <async_obsolete.h>
    37 #include <ns_obsolete.h>
    38 #include <kernel/ipc/ipc_methods.h>
     35#include <arch/mm/page.h>
     36#include <genarch/mm/page_ht.h>
     37#include <mm/page.h>
     38#include <mm/frame.h>
    3939
    40 int service_obsolete_connect(sysarg_t service, sysarg_t arg2, sysarg_t arg3)
     40void page_arch_init(void)
    4141{
    42         return async_obsolete_connect_me_to(PHONE_NS, service, arg2, arg3);
     42        page_mapping_operations = &ht_mapping_operations;
    4343}
    4444
    45 int service_obsolete_connect_blocking(sysarg_t service, sysarg_t arg2, sysarg_t arg3)
     45/** Map device into kernel space
     46 * - on mips, all devices are already mapped into kernel space,
     47 *   translate the physical address to uncached area
     48 */
     49uintptr_t hw_map(uintptr_t physaddr, size_t size)
    4650{
    47         return async_obsolete_connect_me_to_blocking(PHONE_NS, service, arg2, arg3);
     51        return physaddr + 0xffffffffa0000000;
    4852}
    4953
Note: See TracChangeset for help on using the changeset viewer.