Changeset 45f04f8 in mainline for uspace/lib/c/include


Ignore:
Timestamp:
2010-11-18T18:23:43Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3f0a7971, a7811f17, cb569e6
Parents:
51a268f (diff), c63e70c (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 changes that aim to do a better job in differentiating between
dev_handle_t and device_handle_t, respectively, by renaming these types to
devmap_handle_t and devman_handle_t, respectively.

Location:
uspace/lib/c/include
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r51a268f r45f04f8  
    4242
    4343
    44 int devman_get_phone(devman_interface_t, unsigned int);
    45 void devman_hangup_phone(devman_interface_t iface);
     44extern int devman_get_phone(devman_interface_t, unsigned int);
     45extern void devman_hangup_phone(devman_interface_t);
    4646
    47 int devman_driver_register(const char *, async_client_conn_t);
    48 int devman_child_device_register(const char *, match_id_list_t *, device_handle_t, device_handle_t *);
     47extern int devman_driver_register(const char *, async_client_conn_t);
     48extern int devman_child_device_register(const char *, match_id_list_t *,
     49    devman_handle_t, devman_handle_t *);
    4950
    50 int devman_device_connect(device_handle_t handle, unsigned int flags);
    51 int devman_parent_device_connect(device_handle_t handle, unsigned int flags);
     51extern int devman_device_connect(devman_handle_t, unsigned int);
     52extern int devman_parent_device_connect(devman_handle_t, unsigned int);
    5253
    53 int devman_device_get_handle(const char *pathname, device_handle_t *handle, unsigned int flags);
     54extern int devman_device_get_handle(const char *, devman_handle_t *,
     55    unsigned int);
    5456
    55 int devman_add_device_to_class(device_handle_t dev_handle, const char *class_name);
     57extern int devman_add_device_to_class(devman_handle_t, const char *);
    5658
    5759#endif

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

    r51a268f r45f04f8  
    4444
    4545extern int devmap_driver_register(const char *, async_client_conn_t);
    46 extern int devmap_device_register(const char *, dev_handle_t *);
     46extern int devmap_device_register(const char *, devmap_handle_t *);
    4747
    48 extern int devmap_device_get_handle(const char *, dev_handle_t *, unsigned int);
    49 extern int devmap_namespace_get_handle(const char *, dev_handle_t *, unsigned int);
    50 extern devmap_handle_type_t devmap_handle_probe(dev_handle_t);
     48extern int devmap_device_get_handle(const char *, devmap_handle_t *, unsigned int);
     49extern int devmap_namespace_get_handle(const char *, devmap_handle_t *, unsigned int);
     50extern devmap_handle_type_t devmap_handle_probe(devmap_handle_t);
    5151
    52 extern int devmap_device_connect(dev_handle_t, unsigned int);
     52extern int devmap_device_connect(devmap_handle_t, unsigned int);
    5353
    5454extern int devmap_null_create(void);
    … …  
    5656
    5757extern size_t devmap_count_namespaces(void);
    58 extern size_t devmap_count_devices(dev_handle_t);
     58extern size_t devmap_count_devices(devmap_handle_t);
    5959
    6060extern size_t devmap_get_namespaces(dev_desc_t **);
    61 extern size_t devmap_get_devices(dev_handle_t, dev_desc_t **);
     61extern size_t devmap_get_devices(devmap_handle_t, dev_desc_t **);
    6262
    6363#endif

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

    r51a268f r45f04f8  
    4242#define DEVMAN_NAME_MAXLEN 256
    4343
    44 typedef ipcarg_t device_handle_t;
     44typedef ipcarg_t devman_handle_t;
    4545
    4646/** Ids of device models used for device-to-driver matching.

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

    r51a268f r45f04f8  
    4040#define DEVMAP_NAME_MAXLEN  255
    4141
    42 typedef ipcarg_t dev_handle_t;
     42typedef ipcarg_t devmap_handle_t;
    4343
    4444typedef enum {
    … …  
    8181
    8282typedef struct {
    83         dev_handle_t handle;
     83        devmap_handle_t handle;
    8484        char name[DEVMAP_NAME_MAXLEN + 1];
    8585} dev_desc_t;

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

    r51a268f r45f04f8  
    4343struct stat {
    4444        fs_handle_t fs_handle;
    45         dev_handle_t dev_handle;
     45        devmap_handle_t devmap_handle;
    4646        fs_index_t index;
    4747        unsigned int lnkcnt;
    … …  
    4949        bool is_directory;
    5050        aoff64_t size;
    51         dev_handle_t device;
     51        devmap_handle_t device;
    5252};
    5353

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

    r51a268f r45f04f8  
    4747typedef struct {
    4848        fs_handle_t fs_handle;
    49         dev_handle_t dev_handle;
     49        devmap_handle_t devmap_handle;
    5050        fs_index_t index;
    5151} fdi_node_t;
Note: See TracChangeset for help on using the changeset viewer.