Changeset 83a2f43 in mainline for uspace/drv/isa/isa.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/isa/isa.c (modified) (11 diffs)

uspace/drv/isa/isa.c

@@ -68 +68 @@
 
 typedef struct isa_fun {
-        function_t *fnode;
+        ddf_fun_t *fnode;
         hw_resource_list_t hw_resources;
 } isa_fun_t;
 
-static hw_resource_list_t *isa_get_fun_resources(function_t *fnode)
+static hw_resource_list_t *isa_get_fun_resources(ddf_fun_t *fnode)
 {
         isa_fun_t *fun = ISA_FUN(fnode);
@@ -80 +80 @@
 }
 
-static bool isa_enable_fun_interrupt(function_t *fnode)
+static bool isa_enable_fun_interrupt(ddf_fun_t *fnode)
 {
         // TODO
@@ -92 +92 @@
 };
 
-static device_ops_t isa_fun_ops;
-
-static int isa_add_device(device_t *dev);
+static ddf_dev_ops_t isa_fun_ops;
+
+static int isa_add_device(ddf_dev_t *dev);
 
 /** The isa device driver's standard operations */
@@ -107 +107 @@
 };
 
-static isa_fun_t *isa_fun_create(device_t *dev, const char *name)
+static isa_fun_t *isa_fun_create(ddf_dev_t *dev, const char *name)
 {
         isa_fun_t *fun = calloc(1, sizeof(isa_fun_t));
@@ -113 +113 @@
                 return NULL;
 
-        function_t *fnode = ddf_fun_create(dev, fun_inner, name);
+        ddf_fun_t *fnode = ddf_fun_create(dev, fun_inner, name);
         if (fnode == NULL) {
                 free(fun);
@@ -388 +388 @@
 }
 
-static char *isa_fun_read_info(char *fun_conf, device_t *dev)
+static char *isa_fun_read_info(char *fun_conf, ddf_dev_t *dev)
 {
         char *line;
@@ -447 +447 @@
 }
 
-static void fun_conf_parse(char *conf, device_t *dev)
+static void fun_conf_parse(char *conf, ddf_dev_t *dev)
 {
         while (conf != NULL && *conf != '\0') {
@@ -454 +454 @@
 }
 
-static void isa_functions_add(device_t *dev)
+static void isa_functions_add(ddf_dev_t *dev)
 {
         char *fun_conf;
@@ -465 +465 @@
 }
 
-static int isa_add_device(device_t *dev)
+static int isa_add_device(ddf_dev_t *dev)
 {
         printf(NAME ": isa_add_device, device handle = %d\n",
@@ -473 +473 @@
         printf(NAME ": adding a 'ctl' function\n");
 
-        function_t *ctl = ddf_fun_create(dev, fun_exposed, "ctl");
+        ddf_fun_t *ctl = ddf_fun_create(dev, fun_exposed, "ctl");
         if (ctl == NULL) {
                 printf(NAME ": Error creating control function.\n");
@@ -500 +500 @@
         printf(NAME ": HelenOS ISA bus driver\n");
         isa_init();
-        return driver_main(&isa_driver);
+        return ddf_driver_main(&isa_driver);
 }