Changeset 8e9becf6 in mainline for uspace/drv/pciintel/pci.c

Timestamp:

2011-03-08T20:00:47Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

021351c

Parents:

0588062e (diff), d2fc1c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged branch lelian/hidd

File:

• uspace/drv/pciintel/pci.c (modified) (6 diffs)

uspace/drv/pciintel/pci.c

@@ -94 +94 @@
   sysarg_t apic;
   sysarg_t i8259;
+
         int irc_phone = -1;
         int irc_service = 0;
@@ -103 +104 @@
         }
 
-  if (irc_service) {
-    while (irc_phone < 0)
-      irc_phone = service_connect_blocking(irc_service, 0, 0);
-  } else {
+  if (irc_service == 0)
                 return false;
-        }
+
+        irc_phone = service_connect_blocking(irc_service, 0, 0);
+        if (irc_phone < 0)
+                return false;
 
         size_t i;
@@ -114 +115 @@
                 if (dev_data->hw_resources.resources[i].type == INTERRUPT) {
                         int irq = dev_data->hw_resources.resources[i].res.interrupt.irq;
-                        async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, irq);
+                        int rc = async_req_1_0(irc_phone, IRC_ENABLE_INTERRUPT, irq);
+                        if (rc != EOK) {
+                                async_hangup(irc_phone);
+                                return false;
+                        }
                 }
         }
@@ -122 +127 @@
 }
 
-static int pci_config_space_write_16(ddf_fun_t *fun, uint32_t address, uint16_t data)
+static int pci_config_space_write_32(
+    ddf_fun_t *fun, uint32_t address, uint32_t data)
+{
+        if (address > 252)
+                return EINVAL;
+        pci_conf_write_32(PCI_FUN(fun), address, data);
+        return EOK;
+}
+
+static int pci_config_space_write_16(
+    ddf_fun_t *fun, uint32_t address, uint16_t data)
 {
         if (address > 254)
@@ -130 +145 @@
 }
 
+static int pci_config_space_write_8(
+    ddf_fun_t *fun, uint32_t address, uint8_t data)
+{
+        if (address > 255)
+                return EINVAL;
+        pci_conf_write_8(PCI_FUN(fun), address, data);
+        return EOK;
+}
+
+static int pci_config_space_read_32(
+    ddf_fun_t *fun, uint32_t address, uint32_t *data)
+{
+        if (address > 252)
+                return EINVAL;
+        *data = pci_conf_read_32(PCI_FUN(fun), address);
+        return EOK;
+}
+
+static int pci_config_space_read_16(
+    ddf_fun_t *fun, uint32_t address, uint16_t *data)
+{
+        if (address > 254)
+                return EINVAL;
+        *data = pci_conf_read_16(PCI_FUN(fun), address);
+        return EOK;
+}
+
+static int pci_config_space_read_8(
+    ddf_fun_t *fun, uint32_t address, uint8_t *data)
+{
+        if (address > 255)
+                return EINVAL;
+        *data = pci_conf_read_8(PCI_FUN(fun), address);
+        return EOK;
+}
 
 static hw_res_ops_t pciintel_hw_res_ops = {
@@ -137 +187 @@
 
 static pci_dev_iface_t pci_dev_ops = {
-        .config_space_read_8 = NULL,
-        .config_space_read_16 = NULL,
-        .config_space_read_32 = NULL,
-        .config_space_write_8 = NULL,
+        .config_space_read_8 = &pci_config_space_read_8,
+        .config_space_read_16 = &pci_config_space_read_16,
+        .config_space_read_32 = &pci_config_space_read_32,
+        .config_space_write_8 = &pci_config_space_write_8,
         .config_space_write_16 = &pci_config_space_write_16,
-        .config_space_write_32 = NULL
+        .config_space_write_32 = &pci_config_space_write_32
 };