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

    r3eb0c85 r8e7c9fe  
    11/*
    2  * Copyright (c) 2006 Martin Decky
     2 * Copyright (c) 2014 Martin Decky
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup mips64
     29/** @addtogroup libmathia32
    3030 * @{
    3131 */
     
    3333 */
    3434
    35 #ifndef KERN_mips64_CYCLE_H_
    36 #define KERN_mips64_CYCLE_H_
     35#ifndef LIBMATH_ia32_MATH_H_
     36#define LIBMATH_ia32_MATH_H_
    3737
    38 #include <arch/cp0.h>
    39 #include <arch/interrupt.h>
    40 #include <trace.h>
     38#include <mod.h>
    4139
    42 NO_TRACE static inline uint64_t get_cycle(void)
     40static inline double fmod(double dividend, double divisor)
    4341{
    44         return ((uint64_t) count_hi << 32) + ((uint64_t) cp0_count_read());
     42        return double_mod(dividend, divisor);
    4543}
     44
     45extern double sin(double);
     46extern double cos(double);
     47extern double trunc(double);
    4648
    4749#endif
Note: See TracChangeset for help on using the changeset viewer.