Changeset b0f00a9 in mainline for uspace/lib/c/arch/mips64/src/tls.c


Ignore:
Timestamp:
2011-11-06T22:21:05Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
898e847
Parents:
2bdf8313 (diff), 7b5f4c9 (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.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/mips64/src/tls.c

    r2bdf8313 rb0f00a9  
    2727 */
    2828
    29 #ifndef FB_PPM_H_
    30 #define FB_PPM_H_
     29/** @addtogroup libcmips64
     30 * @{
     31 */
     32/** @file
     33 * @ingroup libcmips64
     34 */
    3135
    32 #include "fb.h"
     36#include <tls.h>
    3337#include <sys/types.h>
    3438
    35 extern int ppm_draw(unsigned char *, size_t, unsigned int, unsigned int,
    36     unsigned int, unsigned int, putpixel_cb_t, void *);
    37 extern int ppm_get_data(unsigned char *, size_t, unsigned int *, unsigned int *);
     39tcb_t * __alloc_tls(void **data, size_t size)
     40{
     41        return tls_alloc_variant_1(data, size);
     42}
    3843
    39 #endif
     44void __free_tls_arch(tcb_t *tcb, size_t size)
     45{
     46        tls_free_variant_1(tcb, size);
     47}
     48
     49/** @}
     50 */
Note: See TracChangeset for help on using the changeset viewer.