Changeset 2a5d4649 in mainline for uspace/drv/block/pci-ide/main.c


Ignore:
Timestamp:
2025-04-14T09:36:33Z (9 days ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
11782da
Parents:
6120b7b
git-author:
Jiri Svoboda <jiri@…> (2025-04-14 09:36:30)
git-committer:
Jiri Svoboda <jiri@…> (2025-04-14 09:36:33)
Message:

ISA/PCI IDE needs to attach even if one channel is empty.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/block/pci-ide/main.c

    r6120b7b r2a5d4649  
    136136        pci_ide_hwres_t res;
    137137        async_sess_t *parent_sess;
     138        unsigned chans;
    138139        errno_t rc;
    139140
     
    157158                goto error;
    158159
     160        chans = 0;
     161
    159162        rc = pci_ide_channel_init(ctrl, &ctrl->channel[0], 0, &res);
    160         if (rc == ENOENT)
     163        if (rc == EOK)
     164                ++chans;
     165        else if (rc != ENOENT)
    161166                goto error;
    162167
    163168        rc = pci_ide_channel_init(ctrl, &ctrl->channel[1], 1, &res);
    164         if (rc == ENOENT)
    165                 goto error;
    166 
    167         if (rc != EOK) {
    168                 ddf_msg(LVL_ERROR, "Failed initializing ATA controller.");
     169        if (rc == EOK)
     170                ++chans;
     171        else if (rc != ENOENT)
     172                goto error;
     173
     174        if (chans == 0) {
     175                ddf_msg(LVL_ERROR, "No PCI IDE devices found.");
    169176                rc = EIO;
    170177                goto error;
Note: See TracChangeset for help on using the changeset viewer.