Index: uspace/lib/c/generic/io/log.c =================================================================== --- uspace/lib/c/generic/io/log.c (revision 9b415c96f2f29f61f5d4f5f7ea3fd3b1ef1ea27a) +++ uspace/lib/c/generic/io/log.c (revision fc51296af4f45da426f5626f3573adee6b0babda) @@ -35,4 +35,5 @@ #include #include +#include #include #include @@ -89,12 +90,25 @@ va_list args; + va_start(args, fmt); + log_msgv(level, fmt, args); + va_end(args); +} + +/** Write an entry to the log (va_list variant). + * + * @param level Message verbosity level. Message is only printed + * if verbosity is less than or equal to current + * reporting level. + * @param fmt Format string + */ +void log_msgv(log_level_t level, const char *fmt, va_list args) +{ assert(level < LVL_LIMIT); /* Higher number means higher verbosity. */ if (level <= log_level) { - va_start(args, fmt); fibril_mutex_lock(&log_serializer); - fprintf(log_stream, "%s: %s", log_prog_name, + fprintf(log_stream, "%s: %s: ", log_prog_name, log_level_names[level]); vfprintf(log_stream, fmt, args); @@ -102,5 +116,4 @@ fibril_mutex_unlock(&log_serializer); - va_end(args); } } Index: uspace/lib/c/include/io/log.h =================================================================== --- uspace/lib/c/include/io/log.h (revision 9b415c96f2f29f61f5d4f5f7ea3fd3b1ef1ea27a) +++ uspace/lib/c/include/io/log.h (revision fc51296af4f45da426f5626f3573adee6b0babda) @@ -35,4 +35,6 @@ #define LIBC_IO_LOG_H_ +#include + typedef enum { LVL_FATAL, @@ -49,4 +51,5 @@ extern int log_init(const char *, log_level_t); extern void log_msg(log_level_t, const char *, ...); +extern void log_msgv(log_level_t, const char *, va_list); #endif Index: uspace/lib/drv/Makefile =================================================================== --- uspace/lib/drv/Makefile (revision 9b415c96f2f29f61f5d4f5f7ea3fd3b1ef1ea27a) +++ uspace/lib/drv/Makefile (revision fc51296af4f45da426f5626f3573adee6b0babda) @@ -35,4 +35,5 @@ generic/driver.c \ generic/dev_iface.c \ + generic/log.c \ generic/remote_hw_res.c \ generic/remote_char_dev.c Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision 9b415c96f2f29f61f5d4f5f7ea3fd3b1ef1ea27a) +++ uspace/lib/drv/generic/driver.c (revision fc51296af4f45da426f5626f3573adee6b0babda) @@ -273,12 +273,6 @@ res = driver->driver_ops->add_device(dev); - if (res == EOK) { - printf("%s: new device with handle=%" PRIun " was added.\n", - driver->name, dev_handle); - } else { - printf("%s: failed to add a new device with handle = %" PRIun ".\n", - driver->name, dev_handle); + if (res != EOK) delete_device(dev); - } async_answer_0(iid, res); Index: uspace/lib/drv/generic/log.c =================================================================== --- uspace/lib/drv/generic/log.c (revision fc51296af4f45da426f5626f3573adee6b0babda) +++ uspace/lib/drv/generic/log.c (revision fc51296af4f45da426f5626f3573adee6b0babda) @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libdrv + * @{ + */ + +#include +#include + +#include + +/** Initialize the logging system. + * + * @param drv_name Driver name, will be printed as part of message + * @param level Minimum message level to print + */ +int ddf_log_init(const char *drv_name, log_level_t level) +{ + return log_init(drv_name, level); +} + +/** Log a driver message. + * + * @param level Message verbosity level. Message is only printed + * if verbosity is less than or equal to current + * reporting level. + * @param fmt Format string + */ +void ddf_msg(log_level_t level, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + log_msgv(level, fmt, args); + va_end(args); +} + +/** @} + */ Index: uspace/lib/drv/include/ddf/log.h =================================================================== --- uspace/lib/drv/include/ddf/log.h (revision fc51296af4f45da426f5626f3573adee6b0babda) +++ uspace/lib/drv/include/ddf/log.h (revision fc51296af4f45da426f5626f3573adee6b0babda) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * 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 libdrv + * @{ + */ + +#ifndef DDF_LOG_H_ +#define DDF_LOG_H_ + +#include + +extern int ddf_log_init(const char *, log_level_t); +extern void ddf_msg(log_level_t, const char *, ...); + +#endif + +/** @} + */