Rev 2125 | Rev 3058 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2125 | Rev 2208 | ||
|---|---|---|---|
| 1 | /* |
1 | /* |
| 2 | * Copyright (c) 2006 Josef Cejka |
2 | * Copyright (c) 2006 Josef Cejka |
| 3 | * All rights reserved. |
3 | * All rights reserved. |
| 4 | * |
4 | * |
| 5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
| 6 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
| 7 | * are met: |
7 | * are met: |
| 8 | * |
8 | * |
| 9 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
| 10 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
| 11 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
| 12 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
| 13 | * documentation and/or other materials provided with the distribution. |
13 | * documentation and/or other materials provided with the distribution. |
| 14 | * - The name of the author may not be used to endorse or promote products |
14 | * - The name of the author may not be used to endorse or promote products |
| 15 | * derived from this software without specific prior written permission. |
15 | * derived from this software without specific prior written permission. |
| 16 | * |
16 | * |
| 17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| 18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| 19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| 20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| 21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| 22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 27 | */ |
27 | */ |
| 28 | 28 | ||
| 29 | /** @addtogroup generic |
29 | /** @addtogroup generic |
| 30 | * @{ |
30 | * @{ |
| 31 | */ |
31 | */ |
| 32 | /** @file |
32 | /** @file |
| 33 | */ |
33 | */ |
| 34 | 34 | ||
| 35 | #include <print.h> |
35 | #include <print.h> |
| 36 | #include <printf/printf_core.h> |
36 | #include <printf/printf_core.h> |
| 37 | #include <putchar.h> |
37 | #include <putchar.h> |
| - | 38 | #include <synch/spinlock.h> |
|
| - | 39 | #include <arch/asm.h> |
|
| - | 40 | ||
| - | 41 | SPINLOCK_INITIALIZE(printf_lock); /**< vprintf spinlock */ |
|
| 38 | 42 | ||
| 39 | static int vprintf_write(const char *str, size_t count, void *unused) |
43 | static int vprintf_write(const char *str, size_t count, void *unused) |
| 40 | { |
44 | { |
| 41 | size_t i; |
45 | size_t i; |
| 42 | for (i = 0; i < count; i++) |
46 | for (i = 0; i < count; i++) |
| 43 | putchar(str[i]); |
47 | putchar(str[i]); |
| 44 | return i; |
48 | return i; |
| 45 | } |
49 | } |
| 46 | 50 | ||
| 47 | int puts(const char *s) |
51 | int puts(const char *s) |
| 48 | { |
52 | { |
| 49 | size_t i; |
53 | size_t i; |
| 50 | for (i = 0; s[i] != 0; i++) |
54 | for (i = 0; s[i] != 0; i++) |
| 51 | putchar(s[i]); |
55 | putchar(s[i]); |
| 52 | return i; |
56 | return i; |
| 53 | } |
57 | } |
| 54 | 58 | ||
| 55 | int vprintf(const char *fmt, va_list ap) |
59 | int vprintf(const char *fmt, va_list ap) |
| 56 | { |
60 | { |
| 57 | struct printf_spec ps = {(int(*)(void *, size_t, void *)) vprintf_write, NULL}; |
61 | struct printf_spec ps = {(int(*)(void *, size_t, void *)) vprintf_write, NULL}; |
| - | 62 | ||
| - | 63 | int irqpri = interrupts_disable(); |
|
| - | 64 | spinlock_lock(&printf_lock); |
|
| - | 65 | ||
| 58 | return printf_core(fmt, &ps, ap); |
66 | int ret = printf_core(fmt, &ps, ap); |
| - | 67 | ||
| - | 68 | spinlock_unlock(&printf_lock); |
|
| - | 69 | interrupts_restore(irqpri); |
|
| 59 | 70 | ||
| - | 71 | return ret; |
|
| 60 | } |
72 | } |
| 61 | 73 | ||
| 62 | /** @} |
74 | /** @} |
| 63 | */ |
75 | */ |
| 64 | 76 | ||