Changeset b25970f in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2018-10-29T14:11:39Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

94ab1fee

Parents:

184f2f8a

git-author:

Jiri Svoboda <jiri@…> (2018-10-28 22:10:25)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-29 14:11:39)

Message:

Fix ISA-only PC support.

File:

• uspace/drv/bus/isa/isa.c (modified) (3 diffs)

uspace/drv/bus/isa/isa.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2018 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
- * Copyright (c) 2011 Jiri Svoboda
  * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
@@ -697 +697 @@
 }
 
-static errno_t isa_dev_add(ddf_dev_t *dev)
-{
-        async_sess_t *sess;
+static errno_t isa_read_pci_cfg(isa_bus_t *isa, async_sess_t *sess)
+{
         errno_t rc;
-
-        ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d",
-            (int) ddf_dev_get_handle(dev));
-
-        isa_bus_t *isa = ddf_dev_data_alloc(dev, sizeof(isa_bus_t));
-        if (isa == NULL)
-                return ENOMEM;
-
-        fibril_mutex_initialize(&isa->mutex);
-        isa->dev = dev;
-        list_initialize(&isa->functions);
-
-        sess = ddf_dev_parent_sess_get(dev);
-        if (sess == NULL) {
-                ddf_msg(LVL_ERROR, "isa_dev_add failed to connect to the "
-                    "parent driver.");
-                return ENOENT;
-        }
 
         rc = pci_config_space_read_16(sess, PCI_VENDOR_ID, &isa->pci_vendor_id);
@@ -733 +714 @@
                 return rc;
 
+        return EOK;
+}
+
+static errno_t isa_dev_add(ddf_dev_t *dev)
+{
+        async_sess_t *sess;
+        errno_t rc;
+
+        ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d",
+            (int) ddf_dev_get_handle(dev));
+
+        isa_bus_t *isa = ddf_dev_data_alloc(dev, sizeof(isa_bus_t));
+        if (isa == NULL)
+                return ENOMEM;
+
+        fibril_mutex_initialize(&isa->mutex);
+        isa->dev = dev;
+        list_initialize(&isa->functions);
+
+        sess = ddf_dev_parent_sess_get(dev);
+        if (sess == NULL) {
+                ddf_msg(LVL_ERROR, "isa_dev_add failed to connect to the "
+                    "parent driver.");
+                return ENOENT;
+        }
+
+        rc = isa_read_pci_cfg(isa, sess);
+        if (rc != EOK) {
+                ddf_msg(LVL_NOTE, "Cannot read PCI config. Assuming ISA classic.");
+                isa->pci_vendor_id = 0;
+                isa->pci_device_id = 0;
+                isa->pci_class = BASE_CLASS_BRIDGE;
+                isa->pci_subclass = SUB_CLASS_BRIDGE_ISA;
+        }
+
         rc = pio_window_get(sess, &isa->pio_win);
         if (rc != EOK) {