Changeset 3c5b86c in mainline

Timestamp:

2016-12-16T22:24:49Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7e9e652

Parents:

7f766f4

Message:

Allow ISA driver to use different .dev configs based on vendor/device ID

Add .dev config for EBUS. At this point it consist only of entries for
com1.

Files:

• boot/Makefile (modified) (1 diff)
• uspace/drv/bus/isa/ebus.dev (added)
• uspace/drv/bus/isa/isa.c (modified) (4 diffs)

boot/Makefile

@@ -113 +113 @@
                 file_dir="`dirname "$$file"`" ; \
                 file_name="`basename "$$file"`" ; \
-                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
+                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/"*".dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
         done
         for file in $(RD_DRVS_FW) ; do \

uspace/drv/bus/isa/isa.c

@@ -66 +66 @@
 #include <device/pio_window.h>
 
+#include <pci_dev_iface.h>
+
 #include "i8237.h"
 
 #define NAME "isa"
-#define CHILD_FUN_CONF_PATH "/drv/isa/isa.dev"
+#define ISA_CHILD_FUN_CONF_PATH "/drv/isa/isa.dev"
+#define EBUS_CHILD_FUN_CONF_PATH "/drv/isa/ebus.dev"
 
 #define ISA_MAX_HW_RES 5
@@ -75 +78 @@
 typedef struct {
         fibril_mutex_t mutex;
+        uint16_t vendor_id;
+        uint16_t device_id;
         ddf_dev_t *dev;
         ddf_fun_t *fctl;
@@ -593 +598 @@
 static void isa_functions_add(isa_bus_t *isa)
 {
-        char *conf = fun_conf_read(CHILD_FUN_CONF_PATH);
+#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
+                conf_path = ISA_CHILD_FUN_CONF_PATH;
+
+        char *conf = fun_conf_read(conf_path);
         while (conf != NULL && *conf != '\0') {
                 conf = isa_fun_read_info(conf, isa);
@@ -623 +639 @@
         }
 
+        rc = pci_config_space_read_16(sess, PCI_VENDOR_ID, &isa->vendor_id);
+        if (rc != EOK)
+                return rc;
+        rc = pci_config_space_read_16(sess, PCI_DEVICE_ID, &isa->device_id);
+        if (rc != EOK)
+                return rc;
+        
         rc = pio_window_get(sess, &isa->pio_win);
         if (rc != EOK) {