Changeset 858fc90 in mainline for uspace/lib/libc/include/stdio.h

Timestamp:

2010-03-15T19:35:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6092b56e

Parents:

92307f1 (diff), 4684368 (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 from bzr://bzr.helenos.org/head.

File:

• uspace/lib/libc/include/stdio.h (modified) (2 diffs)

uspace/lib/libc/include/stdio.h

@@ -75 +75 @@
 };
 
+enum _buffer_state {
+        /** Buffer is empty */
+        _bs_empty,
+
+        /** Buffer contains data to be written */
+        _bs_write,
+
+        /** Buffer contains prefetched data for reading */
+        _bs_read
+};
+
 typedef struct {
         /** Linked list pointer. */
@@ -94 +105 @@
         int phone;
 
+        /**
+         * Non-zero if the stream needs sync on fflush(). XXX change
+         * console semantics so that sync is not needed.
+         */
+        int need_sync;
+
         /** Buffering type */
         enum _buffer_type btype;
+
         /** Buffer */
         uint8_t *buf;
+
         /** Buffer size */
         size_t buf_size;
+
+        /** Buffer state */
+        enum _buffer_state buf_state;
+
         /** Buffer I/O pointer */
         uint8_t *buf_head;
+
+        /** Points to end of occupied space when in read mode. */
+        uint8_t *buf_tail;
 } FILE;