Changeset cf2af94 in mainline for uspace/lib/c/include/ipc/services.h


Ignore:
Timestamp:
2011-02-09T11:46:47Z (14 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cb15135a
Parents:
a49c4002 (diff), 0b37882 (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

Local modifications:

  • change pipefs and ext2 to build again (use async_* calls instead of ipc_*)
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    ra49c4002 rcf2af94  
    3535 */
    3636
    37 #ifndef LIBIPC_SERVICES_H_
    38 #define LIBIPC_SERVICES_H_
     37#ifndef LIBC_SERVICES_H_
     38#define LIBC_SERVICES_H_
    3939
    4040typedef enum {
    … …  
    4949        SERVICE_FHC,
    5050        SERVICE_OBIO,
     51        SERVICE_APIC,
     52        SERVICE_I8259,
    5153        SERVICE_CLIPBOARD,
    5254        SERVICE_NETWORKING,
    5355        SERVICE_LO,
    54         SERVICE_DP8390,
     56        SERVICE_NE2000,
    5557        SERVICE_ETHERNET,
    5658        SERVICE_NILDUMMY,
    … …  
    6466} services_t;
    6567
    66 /* Memory area to be received from NS */
    67 #define SERVICE_MEM_REALTIME    1
    68 #define SERVICE_MEM_KLOG        2
    69 
    7068#endif
    7169
Note: See TracChangeset for help on using the changeset viewer.