Rev 3022 | Rev 4201 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3022 | Rev 4055 | ||
|---|---|---|---|
| 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> |
38 | #include <synch/spinlock.h> |
| 39 | #include <arch/asm.h> |
39 | #include <arch/asm.h> |
| - | 40 | #include <arch/types.h> |
|
| - | 41 | #include <typedefs.h> |
|
| 40 | 42 | ||
| 41 | SPINLOCK_INITIALIZE(printf_lock); /**< vprintf spinlock */ |
43 | SPINLOCK_INITIALIZE(printf_lock); /**< vprintf spinlock */ |
| 42 | 44 | ||
| 43 | static int vprintf_write(const char *str, size_t count, void *unused) |
45 | static int vprintf_write(const char *str, size_t count, void *unused) |
| 44 | { |
46 | { |
| 45 | size_t i; |
47 | size_t i; |
| 46 | for (i = 0; i < count; i++) |
48 | for (i = 0; i < count; i++) |
| 47 | putchar(str[i]); |
49 | putchar(str[i]); |
| 48 | return i; |
50 | return i; |
| 49 | } |
51 | } |
| 50 | 52 | ||
| 51 | int puts(const char *s) |
53 | int puts(const char *s) |
| 52 | { |
54 | { |
| 53 | size_t i; |
55 | size_t i; |
| 54 | for (i = 0; s[i] != 0; i++) |
56 | for (i = 0; s[i] != 0; i++) |
| 55 | putchar(s[i]); |
57 | putchar(s[i]); |
| 56 | return i; |
58 | return i; |
| 57 | } |
59 | } |
| 58 | 60 | ||
| 59 | int vprintf(const char *fmt, va_list ap) |
61 | int vprintf(const char *fmt, va_list ap) |
| 60 | { |
62 | { |
| 61 | struct printf_spec ps = {(int(*)(void *, size_t, void *)) vprintf_write, NULL}; |
63 | struct printf_spec ps = {(int(*)(void *, size_t, void *)) vprintf_write, NULL}; |
| 62 | 64 | ||
| 63 | int irqpri = interrupts_disable(); |
65 | ipl_t ipl = interrupts_disable(); |
| 64 | spinlock_lock(&printf_lock); |
66 | spinlock_lock(&printf_lock); |
| 65 | 67 | ||
| 66 | int ret = printf_core(fmt, &ps, ap); |
68 | int ret = printf_core(fmt, &ps, ap); |
| 67 | 69 | ||
| 68 | spinlock_unlock(&printf_lock); |
70 | spinlock_unlock(&printf_lock); |
| 69 | interrupts_restore(irqpri); |
71 | interrupts_restore(ipl); |
| 70 | 72 | ||
| 71 | return ret; |
73 | return ret; |
| 72 | } |
74 | } |
| 73 | 75 | ||
| 74 | /** @} |
76 | /** @} |
| 75 | */ |
77 | */ |
| 76 | 78 | ||