Ignore:
Timestamp:
2014-09-12T03:45:25Z (10 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/ppc32/include/libarch/fibril.h

    r3eb0c85 r8e7c9fe  
    3737
    3838#include <sys/types.h>
     39#include <libarch/fibril_context.h>
    3940
    4041#define SP_DELTA  16
     
    5354        } while (0)
    5455
    55 typedef struct {
    56         uint32_t sp;
    57         uint32_t pc;
    58        
    59         uint32_t tls;
    60         uint32_t r13;
    61         uint32_t r14;
    62         uint32_t r15;
    63         uint32_t r16;
    64         uint32_t r17;
    65         uint32_t r18;
    66         uint32_t r19;
    67         uint32_t r20;
    68         uint32_t r21;
    69         uint32_t r22;
    70         uint32_t r23;
    71         uint32_t r24;
    72         uint32_t r25;
    73         uint32_t r26;
    74         uint32_t r27;
    75         uint32_t r28;
    76         uint32_t r29;
    77         uint32_t r30;
    78         uint32_t r31;
    79        
    80         uint32_t cr;
    81 } __attribute__ ((packed)) context_t;
    82 
    8356static inline uintptr_t context_get_fp(context_t *ctx)
    8457{
Note: See TracChangeset for help on using the changeset viewer.