Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset db6e419 in mainline for uspace/lib/c/include/loc.h


Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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/include/loc.h

    re0e922d rdb6e419  
    3333 */
    3434
    35 #ifndef LIBC_DEVMAP_H_
    36 #define LIBC_DEVMAP_H_
     35#ifndef LIBC_LOC_H_
     36#define LIBC_LOC_H_
    3737
    38 #include <ipc/devmap.h>
     38#include <ipc/loc.h>
    3939#include <async.h>
    4040#include <bool.h>
    4141
    42 extern async_exch_t *devmap_exchange_begin_blocking(devmap_interface_t);
    43 extern async_exch_t *devmap_exchange_begin(devmap_interface_t);
    44 extern void devmap_exchange_end(async_exch_t *);
     42extern async_exch_t *loc_exchange_begin_blocking(loc_interface_t);
     43extern async_exch_t *loc_exchange_begin(loc_interface_t);
     44extern void loc_exchange_end(async_exch_t *);
    4545
    46 extern int devmap_driver_register(const char *, async_client_conn_t);
    47 extern int devmap_device_register(const char *, devmap_handle_t *);
    48 extern int devmap_device_register_with_iface(const char *, devmap_handle_t *,
     46extern int loc_server_register(const char *, async_client_conn_t);
     47extern int loc_service_register(const char *, service_id_t *);
     48extern int loc_service_register_with_iface(const char *, service_id_t *,
    4949    sysarg_t);
     50extern int loc_service_add_to_cat(service_id_t, category_id_t);
    5051
    51 extern int devmap_device_get_handle(const char *, devmap_handle_t *,
     52extern int loc_service_get_id(const char *, service_id_t *,
    5253    unsigned int);
    53 extern int devmap_namespace_get_handle(const char *, devmap_handle_t *,
     54extern int loc_service_get_name(service_id_t, char **);
     55extern int loc_namespace_get_id(const char *, service_id_t *,
    5456    unsigned int);
    55 extern devmap_handle_type_t devmap_handle_probe(devmap_handle_t);
     57extern int loc_category_get_id(const char *, category_id_t *,
     58    unsigned int);
     59extern int loc_category_get_name(category_id_t, char **);
     60extern int loc_category_get_svcs(category_id_t, category_id_t **, size_t *);
     61extern loc_object_type_t loc_id_probe(service_id_t);
    5662
    57 extern async_sess_t *devmap_device_connect(exch_mgmt_t, devmap_handle_t,
     63extern async_sess_t *loc_service_connect(exch_mgmt_t, service_id_t,
    5864    unsigned int);
    5965
    60 extern int devmap_null_create(void);
    61 extern void devmap_null_destroy(int);
     66extern int loc_null_create(void);
     67extern void loc_null_destroy(int);
    6268
    63 extern size_t devmap_count_namespaces(void);
    64 extern size_t devmap_count_devices(devmap_handle_t);
     69extern size_t loc_count_namespaces(void);
     70extern size_t loc_count_services(service_id_t);
    6571
    66 extern size_t devmap_get_namespaces(dev_desc_t **);
    67 extern size_t devmap_get_devices(devmap_handle_t, dev_desc_t **);
     72extern size_t loc_get_namespaces(loc_sdesc_t **);
     73extern size_t loc_get_services(service_id_t, loc_sdesc_t **);
     74extern int loc_get_categories(category_id_t **, size_t *);
     75
    6876
    6977#endif
Note: See TracChangeset for help on using the changeset viewer.