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 moved

Legend:

Unmodified
Added
Removed
  • kernel/arch/mips32/include/arch/fpu_context_struct.ag

    r3eb0c85 r8e7c9fe  
    1 #! /bin/awk -f
    2 
    3 #
    4 # Copyright (c) 2011 Petr Koupy
     1# Copyright (c) 2014 Jakub Jermar
    52# All rights reserved.
    63#
     
    2926#
    3027
    31 #
    32 # This script is reserved for transformation of native
    33 # uspace/Makefile.common so it would be compatible with ported
    34 # application and its operations could be intercepted.
    35 #
     28{
     29        name : fpu_context,
    3630
    37 # Rename 'all' target so it can be hijacked.
    38 /^all/ {
    39         $1 = "all_:"
     31        includes : [
     32                {
     33                        include : <typedefs.h>
     34                }
     35        ],
     36
     37        members : [
     38                {
     39                        name : dregs,
     40                        type : sysarg_t,
     41                        elements: 32
     42                },
     43                {
     44                        name : cregs,
     45                        type : sysarg_t,
     46                        elements : 32
     47                }
     48        ]
    4049}
    41 
    42 # Rename 'clean' target so it can be hijacked.
    43 /^clean/ {
    44         $1 = "clean_:"
    45 }
    46 
    47 # Print rest of the lines unaltered.
    48 {
    49         print
    50 }
    51 
Note: See TracChangeset for help on using the changeset viewer.