Changeset e27e36e in mainline for uspace/drv/platform/mac/mac.c

Timestamp:

2017-10-04T17:39:48Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c188c62

Parents:

7e55bed7

Message:

Convert CUDA driver to DDF.

File:

• uspace/drv/platform/mac/mac.c (modified) (5 diffs)

uspace/drv/platform/mac/mac.c

@@ -41 +41 @@
 #include <ops/hw_res.h>
 #include <stdio.h>
+#include <sysinfo.h>
 
 #define NAME  "mac"
@@ -47 +48 @@
         hw_resource_list_t hw_resources;
 } mac_fun_t;
+
+static hw_resource_t adb_regs[] = {
+        {
+                .type = IO_RANGE,
+                .res.io_range = {
+                        .address = 0,
+                        .size = 0x2000,
+                        .relative = false,
+                        .endianness = BIG_ENDIAN
+                }
+        },
+};
+
+static mac_fun_t adb_data = {
+        .hw_resources = {
+                1,
+                adb_regs
+        }
+};
 
 static hw_resource_t pci_conf_regs[] = {
@@ -88 +108 @@
 {
         ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name);
+        printf("mac: Adding new function '%s'.\n", name);
         
         ddf_fun_t *fnode = NULL;
@@ -114 +135 @@
         }
         
+        printf("mac: Added new function '%s' (str=%s).\n", name, str_match_id);
         return true;
         
@@ -135 +157 @@
 static int mac_dev_add(ddf_dev_t *dev)
 {
+        int rc;
+        uintptr_t cuda_physical;
 #if 0
         /* Register functions */
-        if (!mac_add_fun(dev, "pci0", "intel_pci", &pci_data))
-                ddf_msg(LVL_ERROR, "Failed to add functions for Mac platform.");
+        if (!mac_add_fun(dev, "pci0", "intel_pci", &pci_data)) {
+                ddf_msg(LVL_ERROR, "Failed to add PCI function for Mac platform.");
+                return EIO;
+        }
 #else
         (void)pci_data;
-        (void)mac_add_fun;
 #endif
-        
+        rc = sysinfo_get_value("cuda.address.physical", &cuda_physical);
+        if (rc != EOK)
+                return EIO;
+
+        adb_regs[0].res.io_range.address = cuda_physical;
+
+        if (!mac_add_fun(dev, "adb", "cuda_adb", &adb_data)) {
+                ddf_msg(LVL_ERROR, "Failed to add ADB function for Mac platform.");
+                return EIO;
+        }
+
         return EOK;
 }