Changeset 7bf29e5 in mainline for uspace/srv/hid/display/display.c


Ignore:
Timestamp:
2025-01-09T11:29:38Z (7 months ago)
Author:
Miroslav Cimerman <mc@…>
Children:
a5c2960e
Parents:
bc3d695 (diff), 4e1221c (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 'upstream/master' into helenraid-para

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/display/display.c

    rbc3d695 r7bf29e5  
    105105        list_initialize(&disp->ddevs);
    106106        list_initialize(&disp->idevcfgs);
     107        list_initialize(&disp->ievents);
     108        fibril_condvar_initialize(&disp->ievent_cv);
    107109        list_initialize(&disp->seats);
    108110        list_initialize(&disp->windows);
     
    129131        assert(list_empty(&disp->ddevs));
    130132        assert(list_empty(&disp->idevcfgs));
     133        assert(list_empty(&disp->ievents));
    131134        assert(list_empty(&disp->seats));
    132135        assert(list_empty(&disp->windows));
     
    215218                }
    216219
     220                /*
     221                 * Load device configuration entry. If the device
     222                 * is not currently connected (ENOENT), skip it.
     223                 */
    217224                rc = ds_idevcfg_load(display, nidevcfg, &idevcfg);
    218                 if (rc != EOK)
     225                if (rc != EOK && rc != ENOENT)
    219226                        goto error;
    220227
Note: See TracChangeset for help on using the changeset viewer.