Changes in uspace/drv/bus/isa/isa.c [832cbe7:3d0fd0d] in mainline

File:

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

uspace/drv/bus/isa/isa.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2018 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * Copyright (c) 2011 Jan Vesely
@@ -72 +72 @@
 #define EBUS_CHILD_FUN_CONF_PATH "/drv/isa/ebus.dev"
 
-#define ISA_MAX_HW_RES 6
+#define ISA_MAX_HW_RES 5
 
 typedef struct {
         fibril_mutex_t mutex;
-        bool pci_isa_bridge;
         uint16_t pci_vendor_id;
         uint16_t pci_device_id;
@@ -93 +92 @@
         hw_resource_list_t hw_resources;
         link_t bus_link;
-        isa_bus_t *bus;
 } isa_fun_t;
 
@@ -206 +204 @@
 }
 
-/** Handle legacy IO availability query from function.
- *
- * @param fnode Function performing the query
- * @param rclaims Place to store the legacy IO claims bitmask
- * @return EOK on success or an error code
- */
-static errno_t isa_fun_query_legacy_io(ddf_fun_t *fnode,
-    hw_res_claims_t *rclaims)
-{
-        isa_fun_t *fun = isa_fun(fnode);
-        hw_res_claims_t claims;
-        async_sess_t *sess;
-        errno_t rc;
-
-        ddf_msg(LVL_DEBUG, "isa_fun_query_legacy_io()");
-
-        sess = ddf_dev_parent_sess_get(fun->bus->dev);
-        if (sess == NULL) {
-                ddf_msg(LVL_ERROR, "isa_dev_add failed to connect to the "
-                    "parent driver.");
-                return ENOENT;
-        }
-
-        if (!fun->bus->pci_isa_bridge) {
-                ddf_msg(LVL_NOTE, "isa_fun_query_legacy_io: classic ISA - "
-                    "legacy IDE range is available");
-                /* Classic ISA, we can be sure IDE is unclaimed by PCI */
-                claims = 0;
-        } else {
-                ddf_msg(LVL_NOTE, "isa_fun_query_legacy_io: ISA bridge - "
-                    "determine legacy IDE availability from PCI bus driver");
-                rc = hw_res_query_legacy_io(sess, &claims);
-                if (rc != EOK) {
-                        ddf_msg(LVL_NOTE, "Error querying legacy IO claims.");
-                        return rc;
-                }
-        }
-
-        ddf_msg(LVL_DEBUG, "isa_fun_query_legacy_io: returning 0x%x", claims);
-        *rclaims = claims;
-        return EOK;
-}
-
 static hw_res_ops_t isa_fun_hw_res_ops = {
         .get_resource_list = isa_fun_get_resources,
@@ -256 +211 @@
         .dma_channel_setup = isa_fun_setup_dma,
         .dma_channel_remain = isa_fun_remain_dma,
-        .query_legacy_io = isa_fun_query_legacy_io
 };
 
@@ -310 +264 @@
         fibril_mutex_initialize(&fun->mutex);
         fun->hw_resources.resources = fun->resources;
-        fun->bus = isa;
 
         fun->fnode = fnode;
@@ -790 +743 @@
         if (rc != EOK) {
                 ddf_msg(LVL_NOTE, "Cannot read PCI config. Assuming ISA classic.");
-                isa->pci_isa_bridge = false;
                 isa->pci_vendor_id = 0;
                 isa->pci_device_id = 0;
                 isa->pci_class = BASE_CLASS_BRIDGE;
                 isa->pci_subclass = SUB_CLASS_BRIDGE_ISA;
-        } else {
-                ddf_msg(LVL_NOTE, "ISA Bridge");
-                isa->pci_isa_bridge = true;
         }