Changeset d15797d in mainline


Ignore:
Timestamp:
2017-10-08T20:34:35Z (7 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
53a309e
Parents:
2fd26bb
Message:

Remove unnecessary references to devman.

Location:
uspace
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/tester/hw/misc/virtchar1.c

    r2fd26bb rd15797d  
    6060                            "have you compiled test drivers?)\n");
    6161                }
    62                 return "Failed opening devman driver device for reading";
     62                return "Failed opening NULL device for reading";
    6363        }
    6464       

  • uspace/app/usbinfo/usbinfo.h

    r2fd26bb rd15797d  
    4040#include <usb/dev/device.h>
    4141#include <usb/dev/dp.h>
    42 #include <ipc/devman.h>
    4342
    4443typedef struct {

  • uspace/drv/audio/sb16/dsp.c

    r2fd26bb rd15797d  
    3535#include <as.h>
    3636#include <stdbool.h>
     37#include <ddf/driver.h>
    3738#include <ddi.h>
    38 #include <devman.h>
    3939#include <device/hw_res.h>
    4040#include <libarch/ddi.h>
    … …  
    161161static inline int setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
    162162{
    163         async_sess_t *sess = devman_parent_device_connect(
    164             ddf_dev_get_handle(dsp->sb_dev), IPC_FLAG_BLOCKING);
     163        async_sess_t *sess = ddf_dev_parent_sess_get(dsp->sb_dev);
    165164
    166165        const int ret = hw_res_dma_channel_setup(sess,
    … …  
    304303
    305304        assert(dsp->buffer.data);
    306         async_sess_t *sess = devman_parent_device_connect(
    307             ddf_dev_get_handle(dsp->sb_dev), IPC_FLAG_BLOCKING);
     305        async_sess_t *sess = ddf_dev_parent_sess_get(dsp->sb_dev);
    308306
    309307        // TODO: Assumes DMA 16

  • uspace/drv/audio/sb16/main.c

    r2fd26bb rd15797d  
    3737#include <ddf/log.h>
    3838#include <device/hw_res_parsed.h>
    39 #include <devman.h>
    4039#include <assert.h>
    4140#include <stdio.h>
    … …  
    180179        assert(device);
    181180
    182         async_sess_t *parent_sess = devman_parent_device_connect(
    183             ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    184         if (!parent_sess)
     181        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
     182        if (parent_sess == NULL)
    185183                return ENOMEM;
    186184
    … …  
    247245int sb_enable_interrupts(ddf_dev_t *device)
    248246{
    249         async_sess_t *parent_sess = devman_parent_device_connect(
    250             ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    251         if (!parent_sess)
     247        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
     248        if (parent_sess == NULL)
    252249                return ENOMEM;
    253250

  • uspace/drv/block/ahci/ahci.h

    r2fd26bb rd15797d  
    3535
    3636#include <async.h>
    37 #include <devman.h>
    3837#include <ddf/interrupt.h>
    3938#include <stdio.h>
    … …  
    9291        ahci_port_is_t event_pxis;
    9392       
    94         /** Block device service id. */
    95         service_id_t service_id;
    96        
    9793        /** Number of device data blocks. */
    9894        uint64_t blocks;

  • uspace/drv/bus/usb/ehci/res.c

    r2fd26bb rd15797d  
    3939#include <str_error.h>
    4040#include <assert.h>
    41 #include <devman.h>
     41#include <ddf/driver.h>
    4242#include <ddi.h>
    4343#include <usb/debug.h>
    … …  
    176176        assert(device);
    177177
    178         async_sess_t *parent_sess = devman_parent_device_connect(
    179             ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    180         if (!parent_sess)
     178        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
     179        if (parent_sess == NULL)
    181180                return ENOMEM;
    182181

  • uspace/drv/bus/usb/uhci/main.c

    r2fd26bb rd15797d  
    3636#include <assert.h>
    3737#include <ddf/driver.h>
    38 #include <devman.h>
    3938#include <errno.h>
    4039#include <io/log.h>
    … …  
    106105        assert(device);
    107106
    108         async_sess_t *parent_sess = devman_parent_device_connect(
    109             ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    110         if (!parent_sess)
     107        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
     108        if (parent_sess == NULL)
    111109                return ENOMEM;
    112110

  • uspace/drv/bus/usb/usbhub/usbhub.h

    r2fd26bb rd15797d  
    3838#define DRV_USBHUB_USBHUB_H
    3939
    40 #include <ipc/devman.h>
    4140#include <ddf/driver.h>
    4241
    … …  
    7271        /** Condition variable for pending_ops_count. */
    7372        fibril_condvar_t pending_ops_cv;
    74         /** Pointer to devman usbhub function. */
     73        /** Pointer to usbhub function. */
    7574        ddf_fun_t *hub_fun;
    7675        /** Status indicator */

  • uspace/drv/bus/usb/usbmid/explore.c

    r2fd26bb rd15797d  
    132132 *
    133133 * @param dev Device to be explored.
    134  * @return Whether to accept this device from devman.
     134 * @return Whether to accept this device.
    135135 */
    136136int usbmid_explore_device(usb_device_t *dev)

  • uspace/drv/fb/amdm37x_dispc/main.c

    r2fd26bb rd15797d  
    9191        }
    9292
    93         /* Report to devman */
     93        /* Bind function */
    9494        ret = ddf_fun_bind(fun);
    9595        if (ret != EOK) {

  • uspace/drv/test/test1/test1.c

    r2fd26bb rd15797d  
    135135 * /virtual/test1/clone/child
    136136 *
    137  * and devman shall not deadlock.
     137 * and the DDF shall not deadlock.
    138138 *
    139139 *
Note: See TracChangeset for help on using the changeset viewer.