Changeset 41811af in mainline for uspace/srv/devman/devman.h


Ignore:
Timestamp:
2011-06-10T10:14:26Z (14 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ab547063
Parents:
9536e6e (diff), 390d80d (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/devman/devman.h

    r9536e6e r41811af  
    4444#include <fibril_synch.h>
    4545#include <atomic.h>
     46#include <async.h>
    4647
    4748#include "util.h"
     
    8788        int state;
    8889       
    89         /** Phone asociated with this driver. */
    90         int phone;
     90        /** Session asociated with this driver. */
     91        async_sess_t *sess;
    9192        /** Name of the device driver. */
    9293        char *name;
     
    99100       
    100101        /**
    101          * Fibril mutex for this driver - driver state, list of devices, phone.
     102         * Fibril mutex for this driver - driver state, list of devices, session.
    102103         */
    103104        fibril_mutex_t driver_mutex;
     
    312313extern void add_driver(driver_list_t *, driver_t *);
    313314extern void attach_driver(dev_node_t *, driver_t *);
    314 extern void add_device(int, driver_t *, dev_node_t *, dev_tree_t *);
     315extern void add_device(async_sess_t *, driver_t *, dev_node_t *, dev_tree_t *);
    315316extern bool start_driver(driver_t *);
    316317
Note: See TracChangeset for help on using the changeset viewer.