Changeset 7e9e652 in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2016-12-17T09:37:08Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0195374

Parents:

3c5b86c

Message:

Detect the default ISA bridge by its PCI class and subclass

File:

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

uspace/drv/bus/isa/isa.c

@@ -78 +78 @@
 typedef struct {
         fibril_mutex_t mutex;
-        uint16_t vendor_id;
-        uint16_t device_id;
+        uint16_t pci_vendor_id;
+        uint16_t pci_device_id;
+        uint8_t pci_class;
+        uint8_t pci_subclass;
         ddf_dev_t *dev;
         ddf_fun_t *fctl;
@@ -598 +600 @@
 static void isa_functions_add(isa_bus_t *isa)
 {
+#define BASE_CLASS_BRIDGE       0x06
+#define SUB_CLASS_BRIDGE_ISA    0x01
+        bool isa_bridge = ((isa->pci_class == BASE_CLASS_BRIDGE) &&
+            (isa->pci_subclass == SUB_CLASS_BRIDGE_ISA));
+
 #define VENDOR_ID_SUN   0x108e
 #define DEVICE_ID_EBUS  0x1000
-        bool ebus = ((isa->vendor_id == VENDOR_ID_SUN) &&
-            (isa->device_id == DEVICE_ID_EBUS));
-
-        const char *conf_path;
-        if (ebus)
-                conf_path = EBUS_CHILD_FUN_CONF_PATH; 
-        else
+        bool ebus = ((isa->pci_vendor_id == VENDOR_ID_SUN) &&
+            (isa->pci_device_id == DEVICE_ID_EBUS));
+
+        const char *conf_path = NULL;
+        if (isa_bridge)
                 conf_path = ISA_CHILD_FUN_CONF_PATH;
+        else if (ebus)
+                conf_path = EBUS_CHILD_FUN_CONF_PATH;
 
         char *conf = fun_conf_read(conf_path);
@@ -639 +646 @@
         }
 
-        rc = pci_config_space_read_16(sess, PCI_VENDOR_ID, &isa->vendor_id);
+        rc = pci_config_space_read_16(sess, PCI_VENDOR_ID, &isa->pci_vendor_id);
         if (rc != EOK)
                 return rc;
-        rc = pci_config_space_read_16(sess, PCI_DEVICE_ID, &isa->device_id);
+        rc = pci_config_space_read_16(sess, PCI_DEVICE_ID, &isa->pci_device_id);
+        if (rc != EOK)
+                return rc;
+        rc = pci_config_space_read_8(sess, PCI_BASE_CLASS, &isa->pci_class);
+        if (rc != EOK)
+                return rc;
+        rc = pci_config_space_read_8(sess, PCI_SUB_CLASS, &isa->pci_subclass);
         if (rc != EOK)
                 return rc;