Changeset cf2af94 in mainline for uspace/lib/c/include/device/char_dev.h

Timestamp:

2011-02-09T11:46:47Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/lib/c/include/device/char_dev.h (moved) (moved from uspace/lib/c/include/device/char.h ) (2 diffs)

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

@@ -27 +27 @@
  */
 
- /** @addtogroup libc
+/** @addtogroup libc
  * @{
  */
@@ -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_READ_DEV = 0,
-        CHAR_WRITE_DEV
-} hw_res_funcs_t;
+        CHAR_DEV_READ = 0,
+        CHAR_DEV_WRITE
+} char_dev_method_t;
 
-ssize_t read_dev(int dev_phone, void *buf, size_t len);
-ssize_t write_dev(int dev_phone, void *buf, size_t len);
+ssize_t char_dev_read(int dev_phone, void *buf, size_t len);
+ssize_t char_dev_write(int dev_phone, void *buf, size_t len);
 
 #endif