Changeset 83a2f43 in mainline for uspace/lib/drv/generic/driver.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/lib/drv/generic/driver.c (modified) (23 diffs)

uspace/lib/drv/generic/driver.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -76 +77 @@
 };
 
-static device_t *create_device(void);
-static void delete_device(device_t *);
+static ddf_dev_t *create_device(void);
+static void delete_device(ddf_dev_t *);
 
 static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall)
@@ -152 +153 @@
 
 interrupt_context_t *
-find_interrupt_context(interrupt_context_list_t *list, device_t *dev, int irq)
+find_interrupt_context(interrupt_context_list_t *list, ddf_dev_t *dev, int irq)
 {
         fibril_mutex_lock(&list->mutex);
@@ -174 +175 @@
 
 int
-register_interrupt_handler(device_t *dev, int irq, interrupt_handler_t *handler,
+register_interrupt_handler(ddf_dev_t *dev, int irq, interrupt_handler_t *handler,
     irq_code_t *pseudocode)
 {
@@ -197 +198 @@
 }
 
-int unregister_interrupt_handler(device_t *dev, int irq)
+int unregister_interrupt_handler(ddf_dev_t *dev, int irq)
 {
         interrupt_context_t *ctx = find_interrupt_context(&interrupt_contexts,
@@ -211 +212 @@
 }
 
-static void add_to_functions_list(function_t *fun)
+static void add_to_functions_list(ddf_fun_t *fun)
 {
         fibril_mutex_lock(&functions_mutex);
@@ -218 +219 @@
 }
 
-static void remove_from_functions_list(function_t *fun)
+static void remove_from_functions_list(ddf_fun_t *fun)
 {
         fibril_mutex_lock(&functions_mutex);
@@ -225 +226 @@
 }
 
-static function_t *driver_get_function(link_t *functions, devman_handle_t handle)
-{
-        function_t *fun = NULL;
+static ddf_fun_t *driver_get_function(link_t *functions, devman_handle_t handle)
+{
+        ddf_fun_t *fun = NULL;
         printf("driver_get_function handle=%" PRIun "\n", handle);
         
@@ -234 +235 @@
         
         while (link != functions) {
-                fun = list_get_instance(link, function_t, link);
+                fun = list_get_instance(link, ddf_fun_t, link);
                 printf(" - fun handle %" PRIun "\n", fun->handle);
                 if (fun->handle == handle) {
@@ -257 +258 @@
         devman_handle_t parent_fun_handle = IPC_GET_ARG2(*icall);
         
-        device_t *dev = create_device();
+        ddf_dev_t *dev = create_device();
         dev->handle = dev_handle;
 
@@ -318 +319 @@
          */
         devman_handle_t handle = IPC_GET_ARG2(*icall);
-        function_t *fun = driver_get_function(&functions, handle);
+        ddf_fun_t *fun = driver_get_function(&functions, handle);
 
         if (fun == NULL) {
@@ -461 +462 @@
  * @return              The device structure.
  */
-static device_t *create_device(void)
-{
-        device_t *dev;
-
-        dev = malloc(sizeof(device_t));
+static ddf_dev_t *create_device(void)
+{
+        ddf_dev_t *dev;
+
+        dev = malloc(sizeof(ddf_dev_t));
         if (dev == NULL)
                 return NULL;
 
-        memset(dev, 0, sizeof(device_t));
+        memset(dev, 0, sizeof(ddf_dev_t));
         return dev;
 }
@@ -477 +478 @@
  * @return              The device structure.
  */
-static function_t *create_function(void)
-{
-        function_t *fun;
-
-        fun = calloc(1, sizeof(function_t));
+static ddf_fun_t *create_function(void)
+{
+        ddf_fun_t *fun;
+
+        fun = calloc(1, sizeof(ddf_fun_t));
         if (fun == NULL)
                 return NULL;
@@ -495 +496 @@
  * @param dev           The device structure.
  */
-static void delete_device(device_t *dev)
+static void delete_device(ddf_dev_t *dev)
 {
         free(dev);
@@ -504 +505 @@
  * @param dev           The device structure.
  */
-static void delete_function(function_t *fun)
+static void delete_function(ddf_fun_t *fun)
 {
         clean_match_ids(&fun->match_ids);
@@ -535 +536 @@
  * @return              New function or @c NULL if memory is not available
  */
-function_t *ddf_fun_create(device_t *dev, fun_type_t ftype, const char *name)
-{
-        function_t *fun;
+ddf_fun_t *ddf_fun_create(ddf_dev_t *dev, fun_type_t ftype, const char *name)
+{
+        ddf_fun_t *fun;
 
         fun = create_function();
@@ -563 +564 @@
  * @param fun           Function to destroy
  */
-void ddf_fun_destroy(function_t *fun)
+void ddf_fun_destroy(ddf_fun_t *fun)
 {
         assert(fun->bound == false);
@@ -569 +570 @@
 }
 
-void *function_get_ops(function_t *fun, dev_inferface_idx_t idx)
+void *function_get_ops(ddf_fun_t *fun, dev_inferface_idx_t idx)
 {
         assert(is_valid_iface_idx(idx));
@@ -589 +590 @@
  * @return              EOK on success or negative error code
  */
-int ddf_fun_bind(function_t *fun)
+int ddf_fun_bind(ddf_fun_t *fun)
 {
         assert(fun->name != NULL);
@@ -617 +618 @@
  * @return                      EOK on success, ENOMEM if out of memory.
  */
-int ddf_fun_add_match_id(function_t *fun, const char *match_id_str,
+int ddf_fun_add_match_id(ddf_fun_t *fun, const char *match_id_str,
     int match_score)
 {
@@ -637 +638 @@
 
 /** Get default handler for client requests */
-remote_handler_t *function_get_default_handler(function_t *fun)
+remote_handler_t *function_get_default_handler(ddf_fun_t *fun)
 {
         if (fun->ops == NULL)
@@ -648 +649 @@
  * Must only be called when the function is bound.
  */
-int add_function_to_class(function_t *fun, const char *class_name)
+int ddf_fun_add_to_class(ddf_fun_t *fun, const char *class_name)
 {
         assert(fun->bound == true);
@@ -656 +657 @@
 }
 
-int driver_main(driver_t *drv)
+int ddf_driver_main(driver_t *drv)
 {
         /*