Changeset 802898f in mainline for uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c

Timestamp:

2013-09-02T20:14:11Z (11 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

8c95dff

Parents:

0435fe41 (diff), 61ab4a9 (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:

mainline update

File:

• uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c (modified) (5 diffs)

uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c

@@ -48 +48 @@
 
 typedef struct {
+        const char *name;
+        match_id_t match_id;
         hw_resource_list_t hw_resources;
 } rootamdm37x_fun_t;
 
-/* See amdm37x TRM page. 3316 for these values */
-#define OHCI_BASE_ADDRESS  0x48064400
-#define OHCI_SIZE  1024
-#define EHCI_BASE_ADDRESS  0x48064800
-#define EHCI_SIZE  1024
+/* See amdm37x TRM page 3316 for these values */
+#define OHCI_BASE_ADDRESS   0x48064400
+#define OHCI_SIZE   1024
+#define EHCI_BASE_ADDRESS   0x48064800
+#define EHCI_SIZE   1024
+
+/* See amdm37x TRM page 1813 for these values */
+#define DSS_BASE_ADDRESS   0x48050000
+#define DSS_SIZE   512
+#define DISPC_BASE_ADDRESS   0x48050400
+#define DISPC_SIZE   1024
+#define VIDEO_ENC_BASE_ADDRESS   0x48050C00
+#define VIDEO_ENC_SIZE   256
+
 
 static hw_resource_t ohci_res[] = {
@@ -88 +99 @@
 };
 
-static const rootamdm37x_fun_t ohci = {
-        .hw_resources = {
-            .resources = ohci_res,
-            .count = sizeof(ohci_res)/sizeof(ohci_res[0]),
-        }
-};
-
-static const rootamdm37x_fun_t ehci = {
-        .hw_resources = {
-            .resources = ehci_res,
-            .count = sizeof(ehci_res) / sizeof(ehci_res[0]),
-        }
-};
+static hw_resource_t disp_res[] = {
+        {
+                .type = MEM_RANGE,
+                .res.io_range = {
+                        .address = DSS_BASE_ADDRESS,
+                        .size = DSS_SIZE,
+                        .endianness = LITTLE_ENDIAN
+                },
+        },
+        {
+                .type = MEM_RANGE,
+                .res.io_range = {
+                        .address = DISPC_BASE_ADDRESS,
+                        .size = DISPC_SIZE,
+                        .endianness = LITTLE_ENDIAN
+                },
+        },
+        {
+                .type = MEM_RANGE,
+                .res.io_range = {
+                        .address = VIDEO_ENC_BASE_ADDRESS,
+                        .size = VIDEO_ENC_SIZE,
+                        .endianness = LITTLE_ENDIAN
+                },
+        },
+        {
+                .type = INTERRUPT,
+                .res.interrupt = { .irq = 25 },
+        },
+};
+
+static const rootamdm37x_fun_t amdm37x_funcs[] = {
+{
+        .name = "ohci",
+        .match_id = { .id = "usb/host=ohci", .score = 90 },
+        .hw_resources = { .resources = ohci_res, .count = ARRAY_SIZE(ohci_res) }
+},
+{
+        .name = "ehci",
+        .match_id = { .id = "usb/host=ehci", .score = 90 },
+        .hw_resources = { .resources = ehci_res, .count = ARRAY_SIZE(ehci_res) }
+},
+{
+        .name = "fb",
+        .match_id = { .id = "amdm37x&dispc", .score = 90 },
+        .hw_resources = { .resources = disp_res, .count = ARRAY_SIZE(disp_res) }
+},
+};
+
 
 static hw_resource_list_t *rootamdm37x_get_resources(ddf_fun_t *fnode);
@@ -114 +161 @@
 };
 
-static int rootamdm37x_add_fun(ddf_dev_t *dev, const char *name,
-    const char *str_match_id, const rootamdm37x_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name);
-        
+static int rootamdm37x_add_fun(ddf_dev_t *dev, const rootamdm37x_fun_t *fun)
+{
+        assert(dev);
+        assert(fun);
+
+        ddf_msg(LVL_DEBUG, "Adding new function '%s'.", fun->name);
+
         /* Create new device function. */
-        ddf_fun_t *fnode = ddf_fun_create(dev, fun_inner, name);
+        ddf_fun_t *fnode = ddf_fun_create(dev, fun_inner, fun->name);
         if (fnode == NULL)
                 return ENOMEM;
         
         /* Add match id */
-        int ret = ddf_fun_add_match_id(fnode, str_match_id, 100);
+        int ret = ddf_fun_add_match_id(fnode,
+            fun->match_id.id, fun->match_id.score);
         if (ret != EOK) {
                 ddf_fun_destroy(fnode);
@@ -146 +196 @@
         ret = ddf_fun_bind(fnode);
         if (ret != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function %s.", name);
+                ddf_msg(LVL_ERROR, "Failed binding function %s.", fun->name);
                 ddf_fun_destroy(fnode);
                 return ret;
@@ -189 +239 @@
 
         /* Register functions */
-        if (rootamdm37x_add_fun(dev, "ohci", "usb/host=ohci", &ohci) != EOK)
-                ddf_msg(LVL_ERROR, "Failed to add OHCI function for "
-                    "BeagleBoard-xM platform.");
-        if (rootamdm37x_add_fun(dev, "ehci", "usb/host=ehci", &ehci) != EOK)
-                ddf_msg(LVL_ERROR, "Failed to add EHCI function for "
-                    "BeagleBoard-xM platform.");
-        if (rootamdm37x_add_fun(dev, "dispc", "amdm37x&dispc", &ehci) != EOK)
-                ddf_msg(LVL_ERROR, "Failed to add dispc function for "
-                    "BeagleBoard-xM platform.");
-
+        for (unsigned i = 0; i < ARRAY_SIZE(amdm37x_funcs); ++i) {
+                if (rootamdm37x_add_fun(dev, &amdm37x_funcs[i]) != EOK)
+                        ddf_msg(LVL_ERROR, "Failed to add %s function for "
+                            "BeagleBoard-xM platform.", amdm37x_funcs[i].name);
+        }
         return EOK;
 }