Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 857edacfd2083028539297de5770b5f4a4a4dd36) +++ uspace/lib/c/Makefile (revision 322a8066dd6a2df80d2650aaf0b4e19bbe60b576) @@ -77,4 +77,5 @@ generic/io/io.c \ generic/io/printf.c \ + generic/io/log.c \ generic/io/klog.c \ generic/io/snprintf.c \ Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision 857edacfd2083028539297de5770b5f4a4a4dd36) +++ uspace/lib/c/generic/devman.c (revision 322a8066dd6a2df80d2650aaf0b4e19bbe60b576) @@ -147,6 +147,4 @@ ret = devman_send_match_id(phone, match_id); if (ret != EOK) { - printf("Driver failed to send match id, error %d\n", - ret); return ret; } @@ -195,10 +193,15 @@ } - devman_send_match_ids(phone, match_ids); - - async_wait_for(req, &retval); - - async_serialize_end(); - + int match_ids_rc = devman_send_match_ids(phone, match_ids); + + async_wait_for(req, &retval); + + async_serialize_end(); + + /* Prefer the answer to DEVMAN_ADD_FUNCTION in case of errors. */ + if ((match_ids_rc != EOK) && (retval == EOK)) { + retval = match_ids_rc; + } + if (retval == EOK) fun_handle = (int) IPC_GET_ARG1(answer); @@ -326,4 +329,49 @@ } +int devman_device_get_handle_by_class(const char *classname, + const char *devname, devman_handle_t *handle, unsigned int flags) +{ + int phone = devman_get_phone(DEVMAN_CLIENT, flags); + + if (phone < 0) + return phone; + + async_serialize_start(); + + ipc_call_t answer; + aid_t req = async_send_1(phone, DEVMAN_DEVICE_GET_HANDLE_BY_CLASS, + flags, &answer); + + sysarg_t retval = async_data_write_start(phone, classname, + str_size(classname)); + if (retval != EOK) { + async_wait_for(req, NULL); + async_serialize_end(); + return retval; + } + retval = async_data_write_start(phone, devname, + str_size(devname)); + if (retval != EOK) { + async_wait_for(req, NULL); + async_serialize_end(); + return retval; + } + + async_wait_for(req, &retval); + + async_serialize_end(); + + if (retval != EOK) { + if (handle != NULL) + *handle = (devman_handle_t) -1; + return retval; + } + + if (handle != NULL) + *handle = (devman_handle_t) IPC_GET_ARG1(answer); + + return retval; +} + /** @} Index: uspace/lib/c/generic/io/log.c =================================================================== --- uspace/lib/c/generic/io/log.c (revision 322a8066dd6a2df80d2650aaf0b4e19bbe60b576) +++ uspace/lib/c/generic/io/log.c (revision 322a8066dd6a2df80d2650aaf0b4e19bbe60b576) @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 libc + * @{ + */ + +#include +#include +#include +#include +#include +#include + +#include + +/** Serialization mutex for logging functions. */ +static FIBRIL_MUTEX_INITIALIZE(log_serializer); + +/** Current log level. */ +static log_level_t log_level; + +static FILE *log_stream; + +static const char *log_prog_name; + +/** Prefixes for individual logging levels. */ +static const char *log_level_names[] = { + [LVL_FATAL] = "Fatal error", + [LVL_ERROR] = "Error", + [LVL_WARN] = "Warning", + [LVL_NOTE] = "Note", + [LVL_DEBUG] = "Debug", + [LVL_DEBUG2] = "Debug2" +}; + +/** Initialize the logging system. + * + * @param prog_name Program name, will be printed as part of message + * @param level Minimum message level to print + */ +int log_init(const char *prog_name, log_level_t level) +{ + assert(level < LVL_LIMIT); + log_level = level; + + log_stream = stdout; + log_prog_name = str_dup(prog_name); + if (log_prog_name == NULL) + return ENOMEM; + + return EOK; +} + +/** Write an entry to the log. + * + * @param level Message verbosity level. Message is only printed + * if verbosity is less than or equal to current + * reporting level. + * @param fmt Format string (no traling newline). + */ +void log_msg(log_level_t level, const char *fmt, ...) +{ + 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 (no trailing newline) + */ +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) { + fibril_mutex_lock(&log_serializer); + + fprintf(log_stream, "%s: %s: ", log_prog_name, + log_level_names[level]); + vfprintf(log_stream, fmt, args); + fputc('\n', log_stream); + fflush(log_stream); + + fibril_mutex_unlock(&log_serializer); + } +} + +/** @} + */ Index: uspace/lib/c/include/devman.h =================================================================== --- uspace/lib/c/include/devman.h (revision 857edacfd2083028539297de5770b5f4a4a4dd36) +++ uspace/lib/c/include/devman.h (revision 322a8066dd6a2df80d2650aaf0b4e19bbe60b576) @@ -53,4 +53,6 @@ extern int devman_device_get_handle(const char *, devman_handle_t *, unsigned int); +extern int devman_device_get_handle_by_class(const char *, const char *, + devman_handle_t *, unsigned int); extern int devman_add_device_to_class(devman_handle_t, const char *); Index: uspace/lib/c/include/io/log.h =================================================================== --- uspace/lib/c/include/io/log.h (revision 322a8066dd6a2df80d2650aaf0b4e19bbe60b576) +++ uspace/lib/c/include/io/log.h (revision 322a8066dd6a2df80d2650aaf0b4e19bbe60b576) @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 libc + * @{ + */ + +#ifndef LIBC_IO_LOG_H_ +#define LIBC_IO_LOG_H_ + +#include + +typedef enum { + LVL_FATAL, + LVL_ERROR, + LVL_WARN, + LVL_NOTE, + LVL_DEBUG, + LVL_DEBUG2, + + /** For checking range of values */ + LVL_LIMIT +} log_level_t; + +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/c/include/ipc/devman.h =================================================================== --- uspace/lib/c/include/ipc/devman.h (revision 857edacfd2083028539297de5770b5f4a4a4dd36) +++ uspace/lib/c/include/ipc/devman.h (revision 322a8066dd6a2df80d2650aaf0b4e19bbe60b576) @@ -148,5 +148,6 @@ typedef enum { - DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD + DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD, + DEVMAN_DEVICE_GET_HANDLE_BY_CLASS } client_to_devman_t;