Changeset ff381a7 in mainline for uspace/drv


Ignore:
Timestamp:
2015-11-02T20:54:19Z (10 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d8513177
Parents:
3feeab2 (diff), 5265eea4 (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.

Location:
uspace/drv
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/audio/hdaudio/hdaudio.c

    r3feeab2 rff381a7  
    175175
    176176        ddf_msg(LVL_NOTE, "create parent sess");
    177         hda->parent_sess = ddf_dev_parent_sess_create(dev,
    178             EXCHANGE_SERIALIZE);
     177        hda->parent_sess = ddf_dev_parent_sess_create(dev);
    179178        if (hda->parent_sess == NULL) {
    180179                ddf_msg(LVL_ERROR, "Failed connecting parent driver.\n");

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

    r3feeab2 rff381a7  
    159159static inline int setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
    160160{
    161         async_sess_t *sess = devman_parent_device_connect(EXCHANGE_ATOMIC,
     161        async_sess_t *sess = devman_parent_device_connect(
    162162            ddf_dev_get_handle(dsp->sb_dev), IPC_FLAG_BLOCKING);
    163163
    … …  
    307307
    308308        assert(dsp->buffer.data);
    309         async_sess_t *sess = devman_parent_device_connect(EXCHANGE_ATOMIC,
     309        async_sess_t *sess = devman_parent_device_connect(
    310310            ddf_dev_get_handle(dsp->sb_dev), IPC_FLAG_BLOCKING);
    311311

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

    r3feeab2 rff381a7  
    178178
    179179        async_sess_t *parent_sess = devman_parent_device_connect(
    180             EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     180            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    181181        if (!parent_sess)
    182182                return ENOMEM;
    … …  
    245245{
    246246        async_sess_t *parent_sess = devman_parent_device_connect(
    247             EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     247            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    248248        if (!parent_sess)
    249249                return ENOMEM;

  • uspace/drv/block/ahci/ahci.c

    r3feeab2 rff381a7  
    11401140       
    11411141        /* Connect to parent device */
    1142         ahci->parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
     1142        ahci->parent_sess = ddf_dev_parent_sess_create(dev);
    11431143        if (ahci->parent_sess == NULL)
    11441144                return NULL;

  • uspace/drv/block/ata_bd/main.c

    r3feeab2 rff381a7  
    6868        int rc;
    6969
    70         parent_sess = ddf_dev_parent_sess_create(dev,
    71             EXCHANGE_SERIALIZE);
     70        parent_sess = ddf_dev_parent_sess_create(dev);
    7271        if (parent_sess == NULL)
    7372                return ENOMEM;

  • uspace/drv/block/ddisk/ddisk.c

    r3feeab2 rff381a7  
    286286        int rc;
    287287
    288         parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
     288        parent_sess = ddf_dev_parent_sess_create(dev);
    289289        if (parent_sess == NULL)
    290290                return ENOMEM;

  • uspace/drv/bus/amba/amba.c

    r3feeab2 rff381a7  
    333333       
    334334        bus->dnode = dnode;
    335         async_sess_t *sess = ddf_dev_parent_sess_create(dnode, EXCHANGE_SERIALIZE);
     335        async_sess_t *sess = ddf_dev_parent_sess_create(dnode);
    336336        if (sess == NULL) {
    337337                ddf_msg(LVL_ERROR, "amba_dev_add failed to connect to the "

  • uspace/drv/bus/isa/isa.c

    r3feeab2 rff381a7  
    270270        }
    271271
    272         r = read_all(fd, buf, len);
     272        r = read(fd, buf, len);
    273273        if (r < 0) {
    274274                ddf_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
    … …  
    616616        list_initialize(&isa->functions);
    617617
    618         sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
     618        sess = ddf_dev_parent_sess_create(dev);
    619619        if (sess == NULL) {
    620620                ddf_msg(LVL_ERROR, "isa_dev_add failed to connect to the "

  • uspace/drv/bus/pci/pciintel/pci.c

    r3feeab2 rff381a7  
    664664        bus->dnode = dnode;
    665665       
    666         sess = ddf_dev_parent_sess_create(dnode, EXCHANGE_SERIALIZE);
     666        sess = ddf_dev_parent_sess_create(dnode);
    667667        if (sess == NULL) {
    668668                ddf_msg(LVL_ERROR, "pci_dev_add failed to connect to the "

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

    r3feeab2 rff381a7  
    8181       
    8282        async_sess_t *parent_sess = devman_parent_device_connect(
    83             EXCHANGE_SERIALIZE, ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
     83            ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
    8484        if (!parent_sess)
    8585                return ENOMEM;
    … …  
    115115{
    116116        async_sess_t *parent_sess = devman_parent_device_connect(
    117             EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     117            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    118118        if (!parent_sess)
    119119                return ENOMEM;
    … …  
    138138
    139139        async_sess_t *parent_sess = devman_parent_device_connect(
    140             EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     140            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    141141        if (!parent_sess)
    142142                return ENOMEM;

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

    r3feeab2 rff381a7  
    5757
    5858        async_sess_t *parent_sess =
    59             devman_parent_device_connect(EXCHANGE_SERIALIZE,
    60             ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
     59            devman_parent_device_connect(ddf_dev_get_handle(dev),
     60            IPC_FLAG_BLOCKING);
    6161        if (!parent_sess)
    6262                return ENOMEM;
    … …  
    9393{
    9494        async_sess_t *parent_sess =
    95             devman_parent_device_connect(EXCHANGE_SERIALIZE,
    96             ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     95            devman_parent_device_connect(ddf_dev_get_handle(device),
     96            IPC_FLAG_BLOCKING);
    9797        if (!parent_sess)
    9898                return ENOMEM;

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

    r3feeab2 rff381a7  
    5555
    5656        async_sess_t *parent_sess =
    57             devman_parent_device_connect(EXCHANGE_SERIALIZE,
    58             ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
     57            devman_parent_device_connect(ddf_dev_get_handle(dev),
     58            IPC_FLAG_BLOCKING);
    5959        if (!parent_sess)
    6060                return ENOMEM;
    … …  
    9191{
    9292        async_sess_t *parent_sess =
    93             devman_parent_device_connect(EXCHANGE_SERIALIZE,
    94             ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     93            devman_parent_device_connect(ddf_dev_get_handle(device),
     94            IPC_FLAG_BLOCKING);
    9595        if (!parent_sess)
    9696                return ENOMEM;
    … …  
    112112
    113113        async_sess_t *parent_sess = devman_parent_device_connect(
    114             EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
     114            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
    115115        if (!parent_sess)
    116116                return ENOMEM;

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

    r3feeab2 rff381a7  
    131131{
    132132        async_sess_t *parent_sess =
    133             devman_parent_device_connect(EXCHANGE_SERIALIZE,
    134             ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
     133            devman_parent_device_connect(ddf_dev_get_handle(dev),
     134            IPC_FLAG_BLOCKING);
    135135        if (!parent_sess)
    136136                return ENOMEM;

  • uspace/drv/char/grlib_uart/grlib_uart.c

    r3feeab2 rff381a7  
    381381       
    382382        /* Connect to the parent's driver. */
    383         async_sess_t *parent_sess = ddf_dev_parent_sess_create(ns->dev,
    384             EXCHANGE_SERIALIZE);
     383        async_sess_t *parent_sess = ddf_dev_parent_sess_create(ns->dev);
    385384        if (parent_sess == NULL) {
    386385                ddf_msg(LVL_ERROR, "Failed to connect to parent driver of "

  • uspace/drv/char/i8042/main.c

    r3feeab2 rff381a7  
    6161        assert(dev);
    6262       
    63         async_sess_t *parent_sess = ddf_dev_parent_sess_create(
    64             dev, EXCHANGE_SERIALIZE);
     63        async_sess_t *parent_sess = ddf_dev_parent_sess_create(dev);
    6564        if (parent_sess == NULL)
    6665                return ENOMEM;

  • uspace/drv/char/ns8250/ns8250.c

    r3feeab2 rff381a7  
    391391       
    392392        /* Connect to the parent's driver. */
    393         parent_sess = ddf_dev_parent_sess_create(ns->dev, EXCHANGE_SERIALIZE);
     393        parent_sess = ddf_dev_parent_sess_create(ns->dev);
    394394        if (parent_sess == NULL) {
    395395                ddf_msg(LVL_ERROR, "Failed to connect to parent driver of "

  • uspace/drv/char/pl050/pl050.c

    r3feeab2 rff381a7  
    167167        pl050->buf_rp = pl050->buf_wp = 0;
    168168
    169         pl050->parent_sess = ddf_dev_parent_sess_create(pl050->dev,
    170             EXCHANGE_SERIALIZE);
     169        pl050->parent_sess = ddf_dev_parent_sess_create(pl050->dev);
    171170        if (pl050->parent_sess == NULL) {
    172171                ddf_msg(LVL_ERROR, "Failed connecitng parent driver.");

  • uspace/drv/char/ps2mouse/ps2mouse.c

    r3feeab2 rff381a7  
    116116{
    117117        mouse->client_sess = NULL;
    118         mouse->parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
     118        mouse->parent_sess = ddf_dev_parent_sess_create(dev);
    119119        if (!mouse->parent_sess)
    120120                return ENOMEM;

  • uspace/drv/char/xtkbd/xtkbd.c

    r3feeab2 rff381a7  
    417417       
    418418        kbd->client_sess = NULL;
    419         kbd->parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
     419        kbd->parent_sess = ddf_dev_parent_sess_create(dev);
    420420       
    421421        if (!kbd->parent_sess) {

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

    r3feeab2 rff381a7  
    186186                (void) register_fun_verbose(dev,
    187187                    "cloning myself twice ;-)", "clone",
    188                     "virtual&test1", 10, EEXISTS, NULL);
     188                    "virtual&test1", 10, EEXIST, NULL);
    189189        } else if (str_cmp(dev_name, "clone") == 0) {
    190190                (void) register_fun_verbose(dev,

  • uspace/drv/time/cmos-rtc/cmos-rtc.c

    r3feeab2 rff381a7  
    213213        /* Connect to the parent's driver */
    214214
    215         parent_sess = ddf_dev_parent_sess_create(rtc->dev, EXCHANGE_SERIALIZE);
     215        parent_sess = ddf_dev_parent_sess_create(rtc->dev);
    216216        if (!parent_sess) {
    217217                ddf_msg(LVL_ERROR, "Failed to connect to parent driver\
Note: See TracChangeset for help on using the changeset viewer.