Subversion Repositories HelenOS-historic

Compare Revisions

Regard whitespace Rev 1365 → Rev 1366

/uspace/trunk/libc/generic/io/stream.c
10,8 → 10,7
 
#define FDS 32
 
typedef struct stream_t
{
typedef struct stream_t {
pwritefn_t w;
preadfn_t r;
void * param;
18,8 → 17,7
}stream_t;
 
 
typedef struct vfb_descriptor_t
{
typedef struct vfb_descriptor_t {
int phone;
int vfb;
}vfb_descriptor_t;
43,7 → 41,8
static ssize_t write_vfb(void *param, const void * buf, size_t count)
{
int i;
for(i=0;i<count;i++) vfb_send_char((vfb_descriptor_t *)param,((char*)buf)[i]);
for (i = 0; i < count; i++)
vfb_send_char((vfb_descriptor_t *) param, ((char *) buf)[i]);
return count;
//return (ssize_t) __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, (sysarg_t) count);
57,7 → 56,6
}
 
 
stream_t open_vfb(void);
stream_t open_vfb(void)
{
stream_t stream;
66,9 → 64,9
int res;
ipcarg_t vfb_no;
while((phoneid=ipc_connect_me_to(PHONE_NS,SERVICE_VIDEO,0))<0)
{
while ((phoneid = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) {
volatile int a;
for(a=0;a<1048576;a++);
}
78,7 → 76,6
vfb->phone=phoneid;
vfb->vfb=vfb_no;
stream.w=write_vfb;
stream.param=vfb;
return stream;
88,18 → 85,18
fd_t open(const char *fname,int flags)
{
int c=0;
while(((streams[c].w)||(streams[c].r))&&(c<FDS))c++;
if(c==FDS) return EMFILE;
 
while (((streams[c].w) || (streams[c].r)) && (c < FDS))
c++;
if (c == FDS)
return EMFILE;
 
if(!strcmp(fname,"stdin"))
{
if (!strcmp(fname, "stdin")) {
streams[c].r=(preadfn_t)1;
return c;
}
if(!strcmp(fname,"stdout"))
{
if (!strcmp(fname, "stdout")) {
//streams[c].w=write_stdout;
//return c;
streams[c]=open_vfb();
106,8 → 103,7
return c;
}
if(!strcmp(fname,"stderr"))
{
if (!strcmp(fname, "stderr")) {
streams[c].w=write_stderr;
return c;
}
116,8 → 112,8
 
ssize_t write(int fd, const void * buf, size_t count)
{
if(fd<FDS) return streams[fd].w(streams[fd].param,buf,count);
if (fd < FDS)
return streams[fd].w(streams[fd].param, buf, count);
return 0;
}