Changeset 2a37b9f in mainline for uspace/drv/platform/mac/mac.c

Timestamp:

2014-08-28T19:54:48Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0f2a9be

Parents:

0ddb84b

Message:

Reorganize platform drivers.

File:

• uspace/drv/platform/mac/mac.c (moved) (moved from uspace/drv/infrastructure/rootmac/rootmac.c ) (10 diffs)

uspace/drv/platform/mac/mac.c

@@ -42 +42 @@
 #include <stdio.h>
 
-#define NAME  "rootmac"
+#define NAME  "mac"
 
 typedef struct {
         hw_resource_list_t hw_resources;
-} rootmac_fun_t;
+} mac_fun_t;
 
 static hw_resource_t pci_conf_regs[] = {
@@ -69 +69 @@
 };
 
-static rootmac_fun_t pci_data = {
+static mac_fun_t pci_data = {
         .hw_resources = {
                 2,
@@ -76 +76 @@
 };
 
-static ddf_dev_ops_t rootmac_fun_ops;
+static ddf_dev_ops_t mac_fun_ops;
 
 /** Obtain function soft-state from DDF function node */
-static rootmac_fun_t *rootmac_fun(ddf_fun_t *fnode)
+static mac_fun_t *mac_fun(ddf_fun_t *fnode)
 {
         return ddf_fun_data_get(fnode);
 }
 
-static bool rootmac_add_fun(ddf_dev_t *dev, const char *name,
-    const char *str_match_id, rootmac_fun_t *fun_proto)
+static bool mac_add_fun(ddf_dev_t *dev, const char *name,
+    const char *str_match_id, mac_fun_t *fun_proto)
 {
         ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name);
@@ -97 +97 @@
                 goto failure;
         
-        rootmac_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(rootmac_fun_t));
+        mac_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(mac_fun_t));
         *fun = *fun_proto;
         
@@ -106 +106 @@
         
         /* Set provided operations to the device. */
-        ddf_fun_set_ops(fnode, &rootmac_fun_ops);
+        ddf_fun_set_ops(fnode, &mac_fun_ops);
         
         /* Register function. */
@@ -133 +133 @@
  *
  */
-static int rootmac_dev_add(ddf_dev_t *dev)
+static int mac_dev_add(ddf_dev_t *dev)
 {
 #if 0
         /* Register functions */
-        if (!rootmac_add_fun(dev, "pci0", "intel_pci", &pci_data))
+        if (!mac_add_fun(dev, "pci0", "intel_pci", &pci_data))
                 ddf_msg(LVL_ERROR, "Failed to add functions for Mac platform.");
 #else
         (void)pci_data;
-        (void)rootmac_add_fun;
+        (void)mac_add_fun;
 #endif
         
@@ -148 +148 @@
 
 /** The root device driver's standard operations. */
-static driver_ops_t rootmac_ops = {
-        .dev_add = &rootmac_dev_add
+static driver_ops_t mac_ops = {
+        .dev_add = &mac_dev_add
 };
 
 /** The root device driver structure. */
-static driver_t rootmac_driver = {
+static driver_t mac_driver = {
         .name = NAME,
-        .driver_ops = &rootmac_ops
+        .driver_ops = &mac_ops
 };
 
-static hw_resource_list_t *rootmac_get_resources(ddf_fun_t *fnode)
+static hw_resource_list_t *mac_get_resources(ddf_fun_t *fnode)
 {
-        rootmac_fun_t *fun = rootmac_fun(fnode);
+        mac_fun_t *fun = mac_fun(fnode);
         assert(fun != NULL);
         
@@ -166 +166 @@
 }
 
-static bool rootmac_enable_interrupt(ddf_fun_t *fun)
+static bool mac_enable_interrupt(ddf_fun_t *fun)
 {
         /* TODO */
@@ -174 +174 @@
 
 static hw_res_ops_t fun_hw_res_ops = {
-        .get_resource_list = &rootmac_get_resources,
-        .enable_interrupt = &rootmac_enable_interrupt
+        .get_resource_list = &mac_get_resources,
+        .enable_interrupt = &mac_enable_interrupt
 };
 
@@ -182 +182 @@
         printf("%s: HelenOS Mac platform driver\n", NAME);
         ddf_log_init(NAME);
-        rootmac_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
-        return ddf_driver_main(&rootmac_driver);
+        mac_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
+        return ddf_driver_main(&mac_driver);
 }