Changeset 46c20c8 in mainline for uspace/lib/c/include/device/char.h

Timestamp:

2010-11-26T20:08:10Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

• uspace/lib/c/include/device/char.h (moved) (moved from boot/generic/printf.h ) (3 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup generic
+ /** @addtogroup libc
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef BOOT_PRINTF_H_
-#define BOOT_PRINTF_H_
+#ifndef LIBC_DEVICE_HW_RES_H_
+#define LIBC_DEVICE_HW_RES_H_
 
-#define INT8    1
-#define INT16   2
-#define INT32   4
-#define INT64   8
+typedef enum {
+        CHAR_READ_DEV = 0,
+        CHAR_WRITE_DEV
+} hw_res_funcs_t;
 
-extern void puts(const char *str);
-extern void printf(const char *fmt, ...);
-
-extern void write(const char *str, const int len);
+ssize_t read_dev(int dev_phone, void *buf, size_t len);
+ssize_t write_dev(int dev_phone, void *buf, size_t len);
 
 #endif