Changes in uspace/drv/platform/msim/msim.c [1569a9b:676e833] in mainline

File:

• uspace/drv/platform/msim/msim.c (modified) (7 diffs)

uspace/drv/platform/msim/msim.c

@@ -38 +38 @@
 
 #include <assert.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <macros.h>
+
+#include <ddi.h>
 #include <ddf/driver.h>
 #include <ddf/log.h>
-#include <errno.h>
 #include <ipc/dev_iface.h>
 #include <ops/hw_res.h>
 #include <ops/pio_window.h>
-#include <stdbool.h>
-#include <stdio.h>
 
 #define NAME "msim"
 
-#define MSIM_DDISK_BASE UINT32_C(0x10000200)
-#define MSIM_DDISK_SIZE UINT32_C(0x00000010)
-#define MSIM_DDISK_IRQ 6
-
-#define MSIM_KBD_ADDRESS UINT32_C(0x10000000)
-#define MSIM_KBD_SIZE 1
-#define MSIM_KBD_IRQ 2
+#define MSIM_DISK_BASE  UINT32_C(0x10000200)
+#define MSIM_DISK_SIZE  UINT32_C(0x00000010)
 
 typedef struct msim_fun {
@@ -65 +65 @@
 static void msim_init(void);
 
-/** Standard driver operations. */
+/** The root device driver's standard operations. */
 static driver_ops_t msim_ops = {
         .dev_add = &msim_dev_add
 };
 
-/** Driver structure. */
+/** The root device driver structure. */
 static driver_t msim_driver = {
         .name = NAME,
@@ -89 +89 @@
                 .type = INTERRUPT,
                 .res.interrupt = {
-                        .irq = MSIM_DDISK_IRQ
+                        .irq = 6
                 }
         }
@@ -101 +101 @@
         .pio_window = {
                 .mem = {
-                        .base = MSIM_DDISK_BASE,
-                        .size = MSIM_DDISK_SIZE
+                        .base = MSIM_DISK_BASE,
+                        .size = MSIM_DISK_SIZE
                 }
         }
 };
 
-static hw_resource_t console_regs[] = {
-        {
-                .type = MEM_RANGE,
-                .res.mem_range = {
-                        .address = 0,
-                        .size = 1,
-                        .relative = true,
-                        .endianness = LITTLE_ENDIAN
-                }
-        },
-        {
-                .type = INTERRUPT,
-                .res.interrupt = {
-                        .irq = MSIM_KBD_IRQ
-                }
-        }
-};
-
-static msim_fun_t console_data = {
-        .hw_resources = {
-                sizeof(console_regs) / sizeof(console_regs[0]),
-                console_regs
-        },
-        .pio_window = {
-                .mem = {
-                        .base = MSIM_KBD_ADDRESS,
-                        .size = MSIM_KBD_SIZE
-                }
-        }
-};
-
 /** Obtain function soft-state from DDF function node */
 static msim_fun_t *msim_fun(ddf_fun_t *fnode)
@@ -156 +125 @@
         /* Nothing to do. */
 
-        return EOK;
+        return true;
 }
 
@@ -194 +163 @@
         
         msim_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(msim_fun_t));
-        if (fun == NULL)
-                goto failure;
-        
         *fun = *fun_proto;
         
@@ -228 +194 @@
         if (!msim_add_fun(dev, "disk0", "msim/ddisk", &disk_data))
                 return false;
-        if (!msim_add_fun(dev, "console", "msim/console", &console_data))
+        if (!msim_add_fun(dev, "console", "msim/console", &disk_data))
                 return false;
         return true;
 }
 
-/** Add MSIM platform device.
- *
- * @param dev DDF device
- * @return Zero on success or non-zero error code.
+/** Get the root device.
+ *
+ * @param dev           The device which is root of the whole device tree (both
+ *                      of HW and pseudo devices).
+ * @return              Zero on success, negative error number otherwise.
  */
 static int msim_dev_add(ddf_dev_t *dev)