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/ia32/include/libarch/fibril.h

    r3eb0c85 r8e7c9fe  
    3737
    3838#include <sys/types.h>
     39#include <libarch/fibril_context.h>
    3940
    4041/*
     
    5354        } while (0)
    5455
    55 /*
    56  * We include only registers that must be preserved
    57  * during function call
    58  */
    59 typedef struct {
    60         uint32_t sp;
    61         uint32_t pc;
    62        
    63         uint32_t ebx;
    64         uint32_t esi;
    65         uint32_t edi;
    66         uint32_t ebp;
    67        
    68         uint32_t tls;
    69 } context_t;
    70 
    7156static inline uintptr_t context_get_fp(context_t *ctx)
    7257{
Note: See TracChangeset for help on using the changeset viewer.