WebSVN – HelenOS – Diff – /trunk/kernel/generic/src/printf/vprintf.c


/*
 * Copyright (c) 2006 Josef Cejka
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * - Redistributions of source code must retain the above copyright
 *   notice, this list of conditions and the following disclaimer.
 * - Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 * - The name of the author may not be used to endorse or promote products
 *   derived from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
/** @addtogroup generic
 * @{
 */
/** @file
 */
 
#include <print.h>
#include <printf/printf_core.h>
#include <putchar.h>
#include <synch/spinlock.h>
#include <arch/asm.h>
#include <arch/types.h>
#include <typedefs.h>
#include <string.h>
 
SPINLOCK_INITIALIZE(printf_lock);  /**< vprintf spinlock */
 
static int vprintf_write_utf8(const char *str, size_t size, void *data)
{
    index_t index = 0;
    index_t chars = 0;
   
    while (index < size) {
        putchar(utf8_decode(str, &index, size));
 
        chars++;
    }
   
    return chars;
}
 
static int vprintf_write_utf32(const wchar_t *str, size_t size, void *data)
{
    index_t index = 0;
   
    while (index < (size / sizeof(wchar_t))) {
        putchar(str[index]);
        index++;
    }
   
    return index;
}
 
int puts(const char *str)
{
    index_t index = 0;
    index_t chars = 0;
    wchar_t uc;
   
    while ((uc = utf8_decode(str, &index, UTF8_NO_LIMIT)) != 0) {
        putchar(uc);
 
        chars++;
    }
   
    return chars;
}
 
int vprintf(const char *fmt, va_list ap)
{
    printf_spec_t ps = {
        vprintf_write_utf8,
        vprintf_write_utf32,
        NULL
    };
   
    ipl_t ipl = interrupts_disable();
    spinlock_lock(&printf_lock);
   
    int ret = printf_core(fmt, &ps, ap);
   
    spinlock_unlock(&printf_lock);
    interrupts_restore(ipl);
   
    return ret;
}
 
/** @}
 */
 

Rev 4180	Rev 4199
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>	40	#include <arch/types.h>
41	#include <typedefs.h>	41	#include <typedefs.h>
42	#include <string.h>	42	#include <string.h>
43		43
44	SPINLOCK_INITIALIZE(printf_lock); /*< vprintf spinlock /	44	SPINLOCK_INITIALIZE(printf_lock); /*< vprintf spinlock /
45		45
46	static int vprintf_write_utf8(const char str, size_t size, void data)	46	static int vprintf_write_utf8(const char str, size_t size, void data)
47	{	47	{
48	index_t index = 0;	48	index_t index = 0;
49	index_t chars = 0;	49	index_t chars = 0;
50		50
51	while (index < size) {	51	while (index < size) {
52	putchar(utf8_decode(str, &index, size - 1));	52	putchar(utf8_decode(str, &index, size));
53	index++;	-
54	chars++;	53	chars++;
55	}	54	}
56		55
57	return chars;	56	return chars;
58	}	57	}
59		58
60	static int vprintf_write_utf32(const wchar_t str, size_t size, void data)	59	static int vprintf_write_utf32(const wchar_t str, size_t size, void data)
61	{	60	{
62	index_t index = 0;	61	index_t index = 0;
63		62
64	while (index < (size / sizeof(wchar_t))) {	63	while (index < (size / sizeof(wchar_t))) {
65	putchar(str[index]);	64	putchar(str[index]);
66	index++;	65	index++;
67	}	66	}
68		67
69	return index;	68	return index;
70	}	69	}
71		70
72	int puts(const char *str)	71	int puts(const char *str)
73	{	72	{
74	index_t index = 0;	73	index_t index = 0;
75	index_t chars = 0;	74	index_t chars = 0;
76	wchar_t uc;	75	wchar_t uc;
77		76
78	while ((uc = utf8_decode(str, &index, UTF8_NO_LIMIT)) != 0) {	77	while ((uc = utf8_decode(str, &index, UTF8_NO_LIMIT)) != 0) {
79	putchar(uc);	78	putchar(uc);
80	index++;	-
81	chars++;	79	chars++;
82	}	80	}
83		81
84	return chars;	82	return chars;
85	}	83	}
86		84
87	int vprintf(const char *fmt, va_list ap)	85	int vprintf(const char *fmt, va_list ap)
88	{	86	{
89	printf_spec_t ps = {	87	printf_spec_t ps = {
90	vprintf_write_utf8,	88	vprintf_write_utf8,
91	vprintf_write_utf32,	89	vprintf_write_utf32,
92	NULL	90	NULL
93	};	91	};
94		92
95	ipl_t ipl = interrupts_disable();	93	ipl_t ipl = interrupts_disable();
96	spinlock_lock(&printf_lock);	94	spinlock_lock(&printf_lock);
97		95
98	int ret = printf_core(fmt, &ps, ap);	96	int ret = printf_core(fmt, &ps, ap);
99		97
100	spinlock_unlock(&printf_lock);	98	spinlock_unlock(&printf_lock);
101	interrupts_restore(ipl);	99	interrupts_restore(ipl);
102		100
103	return ret;	101	return ret;
104	}	102	}
105		103
106	/** @}	104	/** @}
107	*/	105	*/
108		106

Subversion Repositories HelenOS

(root)/trunk/kernel/generic/src/printf/vprintf.c – Rev 4180 → 4199