Changes in uspace/drv/bus/isa/isa.c [443695e:3d0fd0d] in mainline

File:

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

uspace/drv/bus/isa/isa.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 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 @@
 }
 
-static errno_t isa_fun_get_flags(ddf_fun_t *fnode, hw_res_flags_t *rflags)
-{
-        isa_fun_t *fun = isa_fun(fnode);
-        hw_res_flags_t flags;
-
-        flags = 0;
-        if (fun->bus->pci_isa_bridge)
-                flags |= hwf_isa_bridge;
-
-        ddf_msg(LVL_NOTE, "isa_fun_get_flags: returning 0x%x", flags);
-        *rflags = flags;
-        return EOK;
-}
-
 static hw_res_ops_t isa_fun_hw_res_ops = {
         .get_resource_list = isa_fun_get_resources,
@@ -227 +211 @@
         .dma_channel_setup = isa_fun_setup_dma,
         .dma_channel_remain = isa_fun_remain_dma,
-        .get_flags = isa_fun_get_flags
 };
 
@@ -281 +264 @@
         fibril_mutex_initialize(&fun->mutex);
         fun->hw_resources.resources = fun->resources;
-        fun->bus = isa;
 
         fun->fnode = fnode;
@@ -761 +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;
         }