Changeset abf2dfd in mainline


Ignore:
Timestamp:
2015-08-18T17:52:25Z (9 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6a8ce16
Parents:
b688fd8
Message:

preparations for interface types

Files:
1 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • abi/include/abi/fourcc.h

    rb688fd8 rabf2dfd  
    3333 */
    3434
    35 #ifndef LIBC_FOURCC_H_
    36 #define LIBC_FOURCC_H_
    37 
    38 #include <libarch/common.h>
    39 
    40 typedef uint32_t fourcc_t;
     35#ifndef ABI_FOURCC_H_
     36#define ABI_FOURCC_H_
    4137
    4238#define FOURCC(a, b, c, d) \
    … …  
    4440            (((UINT32_T) (c)) << 16) | (((UINT32_T) (d)) << 24))
    4541
     42#define CC_COMPACT(a) \
     43        ((((UINT32_T) (a)) & 0x7c) >> 2)
     44
     45#define FOURCC_COMPACT(a, b, c, d) \
     46        ((CC_COMPACT(a) << 12) | (CC_COMPACT(b) << 17) | \
     47            (CC_COMPACT(c) << 22) | (CC_COMPACT(d) << 27))
     48
    4649#endif
    4750

  • uspace/lib/c/include/async.h

    rb688fd8 rabf2dfd  
    4848#include <abi/ddi/irq.h>
    4949#include <abi/ipc/event.h>
     50#include <abi/ipc/interfaces.h>
    5051
    5152typedef ipc_callid_t aid_t;
     53typedef sysarg_t port_id_t;
    5254
    5355typedef void *(*async_client_data_ctor_t)(void);
    … …  
    8789         *
    8890         */
    89         EXCHANGE_PARALLEL,
     91        EXCHANGE_PARALLEL = 1,
    9092       
    9193        /** Exchange management via mutual exclusion
    … …  
    9597         *
    9698         */
    97         EXCHANGE_SERIALIZE
     99        EXCHANGE_SERIALIZE = 2
    98100} exch_mgmt_t;
    99101

  • uspace/lib/c/include/ipc/services.h

    rb688fd8 rabf2dfd  
    3838#define LIBC_SERVICES_H_
    3939
    40 #include <fourcc.h>
     40#include <sys/types.h>
     41#include <abi/fourcc.h>
    4142
    4243typedef enum {

  • uspace/lib/c/include/sys/types.h

    rb688fd8 rabf2dfd  
    4646typedef uint64_t aoff64_t;
    4747
     48typedef uint32_t fourcc_t;
     49
    4850typedef volatile uint8_t ioport8_t;
    4951typedef volatile uint16_t ioport16_t;

  • uspace/lib/draw/codec/webp.c

    rb688fd8 rabf2dfd  
    3838#include <align.h>
    3939#include <stdbool.h>
    40 #include <fourcc.h>
    4140#include <pixconv.h>
     41#include <sys/types.h>
     42#include <abi/fourcc.h>
    4243#include "webp.h"
    4344
Note: See TracChangeset for help on using the changeset viewer.