Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235516
b: refs/heads/master
c: bf73bd3
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Boyd authored and Greg Kroah-Hartman committed Feb 4, 2011
1 parent c85d021 commit 0135693
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a99632014631409483a481a6a0d77d09ded47239
refs/heads/master: bf73bd35a296b31dace098b9104b6b593ee0070f
12 changes: 4 additions & 8 deletions trunk/drivers/tty/hvc/hvc_dcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static int hvc_dcc_put_chars(uint32_t vt, const char *buf, int count)
while (__dcc_getstatus() & DCC_STATUS_TX)
cpu_relax();

__dcc_putchar((char)(buf[i] & 0xFF));
__dcc_putchar(buf[i]);
}

return count;
Expand All @@ -99,15 +99,11 @@ static int hvc_dcc_get_chars(uint32_t vt, char *buf, int count)
{
int i;

for (i = 0; i < count; ++i) {
int c = -1;

for (i = 0; i < count; ++i)
if (__dcc_getstatus() & DCC_STATUS_RX)
c = __dcc_getchar();
if (c < 0)
buf[i] = __dcc_getchar();
else
break;
buf[i] = c;
}

return i;
}
Expand Down

0 comments on commit 0135693

Please sign in to comment.