Rev 534 | Rev 588 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 534 | Rev 575 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (C) 2003 Josef Cejka |
2 | * Copyright (C) 2003 Josef Cejka |
3 | * Copyright (C) 2005 Jakub Jermar |
3 | * Copyright (C) 2005 Jakub Jermar |
4 | * All rights reserved. |
4 | * All rights reserved. |
5 | * |
5 | * |
6 | * Redistribution and use in source and binary forms, with or without |
6 | * Redistribution and use in source and binary forms, with or without |
7 | * modification, are permitted provided that the following conditions |
7 | * modification, are permitted provided that the following conditions |
8 | * are met: |
8 | * are met: |
9 | * |
9 | * |
10 | * - Redistributions of source code must retain the above copyright |
10 | * - Redistributions of source code must retain the above copyright |
11 | * notice, this list of conditions and the following disclaimer. |
11 | * notice, this list of conditions and the following disclaimer. |
12 | * - Redistributions in binary form must reproduce the above copyright |
12 | * - Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the |
13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. |
14 | * documentation and/or other materials provided with the distribution. |
15 | * - The name of the author may not be used to endorse or promote products |
15 | * - The name of the author may not be used to endorse or promote products |
16 | * derived from this software without specific prior written permission. |
16 | * derived from this software without specific prior written permission. |
17 | * |
17 | * |
18 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
18 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
19 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
20 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
21 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
22 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
23 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
24 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
25 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
28 | */ |
28 | */ |
29 | 29 | ||
30 | #include <console/console.h> |
30 | #include <console/console.h> |
31 | #include <console/chardev.h> |
31 | #include <console/chardev.h> |
32 | #include <synch/waitq.h> |
32 | #include <synch/waitq.h> |
33 | #include <synch/spinlock.h> |
33 | #include <synch/spinlock.h> |
34 | #include <arch/types.h> |
34 | #include <arch/types.h> |
35 | #include <typedefs.h> |
35 | #include <typedefs.h> |
36 | #include <arch.h> |
36 | #include <arch.h> |
37 | 37 | ||
38 | /** Standard input character device. */ |
38 | /** Standard input character device. */ |
39 | chardev_t *stdin = NULL; |
39 | chardev_t *stdin = NULL; |
- | 40 | chardev_t *stdout = NULL; |
|
40 | 41 | ||
41 | /** Get string from character device. |
42 | /** Get string from character device. |
42 | * |
43 | * |
43 | * Read characters from character device until first occurrence |
44 | * Read characters from character device until first occurrence |
44 | * of newline character. |
45 | * of newline character. |
45 | * |
46 | * |
46 | * @param chardev Character device. |
47 | * @param chardev Character device. |
47 | * @param buf Buffer where to store string terminated by '\0'. |
48 | * @param buf Buffer where to store string terminated by '\0'. |
48 | * @param len Size of the buffer. |
49 | * @param len Size of the buffer. |
49 | * |
50 | * |
50 | * @return Number of characters read. |
51 | * @return Number of characters read. |
51 | */ |
52 | */ |
52 | count_t gets(chardev_t *chardev, char *buf, size_t buflen) |
53 | count_t gets(chardev_t *chardev, char *buf, size_t buflen) |
53 | { |
54 | { |
54 | index_t index = 0; |
55 | index_t index = 0; |
55 | char ch; |
56 | char ch; |
56 | 57 | ||
57 | while (index < buflen) { |
58 | while (index < buflen) { |
58 | ch = getc(chardev); |
59 | ch = getc(chardev); |
59 | if (ch == '\n') { /* end of string => write 0, return */ |
60 | if (ch == '\n') { /* end of string => write 0, return */ |
60 | buf[index] = '\0'; |
61 | buf[index] = '\0'; |
61 | return (count_t) index; |
62 | return (count_t) index; |
62 | } |
63 | } |
63 | buf[index++] = ch; |
64 | buf[index++] = ch; |
64 | } |
65 | } |
65 | return (count_t) index; |
66 | return (count_t) index; |
66 | } |
67 | } |
67 | 68 | ||
68 | /** Get character from character device. |
69 | /** Get character from character device. |
69 | * |
70 | * |
70 | * @param chardev Character device. |
71 | * @param chardev Character device. |
71 | * |
72 | * |
72 | * @return Character read. |
73 | * @return Character read. |
73 | */ |
74 | */ |
74 | __u8 getc(chardev_t *chardev) |
75 | __u8 getc(chardev_t *chardev) |
75 | { |
76 | { |
76 | __u8 ch; |
77 | __u8 ch; |
77 | ipl_t ipl; |
78 | ipl_t ipl; |
78 | 79 | ||
79 | waitq_sleep(&chardev->wq); |
80 | waitq_sleep(&chardev->wq); |
80 | ipl = interrupts_disable(); |
81 | ipl = interrupts_disable(); |
81 | spinlock_lock(&chardev->lock); |
82 | spinlock_lock(&chardev->lock); |
82 | ch = chardev->buffer[(chardev->index - chardev->counter) % CHARDEV_BUFLEN]; |
83 | ch = chardev->buffer[(chardev->index - chardev->counter) % CHARDEV_BUFLEN]; |
83 | chardev->counter--; |
84 | chardev->counter--; |
84 | spinlock_unlock(&chardev->lock); |
85 | spinlock_unlock(&chardev->lock); |
85 | interrupts_restore(ipl); |
86 | interrupts_restore(ipl); |
86 | 87 | ||
87 | chardev->op->resume(); |
88 | chardev->op->resume(chardev); |
88 | 89 | ||
89 | return ch; |
90 | return ch; |
90 | } |
91 | } |
- | 92 | ||
- | 93 | void putchar(char c) |
|
- | 94 | { |
|
- | 95 | stdout->op->write(stdout, c); |
|
- | 96 | } |
|
91 | 97 |