Changeset 15d0046 in mainline for uspace/drv/platform/malta/malta.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 mainline changes

File:

• uspace/drv/platform/malta/malta.c (moved) (moved from uspace/drv/infrastructure/rootmalta/rootmalta.c ) (16 diffs)

uspace/drv/platform/malta/malta.c

@@ -29 +29 @@
 
 /**
- * @defgroup root_malta Malta board platform driver.
+ * @defgroup malta Malta board platform driver.
  * @brief HelenOS Malta board platform driver.
  * @{
@@ -55 +55 @@
 #include <byteorder.h>
 
-#define NAME "rootmalta"
+#define NAME "malta"
 
 #define GT_BASE         UINT32_C(0x1be00000)
@@ -72 +72 @@
 #define GT_PCI_IOSIZE   UINT32_C(0x00200000)
 
-typedef struct rootmalta_fun {
+typedef struct malta_fun {
         hw_resource_list_t hw_resources;
         pio_window_t pio_window;
-} rootmalta_fun_t;
-
-static int rootmalta_dev_add(ddf_dev_t *dev);
-static void root_malta_init(void);
+} malta_fun_t;
+
+static int malta_dev_add(ddf_dev_t *dev);
+static void malta_init(void);
 
 /** The root device driver's standard operations. */
-static driver_ops_t rootmalta_ops = {
-        .dev_add = &rootmalta_dev_add
+static driver_ops_t malta_ops = {
+        .dev_add = &malta_dev_add
 };
 
 /** The root device driver structure. */
-static driver_t rootmalta_driver = {
+static driver_t malta_driver = {
         .name = NAME,
-        .driver_ops = &rootmalta_ops
+        .driver_ops = &malta_ops
 };
 
@@ -112 +112 @@
 };
 
-static rootmalta_fun_t pci_data = {
+static malta_fun_t pci_data = {
         .hw_resources = {
                 sizeof(pci_conf_regs) / sizeof(pci_conf_regs[0]),
@@ -130 +130 @@
 
 /** Obtain function soft-state from DDF function node */
-static rootmalta_fun_t *rootmalta_fun(ddf_fun_t *fnode)
+static malta_fun_t *malta_fun(ddf_fun_t *fnode)
 {
         return ddf_fun_data_get(fnode);
 }
 
-static hw_resource_list_t *rootmalta_get_resources(ddf_fun_t *fnode)
-{
-        rootmalta_fun_t *fun = rootmalta_fun(fnode);
+static hw_resource_list_t *malta_get_resources(ddf_fun_t *fnode)
+{
+        malta_fun_t *fun = malta_fun(fnode);
         
         assert(fun != NULL);
@@ -143 +143 @@
 }
 
-static bool rootmalta_enable_interrupt(ddf_fun_t *fun)
+static bool malta_enable_interrupt(ddf_fun_t *fun)
 {
         /* TODO */
@@ -150 +150 @@
 }
 
-static pio_window_t *rootmalta_get_pio_window(ddf_fun_t *fnode)
-{
-        rootmalta_fun_t *fun = rootmalta_fun(fnode);
+static pio_window_t *malta_get_pio_window(ddf_fun_t *fnode)
+{
+        malta_fun_t *fun = malta_fun(fnode);
 
         assert(fun != NULL);
@@ -159 +159 @@
 
 static hw_res_ops_t fun_hw_res_ops = {
-        .get_resource_list = &rootmalta_get_resources,
-        .enable_interrupt = &rootmalta_enable_interrupt,
+        .get_resource_list = &malta_get_resources,
+        .enable_interrupt = &malta_enable_interrupt,
 };
 
 static pio_window_ops_t fun_pio_window_ops = {
-        .get_pio_window = &rootmalta_get_pio_window
-};
-
-/* Initialized in root_malta_init() function. */
-static ddf_dev_ops_t rootmalta_fun_ops;
+        .get_pio_window = &malta_get_pio_window
+};
+
+/* Initialized in malta_init() function. */
+static ddf_dev_ops_t malta_fun_ops;
 
 static bool
-rootmalta_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id,
-    rootmalta_fun_t *fun_proto)
+malta_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id,
+    malta_fun_t *fun_proto)
 {
         ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name);
@@ -184 +184 @@
                 goto failure;
         
-        rootmalta_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(rootmalta_fun_t));
+        malta_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(malta_fun_t));
         *fun = *fun_proto;
         
@@ -193 +193 @@
         
         /* Set provided operations to the device. */
-        ddf_fun_set_ops(fnode, &rootmalta_fun_ops);
+        ddf_fun_set_ops(fnode, &malta_fun_ops);
         
         /* Register function. */
@@ -212 +212 @@
 }
 
-static bool rootmalta_add_functions(ddf_dev_t *dev)
-{
-        return rootmalta_add_fun(dev, "pci0", "intel_pci", &pci_data);
+static bool malta_add_functions(ddf_dev_t *dev)
+{
+        return malta_add_fun(dev, "pci0", "intel_pci", &pci_data);
 }
 
@@ -223 +223 @@
  * @return              Zero on success, negative error number otherwise.
  */
-static int rootmalta_dev_add(ddf_dev_t *dev)
+static int malta_dev_add(ddf_dev_t *dev)
 {
         ioport32_t *gt;
@@ -229 +229 @@
         int ret;
 
-        ddf_msg(LVL_DEBUG, "rootmalta_dev_add, device handle = %d",
+        ddf_msg(LVL_DEBUG, "malta_dev_add, device handle = %d",
             (int)ddf_dev_get_handle(dev));
 
@@ -248 +248 @@
         
         /* Register functions. */
-        if (!rootmalta_add_functions(dev)) {
+        if (!malta_add_functions(dev)) {
                 ddf_msg(LVL_ERROR, "Failed to add functions for the Malta platform.");
         }
@@ -255 +255 @@
 }
 
-static void root_malta_init(void)
+static void malta_init(void)
 {
         ddf_log_init(NAME);
-        rootmalta_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
-        rootmalta_fun_ops.interfaces[PIO_WINDOW_DEV_IFACE] = &fun_pio_window_ops;
+        malta_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
+        malta_fun_ops.interfaces[PIO_WINDOW_DEV_IFACE] = &fun_pio_window_ops;
 }
 
@@ -265 +265 @@
 {
         printf(NAME ": HelenOS Malta platform driver\n");
-        root_malta_init();
-        return ddf_driver_main(&rootmalta_driver);
+        malta_init();
+        return ddf_driver_main(&malta_driver);
 }