Changeset 41811af in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/lib/c/generic/io/io.c (modified) (10 diffs)

uspace/lib/c/generic/io/io.c

@@ -44 +44 @@
 #include <io/klog.h>
 #include <vfs/vfs.h>
+#include <vfs/vfs_sess.h>
 #include <ipc/devmap.h>
 #include <adt/list.h>
 #include "../private/io.h"
+#include "../private/stdio.h"
 
 static void _ffillbuf(FILE *stream);
@@ -56 +58 @@
         .eof = true,
         .klog = false,
-        .phone = -1,
+        .sess = NULL,
         .btype = _IONBF,
         .buf = NULL,
@@ -70 +72 @@
         .eof = false,
         .klog = true,
-        .phone = -1,
+        .sess = NULL,
         .btype = _IOLBF,
         .buf = NULL,
@@ -84 +86 @@
         .eof = false,
         .klog = true,
-        .phone = -1,
+        .sess = NULL,
         .btype = _IONBF,
         .buf = NULL,
@@ -255 +257 @@
         stream->eof = false;
         stream->klog = false;
-        stream->phone = -1;
+        stream->sess = NULL;
         stream->need_sync = false;
         _setvbuf(stream);
@@ -277 +279 @@
         stream->eof = false;
         stream->klog = false;
-        stream->phone = -1;
+        stream->sess = NULL;
         stream->need_sync = false;
         _setvbuf(stream);
@@ -309 +311 @@
         stream->eof = false;
         stream->klog = false;
-        stream->phone = -1;
+        stream->sess = NULL;
         stream->need_sync = false;
         _setvbuf(stream);
@@ -324 +326 @@
         fflush(stream);
         
-        if (stream->phone >= 0)
-                async_hangup(stream->phone);
+        if (stream->sess != NULL)
+                async_hangup(stream->sess);
         
         if (stream->fd >= 0)
@@ -732 +734 @@
         }
         
-        if (stream->fd >= 0 && stream->need_sync) {
+        if ((stream->fd >= 0) && (stream->need_sync)) {
                 /**
                  * Better than syncing always, but probably still not the
@@ -770 +772 @@
 }
 
-int fphone(FILE *stream)
+async_sess_t *fsession(exch_mgmt_t mgmt, FILE *stream)
 {
         if (stream->fd >= 0) {
-                if (stream->phone < 0)
-                        stream->phone = fd_phone(stream->fd);
-                
-                return stream->phone;
-        }
-        
-        return -1;
+                if (stream->sess == NULL)
+                        stream->sess = fd_session(mgmt, stream->fd);
+                
+                return stream->sess;
+        }
+        
+        return NULL;
 }