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 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/amd64/include/libarch/fibril.h

    r3eb0c85 r8e7c9fe  
    3636#define LIBC_amd64_FIBRIL_H_
    3737
    38 #include <sys/types.h>
     38#include <libarch/fibril_context.h>
    3939
    4040/*
     
    5353        } while (0)
    5454
    55 /* We include only registers that must be preserved
    56  * during function call
    57  */
    58 typedef struct {
    59         uint64_t sp;
    60         uint64_t pc;
    61 
    62         uint64_t rbx;
    63         uint64_t rbp;
    64 
    65         uint64_t r12;
    66         uint64_t r13;
    67         uint64_t r14;
    68         uint64_t r15;
    69 
    70         uint64_t tls;
    71 } context_t;
    72 
    7355static inline uintptr_t context_get_fp(context_t *ctx)
    7456{
Note: See TracChangeset for help on using the changeset viewer.