Changeset 83a2f43 in mainline for uspace/drv/rootpc/rootpc.c

Timestamp:

2011-02-15T19:43:50Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

af6b5157

Parents:

34588a80

Message:

Rename bunch of stuff so that it starts with 'ddf_'.

File:

• uspace/drv/rootpc/rootpc.c (modified) (7 diffs)

uspace/drv/rootpc/rootpc.c

@@ -62 +62 @@
 } rootpc_fun_t;
 
-static int rootpc_add_device(device_t *dev);
+static int rootpc_add_device(ddf_dev_t *dev);
 static void root_pc_init(void);
 
@@ -92 +92 @@
 };
 
-static hw_resource_list_t *rootpc_get_resources(function_t *fnode)
+static hw_resource_list_t *rootpc_get_resources(ddf_fun_t *fnode)
 {
         rootpc_fun_t *fun = ROOTPC_FUN(fnode);
@@ -100 +100 @@
 }
 
-static bool rootpc_enable_interrupt(function_t *fun)
+static bool rootpc_enable_interrupt(ddf_fun_t *fun)
 {
         /* TODO */
@@ -113 +113 @@
 
 /* Initialized in root_pc_init() function. */
-static device_ops_t rootpc_fun_ops;
+static ddf_dev_ops_t rootpc_fun_ops;
 
 static bool
-rootpc_add_fun(device_t *dev, const char *name, const char *str_match_id,
+rootpc_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id,
     rootpc_fun_t *fun)
 {
         printf(NAME ": adding new function '%s'.\n", name);
         
-        function_t *fnode = NULL;
+        ddf_fun_t *fnode = NULL;
         match_id_t *match_id = NULL;
         
@@ -164 +164 @@
 }
 
-static bool rootpc_add_functions(device_t *dev)
+static bool rootpc_add_functions(ddf_dev_t *dev)
 {
         return rootpc_add_fun(dev, "pci0", "intel_pci", &pci_data);
@@ -175 +175 @@
  * @return              Zero on success, negative error number otherwise.
  */
-static int rootpc_add_device(device_t *dev)
+static int rootpc_add_device(ddf_dev_t *dev)
 {
         printf(NAME ": rootpc_add_device, device handle = %d\n",
@@ -197 +197 @@
         printf(NAME ": HelenOS PC platform driver\n");
         root_pc_init();
-        return driver_main(&rootpc_driver);
+        return ddf_driver_main(&rootpc_driver);
 }