Changeset c8211849 in mainline for uspace/srv


Ignore:
Timestamp:
2017-12-08T21:03:35Z (8 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:
a99cbc1e
Parents:
c19a5a59
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 23:08:49)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)
Message:

Return number of characters separately from error code in console IO.

Location:
uspace/srv/hid
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/console/console.c

    rc19a5a59 rc8211849  
    119119static int cons_open(con_srvs_t *, con_srv_t *);
    120120static int cons_close(con_srv_t *);
    121 static int cons_read(con_srv_t *, void *, size_t);
    122 static int cons_write(con_srv_t *, void *, size_t);
     121static int cons_read(con_srv_t *, void *, size_t, size_t *);
     122static int cons_write(con_srv_t *, void *, size_t, size_t *);
    123123static void cons_sync(con_srv_t *);
    124124static void cons_clear(con_srv_t *);
    … …  
    338338}
    339339
    340 static int cons_read(con_srv_t *srv, void *buf, size_t size)
     340static int cons_read(con_srv_t *srv, void *buf, size_t size, size_t *nread)
    341341{
    342342        uint8_t *bbuf = buf;
    … …  
    378378        }
    379379       
    380         return size;
    381 }
    382 
    383 static int cons_write(con_srv_t *srv, void *data, size_t size)
     380        *nread = size;
     381        return EOK;
     382}
     383
     384static int cons_write(con_srv_t *srv, void *data, size_t size, size_t *nwritten)
    384385{
    385386        console_t *cons = srv_to_console(srv);
    … …  
    389390                cons_write_char(cons, str_decode(data, &off, size));
    390391       
    391         return size;
     392        *nwritten = size;
     393        return EOK;
    392394}
    393395

  • uspace/srv/hid/remcons/remcons.c

    rc19a5a59 rc8211849  
    7272static int remcons_open(con_srvs_t *, con_srv_t *);
    7373static int remcons_close(con_srv_t *);
    74 static int remcons_write(con_srv_t *, void *, size_t);
     74static int remcons_write(con_srv_t *, void *, size_t, size_t *);
    7575static void remcons_sync(con_srv_t *);
    7676static void remcons_clear(con_srv_t *);
    … …  
    137137}
    138138
    139 static int remcons_write(con_srv_t *srv, void *data, size_t size)
     139static int remcons_write(con_srv_t *srv, void *data, size_t size, size_t *nwritten)
    140140{
    141141        telnet_user_t *user = srv_to_user(srv);
    … …  
    146146                return rc;
    147147
    148         return size;
     148        *nwritten = size;
     149        return EOK;
    149150}
    150151
Note: See TracChangeset for help on using the changeset viewer.