Changeset 50c57df in mainline for uspace/lib/drv

Timestamp:

2011-01-09T17:40:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

41b56084

Parents:

36a6e11

Message:

Rename driver op structures for consistency.

Location:

uspace/lib/drv

Files:

• generic/dev_iface.c (modified) (1 diff)
• generic/remote_char.c (modified) (5 diffs)
• generic/remote_res.c (modified) (3 diffs)
• include/char_dev.h (moved) (moved from uspace/lib/drv/include/char.h ) (1 diff)
• include/hw_res.h (moved) (moved from uspace/lib/drv/include/resource.h ) (1 diff)
• include/remote_char_dev.h (moved) (moved from uspace/lib/drv/include/remote_res.h ) (1 diff)
• include/remote_hw_res.h (moved) (moved from uspace/lib/drv/include/remote_char.h ) (1 diff)

uspace/lib/drv/generic/dev_iface.c

@@ -37 +37 @@
 
 #include "dev_iface.h"
-#include "remote_res.h"
-#include "remote_char.h"
+#include "remote_hw_res.h"
+#include "remote_char_dev.h"
 
 static iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
-                &remote_res_iface,
-                &remote_char_iface
+                &remote_hw_res_iface,
+                &remote_char_dev_iface
         }
 };

uspace/lib/drv/generic/remote_char.c

@@ -37 +37 @@
 #include <errno.h>
 
-#include "char.h"
+#include "char_dev.h"
 #include "driver.h"
 
@@ -46 +46 @@
 
 /** Remote character interface operations. */
-static remote_iface_func_ptr_t remote_char_iface_ops[] = {
+static remote_iface_func_ptr_t remote_char_dev_iface_ops[] = {
         &remote_char_read,
         &remote_char_write
@@ -56 +56 @@
  * character interface.
  */
-remote_iface_t remote_char_iface = {
-        .method_count = sizeof(remote_char_iface_ops) /
+remote_iface_t remote_char_dev_iface = {
+        .method_count = sizeof(remote_char_dev_iface_ops) /
             sizeof(remote_iface_func_ptr_t),
-        .methods = remote_char_iface_ops
+        .methods = remote_char_dev_iface_ops
 };
 
@@ -75 +75 @@
     ipc_call_t *call)
 {
-        char_iface_t *char_iface = (char_iface_t *) iface;
+        char_dev_ops_t *char_iface = (char_dev_ops_t *) iface;
         ipc_callid_t cid;
         
@@ -122 +122 @@
     ipc_call_t *call)
 {
-        char_iface_t *char_iface = (char_iface_t *) iface;
+        char_dev_ops_t *char_iface = (char_dev_ops_t *) iface;
         ipc_callid_t cid;
         size_t len;

uspace/lib/drv/generic/remote_res.c

@@ -38 +38 @@
 
 #include "driver.h"
-#include "resource.h"
+#include "hw_res.h"
 
-static void remote_res_get_resources(device_t *, void *, ipc_callid_t,
+static void remote_res_get_resource_list(device_t *, void *, ipc_callid_t,
     ipc_call_t *);
 static void remote_res_enable_interrupt(device_t *, void *, ipc_callid_t,
     ipc_call_t *);
 
-static remote_iface_func_ptr_t remote_res_iface_ops [] = {
-        &remote_res_get_resources,
+static remote_iface_func_ptr_t remote_hw_res_iface_ops [] = {
+        &remote_res_get_resource_list,
         &remote_res_enable_interrupt
 };
 
-remote_iface_t remote_res_iface = {
-        .method_count = sizeof(remote_res_iface_ops) /
+remote_iface_t remote_hw_res_iface = {
+        .method_count = sizeof(remote_hw_res_iface_ops) /
             sizeof(remote_iface_func_ptr_t),
-        .methods = remote_res_iface_ops
+        .methods = remote_hw_res_iface_ops
 };
 
@@ -59 +59 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        resource_iface_t *ires = (resource_iface_t *) iface;
+        hw_res_ops_t *ires = (hw_res_ops_t *) iface;
         
         if (NULL == ires->enable_interrupt)
@@ -69 +69 @@
 }
 
-static void remote_res_get_resources(device_t *dev, void *iface,
+static void remote_res_get_resource_list(device_t *dev, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
-        resource_iface_t *ires = (resource_iface_t *) iface;
-        if (NULL == ires->get_resources) {
+        hw_res_ops_t *ires = (hw_res_ops_t *) iface;
+        if (NULL == ires->get_resource_list) {
                 ipc_answer_0(callid, ENOTSUP);
                 return;
         }
         
-        hw_resource_list_t *hw_resources = ires->get_resources(dev);
+        hw_resource_list_t *hw_resources = ires->get_resource_list(dev);
         if (NULL == hw_resources){
                 ipc_answer_0(callid, ENOENT);

uspace/lib/drv/include/char_dev.h

@@ -33 +33 @@
  */
 
-#ifndef LIBDRV_CHAR_H_
-#define LIBDRV_CHAR_H_
+#ifndef LIBDRV_CHAR_DEV_H_
+#define LIBDRV_CHAR_DEV_H_
 
 #include "driver.h"
 
-typedef struct char_iface {
+typedef struct {
         int (*read)(device_t *, char *, size_t);
         int (*write)(device_t *, char *, size_t);
-} char_iface_t;
+} char_dev_ops_t;
 
 #endif

uspace/lib/drv/include/hw_res.h

@@ -33 +33 @@
  */
 
-#ifndef LIBDRV_RESOURCE_H_
-#define LIBDRV_RESOURCE_H_
+#ifndef LIBDRV_HW_RES_H_
+#define LIBDRV_HW_RES_H_
 
 #include <device/hw_res.h>
 #include <sys/types.h>
 
-typedef struct resource_iface {
-         hw_resource_list_t *(* get_resources)(device_t *);
+typedef struct {
+         hw_resource_list_t *(*get_resource_list)(device_t *);
          bool (*enable_interrupt)(device_t *);
-} resource_iface_t;
-
+} hw_res_ops_t;
 
 #endif

uspace/lib/drv/include/remote_char_dev.h

@@ -33 +33 @@
  */
 
-#ifndef LIBDRV_REMOTE_RES_H_
-#define LIBDRV_REMOTE_RES_H_
+#ifndef LIBDRV_REMOTE_CHAR_DEV_H_
+#define LIBDRV_REMOTE_CHAR_DEV_H_
 
-extern remote_iface_t remote_res_iface;
+extern remote_iface_t remote_char_dev_iface;
 
 #endif

uspace/lib/drv/include/remote_hw_res.h

@@ -33 +33 @@
  */
 
-#ifndef LIBDRV_REMOTE_CHAR_H_
-#define LIBDRV_REMOTE_CHAR_H_
+#ifndef LIBDRV_REMOTE_HW_RES_H_
+#define LIBDRV_REMOTE_HW_RES_H_
 
-extern remote_iface_t remote_char_iface;
+extern remote_iface_t remote_hw_res_iface;
 
 #endif