Changeset 2b3dd78 in mainline for uspace/drv/platform/amdm37x/main.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/drv/platform/amdm37x/main.c (modified) (3 diffs)

uspace/drv/platform/amdm37x/main.c

@@ -49 +49 @@
 typedef struct {
         const char *name;
-        match_id_t match_id;
+        const char *id;
+        int score;
         hw_resource_list_t hw_resources;
 } amdm37x_fun_t;
@@ -133 +134 @@
 {
         .name = "ohci",
-        .match_id = { .id = "usb/host=ohci", .score = 90 },
+        .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 },
+        .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 },
+        .id = "amdm37x&dispc",
+        .score = 90,
         .hw_resources = { .resources = disp_res, .count = ARRAY_SIZE(disp_res) }
 },
@@ -174 +178 @@
         
         /* Add match id */
-        errno_t ret = ddf_fun_add_match_id(fnode,
-            fun->match_id.id, fun->match_id.score);
+        errno_t ret = ddf_fun_add_match_id(fnode, fun->id, fun->score);
         if (ret != EOK) {
                 ddf_fun_destroy(fnode);