Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/devman/devman.c (revision ea5352913e3f4737d9d751831020498633794587) @@ -34,4 +34,5 @@ #include #include +#include #include #include @@ -146,6 +147,6 @@ fibril_mutex_unlock(&drivers_list->drivers_mutex); - printf(NAME": the '%s' driver was added to the list of available " - "drivers.\n", drv->name); + log_msg(LVL_NOTE, "Driver `%s' was added to the list of available " + "drivers.", drv->name); } @@ -237,5 +238,5 @@ bool read_match_ids(const char *conf_path, match_id_list_t *ids) { - printf(NAME ": read_match_ids conf_path = %s.\n", conf_path); + log_msg(LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path); bool suc = false; @@ -247,5 +248,6 @@ fd = open(conf_path, O_RDONLY); if (fd < 0) { - printf(NAME ": unable to open %s\n", conf_path); + log_msg(LVL_ERROR, "Unable to open `%s' for reading: %s.", + conf_path, str_error(fd)); goto cleanup; } @@ -255,5 +257,6 @@ lseek(fd, 0, SEEK_SET); if (len == 0) { - printf(NAME ": configuration file '%s' is empty.\n", conf_path); + log_msg(LVL_ERROR, "Configuration file '%s' is empty.", + conf_path); goto cleanup; } @@ -261,6 +264,6 @@ buf = malloc(len + 1); if (buf == NULL) { - printf(NAME ": memory allocation failed when parsing file " - "'%s'.\n", conf_path); + log_msg(LVL_ERROR, "Memory allocation failed when parsing file " + "'%s'.", conf_path); goto cleanup; } @@ -268,5 +271,5 @@ ssize_t read_bytes = safe_read(fd, buf, len); if (read_bytes <= 0) { - printf(NAME ": unable to read file '%s'.\n", conf_path); + log_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path); goto cleanup; } @@ -306,5 +309,5 @@ bool get_driver_info(const char *base_path, const char *name, driver_t *drv) { - printf(NAME ": get_driver_info base_path = %s, name = %s.\n", + log_msg(LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")", base_path, name); @@ -338,5 +341,6 @@ struct stat s; if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */ - printf(NAME ": driver not found at path %s.", drv->binary_path); + log_msg(LVL_ERROR, "Driver not found at path `%s'.", + drv->binary_path); goto cleanup; } @@ -365,5 +369,5 @@ int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path) { - printf(NAME ": lookup_available_drivers, dir = %s \n", dir_path); + log_msg(LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path); int drv_cnt = 0; @@ -399,5 +403,5 @@ dev_node_t *dev; - printf(NAME ": create_root_nodes\n"); + log_msg(LVL_DEBUG, "create_root_nodes()"); fibril_rwlock_write_lock(&tree->rwlock); @@ -484,6 +488,6 @@ void attach_driver(dev_node_t *dev, driver_t *drv) { - printf(NAME ": attach_driver %s to device %s\n", - drv->name, dev->pfun->pathname); + log_msg(LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")", + dev->pfun->pathname, drv->name); fibril_mutex_lock(&drv->driver_mutex); @@ -507,10 +511,10 @@ assert(fibril_mutex_is_locked(&drv->driver_mutex)); - printf(NAME ": start_driver '%s'\n", drv->name); + log_msg(LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name); rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL); if (rc != EOK) { - printf(NAME ": error spawning %s (%s)\n", - drv->name, str_error(rc)); + log_msg(LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.", + drv->name, drv->binary_path, str_error(rc)); return false; } @@ -574,5 +578,6 @@ int phone; - printf(NAME ": pass_devices_to_driver(`%s')\n", driver->name); + log_msg(LVL_DEBUG, "pass_devices_to_driver(driver=\"%s\")", + driver->name); fibril_mutex_lock(&driver->driver_mutex); @@ -641,5 +646,5 @@ * immediately and possibly started here as well. */ - printf(NAME ": driver %s goes into running state.\n", driver->name); + log_msg(LVL_DEBUG, "Driver `%s' enters running state.", driver->name); driver->state = DRIVER_RUNNING; @@ -658,5 +663,6 @@ void initialize_running_driver(driver_t *driver, dev_tree_t *tree) { - printf(NAME ": initialize_running_driver (`%s')\n", driver->name); + log_msg(LVL_DEBUG, "initialize_running_driver(driver=\"%s\")", + driver->name); /* @@ -748,6 +754,6 @@ * access any structures that would affect driver_t. */ - printf(NAME ": add_device (driver `%s', device `%s')\n", drv->name, - dev->pfun->name); + log_msg(LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")", + drv->name, dev->pfun->name); sysarg_t rc; @@ -810,5 +816,5 @@ driver_t *drv = find_best_match_driver(drivers_list, dev); if (drv == NULL) { - printf(NAME ": no driver found for device '%s'.\n", + log_msg(LVL_ERROR, "No driver found for device `%s'.", dev->pfun->pathname); return false; @@ -848,5 +854,5 @@ bool init_device_tree(dev_tree_t *tree, driver_list_t *drivers_list) { - printf(NAME ": init_device_tree.\n"); + log_msg(LVL_DEBUG, "init_device_tree()"); tree->current_handle = 0; @@ -1027,5 +1033,5 @@ fun->pathname = (char *) malloc(pathsize); if (fun->pathname == NULL) { - printf(NAME ": failed to allocate device path.\n"); + log_msg(LVL_ERROR, "Failed to allocate device path."); return false; } @@ -1058,4 +1064,7 @@ assert(fibril_rwlock_is_write_locked(&tree->rwlock)); + log_msg(LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])", + dev, pfun, pfun->pathname); + /* Add the node to the handle-to-node map. */ dev->handle = ++tree->current_handle; @@ -1064,5 +1073,4 @@ /* Add the node to the list of its parent's children. */ - printf("insert_dev_node: dev=%p, dev->pfun := %p\n", dev, pfun); dev->pfun = pfun; pfun->child = dev; @@ -1165,4 +1173,63 @@ } +/** Find function with a specified name belonging to given device. + * + * Device tree rwlock should be held at least for reading. + * + * @param dev Device the function belongs to. + * @param name Function name (not path). + * @return Function node. + * @retval NULL No function with given name. + */ +fun_node_t *find_fun_node_in_device(dev_node_t *dev, const char *name) +{ + assert(dev != NULL); + assert(name != NULL); + + fun_node_t *fun; + link_t *link; + + for (link = dev->functions.next; + link != &dev->functions; + link = link->next) { + fun = list_get_instance(link, fun_node_t, dev_functions); + + if (str_cmp(name, fun->name) == 0) + return fun; + } + + return NULL; +} + +/** Find function node by its class name and index. */ +fun_node_t *find_fun_node_by_class(class_list_t *class_list, + const char *class_name, const char *dev_name) +{ + assert(class_list != NULL); + assert(class_name != NULL); + assert(dev_name != NULL); + + fibril_rwlock_read_lock(&class_list->rwlock); + + dev_class_t *cl = find_dev_class_no_lock(class_list, class_name); + if (cl == NULL) { + fibril_rwlock_read_unlock(&class_list->rwlock); + return NULL; + } + + dev_class_info_t *dev = find_dev_in_class(cl, dev_name); + if (dev == NULL) { + fibril_rwlock_read_unlock(&class_list->rwlock); + return NULL; + } + + fun_node_t *fun = dev->fun; + + fibril_rwlock_read_unlock(&class_list->rwlock); + + return fun; +} + + /** Find child function node with a specified name. * @@ -1175,19 +1242,5 @@ fun_node_t *find_node_child(fun_node_t *pfun, const char *name) { - fun_node_t *fun; - link_t *link; - - link = pfun->child->functions.next; - - while (link != &pfun->child->functions) { - fun = list_get_instance(link, fun_node_t, dev_functions); - - if (str_cmp(name, fun->name) == 0) - return fun; - - link = link->next; - } - - return NULL; + return find_fun_node_in_device(pfun->child, name); } @@ -1351,4 +1404,24 @@ } +dev_class_info_t *find_dev_in_class(dev_class_t *dev_class, const char *dev_name) +{ + assert(dev_class != NULL); + assert(dev_name != NULL); + + link_t *link; + for (link = dev_class->devices.next; + link != &dev_class->devices; + link = link->next) { + dev_class_info_t *dev = list_get_instance(link, + dev_class_info_t, link); + + if (str_cmp(dev->dev_name, dev_name) == 0) { + return dev; + } + } + + return NULL; +} + void init_class_list(class_list_t *class_list) { Index: uspace/srv/devman/devman.h =================================================================== --- uspace/srv/devman/devman.h (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/devman/devman.h (revision ea5352913e3f4737d9d751831020498633794587) @@ -338,4 +338,6 @@ extern fun_node_t *find_fun_node(dev_tree_t *tree, devman_handle_t handle); extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *); +extern fun_node_t *find_fun_node_in_device(dev_node_t *, const char *); +extern fun_node_t *find_fun_node_by_class(class_list_t *, const char *, const char *); /* Device tree */ @@ -359,4 +361,5 @@ extern dev_class_t *get_dev_class(class_list_t *, char *); extern dev_class_t *find_dev_class_no_lock(class_list_t *, const char *); +extern dev_class_info_t *find_dev_in_class(dev_class_t *, const char *); extern void add_dev_class_no_lock(class_list_t *, dev_class_t *); Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/devman/main.c (revision ea5352913e3f4737d9d751831020498633794587) @@ -43,4 +43,5 @@ #include #include +#include #include #include @@ -51,4 +52,5 @@ #include #include +#include #include #include @@ -71,5 +73,5 @@ driver_t *driver = NULL; - printf(NAME ": devman_driver_register \n"); + log_msg(LVL_DEBUG, "devman_driver_register"); iid = async_get_call(&icall); @@ -88,5 +90,5 @@ } - printf(NAME ": the %s driver is trying to register by the service.\n", + log_msg(LVL_DEBUG, "The `%s' driver is trying to register.", drv_name); @@ -95,5 +97,5 @@ if (driver == NULL) { - printf(NAME ": no driver named %s was found.\n", drv_name); + log_msg(LVL_ERROR, "No driver named `%s' was found.", drv_name); free(drv_name); drv_name = NULL; @@ -106,5 +108,6 @@ /* Create connection to the driver. */ - printf(NAME ": creating connection to the %s driver.\n", driver->name); + log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.", + driver->name); ipc_call_t call; ipc_callid_t callid = async_get_call(&call); @@ -118,5 +121,6 @@ set_driver_phone(driver, IPC_GET_ARG5(call)); - printf(NAME ": the %s driver was successfully registered as running.\n", + log_msg(LVL_NOTE, + "The `%s' driver was successfully registered as running.", driver->name); @@ -142,6 +146,6 @@ callid = async_get_call(&call); if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) { - printf(NAME ": ERROR: devman_receive_match_id - invalid " - "protocol.\n"); + log_msg(LVL_ERROR, + "Invalid protocol when trying to receive match id."); async_answer_0(callid, EINVAL); delete_match_id(match_id); @@ -150,6 +154,5 @@ if (match_id == NULL) { - printf(NAME ": ERROR: devman_receive_match_id - failed to " - "allocate match id.\n"); + log_msg(LVL_ERROR, "Failed to allocate match id."); async_answer_0(callid, ENOMEM); return ENOMEM; @@ -165,6 +168,6 @@ if (rc != EOK) { delete_match_id(match_id); - printf(NAME ": devman_receive_match_id - failed to receive " - "match id string.\n"); + log_msg(LVL_ERROR, "Failed to receive match id string: %s.", + str_error(rc)); return rc; } @@ -172,5 +175,5 @@ list_append(&match_id->link, &match_ids->ids); - printf(NAME ": received match id '%s', score = %d \n", + log_msg(LVL_DEBUG, "Received match id `%s', score %d.", match_id->id, match_id->score); return rc; @@ -228,5 +231,7 @@ if (ftype != fun_inner && ftype != fun_exposed) { /* Unknown function type */ - printf(NAME ": Error, unknown function type provided by driver!\n"); + log_msg(LVL_ERROR, + "Unknown function type %d provided by driver.", + (int) ftype); fibril_rwlock_write_unlock(&tree->rwlock); @@ -243,4 +248,14 @@ } + /* Check that function with same name is not there already. */ + if (find_fun_node_in_device(pdev, fun_name) != NULL) { + fibril_rwlock_write_unlock(&tree->rwlock); + async_answer_0(callid, EEXISTS); + printf(NAME ": Warning, driver tried to register `%s' twice.\n", + fun_name); + free(fun_name); + return; + } + fun_node_t *fun = create_fun_node(); if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) { @@ -265,5 +280,5 @@ fibril_rwlock_write_unlock(&tree->rwlock); - printf(NAME ": devman_add_function %s\n", fun->pathname); + log_msg(LVL_DEBUG, "devman_add_function(fun=\"%s\")", fun->pathname); devman_receive_match_ids(match_count, &fun->match_ids); @@ -347,6 +362,6 @@ devmap_register_class_dev(class_info); - printf(NAME ": function'%s' added to class '%s', class name '%s' was " - "asigned to it\n", fun->pathname, class_name, class_info->dev_name); + log_msg(LVL_NOTE, "Function `%s' added to class `%s' as `%s'.", + fun->pathname, class_name, class_info->dev_name); async_answer_0(callid, EOK); @@ -363,5 +378,5 @@ initialize_running_driver(driver, &device_tree); - printf(NAME ": the %s driver was successfully initialized. \n", + log_msg(LVL_DEBUG, "The `%s` driver was successfully initialized.", driver->name); return 0; @@ -385,6 +400,6 @@ fid_t fid = fibril_create(init_running_drv, driver); if (fid == 0) { - printf(NAME ": Error creating fibril for the initialization of " - "the newly registered running driver.\n"); + log_msg(LVL_ERROR, "Failed to create initialization fibril " \ + "for driver `%s'.", driver->name); return; } @@ -438,4 +453,38 @@ } +/** Find handle for the device instance identified by device class name. */ +static void devman_function_get_handle_by_class(ipc_callid_t iid, + ipc_call_t *icall) +{ + char *classname; + char *devname; + + int rc = async_data_write_accept((void **) &classname, true, 0, 0, 0, 0); + if (rc != EOK) { + async_answer_0(iid, rc); + return; + } + rc = async_data_write_accept((void **) &devname, true, 0, 0, 0, 0); + if (rc != EOK) { + free(classname); + async_answer_0(iid, rc); + return; + } + + + fun_node_t *fun = find_fun_node_by_class(&class_list, + classname, devname); + + free(classname); + free(devname); + + if (fun == NULL) { + async_answer_0(iid, ENOENT); + return; + } + + async_answer_1(iid, EOK, fun->handle); +} + /** Function for handling connections from a client to the device manager. */ @@ -457,4 +506,7 @@ devman_function_get_handle(callid, &call); break; + case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS: + devman_function_get_handle_by_class(callid, &call); + break; default: async_answer_0(callid, ENOENT); @@ -484,6 +536,6 @@ */ if (dev == NULL) { - printf(NAME ": devman_forward error - no device or function with " - "handle %" PRIun " was found.\n", handle); + log_msg(LVL_ERROR, "IPC forwarding failed - no device or " + "function with handle %" PRIun " was found.", handle); async_answer_0(iid, ENOENT); return; @@ -491,6 +543,7 @@ if (fun == NULL && !drv_to_parent) { - printf(NAME ": devman_forward error - cannot connect to " - "handle %" PRIun ", refers to a device.\n", handle); + log_msg(LVL_ERROR, NAME ": devman_forward error - cannot " + "connect to handle %" PRIun ", refers to a device.", + handle); async_answer_0(iid, ENOENT); return; @@ -513,6 +566,6 @@ if (driver == NULL) { - printf(NAME ": devman_forward error - the device is not in %" PRIun - " usable state.\n", handle); + log_msg(LVL_ERROR, "IPC forwarding refused - " \ + "the device %" PRIun " is not in usable state.", handle); async_answer_0(iid, ENOENT); return; @@ -526,7 +579,7 @@ if (driver->phone <= 0) { - printf(NAME ": devman_forward: cound not forward to driver %s ", - driver->name); - printf("the driver's phone is %" PRIun ").\n", driver->phone); + log_msg(LVL_ERROR, + "Could not forward to driver `%s' (phone is %d).", + driver->name, (int) driver->phone); async_answer_0(iid, EINVAL); return; @@ -534,9 +587,11 @@ if (fun != NULL) { - printf(NAME ": devman_forward: forward connection to function %s to " - "driver %s.\n", fun->pathname, driver->name); + log_msg(LVL_DEBUG, + "Forwarding request for `%s' function to driver `%s'.", + fun->pathname, driver->name); } else { - printf(NAME ": devman_forward: forward connection to device %s to " - "driver %s.\n", dev->pfun->pathname, driver->name); + log_msg(LVL_DEBUG, + "Forwarding request for `%s' device to driver `%s'.", + dev->pfun->pathname, driver->name); } @@ -570,6 +625,7 @@ async_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, fun->handle, 0, IPC_FF_NONE); - printf(NAME ": devman_connection_devmapper: forwarded connection to " - "device %s to driver %s.\n", fun->pathname, dev->drv->name); + log_msg(LVL_DEBUG, + "Forwarding devmapper request for `%s' function to driver `%s'.", + fun->pathname, dev->drv->name); } @@ -606,5 +662,5 @@ static bool devman_init(void) { - printf(NAME ": devman_init - looking for available drivers.\n"); + log_msg(LVL_DEBUG, "devman_init - looking for available drivers."); /* Initialize list of available drivers. */ @@ -612,13 +668,13 @@ if (lookup_available_drivers(&drivers_list, DRIVER_DEFAULT_STORE) == 0) { - printf(NAME " no drivers found."); + log_msg(LVL_FATAL, "No drivers found."); return false; } - printf(NAME ": devman_init - list of drivers has been initialized.\n"); + log_msg(LVL_DEBUG, "devman_init - list of drivers has been initialized."); /* Create root device node. */ if (!init_device_tree(&device_tree, &drivers_list)) { - printf(NAME " failed to initialize device tree."); + log_msg(LVL_FATAL, "Failed to initialize device tree."); return false; } @@ -641,6 +697,11 @@ printf(NAME ": HelenOS Device Manager\n"); + if (log_init(NAME, LVL_ERROR) != EOK) { + printf(NAME ": Error initializing logging subsystem.\n"); + return -1; + } + if (!devman_init()) { - printf(NAME ": Error while initializing service\n"); + log_msg(LVL_ERROR, "Error while initializing service."); return -1; } @@ -650,8 +711,10 @@ /* Register device manager at naming service. */ - if (service_register(SERVICE_DEVMAN) != EOK) + if (service_register(SERVICE_DEVMAN) != EOK) { + log_msg(LVL_ERROR, "Failed registering as a service."); return -1; - - printf(NAME ": Accepting connections\n"); + } + + printf(NAME ": Accepting connections.\n"); async_manager(); Index: uspace/srv/devmap/devmap.c =================================================================== --- uspace/srv/devmap/devmap.c (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/devmap/devmap.c (revision ea5352913e3f4737d9d751831020498633794587) @@ -551,5 +551,5 @@ if (devmap_device_find_name(namespace->name, device->name) != NULL) { printf("%s: Device '%s/%s' already registered\n", NAME, - device->namespace->name, device->name); + namespace->name, device->name); devmap_namespace_destroy(namespace); fibril_mutex_unlock(&devices_list_mutex); Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision ea5352913e3f4737d9d751831020498633794587) @@ -367,9 +367,9 @@ static void cuda_irq_rcv_end(void *buf, size_t *len) { - uint8_t data, b; - + uint8_t b; + b = pio_read_8(&dev->b); - data = pio_read_8(&dev->sr); - + pio_read_8(&dev->sr); + if ((b & TREQ) == 0) { instance->xstate = cx_receive; @@ -379,7 +379,7 @@ cuda_send_start(); } - - memcpy(buf, instance->rcv_buf, instance->bidx); - *len = instance->bidx; + + memcpy(buf, instance->rcv_buf, instance->bidx); + *len = instance->bidx; instance->bidx = 0; } Index: uspace/srv/hw/netif/ne2000/dp8390_drv.h =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390_drv.h (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ (revision ) @@ -1,84 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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 dp8390 - * @{ - */ - -/** @file - * DP8390 network interface driver interface. - */ - -#ifndef __NET_NETIF_DP8390_DRIVER_H__ -#define __NET_NETIF_DP8390_DRIVER_H__ - -#include "dp8390.h" - -/** Initializes and/or starts the network interface. - * @param[in,out] dep The network interface structure. - * @param[in] mode The state mode. - * @returns EOK on success. - * @returns EXDEV if the network interface is disabled. - */ -int do_init(dpeth_t *dep, int mode); - -/** Stops the network interface. - * @param[in,out] dep The network interface structure. - */ -void do_stop(dpeth_t *dep); - -/** Processes the interrupt. - * @param[in,out] dep The network interface structure. - * @param[in] isr The interrupt status register. - */ -void dp_check_ints(dpeth_t *dep, int isr); - -/** Probes and initializes the network interface. - * @param[in,out] dep The network interface structure. - * @returns EOK on success. - * @returns EXDEV if the network interface was not recognized. - */ -int do_probe(dpeth_t * dep); - -/** Sends a packet. - * @param[in,out] dep The network interface structure. - * @param[in] packet The packet t be sent. - * @param[in] from_int The value indicating whether the sending is initialized from the interrupt handler. - * @returns - */ -int do_pwrite(dpeth_t * dep, packet_t *packet, int from_int); - -/** Prints out network interface information. - * @param[in] dep The network interface structure. - */ -void dp8390_dump(dpeth_t * dep); - -#endif - -/** @} - */ Index: uspace/srv/hw/netif/ne2000/dp8390_port.h =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390_port.h (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ (revision ) @@ -1,274 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * 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 dp8390 - * @{ - */ - -/** @file - * DP8390 network interface types and structures ports. - */ - -#ifndef __NET_NETIF_DP8390_PORT_H__ -#define __NET_NETIF_DP8390_PORT_H__ - -#include -#include -#include -#include -#include - -/** Macro for difining functions. - * @param[in] function The function type and name definition. - * @param[in] params The function parameters definition. - */ -#define _PROTOTYPE(function, params) function params - -/** Success error code. - */ -#define OK EOK - -/** Type definition of the unsigned byte. - */ -typedef uint8_t u8_t; - -/** Type definition of the unsigned short. - */ -typedef uint16_t u16_t; - -/** Compares two memory blocks. - * @param[in] first The first memory block. - * @param[in] second The second memory block. - * @param[in] size The blocks size in bytes. - * @returns 0 if equeal. - * @returns -1 if the first is greater than the second. - * @returns 1 if the second is greater than the first. - */ -#define memcmp(first, second, size) bcmp((char *) (first), (char *) (second), (size)) - -/** Reads 1 byte. - * @param[in] port The address to be read. - * @returns The read value. - */ -#define inb(port) pio_read_8((ioport8_t *) (port)) - -/** Reads 1 word (2 bytes). - * @param[in] port The address to be read. - * @returns The read value. - */ -#define inw(port) pio_read_16((ioport16_t *) (port)) - -/** Writes 1 byte. - * @param[in] port The address to be written. - * @param[in] value The value to be written. - */ -#define outb(port, value) pio_write_8((ioport8_t *) (port), (value)) - -/** Writes 1 word (2 bytes). - * @param[in] port The address to be written. - * @param[in] value The value to be written. - */ -#define outw(port, value) pio_write_16((ioport16_t *) (port), (value)) - -/** Prints out the driver critical error. - * Does not call the system panic(). - */ -#define panic(...) printf("%s%s%d", __VA_ARGS__) - -/** Copies a memory block. - * @param proc The source process. Ignored parameter. - * @param src_s Ignored parameter. - * @param[in] src The source address. - * @param me The current proces. Ignored parameter. - * @param dst_s Ignored parameter. - * @param[in] dst The destination address. - * @param[in] bytes The block size in bytes. - * @returns EOK. - */ -#define sys_vircopy(proc, src_s, src, me, dst_s, dst, bytes) ({memcpy((void *)(dst), (void *)(src), (bytes)); EOK;}) - -/** Reads a memory block byte by byte. - * @param[in] port The address to be written. - * @param proc The source process. Ignored parameter. - * @param[in] dst The destination address. - * @param[in] bytes The block size in bytes. - */ -#define do_vir_insb(port, proc, dst, bytes) insb((port), (void *)(dst), (bytes)) - -/** Reads a memory block word by word (2 bytes). - * @param[in] port The address to be written. - * @param proc The source process. Ignored parameter. - * @param[in] dst The destination address. - * @param[in] bytes The block size in bytes. - */ -#define do_vir_insw(port, proc, dst, bytes) insw((port), (void *)(dst), (bytes)) - -/** Writes a memory block byte by byte. - * @param[in] port The address to be written. - * @param proc The source process. Ignored parameter. - * @param[in] src The source address. - * @param[in] bytes The block size in bytes. - */ -#define do_vir_outsb(port, proc, src, bytes) outsb((port), (void *)(src), (bytes)) - -/** Writes a memory block word by word (2 bytes). - * @param[in] port The address to be written. - * @param proc The source process. Ignored parameter. - * @param[in] src The source address. - * @param[in] bytes The block size in bytes. - */ -#define do_vir_outsw(port, proc, src, bytes) outsw((port), (void *)(src), (bytes)) - -/* com.h */ -/* Bits in 'DL_MODE' field of DL requests. */ -# define DL_NOMODE 0x0 -# define DL_PROMISC_REQ 0x2 -# define DL_MULTI_REQ 0x4 -# define DL_BROAD_REQ 0x8 - -/* const.h */ -/** True value. - */ -#define TRUE 1 /* used for turning integers into Booleans */ - -/** False value. - */ -#define FALSE 0 /* used for turning integers into Booleans */ - -/** No number value. - */ -#define NO_NUM 0x8000 /* used as numerical argument to panic() */ - -/* devio.h */ -//typedef u16_t port_t; -/** Type definition of a port. - */ -typedef long port_t; - -/* dl_eth.h */ -/** Ethernet statistics. - */ -typedef struct eth_stat -{ - /** Number of receive errors. - */ - unsigned long ets_recvErr; - /** Number of send error. - */ - unsigned long ets_sendErr; - /** Number of buffer overwrite warnings. - */ - unsigned long ets_OVW; - /** Number of crc errors of read. - */ - unsigned long ets_CRCerr; - /** Number of frames not alligned (number of bits % 8 != 0). - */ - unsigned long ets_frameAll; - /** Number of packets missed due to slow processing. - */ - unsigned long ets_missedP; - /** Number of packets received. - */ - unsigned long ets_packetR; - /** Number of packets transmitted. - */ - unsigned long ets_packetT; - /** Number of transmission defered (Tx was busy). - */ - unsigned long ets_transDef; - /** Number of collissions. - */ - unsigned long ets_collision; - /** Number of Tx aborted due to excess collisions. - */ - unsigned long ets_transAb; - /** Number of carrier sense lost. - */ - unsigned long ets_carrSense; - /** Number of FIFO underruns (processor too busy). - */ - unsigned long ets_fifoUnder; - /** Number of FIFO overruns (processor too busy). - */ - unsigned long ets_fifoOver; - /** Number of times unable to transmit collision sig. - */ - unsigned long ets_CDheartbeat; - /** Number of times out of window collision. - */ - unsigned long ets_OWC; -} eth_stat_t; - -/* errno.h */ -/** Generic error. - */ -#define EGENERIC EINVAL - -/* ether.h */ -/** Minimum Ethernet packet size in bytes. - */ -#define ETH_MIN_PACK_SIZE 60 - -/** Maximum Ethernet packet size in bytes. - */ -#define ETH_MAX_PACK_SIZE_TAGGED 1518 - -/** Ethernet address type definition. - */ -typedef struct ether_addr -{ - /** Address data. - */ - u8_t ea_addr[6]; -} ether_addr_t; - -/* type.h */ -/** Type definition of the physical addresses and lengths in bytes. - */ -typedef unsigned long phys_bytes; - -/** Type definition of the virtual addresses and lengths in bytes. - */ -typedef unsigned long vir_bytes; - -/** Type definition of the input/output vector. - */ -typedef struct { - /** Address of an I/O buffer. - */ - vir_bytes iov_addr; - /** Sizeof an I/O buffer. - */ - vir_bytes iov_size; -} iovec_t; - -#endif - -/** @} - */ Index: uspace/srv/hw/netif/ne2000/local.h =================================================================== --- uspace/srv/hw/netif/ne2000/local.h (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ (revision ) @@ -1,99 +1,0 @@ -/* - * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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. - * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * * Any deviations from these conditions require written permission from the copyright holder in advance - * - * - * Disclaimer - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, AND CONTRIBUTORS ``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 COPYRIGHT HOLDER OR ANY AUTHORS OR CONTRIBUTORS 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. - * - * Changes: - * 2009 ported to HelenOS, Lukas Mejdrech - */ - -/** @addtogroup dp8390 - * @{ - */ - -/** @file - * Network interface probe functions. - */ - -#ifndef __NET_NETIF_DP8390_CONFIG_H__ -#define __NET_NETIF_DP8390_CONFIG_H__ - -#include "dp8390_port.h" - -/* -local.h -*/ - -/** WDETH switch. - */ -#define ENABLE_WDETH 0 - -/** NE2000 switch. - */ -#define ENABLE_NE2000 1 - -/** 3C503 switch. - */ -#define ENABLE_3C503 0 - -/** PCI support switch. - */ -#define ENABLE_PCI 0 - -struct dpeth; - -/* 3c503.c */ -/* * Probes a 3C503 network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -//_PROTOTYPE(int el2_probe, (struct dpeth*dep) ); - -/* ne2000.c */ -/** Probes a NE2000 or NE1000 network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -int ne_probe(struct dpeth * dep); -//_PROTOTYPE(int ne_probe, (struct dpeth *dep) ); -//_PROTOTYPE(void ne_init, (struct dpeth *dep) ); - -/* rtl8029.c */ -/* * Probes a RTL8029 network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -//_PROTOTYPE(int rtl_probe, (struct dpeth *dep) ); - -/* wdeth.c */ -/* * Probes a WDETH network interface. - * @param[in] dep The network interface structure. - * @returns 1 if the NE2000 network interface is present. - * @returns 0 otherwise. - */ -//_PROTOTYPE(int wdeth_probe, (struct dpeth*dep) ); - -#endif - -/** @} - */ Index: uspace/srv/hw/netif/ne2000/ne2000.h =================================================================== --- uspace/srv/hw/netif/ne2000/ne2000.h (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ (revision ) @@ -1,111 +1,0 @@ -/* - * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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. - * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. - * * Any deviations from these conditions require written permission from the copyright holder in advance - * - * - * Disclaimer - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, AND CONTRIBUTORS ``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 COPYRIGHT HOLDER OR ANY AUTHORS OR CONTRIBUTORS 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. - * - * Changes: - * 2009 ported to HelenOS, Lukas Mejdrech - */ - -/* -ne2000.h - -Created: March 15, 1994 by Philip Homburg -*/ - -/** @addtogroup ne2k - * @{ - */ - -/** @file - * NE1000 and NE2000 network interface definitions. - */ - -#ifndef __NET_NETIF_NE2000_H__ -#define __NET_NETIF_NE2000_H__ - -#include - -#include "dp8390_port.h" - -/** DP8390 register offset. - */ -#define NE_DP8390 0x00 - -/** Data register. - */ -#define NE_DATA 0x10 - -/** Reset register. - */ -#define NE_RESET 0x1F - -/** NE1000 data start. - */ -#define NE1000_START 0x2000 - -/** NE1000 data size. - */ -#define NE1000_SIZE 0x2000 - -/** NE2000 data start. - */ -#define NE2000_START 0x4000 - -/** NE2000 data size. - */ -#define NE2000_SIZE 0x4000 - -/** Reads 1 byte register. - * @param[in] dep The network interface structure. - * @param[in] reg The register offset. - * @returns The read value. - */ -#define inb_ne(dep, reg) (inb(dep->de_base_port+reg)) - -/** Writes 1 byte register. - * @param[in] dep The network interface structure. - * @param[in] reg The register offset. - * @param[in] data The value to be written. - */ -#define outb_ne(dep, reg, data) (outb(dep->de_base_port+reg, data)) - -/** Reads 1 word (2 bytes) register. - * @param[in] dep The network interface structure. - * @param[in] reg The register offset. - * @returns The read value. - */ -#define inw_ne(dep, reg) (inw(dep->de_base_port+reg)) - -/** Writes 1 word (2 bytes) register. - * @param[in] dep The network interface structure. - * @param[in] reg The register offset. - * @param[in] data The value to be written. - */ -#define outw_ne(dep, reg, data) (outw(dep->de_base_port+reg, data)) - -#endif /* __NET_NETIF_NE2000_H__ */ - -/* - * $PchId: ne2000.h,v 1.4 2004/08/03 12:03:20 philip Exp $ - */ - -/** @} - */ Index: uspace/srv/loader/arch/abs32le/_link.ld.in =================================================================== --- uspace/srv/loader/arch/abs32le/_link.ld.in (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/loader/arch/abs32le/_link.ld.in (revision ea5352913e3f4737d9d751831020498633794587) @@ -21,6 +21,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/amd64/_link.ld.in =================================================================== --- uspace/srv/loader/arch/amd64/_link.ld.in (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/loader/arch/amd64/_link.ld.in (revision ea5352913e3f4737d9d751831020498633794587) @@ -27,6 +27,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/arm32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/arm32/_link.ld.in (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/loader/arch/arm32/_link.ld.in (revision ea5352913e3f4737d9d751831020498633794587) @@ -25,6 +25,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/ia32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/ia32/_link.ld.in (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/loader/arch/ia32/_link.ld.in (revision ea5352913e3f4737d9d751831020498633794587) @@ -26,6 +26,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/ia64/_link.ld.in =================================================================== --- uspace/srv/loader/arch/ia64/_link.ld.in (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/loader/arch/ia64/_link.ld.in (revision ea5352913e3f4737d9d751831020498633794587) @@ -21,6 +21,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text @@ -29,5 +29,5 @@ .got : { _gp = .; - *(.got*); + *(.got .got.*); } :data Index: uspace/srv/loader/arch/mips32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/mips32/_link.ld.in (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/loader/arch/mips32/_link.ld.in (revision ea5352913e3f4737d9d751831020498633794587) @@ -25,6 +25,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/ppc32/_link.ld.in =================================================================== --- uspace/srv/loader/arch/ppc32/_link.ld.in (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/loader/arch/ppc32/_link.ld.in (revision ea5352913e3f4737d9d751831020498633794587) @@ -25,6 +25,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/arch/sparc64/_link.ld.in =================================================================== --- uspace/srv/loader/arch/sparc64/_link.ld.in (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/loader/arch/sparc64/_link.ld.in (revision ea5352913e3f4737d9d751831020498633794587) @@ -20,6 +20,6 @@ .text : { - *(.text); - *(.rodata*); + *(.text .text.*); + *(.rodata .rodata.*); } :text Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision 348c589fdcd2208295fe60593083e96ca9536b3d) +++ uspace/srv/loader/main.c (revision ea5352913e3f4737d9d751831020498633794587) @@ -407,12 +407,10 @@ /* Not reached */ default: - retval = ENOENT; + retval = EINVAL; break; } - if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) { - DPRINTF("Responding EINVAL to method %d.\n", - IPC_GET_IMETHOD(call)); - async_answer_0(callid, EINVAL); - } + + if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) + async_answer_0(callid, retval); } }