Rev 4052 | Rev 4223 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4052 | Rev 4092 | ||
---|---|---|---|
Line 38... | Line 38... | ||
38 | #include <console/chardev.h> |
38 | #include <console/chardev.h> |
39 | #include <console/console.h> |
39 | #include <console/console.h> |
40 | #include <proc/thread.h> |
40 | #include <proc/thread.h> |
41 | #include <arch.h> |
41 | #include <arch.h> |
42 | 42 | ||
43 | chardev_t srlnin; |
- | |
44 | static chardev_t *srlnout; |
43 | static indev_t srlnout; |
45 | 44 | ||
46 | static void srlnin_suspend(chardev_t *d) |
- | |
47 | { |
- | |
48 | } |
- | |
49 | - | ||
50 | static void srlnin_resume(chardev_t *d) |
- | |
51 | { |
- | |
52 | } |
- | |
53 | - | ||
54 | chardev_operations_t srlnin_ops = { |
45 | indev_operations_t srlnout_ops = { |
55 | .suspend = srlnin_suspend, |
- | |
56 | .resume = srlnin_resume, |
46 | .poll = NULL |
57 | }; |
47 | }; |
58 | 48 | ||
59 | static void ksrln(void *arg) |
49 | static void ksrln(void *arg) |
60 | { |
50 | { |
61 | chardev_t *in = (chardev_t *) arg; |
51 | indev_t *in = (indev_t *) arg; |
62 | uint8_t ch; |
52 | bool cr = false; |
63 | 53 | ||
64 | while (1) { |
54 | while (true) { |
65 | ch = _getc(in); |
55 | uint8_t ch = _getc(in); |
66 | 56 | ||
67 | if (ch == '\r') |
57 | if ((ch == '\n') && (cr)) { |
- | 58 | cr = false; |
|
68 | continue; |
59 | continue; |
69 | - | ||
70 | chardev_push_character(srlnout, ch); |
- | |
71 | } |
- | |
72 | } |
60 | } |
73 | 61 | ||
- | 62 | if (ch == '\r') { |
|
- | 63 | ch = '\n'; |
|
- | 64 | cr = true; |
|
- | 65 | } else |
|
- | 66 | cr = false; |
|
74 | 67 | ||
75 | void srln_init(chardev_t *devout) |
68 | if (ch == 0x7f) |
76 | { |
- | |
77 | thread_t *t; |
69 | ch = '\b'; |
78 | 70 | ||
79 | chardev_initialize("srln", &srlnin, &srlnin_ops); |
71 | indev_push_character(stdin, ch); |
80 | srlnout = devout; |
72 | } |
- | 73 | } |
|
81 | 74 | ||
- | 75 | void srln_init(indev_t *devin) |
|
- | 76 | { |
|
- | 77 | indev_initialize("srln", &srlnout, &srlnout_ops); |
|
- | 78 | thread_t *thread |
|
82 | t = thread_create(ksrln, &srlnin, TASK, 0, "ksrln", false); |
79 | = thread_create(ksrln, devin, TASK, 0, "ksrln", false); |
- | 80 | ||
83 | ASSERT(t); |
81 | if (thread) { |
- | 82 | stdin = &srlnout; |
|
84 | thread_ready(t); |
83 | thread_ready(thread); |
- | 84 | } |
|
85 | } |
85 | } |
86 | 86 | ||
87 | /** @} |
87 | /** @} |
88 | */ |
88 | */ |
89 | - |