HelenOSHelenOS-docHelenOS-historic

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/uspace/lib/libc/generic/io/ @ 2494

  → /trunk/uspace/lib/libc/generic/io/ @ 2495

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 2494 → Rev 2495

/trunk/uspace/lib/libc/generic/io/stream.c
65,11 → 65,12
static ssize_t read_stdin(void *param, void *buf, size_t count)
{
ipcarg_t r0,r1;
ipcarg_t r0, r1;
size_t i = 0;
while (i < count) {
if (async_req_2(streams[0].phone, CONSOLE_GETCHAR, 0, 0, &r0, &r1) < 0) {
if (async_req_2(streams[0].phone, CONSOLE_GETCHAR, 0, 0, &r0,
&r1) < 0) {
return -1;
}
((char *) buf)[i++] = r0;
82,7 → 83,8
int i;
for (i = 0; i < count; i++)
async_msg(streams[1].phone, CONSOLE_PUTCHAR, ((const char *) buf)[i]);
async_msg(streams[1].phone, CONSOLE_PUTCHAR,
((const char *) buf)[i]);
return count;
}
92,7 → 94,8
stream_t stream;
if (console_phone < 0) {
while ((console_phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0)) < 0) {
while ((console_phone = ipc_connect_me_to(PHONE_NS,
SERVICE_CONSOLE, 0)) < 0) {
usleep(10000);
}
}
110,7 → 113,8
stream_t stream;
if (console_phone < 0) {
while ((console_phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0)) < 0) {
while ((console_phone = ipc_connect_me_to(PHONE_NS,
SERVICE_CONSOLE, 0)) < 0) {
usleep(10000);
}
}