Changes in uspace/drv/platform/amdm37x/main.c [cccd60c3:33b8d024] in mainline

File:

• uspace/drv/platform/amdm37x/main.c (modified) (8 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) }
 },
@@ -150 +154 @@
 
 static hw_resource_list_t *amdm37x_get_resources(ddf_fun_t *fnode);
-static int amdm37x_enable_interrupt(ddf_fun_t *fun, int);
+static errno_t amdm37x_enable_interrupt(ddf_fun_t *fun, int);
 
 static hw_res_ops_t fun_hw_res_ops = {
@@ -161 +165 @@
 };
 
-static int amdm37x_add_fun(ddf_dev_t *dev, const amdm37x_fun_t *fun)
+static errno_t amdm37x_add_fun(ddf_dev_t *dev, const amdm37x_fun_t *fun)
 {
         assert(dev);
@@ -174 +178 @@
         
         /* Add match id */
-        int 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);
@@ -209 +212 @@
  *            (both of HW and pseudo devices).
  *
- * @return Zero on success, negative error number otherwise.
- *
- */
-static int amdm37x_dev_add(ddf_dev_t *dev)
+ * @return Zero on success, error number otherwise.
+ *
+ */
+static errno_t amdm37x_dev_add(ddf_dev_t *dev)
 {
         assert(dev);
@@ -218 +221 @@
         if (!device)
                 return ENOMEM;
-        int ret = amdm37x_init(device, DEBUG_CM);
+        errno_t ret = amdm37x_init(device, DEBUG_CM);
         if (ret != EOK) {
                 ddf_msg(LVL_FATAL, "Failed to setup hw access!.\n");
@@ -265 +268 @@
 }
 
-static int amdm37x_enable_interrupt(ddf_fun_t *fun, int irq)
+static errno_t amdm37x_enable_interrupt(ddf_fun_t *fun, int irq)
 {
         //TODO: Implement