Mercurial > sos > sos
changeset 14:94ed54424389
Merge again
author | Jonathan Pevarnek <pevarnj@gmail.com> |
---|---|
date | Wed, 09 Mar 2011 18:24:04 -0500 |
parents | 2356e9d59bc4 (current diff) e2b1d6184703 (diff) |
children | 525eab23e68a |
files | |
diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/arch/io.c Wed Mar 09 18:23:43 2011 -0500 +++ b/arch/io.c Wed Mar 09 18:24:04 2011 -0500 @@ -542,6 +542,8 @@ int getline(char *buf, int len) { + int i; + if (!init_cons) enable_cons(CON_DEV); @@ -550,7 +552,7 @@ wait_for_io_int(); - __builtin_memset(buf, 0, CON_LEN); + __builtin_memset(buf, 0, len); ccw.cmd = 0x0a; ccw.flags = 0x20; ccw.count = len; @@ -566,12 +568,12 @@ wait_for_io_int(); - for(len=0; len<CON_LEN; len++) - if (!buf[len]) + for(i=0; i<len; i++) + if (!buf[i]) break; - if (len) - ebcdic2ascii((u8*) buf, len); + if (i) + ebcdic2ascii((u8*) buf, i); - return len; + return i; }