Changeset ce79069b in mainline

Timestamp:

2011-01-09T17:02:19Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a6e11

Parents:

f724e82

Message:

Remove char.h to char_dev.h (the _dev is part of the interface name in case of char_dev, unlike hw_res).

Location:

uspace

Files:

• app/tester/hw/misc/virtchar1.c (modified) (1 diff)
• app/tester/hw/serial/serial1.c (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/device/char_dev.c (moved) (moved from uspace/lib/c/generic/device/char.c ) (1 diff)
• lib/c/include/device/char_dev.h (moved) (moved from uspace/lib/c/include/device/char.h ) (1 diff)
• lib/c/include/device/hw_res.h (modified) (1 diff)
• lib/drv/generic/remote_char.c (modified) (3 diffs)
• lib/drv/include/driver.h (modified) (1 diff)
• lib/drv/include/resource.h (modified) (1 diff)

uspace/app/tester/hw/misc/virtchar1.c

@@ -40 +40 @@
 #include <sys/types.h>
 #include <async.h>
-#include <device/char.h>
+#include <device/char_dev.h>
 #include <str.h>
 #include <vfs/vfs.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <device/char.h>
 #include "../../tester.h"
 

uspace/app/tester/hw/serial/serial1.c

@@ -45 +45 @@
 #include <ipc/devman.h>
 #include <devman.h>
-#include <device/char.h>
+#include <device/char_dev.h>
 #include <str.h>
 #include <ipc/serial_ctl.h>

uspace/lib/c/Makefile

@@ -59 +59 @@
         generic/devman.c \
         generic/device/hw_res.c \
-        generic/device/char.c \
+        generic/device/char_dev.c \
         generic/event.c \
         generic/errno.c \

uspace/lib/c/generic/device/char_dev.c

@@ -34 +34 @@
 
 #include <ipc/dev_iface.h>
-#include <device/char.h>
+#include <device/char_dev.h>
 #include <errno.h>
 #include <async.h>

uspace/lib/c/include/device/char_dev.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_DEVICE_HW_RES_H_
-#define LIBC_DEVICE_HW_RES_H_
+#ifndef LIBC_DEVICE_CHAR_DEV_H_
+#define LIBC_DEVICE_CHAR_DEV_H_
 
 typedef enum {
         CHAR_DEV_READ = 0,
         CHAR_DEV_WRITE
-} hw_res_funcs_t;
+} char_dev_method_t;
 
 ssize_t char_dev_read(int dev_phone, void *buf, size_t len);

uspace/lib/c/include/device/hw_res.h

@@ -43 +43 @@
         HW_RES_GET_RESOURCE_LIST = 0,
         HW_RES_ENABLE_INTERRUPT
-} hw_res_funcs_t;
+} hw_res_method_t;
 
 /** HW resource types */

uspace/lib/drv/generic/remote_char.c

@@ -46 +46 @@
 
 /** Remote character interface operations. */
-static remote_iface_func_ptr_t remote_char_iface_ops [] = {
+static remote_iface_func_ptr_t remote_char_iface_ops[] = {
         &remote_char_read,
         &remote_char_write
@@ -74 +74 @@
 remote_char_read(device_t *dev, void *iface, ipc_callid_t callid,
     ipc_call_t *call)
-{       
+{
         char_iface_t *char_iface = (char_iface_t *) iface;
         ipc_callid_t cid;
@@ -136 +136 @@
                 ipc_answer_0(callid, ENOTSUP);
                 return;
-        }       
+        }
         
         if (len > MAX_CHAR_RW_COUNT)

uspace/lib/drv/include/driver.h

@@ -41 +41 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <device/hw_res.h>
-#include <device/char.h>
 #include <assert.h>
 #include <ddi.h>

uspace/lib/drv/include/resource.h

@@ -36 +36 @@
 #define LIBDRV_RESOURCE_H_
 
-#include "driver.h"
+#include <device/hw_res.h>
+#include <sys/types.h>
 
 typedef struct resource_iface {