Ignore:
Timestamp:
2014-09-12T03:45:25Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c53b58e
Parents:
3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/app/taskdump/include/taskdump.h

    r3eb0c85 r8e7c9fe  
    11/*
    2  * Copyright (c) 2005 Martin Decky
     2 * Copyright (c) 2014 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup libc
     29/** @addtogroup edit
    3030 * @{
    3131 */
     
    3434 */
    3535
    36 #ifndef LIBC_mips64_SYSCALL_H_
    37 #define LIBC_mips64_SYSCALL_H_
     36#ifndef TASKDUMP_H
     37#define TASKDUMP_H
    3838
    39 #define LIBARCH_SYSCALL_GENERIC
     39#include <stdint.h>
    4040
    41 #include <syscall.h>
     41extern int td_stacktrace(uintptr_t, uintptr_t);
    4242
    4343#endif
Note: See TracChangeset for help on using the changeset viewer.