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
  • uspace/lib/math/arch/arm32/include/libarch/math.h

    r3eb0c85 r8e7c9fe  
    11/*
    2  * Copyright (c) 2010 Jakub Jermar
    3  * Copyright (c) 2010 Jiri Svoboda
     2 * Copyright (c) 2014 Martin Decky
    43 * All rights reserved.
    54 *
     
    2827 */
    2928
    30 /** @addtogroup libcmips64 mips64
    31  * @ingroup lc
     29/** @addtogroup libmatharm32
    3230 * @{
    3331 */
     
    3533 */
    3634
    37 #include <sys/types.h>
    38 #include <stdbool.h>
    39 #include <errno.h>
     35#ifndef LIBMATH_arm32_MATH_H_
     36#define LIBMATH_arm32_MATH_H_
    4037
    41 #include <stacktrace.h>
     38#include <mathtypes.h>
     39#include <mod.h>
     40#include <trunc.h>
     41#include <trig.h>
    4242
    43 bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp)
     43static inline double fmod(double dividend, double divisor)
    4444{
    45         (void) st; (void) fp;
    46         return false;
     45        return double_mod(dividend, divisor);
    4746}
    4847
    49 int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev)
     48static inline double trunc(double val)
    5049{
    51         (void) st; (void) fp; (void) prev;
    52         return ENOTSUP;
     50        double_t arg;
     51        arg.val = val;
     52       
     53        double_t ret;
     54        ret.data = trunc_float64(arg.data);
     55       
     56        return ret.val;
    5357}
    5458
    55 int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra)
     59static inline double sin(double val)
    5660{
    57         (void) st; (void) fp; (void) ra;
    58         return ENOTSUP;
     61        return double_sin(val);
    5962}
     63
     64static inline double cos(double val)
     65{
     66        return double_cos(val);
     67}
     68
     69#endif
    6070
    6171/** @}
Note: See TracChangeset for help on using the changeset viewer.