Index: uspace/srv/bd/file_bd/file_bd.c =================================================================== --- uspace/srv/bd/file_bd/file_bd.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/bd/file_bd/file_bd.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -157,5 +157,5 @@ task_retval(0); async_manager(); - + /* Not reached */ return 0; @@ -171,5 +171,5 @@ bd_srvs_init(&bd_srvs); bd_srvs.ops = &file_bd_ops; - + async_set_fallback_port_handler(file_bd_connection, NULL); errno_t rc = loc_server_register(NAME); @@ -178,14 +178,14 @@ return rc; } - + img = fopen(fname, "rb+"); if (img == NULL) return EINVAL; - + if (fseek(img, 0, SEEK_END) != 0) { fclose(img); return EIO; } - + off64_t img_size = ftell(img); if (img_size < 0) { @@ -193,9 +193,9 @@ return EIO; } - + num_blocks = img_size / block_size; - + fibril_mutex_initialize(&dev_lock); - + return EOK; } Index: uspace/srv/bd/rd/rd.c =================================================================== --- uspace/srv/bd/rd/rd.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/bd/rd/rd.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -119,9 +119,9 @@ return ELIMIT; } - + fibril_rwlock_read_lock(&rd_lock); memcpy(buf, rd_addr + ba * block_size, min(block_size * cnt, size)); fibril_rwlock_read_unlock(&rd_lock); - + return EOK; } @@ -135,9 +135,9 @@ return ELIMIT; } - + fibril_rwlock_write_lock(&rd_lock); memcpy(rd_addr + ba * block_size, buf, min(block_size * cnt, size)); fibril_rwlock_write_unlock(&rd_lock); - + return EOK; } @@ -152,5 +152,5 @@ return false; } - + sysarg_t addr_phys; ret = sysinfo_get_value("rd.address.physical", &addr_phys); @@ -159,9 +159,9 @@ return false; } - + rd_size = ALIGN_UP(size, block_size); unsigned int flags = AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE; - + ret = physmem_map(addr_phys, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags, &rd_addr); @@ -170,11 +170,11 @@ return false; } - + printf("%s: Found RAM disk at %p, %" PRIun " bytes\n", NAME, (void *) addr_phys, size); - + bd_srvs_init(&bd_srvs); bd_srvs.ops = &rd_bd_ops; - + async_set_fallback_port_handler(rd_client_conn, NULL); ret = loc_server_register(NAME); @@ -183,5 +183,5 @@ return false; } - + service_id_t service_id; ret = loc_service_register("bd/initrd", &service_id); @@ -190,7 +190,7 @@ return false; } - + fibril_rwlock_initialize(&rd_lock); - + return true; } @@ -213,11 +213,11 @@ { printf("%s: HelenOS RAM disk server\n", NAME); - + if (!rd_init()) return -1; - + printf("%s: Accepting connections\n", NAME); async_manager(); - + /* Never reached */ return 0; Index: uspace/srv/bd/sata_bd/sata_bd.c =================================================================== --- uspace/srv/bd/sata_bd/sata_bd.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/bd/sata_bd/sata_bd.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -94,21 +94,21 @@ size_t count, i; errno_t rc; - + /* If device is SATA, add device to the disk array. */ disk[disk_count].sess = ahci_get_sess(funh, &disk[disk_count].dev_name); if(disk[disk_count].sess != NULL) { - + ahci_get_sata_device_name(disk[disk_count].sess, SATA_DEV_NAME_LENGTH, disk[disk_count].sata_dev_name); - + ahci_get_block_size(disk[disk_count].sess, &disk[disk_count].block_size); - + ahci_get_num_blocks(disk[disk_count].sess, &disk[disk_count].blocks); - + bd_srvs_init(&disk[disk_count].bds); disk[disk_count].bds.ops = &sata_bd_ops; disk[disk_count].bds.sarg = &disk[disk_count]; - + printf("Device %s - %s , blocks: %lu, block_size: %lu\n", disk[disk_count].dev_name, disk[disk_count].sata_dev_name, @@ -118,5 +118,5 @@ ++disk_count; } - + /* search children */ rc = devman_fun_get_child(funh, &devh); @@ -152,5 +152,5 @@ devman_handle_t root_fun; errno_t rc; - + disk_count = 0; @@ -160,7 +160,7 @@ return EIO; } - + scan_device_tree(root_fun); - + return EOK; } @@ -248,5 +248,5 @@ errno_t rc; category_id_t disk_cat; - + async_set_fallback_port_handler(sata_bd_connection, NULL); rc = loc_server_register(NAME); @@ -255,5 +255,5 @@ return rc; } - + rc = get_sata_disks(); if (rc != EOK) { Index: uspace/srv/clipboard/clipboard.c =================================================================== --- uspace/srv/clipboard/clipboard.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/clipboard/clipboard.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -52,16 +52,16 @@ errno_t rc; size_t size; - + switch (IPC_GET_ARG1(*request)) { case CLIPBOARD_TAG_NONE: fibril_mutex_lock(&clip_mtx); - + if (clip_data) free(clip_data); - + clip_data = NULL; clip_size = 0; clip_tag = CLIPBOARD_TAG_NONE; - + fibril_mutex_unlock(&clip_mtx); async_answer_0(rid, EOK); @@ -73,14 +73,14 @@ break; } - + fibril_mutex_lock(&clip_mtx); - + if (clip_data) free(clip_data); - + clip_data = data; clip_size = size; clip_tag = CLIPBOARD_TAG_DATA; - + fibril_mutex_unlock(&clip_mtx); async_answer_0(rid, EOK); @@ -94,8 +94,8 @@ { fibril_mutex_lock(&clip_mtx); - + ipc_callid_t callid; size_t size; - + /* Check for clipboard data tag compatibility */ switch (IPC_GET_ARG1(*request)) { @@ -106,5 +106,5 @@ break; } - + if (clip_tag != CLIPBOARD_TAG_DATA) { /* So far we only understand binary data */ @@ -113,5 +113,5 @@ break; } - + if (clip_size != size) { /* The client expects different size of data */ @@ -120,5 +120,5 @@ break; } - + errno_t retval = async_data_read_finalize(callid, clip_data, size); if (retval != EOK) { @@ -126,5 +126,5 @@ break; } - + async_answer_0(rid, EOK); break; @@ -137,5 +137,5 @@ break; } - + fibril_mutex_unlock(&clip_mtx); } @@ -144,8 +144,8 @@ { fibril_mutex_lock(&clip_mtx); - + size_t size = clip_size; clipboard_tag_t tag = clip_tag; - + fibril_mutex_unlock(&clip_mtx); async_answer_2(rid, EOK, (sysarg_t) size, (sysarg_t) tag); @@ -156,12 +156,12 @@ /* Accept connection */ async_answer_0(iid, EOK); - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) break; - + switch (IPC_GET_IMETHOD(call)) { case CLIPBOARD_PUT_DATA: @@ -183,8 +183,8 @@ { errno_t rc; - + printf("%s: HelenOS clipboard service\n", NAME); async_set_fallback_port_handler(clip_connection, NULL); - + rc = loc_server_register(NAME); if (rc != EOK) { @@ -192,5 +192,5 @@ return rc; } - + rc = loc_service_register(SERVICE_NAME_CLIPBOARD, &svc_id); if (rc != EOK) { @@ -198,9 +198,9 @@ return rc; } - + printf("%s: Accepting connections\n", NAME); task_retval(0); async_manager(); - + /* Never reached */ return 0; Index: uspace/srv/devman/client_conn.c =================================================================== --- uspace/srv/devman/client_conn.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/client_conn.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -65,5 +65,5 @@ char *pathname; devman_handle_t handle; - + errno_t rc = async_data_write_accept((void **) &pathname, true, 0, 0, 0, 0); if (rc != EOK) { @@ -71,7 +71,7 @@ return; } - + fun_node_t *fun = find_fun_node_by_path(&device_tree, pathname); - + free(pathname); @@ -306,7 +306,7 @@ return; } - + fibril_rwlock_read_lock(&device_tree.rwlock); - + /* Check function state */ if (fun->state == FUN_REMOVED) { @@ -319,5 +319,5 @@ return; } - + size_t sent_length = str_size(fun->pathname); if (sent_length > data_len) { @@ -337,7 +337,7 @@ { dev_node_t *dev; - + fibril_rwlock_read_lock(&device_tree.rwlock); - + dev = find_dev_node_no_lock(&device_tree, IPC_GET_ARG1(*icall)); if (dev == NULL || dev->state == DEVICE_REMOVED) { @@ -346,5 +346,5 @@ return; } - + if (dev->pfun == NULL) { fibril_rwlock_read_unlock(&device_tree.rwlock); @@ -352,7 +352,7 @@ return; } - + async_answer_1(iid, EOK, dev->pfun->handle); - + fibril_rwlock_read_unlock(&device_tree.rwlock); } @@ -364,5 +364,5 @@ size_t act_size; errno_t rc; - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -370,7 +370,7 @@ return; } - + fibril_rwlock_read_lock(&device_tree.rwlock); - + dev_node_t *dev = find_dev_node_no_lock(&device_tree, IPC_GET_ARG1(*icall)); @@ -381,5 +381,5 @@ return; } - + devman_handle_t *hdl_buf = (devman_handle_t *) malloc(size); if (hdl_buf == NULL) { @@ -389,5 +389,5 @@ return; } - + rc = dev_get_functions(&device_tree, dev, hdl_buf, size, &act_size); if (rc != EOK) { @@ -397,10 +397,10 @@ return; } - - fibril_rwlock_read_unlock(&device_tree.rwlock); - + + fibril_rwlock_read_unlock(&device_tree.rwlock); + errno_t retval = async_data_read_finalize(callid, hdl_buf, size); free(hdl_buf); - + async_answer_1(iid, retval, act_size); } @@ -410,7 +410,7 @@ { fun_node_t *fun; - + fibril_rwlock_read_lock(&device_tree.rwlock); - + fun = find_fun_node_no_lock(&device_tree, IPC_GET_ARG1(*icall)); if (fun == NULL || fun->state == FUN_REMOVED) { @@ -419,5 +419,5 @@ return; } - + if (fun->child == NULL) { fibril_rwlock_read_unlock(&device_tree.rwlock); @@ -425,7 +425,7 @@ return; } - + async_answer_1(iid, EOK, fun->child->handle); - + fibril_rwlock_read_unlock(&device_tree.rwlock); } @@ -447,8 +447,8 @@ return; } - + rc = driver_fun_online(&device_tree, fun); fun_del_ref(fun); - + async_answer_0(iid, rc); } @@ -472,8 +472,8 @@ return; } - + rc = driver_fun_offline(&device_tree, fun); fun_del_ref(fun); - + async_answer_0(iid, rc); } @@ -485,5 +485,5 @@ fun = find_loc_tree_function(&device_tree, IPC_GET_ARG1(*icall)); - + if (fun == NULL) { async_answer_0(iid, ENOENT); @@ -512,10 +512,10 @@ size_t act_size; errno_t rc; - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(iid, EREFUSED); return; } - + devman_handle_t *hdl_buf = (devman_handle_t *) malloc(size); if (hdl_buf == NULL) { @@ -524,5 +524,5 @@ return; } - + rc = driver_get_list(&drivers_list, hdl_buf, size, &act_size); if (rc != EOK) { @@ -531,8 +531,8 @@ return; } - + errno_t retval = async_data_read_finalize(callid, hdl_buf, size); free(hdl_buf); - + async_answer_1(iid, retval, act_size); } @@ -544,10 +544,10 @@ size_t act_size; errno_t rc; - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(iid, EREFUSED); return; } - + driver_t *drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall)); if (drv == NULL) { @@ -556,5 +556,5 @@ return; } - + devman_handle_t *hdl_buf = (devman_handle_t *) malloc(size); if (hdl_buf == NULL) { @@ -563,5 +563,5 @@ return; } - + rc = driver_get_devices(drv, hdl_buf, size, &act_size); if (rc != EOK) { @@ -571,8 +571,8 @@ return; } - + errno_t retval = async_data_read_finalize(callid, hdl_buf, size); free(hdl_buf); - + async_answer_1(iid, retval, act_size); } @@ -583,5 +583,5 @@ { char *drvname; - + errno_t rc = async_data_write_accept((void **) &drvname, true, 0, 0, 0, 0); if (rc != EOK) { @@ -589,14 +589,14 @@ return; } - + driver_t *driver = driver_find_by_name(&drivers_list, drvname); - + free(drvname); - + if (driver == NULL) { async_answer_0(iid, ENOENT); return; } - + async_answer_1(iid, EOK, driver->handle); } @@ -697,5 +697,5 @@ { driver_t *drv; - + drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall)); if (drv == NULL) { @@ -703,5 +703,5 @@ return; } - + async_answer_1(iid, EOK, (sysarg_t) drv->state); } @@ -712,5 +712,5 @@ driver_t *drv; errno_t rc; - + drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall)); if (drv == NULL) { @@ -718,5 +718,5 @@ return; } - + fibril_mutex_lock(&drv->driver_mutex); rc = start_driver(drv) ? EOK : EIO; @@ -731,5 +731,5 @@ driver_t *drv; errno_t rc; - + drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall)); if (drv == NULL) { @@ -737,5 +737,5 @@ return; } - + fibril_mutex_lock(&drv->driver_mutex); rc = stop_driver(drv); @@ -750,12 +750,12 @@ /* Accept connection. */ async_answer_0(iid, EOK); - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) break; - + switch (IPC_GET_IMETHOD(call)) { case DEVMAN_DEVICE_GET_HANDLE: Index: uspace/srv/devman/dev.c =================================================================== --- uspace/srv/devman/dev.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/dev.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -43,13 +43,13 @@ { dev_node_t *dev; - + dev = calloc(1, sizeof(dev_node_t)); if (dev == NULL) return NULL; - + atomic_set(&dev->refcnt, 0); list_initialize(&dev->functions); link_initialize(&dev->driver_devices); - + return dev; } @@ -64,5 +64,5 @@ assert(dev->pfun == NULL); assert(dev->drv == NULL); - + free(dev); } @@ -98,9 +98,9 @@ { assert(fibril_rwlock_is_locked(&tree->rwlock)); - + ht_link_t *link = hash_table_find(&tree->devman_devices, &handle); if (link == NULL) return NULL; - + return hash_table_get_inst(link, dev_node_t, devman_dev); } @@ -115,12 +115,12 @@ { dev_node_t *dev = NULL; - + fibril_rwlock_read_lock(&tree->rwlock); dev = find_dev_node_no_lock(tree, handle); if (dev != NULL) dev_add_ref(dev); - + fibril_rwlock_read_unlock(&tree->rwlock); - + return dev; } Index: uspace/srv/devman/devman.h =================================================================== --- uspace/srv/devman/devman.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/devman.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -68,5 +68,5 @@ /** Handle */ devman_handle_t handle; - + /** * Specifies whether the driver has been started and wheter is running @@ -74,5 +74,5 @@ */ driver_state_t state; - + /** Session asociated with this driver. */ async_sess_t *sess; @@ -85,5 +85,5 @@ /** List of devices controlled by this driver. */ list_t devices; - + /** * Fibril mutex for this driver - driver state, list of devices, session. @@ -116,11 +116,11 @@ /** Reference count */ atomic_t refcnt; - + /** The global unique identifier of the device. */ devman_handle_t handle; - + /** (Parent) function the device is attached to. */ fun_node_t *pfun; - + /** List of device functions. */ list_t functions; @@ -131,10 +131,10 @@ /** Link to list of devices owned by driver (driver_t.devices) */ link_t driver_devices; - + /** * Used by the hash table of devices indexed by devman device handles. */ ht_link_t devman_dev; - + /** * Whether this device was already passed to the driver. @@ -160,5 +160,5 @@ /** Locked while performing reconfiguration operations */ fibril_mutex_t busy_lock; - + /** The global unique identifier of the function */ devman_handle_t handle; @@ -167,27 +167,27 @@ /** Function type */ fun_type_t ftype; - + /** Full path and name of the device in device hierarchy */ char *pathname; - + /** Device which this function belongs to */ dev_node_t *dev; - + /** Link to list of functions in the device (ddf_dev_t.functions) */ link_t dev_functions; - + /** Child device node (if any attached). */ dev_node_t *child; /** List of device ids for device-to-driver matching. */ match_id_list_t match_ids; - + /** Service ID if the device function is registered with loc. */ service_id_t service_id; - + /** * Used by the hash table of functions indexed by devman device handles. */ ht_link_t devman_fun; - + /** * Used by the hash table of functions indexed by service IDs. @@ -200,5 +200,5 @@ /** Root device node. */ fun_node_t *root_node; - + /** * The next available handle - handles are assigned in a sequential @@ -206,14 +206,14 @@ */ devman_handle_t current_handle; - + /** Synchronize access to the device tree. */ fibril_rwlock_t rwlock; - + /** Hash table of all devices indexed by devman handles. */ hash_table_t devman_devices; - + /** Hash table of all devices indexed by devman handles. */ hash_table_t devman_functions; - + /** * Hash table of services registered with location service, indexed by Index: uspace/srv/devman/devtree.c =================================================================== --- uspace/srv/devman/devtree.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/devtree.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -127,9 +127,9 @@ fun_node_t *fun; dev_node_t *dev; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "create_root_nodes()"); - + fibril_rwlock_write_lock(&tree->rwlock); - + /* * Create root function. This is a pseudo function to which @@ -138,5 +138,5 @@ * the parent function. */ - + fun = create_fun_node(); if (fun == NULL) { @@ -144,8 +144,8 @@ return false; } - + fun_add_ref(fun); insert_fun_node(tree, fun, str_dup(""), NULL); - + match_id_t *id = create_match_id(); id->id = str_dup("root"); @@ -153,5 +153,5 @@ add_match_id(&fun->match_ids, id); tree->root_node = fun; - + /* * Create root device node. @@ -162,10 +162,10 @@ return false; } - + dev_add_ref(dev); insert_dev_node(tree, dev, fun); - + fibril_rwlock_write_unlock(&tree->rwlock); - + return dev != NULL; } @@ -182,17 +182,17 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "init_device_tree()"); - + tree->current_handle = 0; - + hash_table_create(&tree->devman_devices, 0, 0, &devman_devices_ops); hash_table_create(&tree->devman_functions, 0, 0, &devman_functions_ops); hash_table_create(&tree->loc_functions, 0, 0, &loc_devices_ops); - + fibril_rwlock_initialize(&tree->rwlock); - + /* Create root function and root device and add them to the device tree. */ if (!create_root_nodes(tree)) return false; - + /* Find suitable driver and start it. */ dev_node_t *rdev = tree->root_node->child; @@ -200,5 +200,5 @@ bool rc = assign_driver(rdev, drivers_list, tree); dev_del_ref(rdev); - + return rc; } @@ -216,5 +216,5 @@ { assert(fibril_rwlock_is_write_locked(&tree->rwlock)); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "insert_dev_node(dev=%p, pfun=%p [\"%s\"])", dev, pfun, pfun->pathname); @@ -227,5 +227,5 @@ dev->pfun = pfun; pfun->child = dev; - + return true; } @@ -239,14 +239,14 @@ { assert(fibril_rwlock_is_write_locked(&tree->rwlock)); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "remove_dev_node(dev=%p)", dev); - + /* Remove node from the handle-to-node map. */ hash_table_remove(&tree->devman_devices, &dev->handle); - + /* Unlink from parent function. */ dev->pfun->child = NULL; dev->pfun = NULL; - + dev->state = DEVICE_REMOVED; } @@ -267,8 +267,8 @@ { fun_node_t *pfun; - + assert(fun_name != NULL); assert(fibril_rwlock_is_write_locked(&tree->rwlock)); - + /* * The root function is a special case, it does not belong to any @@ -276,10 +276,10 @@ */ pfun = (dev != NULL) ? dev->pfun : NULL; - + fun->name = fun_name; if (!set_fun_path(tree, fun, pfun)) { return false; } - + /* Add the node to the handle-to-node map. */ fun->handle = ++tree->current_handle; @@ -290,5 +290,5 @@ if (dev != NULL) list_append(&fun->dev_functions, &dev->functions); - + return true; } @@ -302,12 +302,12 @@ { assert(fibril_rwlock_is_write_locked(&tree->rwlock)); - + /* Remove the node from the handle-to-node map. */ hash_table_remove(&tree->devman_functions, &fun->handle); - + /* Remove the node from the list of its parent's children. */ if (fun->dev != NULL) list_remove(&fun->dev_functions); - + fun->dev = NULL; fun->state = FUN_REMOVED; Index: uspace/srv/devman/driver.c =================================================================== --- uspace/srv/devman/driver.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/driver.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -54,5 +54,5 @@ { assert(drv_list != NULL); - + list_initialize(&drv_list->drivers); fibril_mutex_initialize(&drv_list->drivers_mutex); @@ -112,19 +112,19 @@ log_msg(LOG_DEFAULT, LVL_DEBUG, "get_driver_info(base_path=\"%s\", name=\"%s\")", base_path, name); - + assert(base_path != NULL && name != NULL && drv != NULL); - + bool suc = false; char *match_path = NULL; size_t name_size = 0; - + /* Read the list of match ids from the driver's configuration file. */ match_path = get_abs_path(base_path, name, MATCH_EXT); if (match_path == NULL) goto cleanup; - + if (!read_match_ids(match_path, &drv->match_ids)) goto cleanup; - + /* Allocate and fill driver's name. */ name_size = str_size(name) + 1; @@ -133,10 +133,10 @@ goto cleanup; str_cpy(drv->name, name_size, name); - + /* Initialize path with driver's binary. */ drv->binary_path = get_abs_path(base_path, name, ""); if (drv->binary_path == NULL) goto cleanup; - + /* Check whether the driver's binary exists. */ vfs_stat_t s; @@ -146,7 +146,7 @@ goto cleanup; } - + suc = true; - + cleanup: if (!suc) { @@ -156,7 +156,7 @@ init_driver(drv); } - + free(match_path); - + return suc; } @@ -171,5 +171,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "lookup_available_drivers(dir=\"%s\")", dir_path); - + int drv_cnt = 0; DIR *dir = NULL; @@ -177,5 +177,5 @@ dir = opendir(dir_path); - + if (dir != NULL) { driver_t *drv = create_driver(); @@ -190,5 +190,5 @@ closedir(dir); } - + return drv_cnt; } @@ -213,7 +213,7 @@ driver_t *best_drv = NULL; int best_score = 0, score = 0; - + fibril_mutex_lock(&drivers_list->drivers_mutex); - + list_foreach(drivers_list->drivers, drivers, driver_t, drv) { score = get_match_score(drv, node); @@ -223,7 +223,7 @@ } } - + fibril_mutex_unlock(&drivers_list->drivers_mutex); - + return best_drv; } @@ -239,11 +239,11 @@ log_msg(LOG_DEFAULT, LVL_DEBUG, "attach_driver(dev=\"%s\",drv=\"%s\")", dev->pfun->pathname, drv->name); - + fibril_mutex_lock(&drv->driver_mutex); fibril_rwlock_write_lock(&tree->rwlock); - + dev->drv = drv; list_append(&dev->driver_devices, &drv->devices); - + fibril_rwlock_write_unlock(&tree->rwlock); fibril_mutex_unlock(&drv->driver_mutex); @@ -259,16 +259,16 @@ { driver_t *drv = dev->drv; - + assert(drv != NULL); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "detach_driver(dev=\"%s\",drv=\"%s\")", dev->pfun->pathname, drv->name); - + fibril_mutex_lock(&drv->driver_mutex); fibril_rwlock_write_lock(&tree->rwlock); - + dev->drv = NULL; list_remove(&dev->driver_devices); - + fibril_rwlock_write_unlock(&tree->rwlock); fibril_mutex_unlock(&drv->driver_mutex); @@ -286,7 +286,7 @@ assert(fibril_mutex_is_locked(&drv->driver_mutex)); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name); - + rc = task_spawnl(NULL, NULL, drv->binary_path, drv->binary_path, NULL); if (rc != EOK) { @@ -295,5 +295,5 @@ return false; } - + drv->state = DRIVER_STARTING; return true; @@ -310,5 +310,5 @@ async_exch_t *exch; errno_t retval; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "stop_driver(drv=\"%s\")", drv->name); @@ -316,8 +316,8 @@ retval = async_req_0_0(exch, DRIVER_STOP); loc_exchange_end(exch); - + if (retval != EOK) return retval; - + drv->state = DRIVER_NOT_STARTED; async_hangup(drv->sess); @@ -336,7 +336,7 @@ { driver_t *res = NULL; - + fibril_mutex_lock(&drv_list->drivers_mutex); - + list_foreach(drv_list->drivers, drivers, driver_t, drv) { if (drv->handle == handle) { @@ -345,7 +345,7 @@ } } - + fibril_mutex_unlock(&drv_list->drivers_mutex); - + return res; } @@ -362,7 +362,7 @@ { driver_t *res = NULL; - + fibril_mutex_lock(&drv_list->drivers_mutex); - + list_foreach(drv_list->drivers, drivers, driver_t, drv) { if (str_cmp(drv->name, drv_name) == 0) { @@ -371,7 +371,7 @@ } } - + fibril_mutex_unlock(&drv_list->drivers_mutex); - + return res; } @@ -399,5 +399,5 @@ dev = list_get_instance(link, dev_node_t, driver_devices); fibril_rwlock_write_lock(&tree->rwlock); - + if (dev->passed_to_driver) { fibril_rwlock_write_unlock(&tree->rwlock); @@ -461,5 +461,5 @@ log_msg(LOG_DEFAULT, LVL_DEBUG, "initialize_running_driver(driver=\"%s\")", driver->name); - + /* * Pass devices which have been already assigned to the driver to the @@ -507,5 +507,5 @@ { assert(drv != NULL); - + clean_driver(drv); free(drv); @@ -525,5 +525,5 @@ assert(drivers_list != NULL); assert(tree != NULL); - + /* * Find the driver which is the most suitable for handling this device. @@ -535,8 +535,8 @@ return false; } - + /* Attach the driver to the device. */ attach_driver(tree, dev, drv); - + fibril_mutex_lock(&drv->driver_mutex); if (drv->state == DRIVER_NOT_STARTED) { @@ -550,5 +550,5 @@ if (is_running) add_device(drv, dev, tree); - + fibril_mutex_lock(&drv->driver_mutex); fibril_mutex_unlock(&drv->driver_mutex); @@ -575,5 +575,5 @@ log_msg(LOG_DEFAULT, LVL_DEBUG, "add_device(drv=\"%s\", dev=\"%s\")", drv->name, dev->pfun->name); - + /* Send the device to the driver. */ devman_handle_t parent_handle; @@ -583,17 +583,17 @@ parent_handle = 0; } - + async_exch_t *exch = async_exchange_begin(drv->sess); - + ipc_call_t answer; aid_t req = async_send_2(exch, DRIVER_DEV_ADD, dev->handle, parent_handle, &answer); - + /* Send the device name to the driver. */ errno_t rc = async_data_write_start(exch, dev->pfun->name, str_size(dev->pfun->name) + 1); - + async_exchange_end(exch); - + if (rc != EOK) { async_forget(req); @@ -614,5 +614,5 @@ break; } - + dev->passed_to_driver = true; } @@ -624,18 +624,18 @@ driver_t *drv; devman_handle_t handle; - + assert(dev != NULL); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_dev_remove(%p)", dev); - + fibril_rwlock_read_lock(&tree->rwlock); drv = dev->drv; handle = dev->handle; fibril_rwlock_read_unlock(&tree->rwlock); - + exch = async_exchange_begin(drv->sess); retval = async_req_1_0(exch, DRIVER_DEV_REMOVE, handle); async_exchange_end(exch); - + return retval; } @@ -647,18 +647,18 @@ driver_t *drv; devman_handle_t handle; - + assert(dev != NULL); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_dev_gone(%p)", dev); - + fibril_rwlock_read_lock(&tree->rwlock); drv = dev->drv; handle = dev->handle; fibril_rwlock_read_unlock(&tree->rwlock); - + exch = async_exchange_begin(drv->sess); retval = async_req_1_0(exch, DRIVER_DEV_GONE, handle); async_exchange_end(exch); - + return retval; } @@ -670,9 +670,9 @@ driver_t *drv; devman_handle_t handle; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_fun_online(%p)", fun); fibril_rwlock_read_lock(&tree->rwlock); - + if (fun->dev == NULL) { /* XXX root function? */ @@ -680,13 +680,13 @@ return EINVAL; } - + drv = fun->dev->drv; handle = fun->handle; fibril_rwlock_read_unlock(&tree->rwlock); - + exch = async_exchange_begin(drv->sess); retval = async_req_1_0(exch, DRIVER_FUN_ONLINE, handle); loc_exchange_end(exch); - + return retval; } @@ -698,5 +698,5 @@ driver_t *drv; devman_handle_t handle; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "driver_fun_offline(%p)", fun); @@ -707,13 +707,13 @@ return EINVAL; } - + drv = fun->dev->drv; handle = fun->handle; fibril_rwlock_read_unlock(&tree->rwlock); - + exch = async_exchange_begin(drv->sess); retval = async_req_1_0(exch, DRIVER_FUN_OFFLINE, handle); loc_exchange_end(exch); - + return retval; Index: uspace/srv/devman/drv_conn.c =================================================================== --- uspace/srv/devman/drv_conn.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/drv_conn.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -70,5 +70,5 @@ log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_driver_register"); - + /* Get driver name. */ errno_t rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0); @@ -80,5 +80,5 @@ log_msg(LOG_DEFAULT, LVL_DEBUG, "The `%s' driver is trying to register.", drv_name); - + /* Find driver structure. */ driver = driver_find_by_name(&drivers_list, drv_name); @@ -90,10 +90,10 @@ return NULL; } - + free(drv_name); drv_name = NULL; - + fibril_mutex_lock(&driver->driver_mutex); - + if (driver->sess) { /* We already have a connection to the driver. */ @@ -104,5 +104,5 @@ return NULL; } - + switch (driver->state) { case DRIVER_NOT_STARTED: @@ -119,5 +119,5 @@ assert(false); } - + /* Create connection to the driver. */ log_msg(LOG_DEFAULT, LVL_DEBUG, "Creating connection to the `%s' driver.", @@ -131,9 +131,9 @@ /* FIXME: Work around problem with callback sessions */ async_sess_args_set(driver->sess, INTERFACE_DDF_DEVMAN, 0, 0); - + log_msg(LOG_DEFAULT, LVL_NOTE, "The `%s' driver was successfully registered as running.", driver->name); - + /* * Initialize the driver as running (e.g. pass assigned devices to it) @@ -149,8 +149,8 @@ return NULL; } - + fibril_add_ready(fid); fibril_mutex_unlock(&driver->driver_mutex); - + async_answer_0(callid, EOK); return driver; @@ -169,5 +169,5 @@ ipc_call_t call; errno_t rc = 0; - + callid = async_get_call(&call); if (DEVMAN_ADD_MATCH_ID != IPC_GET_IMETHOD(call)) { @@ -178,5 +178,5 @@ return EINVAL; } - + if (match_id == NULL) { log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to allocate match id."); @@ -184,9 +184,9 @@ return ENOMEM; } - + async_answer_0(callid, EOK); - + match_id->score = IPC_GET_ARG1(call); - + char *match_id_str; rc = async_data_write_accept((void **) &match_id_str, true, 0, 0, 0, 0); @@ -198,7 +198,7 @@ return rc; } - + list_append(&match_id->link, &match_ids->ids); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Received match id `%s', score %d.", match_id->id, match_id->score); @@ -218,5 +218,5 @@ errno_t ret = EOK; size_t i; - + for (i = 0; i < match_count; i++) { if (EOK != (ret = devman_receive_match_id(match_ids))) @@ -236,5 +236,5 @@ sysarg_t match_count = IPC_GET_ARG3(*call); dev_tree_t *tree = &device_tree; - + dev_node_t *pdev = find_dev_node(&device_tree, dev_handle); if (pdev == NULL) { @@ -242,5 +242,5 @@ return; } - + if (ftype != fun_inner && ftype != fun_exposed) { /* Unknown function type */ @@ -253,5 +253,5 @@ return; } - + char *fun_name = NULL; errno_t rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0); @@ -261,7 +261,7 @@ return; } - + fibril_rwlock_write_lock(&tree->rwlock); - + /* Check device state */ if (pdev->state == DEVICE_REMOVED) { @@ -271,5 +271,5 @@ return; } - + /* Check that function with same name is not there already. */ fun_node_t *tfun = find_fun_node_in_device(tree, pdev, fun_name); @@ -284,5 +284,5 @@ return; } - + fun_node_t *fun = create_fun_node(); /* One reference for creation, one for us */ @@ -290,5 +290,5 @@ fun_add_ref(fun); fun->ftype = ftype; - + /* * We can lock the function here even when holding the tree because @@ -296,5 +296,5 @@ */ fun_busy_lock(fun); - + if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) { fibril_rwlock_write_unlock(&tree->rwlock); @@ -306,10 +306,10 @@ return; } - + fibril_rwlock_write_unlock(&tree->rwlock); dev_del_ref(pdev); - + devman_receive_match_ids(match_count, &fun->match_ids); - + rc = fun_online(fun); if (rc != EOK) { @@ -320,8 +320,8 @@ return; } - + fun_busy_unlock(fun); fun_del_ref(fun); - + /* Return device handle to parent's driver. */ async_answer_1(callid, EOK, fun->handle); @@ -333,5 +333,5 @@ category_id_t cat_id; errno_t rc; - + /* Get category name. */ char *cat_name; @@ -342,5 +342,5 @@ return; } - + fun_node_t *fun = find_fun_node(&device_tree, handle); if (fun == NULL) { @@ -348,7 +348,7 @@ return; } - + fibril_rwlock_read_lock(&device_tree.rwlock); - + /* Check function state */ if (fun->state == FUN_REMOVED) { @@ -357,5 +357,5 @@ return; } - + rc = loc_category_get_id(cat_name, &cat_id, IPC_FLAG_BLOCKING); if (rc == EOK) { @@ -367,8 +367,8 @@ "`%s'.", fun->pathname, cat_name); } - + fibril_rwlock_read_unlock(&device_tree.rwlock); fun_del_ref(fun); - + async_answer_0(callid, rc); } @@ -382,7 +382,7 @@ fun_node_t *fun; errno_t rc; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_drv_fun_online()"); - + fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall)); if (fun == NULL) { @@ -390,7 +390,7 @@ return; } - + fun_busy_lock(fun); - + fibril_rwlock_read_lock(&device_tree.rwlock); if (fun->dev == NULL || fun->dev->drv != drv) { @@ -402,5 +402,5 @@ } fibril_rwlock_read_unlock(&device_tree.rwlock); - + rc = fun_online(fun); if (rc != EOK) { @@ -410,8 +410,8 @@ return; } - + fun_busy_unlock(fun); fun_del_ref(fun); - + async_answer_0(iid, EOK); } @@ -432,7 +432,7 @@ return; } - + fun_busy_lock(fun); - + fibril_rwlock_write_lock(&device_tree.rwlock); if (fun->dev == NULL || fun->dev->drv != drv) { @@ -443,5 +443,5 @@ } fibril_rwlock_write_unlock(&device_tree.rwlock); - + rc = fun_offline(fun); if (rc != EOK) { @@ -451,5 +451,5 @@ return; } - + fun_busy_unlock(fun); fun_del_ref(fun); @@ -463,5 +463,5 @@ dev_tree_t *tree = &device_tree; errno_t rc; - + fun_node_t *fun = find_fun_node(&device_tree, fun_handle); if (fun == NULL) { @@ -469,11 +469,11 @@ return; } - + fun_busy_lock(fun); - + fibril_rwlock_write_lock(&tree->rwlock); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_remove_function(fun='%s')", fun->pathname); - + /* Check function state */ if (fun->state == FUN_REMOVED) { @@ -484,5 +484,5 @@ return; } - + if (fun->ftype == fun_inner) { /* This is a surprise removal. Handle possible descendants */ @@ -491,10 +491,10 @@ device_state_t dev_state; errno_t gone_rc; - + dev_add_ref(dev); dev_state = dev->state; - + fibril_rwlock_write_unlock(&device_tree.rwlock); - + /* If device is owned by driver, inform driver it is gone. */ if (dev_state == DEVICE_USABLE) @@ -502,7 +502,7 @@ else gone_rc = EOK; - + fibril_rwlock_read_lock(&device_tree.rwlock); - + /* Verify that driver succeeded and removed all functions */ if (gone_rc != EOK || !list_empty(&dev->functions)) { @@ -510,5 +510,5 @@ "functions for device that is gone. " "Device node is now defunct."); - + /* * Not much we can do but mark the device @@ -526,14 +526,14 @@ return; } - + driver_t *driver = dev->drv; fibril_rwlock_read_unlock(&device_tree.rwlock); - + if (driver) detach_driver(&device_tree, dev); - + fibril_rwlock_write_lock(&device_tree.rwlock); remove_dev_node(&device_tree, dev); - + /* Delete ref created when node was inserted */ dev_del_ref(dev); @@ -556,14 +556,14 @@ } } - + remove_fun_node(&device_tree, fun); fibril_rwlock_write_unlock(&tree->rwlock); fun_busy_unlock(fun); - + /* Delete ref added when inserting function into tree */ fun_del_ref(fun); /* Delete ref added above when looking up function */ fun_del_ref(fun); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_remove_function() succeeded."); async_answer_0(callid, EOK); @@ -578,5 +578,5 @@ { driver_t *driver = (driver_t *) drv; - + initialize_running_driver(driver, &device_tree); log_msg(LOG_DEFAULT, LVL_DEBUG, "The `%s` driver was successfully initialized.", @@ -590,8 +590,8 @@ client_t *client; driver_t *driver = NULL; - + /* Accept the connection. */ async_answer_0(iid, EOK); - + client = async_get_client_data(); if (client == NULL) { @@ -599,12 +599,12 @@ return; } - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) break; - + if (IPC_GET_IMETHOD(call) != DEVMAN_DRIVER_REGISTER) { fibril_mutex_lock(&client->mutex); @@ -617,5 +617,5 @@ } } - + switch (IPC_GET_IMETHOD(call)) { case DEVMAN_DRIVER_REGISTER: Index: uspace/srv/devman/fun.c =================================================================== --- uspace/srv/devman/fun.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/fun.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -58,5 +58,5 @@ if (fun == NULL) return NULL; - + fun->state = FUN_INIT; atomic_set(&fun->refcnt, 0); @@ -64,5 +64,5 @@ link_initialize(&fun->dev_functions); list_initialize(&fun->match_ids.ids); - + return fun; } @@ -76,5 +76,5 @@ assert(fun->dev == NULL); assert(fun->child == NULL); - + clean_match_ids(&fun->match_ids); free(fun->name); @@ -125,13 +125,13 @@ { fun_node_t *fun; - + assert(fibril_rwlock_is_locked(&tree->rwlock)); - + ht_link_t *link = hash_table_find(&tree->devman_functions, &handle); if (link == NULL) return NULL; - + fun = hash_table_get_inst(link, fun_node_t, devman_fun); - + return fun; } @@ -146,13 +146,13 @@ { fun_node_t *fun = NULL; - + fibril_rwlock_read_lock(&tree->rwlock); - + fun = find_fun_node_no_lock(tree, handle); if (fun != NULL) fun_add_ref(fun); - + fibril_rwlock_read_unlock(&tree->rwlock); - + return fun; } @@ -170,9 +170,9 @@ assert(fibril_rwlock_is_write_locked(&tree->rwlock)); assert(fun->name != NULL); - + size_t pathsize = (str_size(fun->name) + 1); if (parent != NULL) pathsize += str_size(parent->pathname) + 1; - + fun->pathname = (char *) malloc(pathsize); if (fun->pathname == NULL) { @@ -180,5 +180,5 @@ return false; } - + if (parent != NULL) { str_cpy(fun->pathname, pathsize, parent->pathname); @@ -188,5 +188,5 @@ str_cpy(fun->pathname, pathsize, fun->name); } - + return true; } @@ -209,5 +209,5 @@ fibril_rwlock_read_lock(&tree->rwlock); - + fun_node_t *fun = tree->root_node; fun_add_ref(fun); @@ -219,5 +219,5 @@ char *next_path_elem = NULL; bool cont = (rel_path[1] != '\0'); - + while (cont && fun != NULL) { next_path_elem = get_path_elem_end(rel_path + 1); @@ -228,9 +228,9 @@ cont = false; } - + fun_node_t *cfun = find_node_child(tree, fun, rel_path + 1); fun_del_ref(fun); fun = cfun; - + if (cont) { /* Restore the original path. */ @@ -239,7 +239,7 @@ rel_path = next_path_elem; } - + fibril_rwlock_read_unlock(&tree->rwlock); - + return fun; } @@ -299,7 +299,7 @@ { dev_node_t *dev; - + fibril_rwlock_write_lock(&device_tree.rwlock); - + if (fun->state == FUN_ON_LINE) { fibril_rwlock_write_unlock(&device_tree.rwlock); @@ -308,5 +308,5 @@ return EOK; } - + if (fun->ftype == fun_inner) { dev = create_dev_node(); @@ -315,18 +315,18 @@ return ENOMEM; } - + insert_dev_node(&device_tree, dev, fun); dev_add_ref(dev); } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_add_function(fun=\"%s\")", fun->pathname); - + if (fun->ftype == fun_inner) { dev = fun->child; assert(dev != NULL); - + /* Give one reference over to assign_driver_fibril(). */ dev_add_ref(dev); - + /* * Try to find a suitable driver and assign it to the device. We do @@ -347,8 +347,8 @@ } else loc_register_tree_function(fun, &device_tree); - + fun->state = FUN_ON_LINE; fibril_rwlock_write_unlock(&device_tree.rwlock); - + return EOK; } @@ -357,7 +357,7 @@ { errno_t rc; - + fibril_rwlock_write_lock(&device_tree.rwlock); - + if (fun->state == FUN_OFF_LINE) { fibril_rwlock_write_unlock(&device_tree.rwlock); @@ -366,16 +366,16 @@ return EOK; } - + if (fun->ftype == fun_inner) { log_msg(LOG_DEFAULT, LVL_DEBUG, "Offlining inner function %s.", fun->pathname); - + if (fun->child != NULL) { dev_node_t *dev = fun->child; device_state_t dev_state; - + dev_add_ref(dev); dev_state = dev->state; - + fibril_rwlock_write_unlock(&device_tree.rwlock); @@ -388,5 +388,5 @@ } } - + /* Verify that driver removed all functions */ fibril_rwlock_read_lock(&device_tree.rwlock); @@ -396,14 +396,14 @@ return EIO; } - + driver_t *driver = dev->drv; fibril_rwlock_read_unlock(&device_tree.rwlock); - + if (driver) detach_driver(&device_tree, dev); - + fibril_rwlock_write_lock(&device_tree.rwlock); remove_dev_node(&device_tree, dev); - + /* Delete ref created when node was inserted */ dev_del_ref(dev); @@ -419,11 +419,11 @@ return EIO; } - + fun->service_id = 0; } - + fun->state = FUN_OFF_LINE; fibril_rwlock_write_unlock(&device_tree.rwlock); - + return EOK; } Index: uspace/srv/devman/loc.c =================================================================== --- uspace/srv/devman/loc.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/loc.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -43,13 +43,13 @@ char *loc_pathname = NULL; char *loc_name = NULL; - + assert(fibril_rwlock_is_locked(&tree->rwlock)); - + asprintf(&loc_name, "%s", fun->pathname); if (loc_name == NULL) return; - + replace_char(loc_name, '/', LOC_SEPARATOR); - + asprintf(&loc_pathname, "%s/%s", LOC_DEVICE_NAMESPACE, loc_name); @@ -58,9 +58,9 @@ return; } - + loc_service_register(loc_pathname, &fun->service_id); - + tree_add_loc_function(tree, fun); - + free(loc_name); free(loc_pathname); @@ -77,5 +77,5 @@ { fun_node_t *fun = NULL; - + fibril_rwlock_read_lock(&tree->rwlock); ht_link_t *link = hash_table_find(&tree->loc_functions, &service_id); @@ -85,5 +85,5 @@ } fibril_rwlock_read_unlock(&tree->rwlock); - + return fun; } @@ -92,5 +92,5 @@ { assert(fibril_rwlock_is_write_locked(&tree->rwlock)); - + hash_table_insert(&tree->loc_functions, &fun->loc_fun); } @@ -99,5 +99,5 @@ { assert(fibril_rwlock_is_write_locked(&tree->rwlock)); - + hash_table_remove(&tree->loc_functions, &fun->service_id); } Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/main.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -71,5 +71,5 @@ devman_handle_t handle = IPC_GET_ARG2(*icall); dev_node_t *dev = NULL; - + fun_node_t *fun = find_fun_node(&device_tree, handle); if (fun == NULL) { @@ -77,12 +77,12 @@ } else { fibril_rwlock_read_lock(&device_tree.rwlock); - + dev = fun->dev; if (dev != NULL) dev_add_ref(dev); - + fibril_rwlock_read_unlock(&device_tree.rwlock); } - + /* * For a valid function to connect to we need a device. The root @@ -97,5 +97,5 @@ goto cleanup; } - + if (fun == NULL) { log_msg(LOG_DEFAULT, LVL_ERROR, NAME ": devman_forward error - cannot " @@ -105,12 +105,12 @@ goto cleanup; } - + fibril_rwlock_read_lock(&device_tree.rwlock); - + /* Connect to the specified function */ driver_t *driver = dev->drv; - + fibril_rwlock_read_unlock(&device_tree.rwlock); - + if (driver == NULL) { log_msg(LOG_DEFAULT, LVL_ERROR, "IPC forwarding refused - " \ @@ -119,5 +119,5 @@ goto cleanup; } - + if (!driver->sess) { log_msg(LOG_DEFAULT, LVL_ERROR, @@ -126,5 +126,5 @@ goto cleanup; } - + if (fun != NULL) { log_msg(LOG_DEFAULT, LVL_DEBUG, @@ -136,13 +136,13 @@ dev->pfun->pathname, driver->name); } - + async_exch_t *exch = async_exchange_begin(driver->sess); async_forward_fast(iid, exch, INTERFACE_DDF_CLIENT, handle, 0, IPC_FF_NONE); async_exchange_end(exch); - + cleanup: if (dev != NULL) dev_del_ref(dev); - + if (fun != NULL) fun_del_ref(fun); @@ -154,5 +154,5 @@ devman_handle_t handle = IPC_GET_ARG2(*icall); dev_node_t *dev = NULL; - + fun_node_t *fun = find_fun_node(&device_tree, handle); if (fun == NULL) { @@ -160,12 +160,12 @@ } else { fibril_rwlock_read_lock(&device_tree.rwlock); - + dev = fun->dev; if (dev != NULL) dev_add_ref(dev); - + fibril_rwlock_read_unlock(&device_tree.rwlock); } - + /* * For a valid function to connect to we need a device. The root @@ -180,17 +180,17 @@ goto cleanup; } - + driver_t *driver = NULL; - + fibril_rwlock_read_lock(&device_tree.rwlock); - + /* Connect to parent function of a device (or device function). */ if (dev->pfun->dev != NULL) driver = dev->pfun->dev->drv; - + devman_handle_t fun_handle = dev->pfun->handle; - + fibril_rwlock_read_unlock(&device_tree.rwlock); - + if (driver == NULL) { log_msg(LOG_DEFAULT, LVL_ERROR, "IPC forwarding refused - " \ @@ -199,5 +199,5 @@ goto cleanup; } - + if (!driver->sess) { log_msg(LOG_DEFAULT, LVL_ERROR, @@ -206,5 +206,5 @@ goto cleanup; } - + if (fun != NULL) { log_msg(LOG_DEFAULT, LVL_DEBUG, @@ -216,13 +216,13 @@ dev->pfun->pathname, driver->name); } - + async_exch_t *exch = async_exchange_begin(driver->sess); async_forward_fast(iid, exch, INTERFACE_DDF_DRIVER, fun_handle, 0, IPC_FF_NONE); async_exchange_end(exch); - + cleanup: if (dev != NULL) dev_del_ref(dev); - + if (fun != NULL) fun_del_ref(fun); @@ -233,9 +233,9 @@ iface_t iface = IPC_GET_ARG1(*icall); service_id_t service_id = IPC_GET_ARG2(*icall); - + fun_node_t *fun = find_loc_tree_function(&device_tree, service_id); - + fibril_rwlock_read_lock(&device_tree.rwlock); - + if ((fun == NULL) || (fun->dev == NULL) || (fun->dev->drv == NULL)) { log_msg(LOG_DEFAULT, LVL_WARN, "devman_forward(): function " @@ -245,19 +245,19 @@ return; } - + dev_node_t *dev = fun->dev; driver_t *driver = dev->drv; devman_handle_t handle = fun->handle; - + fibril_rwlock_read_unlock(&device_tree.rwlock); - + async_exch_t *exch = async_exchange_begin(driver->sess); async_forward_fast(iid, exch, iface, handle, 0, IPC_FF_NONE); async_exchange_end(exch); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Forwarding service request for `%s' function to driver `%s'.", fun->pathname, driver->name); - + fun_del_ref(fun); } @@ -266,9 +266,9 @@ { client_t *client; - + client = calloc(1, sizeof(client_t)); if (client == NULL) return NULL; - + fibril_mutex_initialize(&client->mutex); return client; @@ -284,5 +284,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_init - looking for available drivers."); - + /* Initialize list of available drivers. */ init_driver_list(&drivers_list); @@ -292,7 +292,7 @@ return false; } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_init - list of drivers has been initialized."); - + /* Create root device node. */ if (!init_device_tree(&device_tree, &drivers_list)) { @@ -300,5 +300,5 @@ return false; } - + /* * Caution: As the device manager is not a real loc @@ -309,5 +309,5 @@ */ loc_server_register(NAME); - + return true; } @@ -316,5 +316,5 @@ { printf("%s: HelenOS Device Manager\n", NAME); - + errno_t rc = log_init(NAME); if (rc != EOK) { @@ -322,9 +322,9 @@ return rc; } - + /* Set handlers for incoming connections. */ async_set_client_data_constructor(devman_client_data_create); async_set_client_data_destructor(devman_client_data_destroy); - + port_id_t port; rc = async_create_port(INTERFACE_DDF_DRIVER, @@ -334,5 +334,5 @@ return rc; } - + rc = async_create_port(INTERFACE_DDF_CLIENT, devman_connection_client, NULL, &port); @@ -341,5 +341,5 @@ return rc; } - + rc = async_create_port(INTERFACE_DEVMAN_DEVICE, devman_connection_device, NULL, &port); @@ -348,5 +348,5 @@ return rc; } - + rc = async_create_port(INTERFACE_DEVMAN_PARENT, devman_connection_parent, NULL, &port); @@ -355,12 +355,12 @@ return rc; } - + async_set_fallback_port_handler(devman_forward, NULL); - + if (!devman_init()) { log_msg(LOG_DEFAULT, LVL_ERROR, "Error while initializing service."); return -1; } - + /* Register device manager at naming service. */ rc = service_register(SERVICE_DEVMAN); @@ -369,9 +369,9 @@ return rc; } - + printf("%s: Accepting connections.\n", NAME); task_retval(0); async_manager(); - + /* Never reached. */ return 0; Index: uspace/srv/devman/match.c =================================================================== --- uspace/srv/devman/match.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/match.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -69,15 +69,15 @@ link_t *drv_head = &drv->match_ids.ids.head; link_t *dev_head = &dev->pfun->match_ids.ids.head; - + if (list_empty(&drv->match_ids.ids) || list_empty(&dev->pfun->match_ids.ids)) { return 0; } - + /* * Go through all pairs, return the highest score obtained. */ int highest_score = 0; - + link_t *drv_link = drv->match_ids.ids.head.next; while (drv_link != drv_head) { @@ -86,5 +86,5 @@ match_id_t *drv_id = list_get_instance(drv_link, match_id_t, link); match_id_t *dev_id = list_get_instance(dev_link, match_id_t, link); - + int score = compute_match_score(drv_id, dev_id); if (score > highest_score) { @@ -94,8 +94,8 @@ dev_link = dev_link->next; } - + drv_link = drv_link->next; } - + return highest_score; } @@ -111,5 +111,5 @@ char *res = NULL; size_t len = get_nonspace_len(*buf); - + if (len > 0) { res = malloc(len + 1); @@ -119,5 +119,5 @@ } } - + return res; } @@ -141,5 +141,5 @@ char *id = NULL; int ids_read = 0; - + while (true) { /* skip spaces */ @@ -151,28 +151,28 @@ continue; } - + /* read score */ score = strtoul(buf, &buf, 10); - + /* skip spaces */ if (!skip_spaces(&buf)) break; - + /* read id */ id = read_match_id(&buf); if (NULL == id) break; - + /* create new match_id structure */ match_id_t *mid = create_match_id(); mid->id = id; mid->score = score; - + /* add it to the list */ add_match_id(ids, mid); - + ids_read++; } - + return ids_read > 0; } @@ -194,5 +194,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path); - + bool suc = false; char *buf = NULL; @@ -201,5 +201,5 @@ size_t len = 0; vfs_stat_t st; - + errno_t rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd); if (rc != EOK) { @@ -209,5 +209,5 @@ } opened = true; - + rc = vfs_stat(fd, &st); if (rc != EOK) { @@ -222,5 +222,5 @@ goto cleanup; } - + buf = malloc(len + 1); if (buf == NULL) { @@ -229,5 +229,5 @@ goto cleanup; } - + size_t read_bytes; rc = vfs_read(fd, (aoff64_t []) {0}, buf, len, &read_bytes); @@ -238,13 +238,13 @@ } buf[read_bytes] = 0; - + suc = parse_match_ids(buf, ids); - + cleanup: free(buf); - + if (opened) vfs_put(fd); - + return suc; } Index: uspace/srv/devman/util.c =================================================================== --- uspace/srv/devman/util.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/devman/util.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -41,7 +41,7 @@ int base_len = str_size(base_path); int size = base_len + 2 * str_size(name) + str_size(ext) + 3; - + res = malloc(size); - + if (res) { str_cpy(res, size, base_path); @@ -55,5 +55,5 @@ str_append(res, size, ext); } - + return res; } @@ -82,5 +82,5 @@ { size_t len = 0; - + while(*str != '\0' && !isspace(*str)) { len++; Index: uspace/srv/fs/cdfs/cdfs.c =================================================================== --- uspace/srv/fs/cdfs/cdfs.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/cdfs/cdfs.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -60,5 +60,5 @@ { printf("%s: HelenOS cdfs file system server\n", NAME); - + if (argc == 3) { if (!str_cmp(argv[1], "--instance")) @@ -74,5 +74,5 @@ return -1; } - + async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS, INTERFACE_VFS_DRIVER, 0); @@ -81,5 +81,5 @@ return -1; } - + errno_t rc = fs_register(vfs_sess, &cdfs_vfs_info, &cdfs_ops, &cdfs_libfs_ops); @@ -88,9 +88,9 @@ return rc; } - + printf("%s: Accepting connections\n", NAME); task_retval(0); async_manager(); - + /* Not reached */ return 0; Index: uspace/srv/fs/cdfs/cdfs_ops.c =================================================================== --- uspace/srv/fs/cdfs/cdfs_ops.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/cdfs/cdfs_ops.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -92,10 +92,10 @@ uint8_t mon[2]; uint8_t day[2]; - + uint8_t hour[2]; uint8_t min[2]; uint8_t sec[2]; uint8_t msec[2]; - + uint8_t offset; } __attribute__((packed)) cdfs_datetime_t; @@ -105,9 +105,9 @@ uint8_t mon; uint8_t day; - + uint8_t hour; uint8_t min; uint8_t sec; - + uint8_t offset; } __attribute__((packed)) cdfs_timestamp_t; @@ -121,8 +121,8 @@ uint8_t length; uint8_t ea_length; - + uint32_t_lb lba; uint32_t_lb size; - + cdfs_timestamp_t timestamp; uint8_t flags; @@ -130,5 +130,5 @@ uint8_t gap_size; uint16_t_lb sequence_nr; - + uint8_t name_length; uint8_t name[]; @@ -139,8 +139,8 @@ uint8_t length; uint8_t ea_length; - + uint32_t_lb lba; uint32_t_lb size; - + cdfs_timestamp_t timestamp; uint8_t flags; @@ -148,5 +148,5 @@ uint8_t gap_size; uint16_t_lb sequence_nr; - + uint8_t name_length; uint8_t name[1]; @@ -155,40 +155,40 @@ typedef struct { uint8_t flags; /* reserved in primary */ - + uint8_t system_ident[32]; uint8_t ident[32]; - + uint64_t res1; uint32_t_lb lba_size; - + uint8_t esc_seq[32]; /* reserved in primary */ uint16_t_lb set_size; uint16_t_lb sequence_nr; - + uint16_t_lb block_size; uint32_t_lb path_table_size; - + uint32_t path_table_lsb; uint32_t opt_path_table_lsb; uint32_t path_table_msb; uint32_t opt_path_table_msb; - + cdfs_root_dir_t root_dir; uint8_t pad0; - + uint8_t set_ident[128]; uint8_t publisher_ident[128]; uint8_t preparer_ident[128]; uint8_t app_ident[128]; - + uint8_t copyright_file_ident[37]; uint8_t abstract_file_ident[37]; uint8_t biblio_file_ident[37]; - + cdfs_datetime_t creation; cdfs_datetime_t modification; cdfs_datetime_t expiration; cdfs_datetime_t effective; - + uint8_t fs_version; } __attribute__((packed)) cdfs_vol_desc_prisec_t; @@ -236,11 +236,11 @@ fs_index_t index; /**< Node index */ cdfs_t *fs; /**< File system */ - + ht_link_t nh_link; /**< Nodes hash table link */ cdfs_dentry_type_t type; /**< Dentry type */ - + unsigned int lnkcnt; /**< Link count */ uint32_t size; /**< File size if type is CDFS_FILE */ - + list_t cs_list; /**< Child's siblings list */ cdfs_lba_t lba; /**< LBA of data on disk */ @@ -301,5 +301,5 @@ cdfs_node_t *node = hash_table_get_inst(item, cdfs_node_t, nh_link); ht_key_t *key = (ht_key_t*)k; - + return key->service_id == node->fs->service_id && key->index == node->index; } @@ -308,5 +308,5 @@ { cdfs_node_t *node = hash_table_get_inst(item, cdfs_node_t, nh_link); - + if (node->type == CDFS_DIRECTORY) { link_t *link; @@ -317,5 +317,5 @@ } } - + free(node->fs_node); free(node); @@ -338,14 +338,14 @@ .service_id = service_id }; - + ht_link_t *link = hash_table_find(&nodes, &key); if (link) { cdfs_node_t *node = hash_table_get_inst(link, cdfs_node_t, nh_link); - + *rfn = FS_NODE(node); } else *rfn = NULL; - + return EOK; } @@ -367,5 +367,5 @@ node->processed = false; node->opened = 0; - + list_initialize(&node->cs_list); } @@ -375,11 +375,11 @@ { assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY)); - + cdfs_node_t *node = malloc(sizeof(cdfs_node_t)); if (!node) return ENOMEM; - + cdfs_node_initialize(node); - + node->fs_node = malloc(sizeof(fs_node_t)); if (!node->fs_node) { @@ -387,31 +387,31 @@ return ENOMEM; } - + fs_node_initialize(node->fs_node); node->fs_node->data = node; - + fs_node_t *rootfn; errno_t rc = cdfs_root_get(&rootfn, fs->service_id); - + assert(rc == EOK); - + if (!rootfn) node->index = CDFS_SOME_ROOT; else node->index = index; - + node->fs = fs; - + if (lflag & L_DIRECTORY) node->type = CDFS_DIRECTORY; else node->type = CDFS_FILE; - + /* Insert the new node into the nodes hash table. */ hash_table_insert(&nodes, &node->nh_link); - + *rfn = FS_NODE(node); nodes_cached++; - + return EOK; } @@ -421,7 +421,7 @@ cdfs_node_t *parent = CDFS_NODE(pfn); cdfs_node_t *node = CDFS_NODE(fn); - + assert(parent->type == CDFS_DIRECTORY); - + /* Check for duplicate entries */ list_foreach(parent->cs_list, link, cdfs_dentry_t, dentry) { @@ -429,10 +429,10 @@ return EEXIST; } - + /* Allocate and initialize the dentry */ cdfs_dentry_t *dentry = malloc(sizeof(cdfs_dentry_t)); if (!dentry) return ENOMEM; - + /* Populate and link the new dentry */ dentry->name = str_dup(name); @@ -441,11 +441,11 @@ return ENOMEM; } - + link_initialize(&dentry->link); dentry->index = node->index; - + node->lnkcnt++; list_append(&dentry->link, &parent->cs_list); - + return EOK; } @@ -463,5 +463,5 @@ char *str; uint16_t *buf; - + switch (enc) { case enc_ascii: @@ -476,5 +476,5 @@ if (buf == NULL) return NULL; - + size_t i; for (i = 0; i < dsize / sizeof(uint16_t); i++) { @@ -482,13 +482,13 @@ ((unaligned_uint16_t *)data)[i]); } - + size_t dstr_size = dsize / sizeof(uint16_t) * 4 + 1; str = malloc(dstr_size); if (str == NULL) return NULL; - + rc = utf16_to_str(str, dstr_size, buf); free(buf); - + if (rc != EOK) return NULL; @@ -498,5 +498,5 @@ str = NULL; } - + return str; } @@ -516,14 +516,14 @@ char *dot; char *scolon; - + name = cdfs_decode_str(data, dsize, enc); if (name == NULL) return NULL; - + if (dtype == CDFS_DIRECTORY) return name; - + dot = str_chr(name, '.'); - + if (dot != NULL) { scolon = str_chr(dot, ';'); @@ -532,10 +532,10 @@ *scolon = '\0'; } - + /* If the extension is an empty string, trim the dot separator. */ if (dot[1] == '\0') *dot = '\0'; } - + return name; } @@ -552,9 +552,9 @@ char *ident; size_t i; - + ident = cdfs_decode_str(data, dsize, enc); if (ident == NULL) return NULL; - + /* Trim trailing spaces */ i = str_size(ident); @@ -562,5 +562,5 @@ --i; ident[i] = '\0'; - + return ident; } @@ -570,12 +570,12 @@ cdfs_node_t *node = CDFS_NODE(fs_node); assert(node); - + if (node->processed) return EOK; - + uint32_t blocks = node->size / BLOCK_SIZE; if ((node->size % BLOCK_SIZE) != 0) blocks++; - + for (uint32_t i = 0; i < blocks; i++) { block_t *block; @@ -583,7 +583,7 @@ if (rc != EOK) return rc; - + cdfs_dir_t *dir; - + for (size_t offset = 0; offset < BLOCK_SIZE; offset += dir->length) { @@ -595,5 +595,5 @@ break; } - + cdfs_dentry_type_t dentry_type; if (dir->flags & DIR_FLAG_DIRECTORY) @@ -601,7 +601,7 @@ else dentry_type = CDFS_FILE; - + /* Skip special entries */ - + if (dir->name_length == 1 && dir->name[0] == CDFS_NAME_CURDIR) @@ -610,7 +610,7 @@ dir->name[0] == CDFS_NAME_PARENTDIR) continue; - + // FIXME: hack - indexing by dentry byte offset on disc - + fs_node_t *fn; errno_t rc = create_node(&fn, fs, dentry_type, @@ -620,26 +620,26 @@ assert(fn != NULL); - + cdfs_node_t *cur = CDFS_NODE(fn); cur->lba = uint32_lb(dir->lba); cur->size = uint32_lb(dir->size); - + char *name = cdfs_decode_name(dir->name, dir->name_length, node->fs->enc, dentry_type); if (name == NULL) return EIO; - + // FIXME: check return value - + link_node(fs_node, fn, name); free(name); - + if (dentry_type == CDFS_FILE) cur->processed = true; } - + block_put(block); } - + node->processed = true; return EOK; @@ -650,12 +650,12 @@ cdfs_lba_t lba = index / BLOCK_SIZE; size_t offset = index % BLOCK_SIZE; - + block_t *block; errno_t rc = block_get(&block, fs->service_id, lba, BLOCK_FLAGS_NONE); if (rc != EOK) return NULL; - + cdfs_dir_t *dir = (cdfs_dir_t *) (block->data + offset); - + cdfs_dentry_type_t dentry_type; if (dir->flags & DIR_FLAG_DIRECTORY) @@ -663,18 +663,18 @@ else dentry_type = CDFS_FILE; - + fs_node_t *fn; rc = create_node(&fn, fs, dentry_type, index); if ((rc != EOK) || (fn == NULL)) return NULL; - + cdfs_node_t *node = CDFS_NODE(fn); node->lba = uint32_lb(dir->lba); node->size = uint32_lb(dir->size); node->lnkcnt = 1; - + if (dentry_type == CDFS_FILE) node->processed = true; - + block_put(block); return fn; @@ -687,5 +687,5 @@ .service_id = fs->service_id }; - + ht_link_t *link = hash_table_find(&nodes, &key); if (link) { @@ -694,5 +694,5 @@ return FS_NODE(node); } - + return get_uncached_node(fs, index); } @@ -701,5 +701,5 @@ { cdfs_node_t *parent = CDFS_NODE(pfn); - + if (!parent->processed) { errno_t rc = cdfs_readdir(parent->fs, pfn); @@ -707,5 +707,5 @@ return rc; } - + list_foreach(parent->cs_list, link, cdfs_dentry_t, dentry) { if (str_cmp(dentry->name, component) == 0) { @@ -714,5 +714,5 @@ } } - + *fn = NULL; return EOK; @@ -722,8 +722,8 @@ { cdfs_node_t *node = CDFS_NODE(fn); - + if (!node->processed) cdfs_readdir(node->fs, fn); - + node->opened++; return EOK; @@ -763,8 +763,8 @@ { cdfs_node_t *node = CDFS_NODE(fn); - + if ((node->type == CDFS_DIRECTORY) && (!node->processed)) cdfs_readdir(node->fs, fn); - + *has_children = !list_empty(&node->cs_list); return EOK; @@ -809,5 +809,5 @@ { *size = BLOCK_SIZE; - + return EOK; } @@ -816,5 +816,5 @@ { *count = 0; - + return EOK; } @@ -823,5 +823,5 @@ { *count = 0; - + return EOK; } @@ -855,10 +855,10 @@ size_t i, j, k; bool match; - + i = 0; while (i + ucs2_esc_seq_len <= 32) { if (seq[i] == 0) break; - + for (j = 0; j < ucs2_esc_seq_no; j++) { match = true; @@ -870,11 +870,11 @@ } } - + if (!match) return EINVAL; - + i += ucs2_esc_seq_len; } - + while (i < 32) { if (seq[i] != 0) @@ -882,5 +882,5 @@ ++i; } - + return EOK; } @@ -905,12 +905,12 @@ if (rc != EOK) break; - + cdfs_vol_desc_t *vol_desc = (cdfs_vol_desc_t *) block->data; - + if (vol_desc->type == VOL_DESC_SET_TERMINATOR) { block_put(block); break; } - + if ((vol_desc->type != VOL_DESC_SUPPLEMENTARY) || (memcmp(vol_desc->standard_ident, CDFS_STANDARD_IDENT, 5) != 0) || @@ -919,5 +919,5 @@ continue; } - + uint16_t set_size = uint16_lb(vol_desc->data.prisec.set_size); if (set_size > 1) { @@ -929,5 +929,5 @@ */ } - + uint16_t sequence_nr = uint16_lb(vol_desc->data.prisec.sequence_nr); if (sequence_nr != 1) { @@ -939,5 +939,5 @@ continue; } - + uint16_t block_size = uint16_lb(vol_desc->data.prisec.block_size); if (block_size != BLOCK_SIZE) { @@ -945,5 +945,5 @@ continue; } - + rc = cdfs_verify_joliet_esc_seq(vol_desc->data.prisec.esc_seq); if (rc != EOK) @@ -958,5 +958,5 @@ return EOK; } - + return ENOENT; } @@ -971,7 +971,7 @@ if (rc != EOK) return rc; - + cdfs_vol_desc_t *vol_desc = (cdfs_vol_desc_t *) block->data; - + /* * Test for primary volume descriptor @@ -984,5 +984,5 @@ return ENOTSUP; } - + uint16_t set_size = uint16_lb(vol_desc->data.prisec.set_size); if (set_size > 1) { @@ -994,5 +994,5 @@ */ } - + uint16_t sequence_nr = uint16_lb(vol_desc->data.prisec.sequence_nr); if (sequence_nr != 1) { @@ -1004,5 +1004,5 @@ return ENOTSUP; } - + uint16_t block_size = uint16_lb(vol_desc->data.prisec.block_size); if (block_size != BLOCK_SIZE) { @@ -1010,12 +1010,12 @@ return ENOTSUP; } - + // TODO: implement path table support - + /* Search for Joliet SVD */ - + uint32_t jrlba; uint32_t jrsize; - + rc = cdfs_find_joliet_svd(sid, altroot, &jrlba, &jrsize, vol_ident); if (rc == EOK) { @@ -1031,5 +1031,5 @@ 32, enc_ascii); } - + block_put(block); return EOK; @@ -1040,10 +1040,10 @@ { cdfs_node_t *node = CDFS_NODE(rfn); - + errno_t rc = iso_read_vol_desc(fs->service_id, altroot, &node->lba, &node->size, &fs->enc, &fs->vol_ident); if (rc != EOK) return rc; - + return cdfs_readdir(fs, rfn); } @@ -1060,22 +1060,22 @@ if (fs == NULL) goto error; - + fs->service_id = sid; - + /* Create root node */ errno_t rc = create_node(&rfn, fs, L_DIRECTORY, cdfs_index++); - + if ((rc != EOK) || (!rfn)) goto error; - + /* FS root is not linked */ CDFS_NODE(rfn)->lnkcnt = 0; CDFS_NODE(rfn)->lba = 0; CDFS_NODE(rfn)->processed = false; - + /* Check if there is cdfs in given session */ if (iso_readfs(fs, rfn, altroot) != EOK) goto error; - + list_append(&fs->link, &cdfs_instances); return fs; @@ -1094,7 +1094,7 @@ if (rc != EOK) return rc; - + cdfs_lba_t altroot = 0; - + /* * Read TOC multisession information and get the start address @@ -1106,5 +1106,5 @@ if (rc == EOK && (uint16_t_be2host(toc.toc_len) == 10)) altroot = uint32_t_be2host(toc.ftrack_lsess.start_addr); - + /* Initialize the block cache */ rc = block_cache_init(service_id, BLOCK_SIZE, 0, CACHE_MODE_WT); @@ -1113,5 +1113,5 @@ return rc; } - + /* Check if this device is not already mounted */ fs_node_t *rootfn; @@ -1123,5 +1123,5 @@ return EOK; } - + /* Read volume descriptors */ uint32_t rlba; @@ -1135,8 +1135,8 @@ return rc; } - + str_cpy(info->label, FS_LABEL_MAXLEN + 1, vol_ident); free(vol_ident); - + block_cache_fini(service_id); block_fini(service_id); @@ -1151,7 +1151,7 @@ if (rc != EOK) return rc; - + cdfs_lba_t altroot = 0; - + if (str_lcmp(opts, "altroot=", 8) == 0) { /* User-defined alternative root on a multi-session disk */ @@ -1169,5 +1169,5 @@ altroot = uint32_t_be2host(toc.ftrack_lsess.start_addr); } - + /* Initialize the block cache */ rc = block_cache_init(service_id, BLOCK_SIZE, 0, CACHE_MODE_WT); @@ -1176,5 +1176,5 @@ return rc; } - + /* Check if this device is not already mounted */ fs_node_t *rootfn; @@ -1184,23 +1184,23 @@ block_cache_fini(service_id); block_fini(service_id); - + return EEXIST; } - + /* Create cdfs instance */ if (cdfs_fs_create(service_id, altroot) == NULL) { block_cache_fini(service_id); block_fini(service_id); - + return ENOMEM; } - + rc = cdfs_root_get(&rootfn, service_id); assert(rc == EOK); - + cdfs_node_t *root = CDFS_NODE(rootfn); *index = root->index; *size = root->size; - + return EOK; } @@ -1210,9 +1210,9 @@ service_id_t service_id = *(service_id_t*)arg; cdfs_node_t *node = hash_table_get_inst(item, cdfs_node_t, nh_link); - + if (node->fs->service_id == service_id) { hash_table_remove_item(&nodes, &node->nh_link); } - + return true; } @@ -1234,5 +1234,5 @@ return fs; } - + return NULL; } @@ -1245,5 +1245,5 @@ if (fs == NULL) return ENOENT; - + cdfs_fs_destroy(fs); return EOK; @@ -1257,12 +1257,12 @@ .service_id = service_id }; - + ht_link_t *link = hash_table_find(&nodes, &key); if (link == NULL) return ENOENT; - + cdfs_node_t *node = hash_table_get_inst(link, cdfs_node_t, nh_link); - + if (!node->processed) { errno_t rc = cdfs_readdir(node->fs, FS_NODE(node)); @@ -1270,5 +1270,5 @@ return rc; } - + ipc_callid_t callid; size_t len; @@ -1277,5 +1277,5 @@ return EINVAL; } - + if (node->type == CDFS_FILE) { if (pos >= node->size) { @@ -1285,8 +1285,8 @@ cdfs_lba_t lba = pos / BLOCK_SIZE; size_t offset = pos % BLOCK_SIZE; - + *rbytes = min(len, BLOCK_SIZE - offset); *rbytes = min(*rbytes, node->size - pos); - + block_t *block; errno_t rc = block_get(&block, service_id, node->lba + lba, @@ -1296,5 +1296,5 @@ return rc; } - + async_data_read_finalize(callid, block->data + offset, *rbytes); @@ -1309,13 +1309,13 @@ return ENOENT; } - + cdfs_dentry_t *dentry = list_get_instance(link, cdfs_dentry_t, link); - + *rbytes = 1; async_data_read_finalize(callid, dentry->name, str_size(dentry->name) + 1); } - + return EOK; } @@ -1328,5 +1328,5 @@ * the operation is not supported. */ - + return ENOTSUP; } @@ -1339,5 +1339,5 @@ * the operation is not supported. */ - + return ENOTSUP; } @@ -1346,5 +1346,5 @@ { size_t *premove_cnt = (size_t*)arg; - + /* Some nodes were requested to be removed from the cache. */ if (0 < *premove_cnt) { @@ -1353,10 +1353,10 @@ if (!node->opened) { hash_table_remove_item(&nodes, item); - + --nodes_cached; --*premove_cnt; } } - + /* Only continue if more nodes were requested to be removed. */ return 0 < *premove_cnt; @@ -1367,5 +1367,5 @@ if (nodes_cached > NODE_CACHE_SIZE) { size_t remove_cnt = nodes_cached - NODE_CACHE_SIZE; - + if (0 < remove_cnt) hash_table_apply(&nodes, cache_remove_closed, &remove_cnt); @@ -1378,22 +1378,22 @@ if (index == 0) return EOK; - + ht_key_t key = { .index = index, .service_id = service_id }; - + ht_link_t *link = hash_table_find(&nodes, &key); if (link == 0) return ENOENT; - + cdfs_node_t *node = hash_table_get_inst(link, cdfs_node_t, nh_link); - + assert(node->opened > 0); - + node->opened--; cleanup_cache(service_id); - + return EOK; } @@ -1405,5 +1405,5 @@ * the operation is not supported. */ - + return ENOTSUP; } @@ -1415,5 +1415,5 @@ * the sync operation is a no-op. */ - + return EOK; } @@ -1438,5 +1438,5 @@ if (!hash_table_create(&nodes, 0, 0, &nodes_ops)) return false; - + return true; } Index: uspace/srv/fs/exfat/exfat.c =================================================================== --- uspace/srv/fs/exfat/exfat.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/exfat/exfat.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -82,5 +82,5 @@ return -1; } - + rc = fs_register(vfs_sess, &exfat_vfs_info, &exfat_ops, &exfat_libfs_ops); if (rc != EOK) { @@ -88,5 +88,5 @@ goto err; } - + printf(NAME ": Accepting connections\n"); task_retval(0); Index: uspace/srv/fs/exfat/exfat.h =================================================================== --- uspace/srv/fs/exfat/exfat.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/exfat/exfat.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -133,5 +133,5 @@ /** Back pointer to the FS node. */ fs_node_t *bp; - + fibril_mutex_t lock; exfat_node_type_t type; Index: uspace/srv/fs/exfat/exfat_bitmap.c =================================================================== --- uspace/srv/fs/exfat/exfat_bitmap.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/exfat/exfat_bitmap.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -59,10 +59,10 @@ clst -= EXFAT_CLST_FIRST; - + rc = exfat_bitmap_get(&fn, service_id); if (rc != EOK) return rc; bitmapp = EXFAT_NODE(fn); - + aoff64_t offset = clst / 8; rc = exfat_block_get(&b, bs, bitmapp, offset / BPS(bs), BLOCK_FLAGS_NONE); @@ -99,10 +99,10 @@ clst -= EXFAT_CLST_FIRST; - + rc = exfat_bitmap_get(&fn, service_id); if (rc != EOK) return rc; bitmapp = EXFAT_NODE(fn); - + aoff64_t offset = clst / 8; rc = exfat_block_get(&b, bs, bitmapp, offset / BPS(bs), BLOCK_FLAGS_NONE); @@ -120,5 +120,5 @@ return rc; } - + return exfat_node_put(fn); } @@ -134,10 +134,10 @@ clst -= EXFAT_CLST_FIRST; - + rc = exfat_bitmap_get(&fn, service_id); if (rc != EOK) return rc; bitmapp = EXFAT_NODE(fn); - + aoff64_t offset = clst / 8; rc = exfat_block_get(&b, bs, bitmapp, offset / BPS(bs), @@ -156,5 +156,5 @@ return rc; } - + return exfat_node_put(fn); } Index: uspace/srv/fs/exfat/exfat_directory.c =================================================================== --- uspace/srv/fs/exfat/exfat_directory.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/exfat/exfat_directory.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -91,10 +91,10 @@ { errno_t rc = EOK; - + if (di->b) { rc = block_put(di->b); di->b = NULL; } - + return rc; } @@ -141,5 +141,5 @@ if (rc != EOK) di->pos -= 1; - + return rc; } @@ -148,5 +148,5 @@ { errno_t rc = EOK; - + if (di->pos > 0) { di->pos -= 1; @@ -154,8 +154,8 @@ } else return ENOENT; - + if (rc != EOK) di->pos += 1; - + return rc; } @@ -170,5 +170,5 @@ if (rc != EOK) di->pos = _pos; - + return rc; } @@ -177,5 +177,5 @@ { errno_t rc; - + rc = exfat_directory_block_load(di); if (rc == EOK) { @@ -183,5 +183,5 @@ *d = ((exfat_dentry_t *)di->b->data) + o; } - + return rc; } @@ -197,5 +197,5 @@ return ENOENT; } while (exfat_directory_next(di) == EOK); - + return ENOENT; } @@ -222,5 +222,5 @@ size_t offset = 0; aoff64_t start_pos = 0; - + rc = exfat_directory_find(di, EXFAT_DENTRY_FILE, &d); if (rc != EOK) @@ -238,5 +238,5 @@ return ENOENT; *ds = d->stream; - + if (ds->name_size > size) return EOVERFLOW; @@ -470,5 +470,5 @@ di->b->dirty = true; } - + return exfat_directory_seek(di, pos); } @@ -486,5 +486,5 @@ return rc; count = de->file.count + 1; - + while (count) { rc = exfat_directory_get(di, &de); @@ -517,5 +517,5 @@ di->nodep->dirty = true; /* need to sync node */ di->blocks = di->nodep->size / BPS(di->bs); - + return EOK; } Index: uspace/srv/fs/exfat/exfat_fat.c =================================================================== --- uspace/srv/fs/exfat/exfat_fat.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/exfat/exfat_fat.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -516,5 +516,5 @@ blocks = ROUND_UP(nodep->size, BPS(bs))/BPS(bs); count = BPS(bs); - + for (i = 0; i < blocks; i++) { rc = exfat_block_get(&b, bs, nodep, i, BLOCK_FLAGS_NOREAD); Index: uspace/srv/fs/exfat/exfat_idx.c =================================================================== --- uspace/srv/fs/exfat/exfat_idx.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/exfat/exfat_idx.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -120,5 +120,5 @@ { pos_key_t *pos = (pos_key_t*)key; - + size_t hash = 0; hash = hash_combine(pos->pfc, pos->pdi); @@ -129,5 +129,5 @@ { exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uph_link); - + pos_key_t pkey = { .service_id = fidx->service_id, @@ -135,5 +135,5 @@ .pdi = fidx->pdi, }; - + return pos_key_hash(&pkey); } @@ -143,5 +143,5 @@ pos_key_t *pos = (pos_key_t*)key; exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uph_link); - + return pos->service_id == fidx->service_id && pos->pdi == fidx->pdi @@ -184,5 +184,5 @@ exfat_idx_t *fidx = hash_table_get_inst(item, exfat_idx_t, uih_link); idx_key_t *key = (idx_key_t*)key_arg; - + return key->index == fidx->index && key->service_id == fidx->service_id; } @@ -207,5 +207,5 @@ { unused_t *u; - + assert(index); u = unused_find(service_id, true); @@ -339,5 +339,5 @@ return ENOSPC; } - + fibril_mutex_initialize(&fidx->lock); fidx->service_id = service_id; @@ -361,5 +361,5 @@ return rc; } - + hash_table_insert(&ui_hash, &fidx->uih_link); fibril_mutex_lock(&fidx->lock); @@ -374,5 +374,5 @@ { exfat_idx_t *fidx; - + pos_key_t pos_key = { .service_id = service_id, @@ -393,5 +393,5 @@ return NULL; } - + fidx->pfc = pfc; fidx->pdi = pdi; @@ -515,5 +515,5 @@ hash_table_remove_item(&up_hash, item); } - + return true; } @@ -527,5 +527,5 @@ hash_table_remove_item(&ui_hash, item); } - + return true; } Index: uspace/srv/fs/exfat/exfat_ops.c =================================================================== --- uspace/srv/fs/exfat/exfat_ops.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/exfat/exfat_ops.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -519,5 +519,5 @@ service_id = parentp->idx->service_id; fibril_mutex_unlock(&parentp->idx->lock); - + exfat_directory_t di; rc = exfat_directory_open(parentp, &di); @@ -803,5 +803,5 @@ assert(childp->lnkcnt == 1); fibril_mutex_lock(&childp->idx->lock); - + exfat_directory_t di; rc = exfat_directory_open(parentp,&di); @@ -929,5 +929,5 @@ bs = block_bb_get(service_id); *count = DATA_CNT(bs); - + return EOK; } Index: uspace/srv/fs/ext4fs/ext4fs.c =================================================================== --- uspace/srv/fs/ext4fs/ext4fs.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/ext4fs/ext4fs.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -56,5 +56,5 @@ { printf("%s: HelenOS ext4 file system server\n", NAME); - + if (argc == 3) { if (!str_cmp(argv[1], "--instance")) @@ -65,5 +65,5 @@ } } - + async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS, INTERFACE_VFS_DRIVER, 0); @@ -72,5 +72,5 @@ return 2; } - + errno_t rc = ext4_global_init(); if (rc != EOK) { @@ -78,5 +78,5 @@ return rc; } - + rc = fs_register(vfs_sess, &ext4fs_vfs_info, &ext4_ops, &ext4_libfs_ops); @@ -85,9 +85,9 @@ return rc; } - + printf("%s: Accepting connections\n", NAME); task_retval(0); async_manager(); - + /* Not reached */ return 0; Index: uspace/srv/fs/fat/fat.c =================================================================== --- uspace/srv/fs/fat/fat.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/fat/fat.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -62,5 +62,5 @@ { printf(NAME ": HelenOS FAT file system server\n"); - + if (argc == 3) { if (!str_cmp(argv[1], "--instance")) @@ -75,5 +75,5 @@ if (rc != EOK) goto err; - + async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS, INTERFACE_VFS_DRIVER, 0); @@ -82,5 +82,5 @@ return -1; } - + rc = fs_register(vfs_sess, &fat_vfs_info, &fat_ops, &fat_libfs_ops); if (rc != EOK) { @@ -88,12 +88,12 @@ goto err; } - + printf(NAME ": Accepting connections\n"); task_retval(0); async_manager(); - + /* Not reached */ return 0; - + err: printf(NAME ": Failed to register file system: %s\n", str_error(rc)); Index: uspace/srv/fs/fat/fat.h =================================================================== --- uspace/srv/fs/fat/fat.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/fat/fat.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -213,5 +213,5 @@ /** Back pointer to the FS node. */ fs_node_t *bp; - + fibril_mutex_t lock; fat_node_type_t type; Index: uspace/srv/fs/fat/fat_dentry.c =================================================================== --- uspace/srv/fs/fat/fat_dentry.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/fat/fat_dentry.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -81,9 +81,9 @@ { unsigned int i; - + for (i = 0; i < FAT_NAME_LEN; i++) { if (d->name[i] == FAT_PAD) break; - + if (d->name[i] == FAT_DENTRY_E5_ESC) *buf++ = 0xe5; @@ -95,8 +95,8 @@ } } - + if (d->ext[0] != FAT_PAD) *buf++ = '.'; - + for (i = 0; i < FAT_EXT_LEN; i++) { if (d->ext[i] == FAT_PAD) { @@ -104,5 +104,5 @@ return; } - + if (d->ext[i] == FAT_DENTRY_E5_ESC) *buf++ = 0xe5; @@ -114,5 +114,5 @@ } } - + *buf = '\0'; } @@ -124,5 +124,5 @@ bool lower_name = true; bool lower_ext = true; - + for (i = 0; i < FAT_NAME_LEN; i++) { switch ((uint8_t) *name) { @@ -140,13 +140,13 @@ lower_name = false; } - + d->name[i] = toupper(*name++); break; } } - + if (*name++ != '.') name = fake_ext; - + for (i = 0; i < FAT_EXT_LEN; i++) { switch ((uint8_t) *name) { @@ -163,15 +163,15 @@ lower_ext = false; } - + d->ext[i] = toupper(*name++); break; } } - + if (lower_name) d->lcase |= FAT_LCASE_LOWER_NAME; else d->lcase &= ~FAT_LCASE_LOWER_NAME; - + if (lower_ext) d->lcase |= FAT_LCASE_LOWER_EXT; @@ -183,9 +183,9 @@ { unsigned int i; - + for (i = 0; i < FAT_NAME_LEN; i++) { if (d->name[i] == FAT_PAD) break; - + if (d->name[i] == FAT_DENTRY_E5_ESC) *buf++ = 0xe5; @@ -193,5 +193,5 @@ *buf++ = d->name[i]; } - + for (i = 0; i < FAT_EXT_LEN; i++) { if (d->ext[i] == FAT_PAD) { @@ -199,5 +199,5 @@ return; } - + if (d->ext[i] == FAT_DENTRY_E5_ESC) *buf++ = 0xe5; @@ -205,5 +205,5 @@ *buf++ = d->ext[i]; } - + *buf = '\0'; } @@ -291,9 +291,9 @@ { size_t size = 0; - + size += fat_lfn_str_nlength(FAT_LFN_PART1(d), FAT_LFN_PART1_SIZE); size += fat_lfn_str_nlength(FAT_LFN_PART2(d), FAT_LFN_PART2_SIZE); size += fat_lfn_str_nlength(FAT_LFN_PART3(d), FAT_LFN_PART3_SIZE); - + return size; } @@ -354,5 +354,5 @@ d->lfn.type = 0; d->lfn.firstc_lo = 0; - + return *offset; } @@ -363,5 +363,5 @@ size_t off = 0; size_t i = 0; - + while (i < count) { if ((ch = str_decode(src, &off, STR_NO_LIMIT)) != 0) { @@ -384,5 +384,5 @@ size_t offset=0; bool result = true; - + while ((ch = str_decode(name, &offset, STR_NO_LIMIT)) != 0) { if (str_chr(FAT_STOP_CHARS, ch) != NULL) { Index: uspace/srv/fs/fat/fat_dentry.h =================================================================== --- uspace/srv/fs/fat/fat_dentry.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/fat/fat_dentry.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -60,5 +60,5 @@ #define FAT_ATTR_LFN \ (FAT_ATTR_RDONLY | FAT_ATTR_HIDDEN | FAT_ATTR_SYSTEM | FAT_ATTR_VOLLABEL) - + #define FAT_LCASE_LOWER_NAME 0x08 #define FAT_LCASE_LOWER_EXT 0x10 Index: uspace/srv/fs/fat/fat_directory.c =================================================================== --- uspace/srv/fs/fat/fat_directory.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/fat/fat_directory.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -65,8 +65,8 @@ { errno_t rc = EOK; - + if (di->b) rc = block_put(di->b); - + return rc; } @@ -106,5 +106,5 @@ if (rc != EOK) di->pos -= 1; - + return rc; } @@ -113,5 +113,5 @@ { errno_t rc = EOK; - + if (di->pos > 0) { di->pos -= 1; @@ -119,8 +119,8 @@ } else return ENOENT; - + if (rc != EOK) di->pos += 1; - + return rc; } @@ -135,5 +135,5 @@ if (rc != EOK) di->pos = _pos; - + return rc; } @@ -142,5 +142,5 @@ { errno_t rc; - + rc = fat_directory_block_load(di); if (rc == EOK) { @@ -148,5 +148,5 @@ *d = ((fat_dentry_t *)di->b->data) + o; } - + return rc; } @@ -168,5 +168,5 @@ assert(rc == EOK); instance = (fat_instance_t *) data; - + do { rc = fat_directory_get(di, &d); @@ -220,5 +220,5 @@ } else fat_dentry_name_get(d, name); - + *de = d; return EOK; @@ -232,5 +232,5 @@ } } while (fat_directory_next(di) == EOK); - + return ENOENT; } @@ -250,5 +250,5 @@ d->name[0] = FAT_DENTRY_ERASED; di->b->dirty = true; - + while (!flag && fat_directory_prev(di) == EOK) { if (fat_directory_get(di, &d) == EOK && @@ -276,5 +276,5 @@ assert(rc == EOK); instance = (fat_instance_t *) data; - + if (fat_valid_short_name(name)) { /* @@ -296,9 +296,9 @@ uint16_t wname[FAT_LFN_NAME_LEN]; size_t lfn_size, lfn_offset; - + rc = str_to_utf16(wname, FAT_LFN_NAME_LEN, name); if (rc != EOK) return rc; - + lfn_size = utf16_wsize(wname); long_entry_count = lfn_size / FAT_LFN_ENTRY_SIZE; @@ -440,5 +440,5 @@ di->nodep->dirty = true; /* need to sync node */ di->blocks = di->nodep->size / BPS(di->bs); - + return EOK; } @@ -450,5 +450,5 @@ aoff64_t pos; errno_t rc; - + do { found = 0; Index: uspace/srv/fs/fat/fat_fat.c =================================================================== --- uspace/srv/fs/fat/fat_fat.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/fat/fat_fat.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -344,5 +344,5 @@ else *value = (*value) & FAT12_MASK; - + rc = block_put(b); @@ -463,5 +463,5 @@ if (offset / BPS(bs) >= SF(bs)) return ERANGE; - + rc = block_get(&b, service_id, RSCNT(bs) + SF(bs) * fatno + offset / BPS(bs), BLOCK_FLAGS_NONE); @@ -687,5 +687,5 @@ if (!lifo) return ENOMEM; - + /* * Search FAT1 for unused clusters. Index: uspace/srv/fs/fat/fat_idx.c =================================================================== --- uspace/srv/fs/fat/fat_idx.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/fat/fat_idx.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -120,5 +120,5 @@ { pos_key_t *pos = (pos_key_t*)key; - + size_t hash = 0; hash = hash_combine(pos->pfc, pos->pdi); @@ -129,5 +129,5 @@ { fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link); - + pos_key_t pkey = { .service_id = fidx->service_id, @@ -135,5 +135,5 @@ .pdi = fidx->pdi, }; - + return pos_key_hash(&pkey); } @@ -143,5 +143,5 @@ pos_key_t *pos = (pos_key_t*)key; fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link); - + return pos->service_id == fidx->service_id && pos->pdi == fidx->pdi @@ -184,5 +184,5 @@ fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uih_link); idx_key_t *key = (idx_key_t*)key_arg; - + return key->index == fidx->index && key->service_id == fidx->service_id; } @@ -207,5 +207,5 @@ { unused_t *u; - + assert(index); u = unused_find(service_id, true); @@ -339,5 +339,5 @@ return ENOSPC; } - + fibril_mutex_initialize(&fidx->lock); fidx->service_id = service_id; @@ -361,5 +361,5 @@ return rc; } - + hash_table_insert(&ui_hash, &fidx->uih_link); fibril_mutex_lock(&fidx->lock); @@ -393,5 +393,5 @@ return NULL; } - + fidx->pfc = pfc; fidx->pdi = pdi; @@ -514,5 +514,5 @@ hash_table_remove_item(&up_hash, item); } - + return true; } @@ -526,5 +526,5 @@ hash_table_remove_item(&ui_hash, item); } - + return true; } Index: uspace/srv/fs/fat/fat_ops.c =================================================================== --- uspace/srv/fs/fat/fat_ops.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/fat/fat_ops.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -381,5 +381,5 @@ service_id = parentp->idx->service_id; fibril_mutex_unlock(&parentp->idx->lock); - + fat_directory_t di; rc = fat_directory_open(parentp, &di); @@ -716,5 +716,5 @@ assert(childp->lnkcnt == 1); fibril_mutex_lock(&childp->idx->lock); - + fat_directory_t di; rc = fat_directory_open(parentp, &di); @@ -856,5 +856,5 @@ { fat_bs_t *bs; - + bs = block_bb_get(service_id); *count = (SPC(bs)) ? TS(bs) / SPC(bs) : 0; @@ -883,5 +883,5 @@ } *count = block_count; - + return EOK; } @@ -1330,5 +1330,5 @@ int flags = BLOCK_FLAGS_NONE; errno_t rc; - + rc = fat_node_get(&fn, service_id, index); if (rc != EOK) Index: uspace/srv/fs/locfs/locfs.c =================================================================== --- uspace/srv/fs/locfs/locfs.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/locfs/locfs.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -63,5 +63,5 @@ { printf("%s: HelenOS Device Filesystem\n", NAME); - + if (argc == 3) { if (!str_cmp(argv[1], "--instance")) @@ -78,5 +78,5 @@ return -1; } - + async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS, INTERFACE_VFS_DRIVER, 0); @@ -85,5 +85,5 @@ return -1; } - + errno_t rc = fs_register(vfs_sess, &locfs_vfs_info, &locfs_ops, &locfs_libfs_ops); @@ -92,9 +92,9 @@ return rc; } - + printf("%s: Accepting connections\n", NAME); task_retval(0); async_manager(); - + /* Not reached */ return 0; Index: uspace/srv/fs/locfs/locfs_ops.c =================================================================== --- uspace/srv/fs/locfs/locfs_ops.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/locfs/locfs_ops.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -109,5 +109,5 @@ return ENOMEM; } - + *rfn = (fs_node_t *) malloc(sizeof(fs_node_t)); if (*rfn == NULL) { @@ -116,9 +116,9 @@ return ENOMEM; } - + fs_node_initialize(*rfn); node->type = type; node->service_id = service_id; - + (*rfn)->data = node; return EOK; @@ -134,11 +134,11 @@ locfs_node_t *node = (locfs_node_t *) pfn->data; errno_t ret; - + if (node->service_id == 0) { /* Root directory */ - + loc_sdesc_t *nspaces; size_t count = loc_get_namespaces(&nspaces); - + if (count > 0) { size_t pos; @@ -147,5 +147,5 @@ if (str_cmp(nspaces[pos].name, "") == 0) continue; - + if (str_cmp(nspaces[pos].name, component) == 0) { ret = locfs_node_get_internal(rfn, LOC_OBJECT_NAMESPACE, nspaces[pos].id); @@ -154,8 +154,8 @@ } } - + free(nspaces); } - + /* Search root namespace */ service_id_t namespace; @@ -163,5 +163,5 @@ if (loc_namespace_get_id("", &namespace, 0) == EOK) { count = loc_get_services(namespace, &svcs); - + if (count > 0) { size_t pos; @@ -173,16 +173,16 @@ } } - + free(svcs); } } - + *rfn = NULL; return EOK; } - + if (node->type == LOC_OBJECT_NAMESPACE) { /* Namespace directory */ - + loc_sdesc_t *svcs; size_t count = loc_get_services(node->service_id, &svcs); @@ -196,12 +196,12 @@ } } - + free(svcs); } - + *rfn = NULL; return EOK; } - + *rfn = NULL; return EOK; @@ -216,20 +216,20 @@ { locfs_node_t *node = (locfs_node_t *) fn->data; - + if (node->service_id == 0) { /* Root directory */ return EOK; } - + loc_object_type_t type = loc_id_probe(node->service_id); - + if (type == LOC_OBJECT_NAMESPACE) { /* Namespace directory */ return EOK; } - + if (type == LOC_OBJECT_SERVICE) { /* Device node */ - + fibril_mutex_lock(&services_mutex); ht_link_t *lnk; @@ -242,12 +242,12 @@ return ENOMEM; } - + dev->service_id = node->service_id; - + /* Mark as incomplete */ dev->sess = NULL; dev->refcount = 1; fibril_condvar_initialize(&dev->cv); - + /* * Insert the incomplete device structure so that other @@ -256,15 +256,15 @@ */ hash_table_insert(&services, &dev->link); - + /* * Drop the mutex to allow recursive locfs requests. */ fibril_mutex_unlock(&services_mutex); - + async_sess_t *sess = loc_service_connect(node->service_id, INTERFACE_FS, 0); - + fibril_mutex_lock(&services_mutex); - + /* * Notify possible waiters about this device structure @@ -272,5 +272,5 @@ */ fibril_condvar_broadcast(&dev->cv); - + if (!sess) { /* @@ -280,13 +280,13 @@ hash_table_remove(&services, &node->service_id); fibril_mutex_unlock(&services_mutex); - + return ENOENT; } - + /* Set the correct session. */ dev->sess = sess; } else { service_t *dev = hash_table_get_inst(lnk, service_t, link); - + if (!dev->sess) { /* @@ -303,10 +303,10 @@ dev->refcount++; } - + fibril_mutex_unlock(&services_mutex); - - return EOK; - } - + + return EOK; + } + return ENOENT; } @@ -322,5 +322,5 @@ { assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY)); - + *rfn = NULL; return ENOTSUP; @@ -345,5 +345,5 @@ { locfs_node_t *node = (locfs_node_t *) fn->data; - + if (node->service_id == 0) { size_t count = loc_count_namespaces(); @@ -352,5 +352,5 @@ return EOK; } - + /* Root namespace */ service_id_t namespace; @@ -362,9 +362,9 @@ } } - + *has_children = false; return EOK; } - + if (node->type == LOC_OBJECT_NAMESPACE) { size_t count = loc_count_services(node->service_id); @@ -373,9 +373,9 @@ return EOK; } - + *has_children = false; return EOK; } - + *has_children = false; return EOK; @@ -396,8 +396,8 @@ { locfs_node_t *node = (locfs_node_t *) fn->data; - + if (node->service_id == 0) return 0; - + return 1; } @@ -406,5 +406,5 @@ { locfs_node_t *node = (locfs_node_t *) fn->data; - + return ((node->type == LOC_OBJECT_NONE) || (node->type == LOC_OBJECT_NAMESPACE)); } @@ -413,5 +413,5 @@ { locfs_node_t *node = (locfs_node_t *) fn->data; - + return (node->type == LOC_OBJECT_SERVICE); } @@ -420,8 +420,8 @@ { locfs_node_t *node = (locfs_node_t *) fn->data; - + if (node->type == LOC_OBJECT_SERVICE) return node->service_id; - + return 0; } @@ -451,5 +451,5 @@ if (!hash_table_create(&services, 0, 0, &services_ops)) return false; - + return true; } @@ -484,8 +484,8 @@ return EINVAL; } - + loc_sdesc_t *desc; size_t count = loc_get_namespaces(&desc); - + /* Get rid of root namespace */ size_t i; @@ -494,9 +494,9 @@ if (pos >= i) pos++; - + break; } } - + if (pos < count) { async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); @@ -505,13 +505,13 @@ return EOK; } - + free(desc); pos -= count; - + /* Search root namespace */ service_id_t namespace; if (loc_namespace_get_id("", &namespace, 0) == EOK) { count = loc_get_services(namespace, &desc); - + if (pos < count) { async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); @@ -520,14 +520,14 @@ return EOK; } - + free(desc); } - + async_answer_0(callid, ENOENT); return ENOENT; } - + loc_object_type_t type = loc_id_probe(index); - + if (type == LOC_OBJECT_NAMESPACE) { /* Namespace directory */ @@ -538,8 +538,8 @@ return EINVAL; } - + loc_sdesc_t *desc; size_t count = loc_get_services(index, &desc); - + if (pos < count) { async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); @@ -548,13 +548,13 @@ return EOK; } - + free(desc); async_answer_0(callid, ENOENT); return ENOENT; } - + if (type == LOC_OBJECT_SERVICE) { /* Device node */ - + fibril_mutex_lock(&services_mutex); service_id_t service_index = index; @@ -564,8 +564,8 @@ return ENOENT; } - + service_t *dev = hash_table_get_inst(lnk, service_t, link); assert(dev->sess); - + ipc_callid_t callid; if (!async_data_read_receive(&callid, NULL)) { @@ -574,19 +574,19 @@ return EINVAL; } - + /* Make a request at the driver */ async_exch_t *exch = async_exchange_begin(dev->sess); - + ipc_call_t answer; aid_t msg = async_send_4(exch, VFS_OUT_READ, service_id, index, LOWER32(pos), UPPER32(pos), &answer); - + /* Forward the IPC_M_DATA_READ request to the driver */ async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); - + async_exchange_end(exch); - + fibril_mutex_unlock(&services_mutex); - + /* Wait for reply from the driver. */ errno_t rc; @@ -596,9 +596,9 @@ if ((errno_t) rc == EHANGUP) rc = ENOTSUP; - + *rbytes = IPC_GET_ARG1(answer); return rc; } - + return ENOENT; } @@ -610,15 +610,15 @@ if (index == 0) return ENOTSUP; - + loc_object_type_t type = loc_id_probe(index); - + if (type == LOC_OBJECT_NAMESPACE) { /* Namespace directory */ return ENOTSUP; } - + if (type == LOC_OBJECT_SERVICE) { /* Device node */ - + fibril_mutex_lock(&services_mutex); service_id_t service_index = index; @@ -628,8 +628,8 @@ return ENOENT; } - + service_t *dev = hash_table_get_inst(lnk, service_t, link); assert(dev->sess); - + ipc_callid_t callid; if (!async_data_write_receive(&callid, NULL)) { @@ -638,19 +638,19 @@ return EINVAL; } - + /* Make a request at the driver */ async_exch_t *exch = async_exchange_begin(dev->sess); - + ipc_call_t answer; aid_t msg = async_send_4(exch, VFS_OUT_WRITE, service_id, index, LOWER32(pos), UPPER32(pos), &answer); - + /* Forward the IPC_M_DATA_WRITE request to the driver */ async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); - + async_exchange_end(exch); - + fibril_mutex_unlock(&services_mutex); - + /* Wait for reply from the driver. */ errno_t rc; @@ -660,10 +660,10 @@ if ((errno_t) rc == EHANGUP) rc = ENOTSUP; - + *wbytes = IPC_GET_ARG1(answer); *nsize = 0; return rc; } - + return ENOENT; } @@ -679,14 +679,14 @@ if (index == 0) return EOK; - + loc_object_type_t type = loc_id_probe(index); - + if (type == LOC_OBJECT_NAMESPACE) { /* Namespace directory */ return EOK; } - + if (type == LOC_OBJECT_SERVICE) { - + fibril_mutex_lock(&services_mutex); service_id_t service_index = index; @@ -696,9 +696,9 @@ return ENOENT; } - + service_t *dev = hash_table_get_inst(lnk, service_t, link); assert(dev->sess); dev->refcount--; - + if (dev->refcount == 0) { async_hangup(dev->sess); @@ -706,10 +706,10 @@ hash_table_remove(&services, &service_index); } - + fibril_mutex_unlock(&services_mutex); - - return EOK; - } - + + return EOK; + } + return ENOENT; } @@ -719,12 +719,12 @@ if (index == 0) return EOK; - + loc_object_type_t type = loc_id_probe(index); - + if (type == LOC_OBJECT_NAMESPACE) { /* Namespace directory */ return EOK; } - + if (type == LOC_OBJECT_SERVICE) { @@ -736,26 +736,26 @@ return ENOENT; } - + service_t *dev = hash_table_get_inst(lnk, service_t, link); assert(dev->sess); - + /* Make a request at the driver */ async_exch_t *exch = async_exchange_begin(dev->sess); - + ipc_call_t answer; aid_t msg = async_send_2(exch, VFS_OUT_SYNC, service_id, index, &answer); - + async_exchange_end(exch); - + fibril_mutex_unlock(&services_mutex); - + /* Wait for reply from the driver */ errno_t rc; async_wait_for(msg, &rc); - + return rc; } - + return ENOENT; } Index: uspace/srv/fs/mfs/mfs_ops.c =================================================================== --- uspace/srv/fs/mfs/mfs_ops.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/mfs/mfs_ops.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -617,5 +617,5 @@ .index = index }; - + ht_link_t *already_open = hash_table_find(&open_nodes, &key); @@ -974,5 +974,5 @@ if (r != EOK) goto out_err; - + r = mfs_write_map(mnode, pos, block, &dummy); if (r != EOK) { @@ -1202,5 +1202,5 @@ if (NULL == inst) return ENOENT; - + *size = inst->sbi->block_size; @@ -1213,5 +1213,5 @@ struct mfs_instance *inst; errno_t rc; - + rc = mfs_instance_get(service_id, &inst); if (rc != EOK) @@ -1220,5 +1220,5 @@ if (NULL == inst) return ENOENT; - + *count = (uint64_t) MFS_BMAP_SIZE_BITS(inst->sbi, BMAP_ZONE); @@ -1230,5 +1230,5 @@ { uint32_t block_free; - + struct mfs_instance *inst; errno_t rc = mfs_instance_get(service_id, &inst); Index: uspace/srv/fs/mfs/mfs_rw.c =================================================================== --- uspace/srv/fs/mfs/mfs_rw.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/mfs/mfs_rw.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -249,5 +249,5 @@ mfs_version_t fs_version = sbi->fs_version; - + assert(new_size <= ino_i->i_size); Index: uspace/srv/fs/tmpfs/tmpfs.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/tmpfs/tmpfs.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -75,10 +75,10 @@ } } - + if (!tmpfs_init()) { printf(NAME ": failed to initialize TMPFS\n"); return -1; } - + async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS, INTERFACE_VFS_DRIVER, 0); @@ -87,5 +87,5 @@ return -1; } - + errno_t rc = fs_register(vfs_sess, &tmpfs_vfs_info, &tmpfs_ops, &tmpfs_libfs_ops); @@ -94,9 +94,9 @@ return rc; } - + printf(NAME ": Accepting connections\n"); task_retval(0); async_manager(); - + /* Not reached */ return 0; Index: uspace/srv/fs/tmpfs/tmpfs_dump.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_dump.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/tmpfs/tmpfs_dump.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -64,5 +64,5 @@ libfs_ops_t *ops = &tmpfs_libfs_ops; errno_t rc; - + do { char *fname; @@ -70,11 +70,11 @@ tmpfs_node_t *nodep; uint32_t size; - + if (block_seqread(dsid, tmpfs_buf, bufpos, buflen, pos, &entry, sizeof(entry)) != EOK) return false; - + entry.len = uint32_t_le2host(entry.len); - + switch (entry.type) { case TMPFS_NONE: @@ -84,5 +84,5 @@ if (fname == NULL) return false; - + rc = ops->create(&fn, dsid, L_FILE); if (rc != EOK || fn == NULL) { @@ -90,5 +90,5 @@ return false; } - + if (block_seqread(dsid, tmpfs_buf, bufpos, buflen, pos, fname, entry.len) != EOK) { @@ -98,5 +98,5 @@ } fname[entry.len] = 0; - + rc = ops->link(pfn, fn, fname); if (rc != EOK) { @@ -106,21 +106,21 @@ } free(fname); - + if (block_seqread(dsid, tmpfs_buf, bufpos, buflen, pos, &size, sizeof(size)) != EOK) return false; - + size = uint32_t_le2host(size); - + nodep = TMPFS_NODE(fn); nodep->data = malloc(size); if (nodep->data == NULL) return false; - + nodep->size = size; if (block_seqread(dsid, tmpfs_buf, bufpos, buflen, pos, nodep->data, size) != EOK) return false; - + break; case TMPFS_DIRECTORY: @@ -128,5 +128,5 @@ if (fname == NULL) return false; - + rc = ops->create(&fn, dsid, L_DIRECTORY); if (rc != EOK || fn == NULL) { @@ -134,5 +134,5 @@ return false; } - + if (block_seqread(dsid, tmpfs_buf, bufpos, buflen, pos, fname, entry.len) != EOK) { @@ -150,9 +150,9 @@ } free(fname); - + if (!tmpfs_restore_recursion(dsid, bufpos, buflen, pos, fn)) return false; - + break; default: @@ -160,5 +160,5 @@ } } while (entry.type != TMPFS_NONE); - + return true; } @@ -173,17 +173,17 @@ if (rc != EOK) return false; - + size_t bufpos = 0; size_t buflen = 0; aoff64_t pos = 0; - + char tag[6]; if (block_seqread(dsid, tmpfs_buf, &bufpos, &buflen, &pos, tag, 5) != EOK) goto error; - + tag[5] = 0; if (str_cmp(tag, "TMPFS") != 0) goto error; - + rc = ops->root_get(&fn, dsid); if (rc != EOK) @@ -192,8 +192,8 @@ if (!tmpfs_restore_recursion(dsid, &bufpos, &buflen, &pos, fn)) goto error; - + block_fini(dsid); return true; - + error: block_fini(dsid); Index: uspace/srv/fs/tmpfs/tmpfs_ops.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_ops.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/tmpfs/tmpfs_ops.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -163,5 +163,5 @@ tmpfs_node_t *node = hash_table_get_inst(item, tmpfs_node_t, nh_link); node_key_t *key = (node_key_t *)key_arg; - + return key->service_id == node->service_id && key->index == node->index; } @@ -220,5 +220,5 @@ if (!hash_table_create(&nodes, 0, 0, &nodes_ops)) return false; - + return true; } @@ -228,5 +228,5 @@ fs_node_t *rfn; errno_t rc; - + rc = tmpfs_create_node(&rfn, service_id, L_DIRECTORY); if (rc != EOK || !rfn) @@ -240,5 +240,5 @@ service_id_t sid = *(service_id_t*)arg; tmpfs_node_t *node = hash_table_get_inst(item, tmpfs_node_t, nh_link); - + if (node->service_id == sid) { hash_table_remove_item(&nodes, &node->nh_link); @@ -273,7 +273,7 @@ .index = index }; - + ht_link_t *lnk = hash_table_find(&nodes, &key); - + if (lnk) { tmpfs_node_t *nodep; @@ -338,8 +338,8 @@ { tmpfs_node_t *nodep = TMPFS_NODE(fn); - + assert(!nodep->lnkcnt); assert(list_empty(&nodep->cs_list)); - + hash_table_remove_item(&nodes, &nodep->nh_link); @@ -406,5 +406,5 @@ if (!childp) return ENOENT; - + if ((childp->lnkcnt == 1) && !list_empty(&childp->cs_list)) return ENOTEMPTY; @@ -432,5 +432,5 @@ fs_node_t *rootfn; errno_t rc; - + /* Check if this device is not already mounted. */ rc = tmpfs_root_get(&rootfn, service_id); @@ -474,11 +474,11 @@ .index = index }; - + ht_link_t *hlp = hash_table_find(&nodes, &key); if (!hlp) return ENOENT; - + tmpfs_node_t *nodep = hash_table_get_inst(hlp, tmpfs_node_t, nh_link); - + /* * Receive the read request. @@ -499,7 +499,7 @@ tmpfs_dentry_t *dentryp; link_t *lnk; - + assert(nodep->type == TMPFS_DIRECTORY); - + /* * Yes, we really use O(n) algorithm here. @@ -508,5 +508,5 @@ */ lnk = list_nth(&nodep->cs_list, pos); - + if (lnk == NULL) { async_answer_0(callid, ENOENT); @@ -536,10 +536,10 @@ .index = index }; - + ht_link_t *hlp = hash_table_find(&nodes, &key); - + if (!hlp) return ENOENT; - + tmpfs_node_t *nodep = hash_table_get_inst(hlp, tmpfs_node_t, nh_link); @@ -599,26 +599,26 @@ .index = index }; - + ht_link_t *hlp = hash_table_find(&nodes, &key); - + if (!hlp) return ENOENT; tmpfs_node_t *nodep = hash_table_get_inst(hlp, tmpfs_node_t, nh_link); - + if (size == nodep->size) return EOK; - + if (size > SIZE_MAX) return ENOMEM; - + void *newdata = realloc(nodep->data, size); if (!newdata) return ENOMEM; - + if (size > nodep->size) { size_t delta = size - nodep->size; memset(newdata + nodep->size, 0, delta); } - + nodep->size = size; nodep->data = newdata; @@ -637,5 +637,5 @@ .index = index }; - + ht_link_t *hlp = hash_table_find(&nodes, &key); if (!hlp) Index: uspace/srv/fs/udf/udf.c =================================================================== --- uspace/srv/fs/udf/udf.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/udf/udf.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -63,5 +63,5 @@ log_init(NAME); log_msg(LOG_DEFAULT, LVL_NOTE, "HelenOS UDF 1.02 file system server"); - + if (argc == 3) { if (!str_cmp(argv[1], "--instance")) @@ -72,5 +72,5 @@ } } - + async_sess_t *vfs_sess = service_connect_blocking(SERVICE_VFS, INTERFACE_VFS_DRIVER, 0); @@ -79,21 +79,21 @@ return 2; } - + errno_t rc = fs_register(vfs_sess, &udf_vfs_info, &udf_ops, &udf_libfs_ops); if (rc != EOK) goto err; - + rc = udf_idx_init(); if (rc != EOK) goto err; - + log_msg(LOG_DEFAULT, LVL_NOTE, "Accepting connections"); task_retval(0); async_manager(); - + /* Not reached */ return 0; - + err: log_msg(LOG_DEFAULT, LVL_FATAL, "Failed to register file system: %s", str_error(rc)); Index: uspace/srv/fs/udf/udf.h =================================================================== --- uspace/srv/fs/udf/udf.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/udf/udf.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -85,5 +85,5 @@ size_t open_nodes_count; udf_charspec_t charset; - + uint32_t sector_size; udf_lvolume_t *volumes; @@ -105,10 +105,10 @@ fs_node_t *fs_node; fibril_mutex_t lock; - + fs_index_t index; /* FID logical block */ ht_link_t link; size_t ref_cnt; size_t link_cnt; - + uint8_t type; /* 1 - file, 0 - directory */ uint64_t data_size; Index: uspace/srv/fs/udf/udf_cksum.c =================================================================== --- uspace/srv/fs/udf/udf_cksum.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/udf/udf_cksum.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -79,5 +79,5 @@ { uint16_t crc = 0; - + while (len-- > 0) { /* @@ -88,5 +88,5 @@ crc = crc_table[(crc >> 8 ^ (*buf++ & 0xff)) & 0xff] ^ (crc << 8); } - + return crc; } @@ -98,12 +98,12 @@ { uint8_t result = 0; - + for (size_t i = 0; i < UDF_TAG_SIZE; i++) { if (i == 4) continue; - + result = (result + tag[i]) % 256; } - + return result; } Index: uspace/srv/fs/udf/udf_file.c =================================================================== --- uspace/srv/fs/udf/udf_file.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/udf/udf_file.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -65,17 +65,17 @@ if (rc != EOK) return rc; - + udf_ext_ad_t *exd = (udf_ext_ad_t *) block->data; uint32_t start = node->instance->partitions[ FLE16(exd->extent_location.partition_num)].start + FLE32(exd->extent_location.lblock_num); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Extended allocator: start=%d, block_num=%d, len=%d", start, FLE32(exd->extent_location.lblock_num), FLE32(exd->info_length)); - + uint32_t len = FLE32(exd->info_length); block_put(block); - + return udf_read_allocation_sequence(node, NULL, icb_flag, start, len); } @@ -97,10 +97,10 @@ { node->alloc_size = 0; - + switch (icb_flag) { case UDF_SHORT_AD: log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: sequence of allocation descriptors - icbflag = short_ad_t"); - + /* * Identify number of current partition. Virtual partition @@ -110,5 +110,5 @@ size_t pd_num = (size_t) -1; size_t min_start = 0; - + for (size_t i = 0; i < node->instance->partition_cnt; i++) { if ((node->index >= node->instance->partitions[i].start) && @@ -121,8 +121,8 @@ } } - + if (pd_num == (size_t) -1) return ENOENT; - + /* * According to doc, in this we should stop our loop if pass @@ -133,13 +133,13 @@ * which we check inside of loop. */ - + while (true) { udf_short_ad_t *short_d = (udf_short_ad_t *) (af + start_alloc + node->alloc_size * sizeof(udf_short_ad_t)); - + if (FLE32(short_d->length) == 0) break; - + /* * ECMA 167 4/12 - next sequence of allocation descriptors @@ -152,5 +152,5 @@ break; } - + node->allocators = realloc(node->allocators, (node->alloc_size + 1) * sizeof(udf_allocator_t)); @@ -161,23 +161,23 @@ node->alloc_size++; } - + node->allocators = realloc(node->allocators, node->alloc_size * sizeof(udf_allocator_t)); break; - + case UDF_LONG_AD: log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: sequence of allocation descriptors - icbflag = long_ad_t"); - + while (true) { udf_long_ad_t *long_d = (udf_long_ad_t *) (af + start_alloc + node->alloc_size * sizeof(udf_long_ad_t)); - + if (FLE32(long_d->length) == 0) break; - + uint32_t pos_long_ad = udf_long_ad_to_pos(node->instance, long_d); - + /* * ECMA 167 4/12 - next sequence of allocation descriptors @@ -188,5 +188,5 @@ break; } - + node->allocators = realloc(node->allocators, (node->alloc_size + 1) * sizeof(udf_allocator_t)); @@ -194,30 +194,30 @@ EXT_LENGTH(FLE32(long_d->length)); node->allocators[node->alloc_size].position = pos_long_ad; - + node->alloc_size++; } - + node->allocators = realloc(node->allocators, node->alloc_size * sizeof(udf_allocator_t)); break; - + case UDF_EXTENDED_AD: log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: sequence of allocation descriptors - icbflag = extended_ad_t"); break; - + case UDF_DATA_AD: log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: sequence of allocation descriptors - icbflag = 3, node contains data itself"); - + node->data = malloc(node->data_size); if (!node->data) return ENOMEM; - + memcpy(node->data, (af + start_alloc), node->data_size); node->alloc_size = 0; break; } - + return EOK; } @@ -237,5 +237,5 @@ while (true) { fs_index_t pos = node->index; - + block_t *block = NULL; errno_t rc = block_get(&block, node->instance->service_id, pos, @@ -243,5 +243,5 @@ if (rc != EOK) return rc; - + udf_descriptor_tag_t *data = (udf_descriptor_tag_t *) block->data; if (data->checksum != udf_tag_checksum((uint8_t *) data)) { @@ -249,10 +249,10 @@ return EINVAL; } - + /* One sector size descriptors */ switch (FLE16(data->id)) { case UDF_FILE_ENTRY: log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: File entry descriptor found"); - + udf_file_entry_descriptor_t *file = (udf_file_entry_descriptor_t *) block->data; @@ -260,13 +260,13 @@ node->data_size = FLE64(file->info_lenght); node->type = (file->icbtag.file_type == UDF_ICBTYPE_DIR) ? NODE_DIR : NODE_FILE; - + rc = udf_read_allocation_sequence(node, (uint8_t *) file, icb_flag, FLE32(file->ea_lenght) + UDF_FE_OFFSET, FLE32(file->ad_lenght)); block_put(block); return rc; - + case UDF_EFILE_ENTRY: log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: Extended file entry descriptor found"); - + udf_extended_file_entry_descriptor_t *efile = (udf_extended_file_entry_descriptor_t *) block->data; @@ -274,10 +274,10 @@ node->data_size = FLE64(efile->info_lenght); node->type = (efile->icbtag.file_type == UDF_ICBTYPE_DIR) ? NODE_DIR : NODE_FILE; - + rc = udf_read_allocation_sequence(node, (uint8_t *) efile, icb_flag, FLE32(efile->ea_lenght) + UDF_EFE_OFFSET, FLE32(efile->ad_lenght)); block_put(block); return rc; - + case UDF_ICB_TERMINAL: log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: Terminal entry descriptor found"); @@ -285,12 +285,12 @@ return EOK; } - + pos++; - + rc = block_put(block); if (rc != EOK) return rc; } - + return EOK; } @@ -323,5 +323,5 @@ size_t fid_sum = 0; size_t n = 0; - + while (node->data_size - fid_sum >= MIN_FID_LEN) { udf_descriptor_tag_t *desc = @@ -333,8 +333,8 @@ return ENOENT; } - + *fid = (udf_file_identifier_descriptor_t *) (node->data + fid_sum); - + /* According to ECMA 167 4/14.4.9 */ size_t padding = 4 * (((*fid)->lenght_file_id + @@ -343,17 +343,17 @@ size_t size_fid = (*fid)->lenght_file_id + FLE16((*fid)->lenght_iu) + padding + 38; - + fid_sum += size_fid; - + /* aAcording to ECMA 167 4/8.6 */ if (((*fid)->lenght_file_id != 0) && (((*fid)->file_characteristics & 4) == 0)) { n++; - + if (n == pos + 1) return EOK; } } - + return ENOENT; } @@ -374,5 +374,5 @@ if (node->data == NULL) return udf_get_fid_in_allocator(fid, block, node, pos); - + return udf_get_fid_in_data(fid, node, pos); } @@ -392,11 +392,11 @@ { void *buf = malloc(node->instance->sector_size); - + // FIXME: Check for NULL return value - + size_t j = 0; size_t n = 0; size_t len = 0; - + while (j < node->alloc_size) { size_t i = 0; @@ -408,5 +408,5 @@ return rc; } - + /* * Last item in allocator is a part of sector. We take @@ -422,5 +422,5 @@ break; } - + rc = udf_get_fid_in_sector(fid, block, node, pos, &n, &buf, &len); if (rc == EOK) { @@ -428,29 +428,29 @@ return EOK; } - + if (rc == EINVAL) { // FIXME: Memory leak return ENOENT; } - + if (rc == ENOENT) { if (block) { rc = block_put(*block); *block = NULL; - + if (rc != EOK) return rc; } } - + i++; } - + j++; } - + if (buf) free(buf); - + return ENOENT; } @@ -474,9 +474,9 @@ { void *fidbuf = malloc(node->instance->sector_size); - + // FIXME: Check for NULL return value - + bool buf_flag; - + if (*len > 0) { memcpy(fidbuf, *buf, *len); @@ -484,10 +484,10 @@ } else buf_flag = false; - + size_t fid_sum = 0; while (node->instance->sector_size - fid_sum > 0) { if (node->instance->sector_size - fid_sum >= MIN_FID_LEN) { void *fid_data; - + if (buf_flag) { memcpy((fidbuf + *len), (*block)->data, @@ -496,12 +496,12 @@ } else fid_data = (*block)->data + fid_sum; - + udf_descriptor_tag_t *desc = (udf_descriptor_tag_t *) fid_data; - + if (desc->checksum != udf_tag_checksum((uint8_t *) desc)) { if (fidbuf) free(fidbuf); - + if (*buf) { free(*buf); @@ -509,10 +509,10 @@ *len = 0; } - + return EINVAL; } - + *fid = (udf_file_identifier_descriptor_t *) fid_data; - + /* According to ECMA 167 4/14.4.9 */ size_t padding = 4 * (((*fid)->lenght_file_id + @@ -525,5 +525,5 @@ else fid_sum += size_fid; - + /* According to ECMA 167 4/8.6 */ if (((*fid)->lenght_file_id != 0) && @@ -533,9 +533,9 @@ if (fidbuf) free(fidbuf); - + return EOK; } } - + if (fidbuf) { buf_flag = false; @@ -543,5 +543,5 @@ fidbuf = NULL; } - + if (*buf) { free(*buf); @@ -552,14 +552,14 @@ if (*buf) free(*buf); - + *len = node->instance->sector_size - fid_sum; *buf = malloc(*len); buf_flag = false; memcpy(*buf, ((*block)->data + fid_sum), *len); - + return ENOENT; } } - + return ENOENT; } @@ -581,5 +581,5 @@ size_t i = 0; size_t l = 0; - + while (i < node->alloc_size) { if (pos >= l + node->allocators[i].length) { @@ -589,8 +589,8 @@ break; } - + size_t sector_cnt = ALL_UP(l, node->instance->sector_size); size_t sector_num = pos / node->instance->sector_size; - + block_t *block = NULL; errno_t rc = block_get(&block, node->instance->service_id, @@ -601,12 +601,12 @@ return rc; } - + size_t sector_pos = pos % node->instance->sector_size; - + if (sector_pos + len < node->instance->sector_size) *read_len = len; else *read_len = node->instance->sector_size - sector_pos; - + if (ALL_UP(node->allocators[i].length, node->instance->sector_size) == sector_num - sector_cnt + 1) { @@ -618,5 +618,5 @@ *read_len = len; } - + async_data_read_finalize(callid, block->data + sector_pos, *read_len); return block_put(block); Index: uspace/srv/fs/udf/udf_idx.c =================================================================== --- uspace/srv/fs/udf/udf_idx.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/udf/udf_idx.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -95,5 +95,5 @@ if (!hash_table_create(&udf_idx, 0, 0, &udf_idx_ops)) return ENOMEM; - + return EOK; } @@ -127,5 +127,5 @@ .index = index }; - + ht_link_t *already_open = hash_table_find(&udf_idx, &key); if (already_open) { @@ -133,11 +133,11 @@ udf_node_t, link); node->ref_cnt++; - + *udfn = node; - + fibril_mutex_unlock(&udf_idx_lock); return EOK; } - + fibril_mutex_unlock(&udf_idx_lock); return ENOENT; @@ -156,5 +156,5 @@ { fibril_mutex_lock(&udf_idx_lock); - + udf_node_t *udf_node = malloc(sizeof(udf_node_t)); if (udf_node == NULL) { @@ -162,5 +162,5 @@ return ENOMEM; } - + fs_node_t *fs_node = malloc(sizeof(fs_node_t)); if (fs_node == NULL) { @@ -169,7 +169,7 @@ return ENOMEM; } - + fs_node_initialize(fs_node); - + udf_node->index = index; udf_node->instance = instance; @@ -179,13 +179,13 @@ udf_node->data = NULL; udf_node->allocators = NULL; - + fibril_mutex_initialize(&udf_node->lock); fs_node->data = udf_node; - + hash_table_insert(&udf_idx, &udf_node->link); instance->open_nodes_count++; - + *udfn = udf_node; - + fibril_mutex_unlock(&udf_idx_lock); return EOK; @@ -202,15 +202,15 @@ { assert(node->ref_cnt == 0); - + fibril_mutex_lock(&udf_idx_lock); - + hash_table_remove_item(&udf_idx, &node->link); - + assert(node->instance->open_nodes_count > 0); node->instance->open_nodes_count--; - + free(node->fs_node); free(node); - + fibril_mutex_unlock(&udf_idx_lock); return EOK; Index: uspace/srv/fs/udf/udf_ops.c =================================================================== --- uspace/srv/fs/udf/udf_ops.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/udf/udf_ops.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -75,5 +75,5 @@ if (rc != EOK) return rc; - + udf_node_t *node; rc = udf_idx_get(&node, instance, index); @@ -82,5 +82,5 @@ if (rc != EOK) return rc; - + rc = udf_node_get_core(node); if (rc != EOK) { @@ -89,5 +89,5 @@ } } - + *rfn = FS_NODE(node); return EOK; @@ -100,5 +100,5 @@ if (rc != EOK) return rc; - + return udf_node_get(rfn, service_id, instance->volumes[DEFAULT_VOL].root_dir); @@ -110,5 +110,5 @@ if (udfn) return udfn->instance->service_id; - + return 0; } @@ -119,27 +119,27 @@ if (name == NULL) return ENOMEM; - + block_t *block = NULL; udf_file_identifier_descriptor_t *fid = NULL; size_t pos = 0; - + while (udf_get_fid(&fid, &block, UDF_NODE(pfn), pos) == EOK) { udf_long_ad_t long_ad = fid->icb; - + udf_to_unix_name(name, MAX_FILE_NAME_LEN, (char *) fid->implementation_use + FLE16(fid->lenght_iu), fid->lenght_file_id, &UDF_NODE(pfn)->instance->charset); - + if (str_casecmp(name, component) == 0) { errno_t rc = udf_node_get(rfn, udf_service_get(pfn), udf_long_ad_to_pos(UDF_NODE(pfn)->instance, &long_ad)); - + if (block != NULL) block_put(block); - + free(name); return rc; } - + if (block != NULL) { errno_t rc = block_put(block); @@ -147,8 +147,8 @@ return rc; } - + pos++; } - + free(name); return ENOENT; @@ -165,13 +165,13 @@ if (!node) return EINVAL; - + fibril_mutex_lock(&node->lock); node->ref_cnt--; fibril_mutex_unlock(&node->lock); - + /* Delete node from hash table and memory */ if (!node->ref_cnt) udf_idx_del(node); - + return EOK; } @@ -208,5 +208,5 @@ if (node) return node->index; - + return 0; } @@ -217,5 +217,5 @@ if (node) return node->data_size; - + return 0; } @@ -226,5 +226,5 @@ if (node) return node->link_cnt; - + return 0; } @@ -235,5 +235,5 @@ if (node) return node->type == NODE_DIR; - + return false; } @@ -244,5 +244,5 @@ if (node) return node->type == NODE_FILE; - + return false; } @@ -257,7 +257,7 @@ if (NULL == instance) return ENOENT; - + *size = instance->volumes[DEFAULT_VOL].logical_block_size; - + return EOK; } @@ -266,5 +266,5 @@ { *count = 0; - + return EOK; } @@ -273,5 +273,5 @@ { *count = 0; - + return EOK; } @@ -308,5 +308,5 @@ { enum cache_mode cmode; - + /* Check for option enabling write through. */ if (str_cmp(opts, "wtcache") == 0) @@ -314,11 +314,11 @@ else cmode = CACHE_MODE_WB; - + udf_instance_t *instance = malloc(sizeof(udf_instance_t)); if (!instance) return ENOMEM; - + instance->sector_size = 0; - + /* Check for block size. Will be enhanced later */ if (str_cmp(opts, "bs=512") == 0) @@ -328,10 +328,10 @@ else if (str_cmp(opts, "bs=2048") == 0) instance->sector_size = 2048; - + /* initialize block cache */ errno_t rc = block_init(service_id, MAX_SIZE); if (rc != EOK) return rc; - + rc = fs_instance_create(service_id, instance); if (rc != EOK) { @@ -340,8 +340,8 @@ return rc; } - + instance->service_id = service_id; instance->open_nodes_count = 0; - + /* Check Volume Recognition Sequence */ rc = udf_volume_recongnition(service_id); @@ -353,5 +353,5 @@ return rc; } - + /* Search for Anchor Volume Descriptor */ udf_anchor_volume_descriptor_t avd; @@ -364,5 +364,5 @@ return rc; } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume: Anchor volume descriptor found. Sector size=%" PRIu32, @@ -376,5 +376,5 @@ PRIu32 " (sector)]", avd.reserve_extent.length, avd.reserve_extent.location); - + /* Initialize the block cache */ rc = block_cache_init(service_id, instance->sector_size, 0, cmode); @@ -385,5 +385,5 @@ return rc; } - + /* Read Volume Descriptor Sequence */ rc = udf_read_volume_descriptor_sequence(service_id, avd.main_extent); @@ -396,5 +396,5 @@ return rc; } - + fs_node_t *rfn; rc = udf_node_get(&rfn, service_id, instance->volumes[DEFAULT_VOL].root_dir); @@ -407,9 +407,9 @@ return rc; } - + udf_node_t *node = UDF_NODE(rfn); *index = instance->volumes[DEFAULT_VOL].root_dir; *size = node->data_size; - + return EOK; } @@ -421,8 +421,8 @@ if (rc != EOK) return rc; - + udf_node_t *nodep = UDF_NODE(fn); udf_instance_t *instance = nodep->instance; - + /* * We expect exactly two references on the root node. @@ -434,5 +434,5 @@ return EBUSY; } - + /* * Put the root node twice. @@ -440,10 +440,10 @@ udf_node_put(fn); udf_node_put(fn); - + fs_instance_destroy(service_id); free(instance); block_cache_fini(service_id); block_fini(service_id); - + return EOK; } @@ -456,12 +456,12 @@ if (rc != EOK) return rc; - + fs_node_t *rfn; rc = udf_node_get(&rfn, service_id, index); if (rc != EOK) return rc; - + udf_node_t *node = UDF_NODE(rfn); - + ipc_callid_t callid; size_t len = 0; @@ -471,5 +471,5 @@ return EINVAL; } - + if (node->type == NODE_FILE) { if (pos >= node->data_size) { @@ -479,5 +479,5 @@ return EOK; } - + size_t read_len = 0; if (node->data == NULL) @@ -489,5 +489,5 @@ rc = EOK; } - + *rbytes = read_len; (void) udf_node_put(rfn); @@ -498,19 +498,19 @@ if (udf_get_fid(&fid, &block, node, pos) == EOK) { char *name = malloc(MAX_FILE_NAME_LEN + 1); - + // FIXME: Check for NULL return value - + udf_to_unix_name(name, MAX_FILE_NAME_LEN, (char *) fid->implementation_use + FLE16(fid->lenght_iu), fid->lenght_file_id, &node->instance->charset); - + async_data_read_finalize(callid, name, str_size(name) + 1); *rbytes = 1; free(name); udf_node_put(rfn); - + if (block != NULL) return block_put(block); - + return EOK; } else { Index: uspace/srv/fs/udf/udf_osta.c =================================================================== --- uspace/srv/fs/udf/udf_osta.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/udf/udf_osta.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -59,5 +59,5 @@ if ((ch == 0x0000) || (ch == 0x002F)) return false; - + return true; } @@ -85,12 +85,12 @@ /* Use udf_compressed to store current byte being read. */ uint8_t comp_id = udf_compressed[0]; - + /* First check for valid compID. */ if ((comp_id != 8) && (comp_id != 16)) return 0; - + size_t unicode_idx = 0; size_t byte_idx = 1; - + /* Loop through all the bytes. */ while ((byte_idx < number_of_bytes) && (unicode_idx < unicode_max_len)) { @@ -103,13 +103,13 @@ } else unicode[unicode_idx] = 0; - + if (byte_idx < number_of_bytes) { /* Then the next byte to the low bits. */ unicode[unicode_idx] |= udf_compressed[byte_idx++]; } - + unicode_idx++; } - + return unicode_idx; } @@ -136,11 +136,11 @@ size_t new_idx = 0; size_t new_ext_idx = 0; - + for (size_t idx = 0; idx < udf_len; idx++) { uint16_t current = udf_name[idx]; - + if ((!legal_check(current)) || (!ascii_check(current))) { needs_crc = true; - + /* * Replace Illegal and non-displayable chars with @@ -148,5 +148,5 @@ */ current = ILLEGAL_CHAR_MARK; - + /* * Skip any other illegal or non-displayable @@ -158,5 +158,5 @@ idx++; } - + /* Record position of extension, if one is found. */ if ((current == PERIOD) && ((udf_len - idx - 1) <= EXT_SIZE)) { @@ -170,5 +170,5 @@ } } - + if (new_idx < MAXLEN) new_name[new_idx++] = current; @@ -176,20 +176,20 @@ needs_crc = true; } - + if (needs_crc) { uint16_t ext[EXT_SIZE]; size_t local_ext_idx = 0; - + if (has_ext) { size_t max_filename_len; - + /* Translate extension, and store it in ext. */ for (size_t idx = 0; (idx < EXT_SIZE) && (ext_idx + idx + 1 < udf_len); idx++) { uint16_t current = udf_name[ext_idx + idx + 1]; - + if ((!legal_check(current)) || (!ascii_check(current))) { needs_crc = true; - + /* * Replace Illegal and non-displayable @@ -197,5 +197,5 @@ */ current = ILLEGAL_CHAR_MARK; - + /* * Skip any other illegal or @@ -207,8 +207,8 @@ idx++; } - + ext[local_ext_idx++] = current; } - + /* * Truncate filename to leave room for extension and @@ -224,28 +224,28 @@ new_idx = MAXLEN - 5; } - + /* Add mark for CRC. */ new_name[new_idx++] = CRC_MARK; - + /* Calculate CRC from original filename. */ uint16_t value_crc = udf_unicode_cksum(udf_name, udf_len); - + /* Convert 16-bits of CRC to hex characters. */ const char hex_char[] = "0123456789ABCDEF"; - + new_name[new_idx++] = hex_char[(value_crc & 0xf000) >> 12]; new_name[new_idx++] = hex_char[(value_crc & 0x0f00) >> 8]; new_name[new_idx++] = hex_char[(value_crc & 0x00f0) >> 4]; new_name[new_idx++] = hex_char[(value_crc & 0x000f)]; - + /* Place a translated extension at end, if found. */ if (has_ext) { new_name[new_idx++] = PERIOD; - + for (size_t idx = 0; idx < local_ext_idx; idx++) new_name[new_idx++] = ext[idx]; } } - + return new_idx; } @@ -265,17 +265,17 @@ const char *osta_id = "OSTA Compressed Unicode"; size_t ucode_chars, nice_uchars; - + uint16_t *raw_name = malloc(MAX_BUF * sizeof(uint16_t)); uint16_t *unix_name = malloc(MAX_BUF * sizeof(uint16_t)); - + // FIXME: Check for malloc returning NULL - + bool is_osta_typ0 = (chsp->type == 0) && (str_cmp((char *) chsp->info, osta_id) == 0); - + if (is_osta_typ0) { *raw_name = 0; *unix_name = 0; - + ucode_chars = udf_uncompress_unicode(len, (uint8_t *) id, raw_name, MAX_BUF); @@ -283,5 +283,5 @@ nice_uchars = udf_translate_name(unix_name, raw_name, ucode_chars); - + /* Output UTF-8 */ unix_name[nice_uchars] = 0; @@ -292,5 +292,5 @@ str_size((char *) (id + 1))); } - + free(raw_name); free(unix_name); Index: uspace/srv/fs/udf/udf_volume.c =================================================================== --- uspace/srv/fs/udf/udf_volume.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/fs/udf/udf_volume.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -67,5 +67,5 @@ FLE16(long_ad->location.partition_num), FLE32(long_ad->location.lblock_num)); - + return instance->partitions[ FLE16(long_ad->location.partition_num)].start + @@ -108,5 +108,5 @@ if (!vd) return ENOMEM; - + errno_t rc = udf_volume_recongnition_structure_test(service_id, addr, vd); if (rc != EOK) { @@ -114,8 +114,8 @@ return rc; } - + for (size_t i = 0; i < VRS_DEPTH; i++) { addr += sizeof(udf_vrs_descriptor_t); - + rc = udf_volume_recongnition_structure_test(service_id, addr, vd); if (rc != EOK) { @@ -123,5 +123,5 @@ return rc; } - + /* * UDF standard identifier. According to ECMA 167 2/9.1.2 @@ -133,5 +133,5 @@ continue; } - + if (str_lcmp(VRS_END, (char *) vd->identifier, VRS_ID_LEN) == 0) { log_msg(LOG_DEFAULT, LVL_DEBUG, "VRS: end found"); @@ -139,7 +139,7 @@ } } - + free(vd); - + if (nsr_found) return EOK; @@ -178,19 +178,19 @@ if (rc != EOK) return rc; - + if (avd->tag.checksum != udf_tag_checksum((uint8_t *) &avd->tag)) return EINVAL; - + // TODO: Should be tested in big-endian mode udf_prepare_tag(&avd->tag); - + if (avd->tag.id != UDF_TAG_AVDP) return EINVAL; - + GET_LE32(avd->main_extent.length); GET_LE32(avd->main_extent.location); GET_LE32(avd->reserve_extent.length); GET_LE32(avd->reserve_extent.location); - + return EOK; } @@ -211,10 +211,10 @@ { uint32_t default_sector_size[] = {512, 1024, 2048, 4096, 8192, 0}; - + udf_instance_t *instance; errno_t rc = fs_instance_get(service_id, (void **) &instance); if (rc != EOK) return rc; - + if (instance->sector_size) { return udf_get_anchor_volume_descriptor_by_ssize(service_id, avd, @@ -229,9 +229,9 @@ return EOK; } - + i++; } } - + return EINVAL; } @@ -273,5 +273,5 @@ } } - + return false; } @@ -310,5 +310,5 @@ } } - + return false; } @@ -343,5 +343,5 @@ } } - + return false; } @@ -368,5 +368,5 @@ if (rc != EOK) return rc; - + udf_descriptor_tag_t *desc = (udf_descriptor_tag_t *) (block->data); if (desc->checksum != udf_tag_checksum((uint8_t *) desc)) { @@ -374,5 +374,5 @@ return EINVAL; } - + /* * We think that we have only one allocator. It is means that virtual @@ -383,5 +383,5 @@ case UDF_FILE_ENTRY: log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: File entry descriptor found"); - + udf_file_entry_descriptor_t *fed = (udf_file_entry_descriptor_t *) block->data; @@ -392,8 +392,8 @@ instance->partitions[id].lenght = FLE32(short_d->length); break; - + case UDF_EFILE_ENTRY: log_msg(LOG_DEFAULT, LVL_DEBUG, "ICB: Extended file entry descriptor found"); - + udf_extended_file_entry_descriptor_t *efed = (udf_extended_file_entry_descriptor_t *) block->data; @@ -404,5 +404,5 @@ break; } - + return block_put(block); } @@ -426,5 +426,5 @@ return i; } - + return (size_t) -1; } @@ -448,5 +448,5 @@ if (instance->volumes == NULL) return ENOMEM; - + instance->partitions = calloc(pd_cnt, sizeof(udf_partition_t)); if (instance->partitions == NULL) { @@ -454,12 +454,12 @@ return ENOMEM; } - + instance->partition_cnt = pd_cnt; - + /* * Fill information about logical volumes. We will save * information about all partitions placed inside each volumes. */ - + size_t vir_pd_cnt = 0; for (size_t i = 0; i < lvd_cnt; i++) { @@ -471,9 +471,9 @@ return ENOMEM; } - + instance->volumes[i].partition_cnt = 0; instance->volumes[i].logical_block_size = FLE32(lvd[i].logical_block_size); - + /* * In theory we could have more than 1 logical volume. But now @@ -481,5 +481,5 @@ * partitions from array pd belong to only first lvd */ - + uint8_t *idx = lvd[i].partition_map; for (size_t j = 0; j < FLE32(lvd[i].number_of_partitions_maps); @@ -487,5 +487,5 @@ udf_type1_partition_map_t *pm1 = (udf_type1_partition_map_t *) idx; - + if (pm1->partition_map_type == 1) { size_t pd_num = udf_find_partition(pd, pd_cnt, @@ -495,5 +495,5 @@ return ENOENT; } - + /* * Fill information about physical partitions. We will save all @@ -509,29 +509,29 @@ instance->partitions[j].start = FLE32(pd[pd_num].starting_location); - + instance->volumes[i].partitions[ instance->volumes[i].partition_cnt] = &instance->partitions[j]; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume[%" PRIun "]: partition [type %u] " "found and filled", i, pm1->partition_map_type); - + instance->volumes[i].partition_cnt++; idx += pm1->partition_map_lenght; continue; } - + udf_type2_partition_map_t *pm2 = (udf_type2_partition_map_t *) idx; - + if (pm2->partition_map_type == 2) { // TODO: check partition_ident for metadata_partition_map - + udf_metadata_partition_map_t *metadata = (udf_metadata_partition_map_t *) idx; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Metadata file location=%u", FLE32(metadata->metadata_fileloc)); - + vir_pd_cnt++; instance->partitions = realloc(instance->partitions, @@ -541,7 +541,7 @@ return ENOMEM; } - + instance->partition_cnt++; - + size_t pd_num = udf_find_partition(pd, pd_cnt, FLE16(metadata->partition_number)); @@ -550,5 +550,5 @@ return ENOENT; } - + instance->partitions[j].number = FLE16(metadata->partition_number); @@ -560,13 +560,13 @@ return rc; } - + /* Virtual partition placed inside physical */ instance->partitions[j].start += FLE32(pd[pd_num].starting_location); - + instance->volumes[i].partitions[ instance->volumes[i].partition_cnt] = &instance->partitions[j]; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Virtual partition: num=%d, start=%d", instance->partitions[j].number, @@ -574,20 +574,20 @@ log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume[%" PRIun "]: partition [type %u] " "found and filled", i, pm2->partition_map_type); - + instance->volumes[i].partition_cnt++; idx += metadata->partition_map_length; continue; } - + /* Not type 1 nor type 2 */ udf_general_type_t *pm = (udf_general_type_t *) idx; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume[%" PRIun "]: partition [type %u] " "found and skipped", i, pm->partition_map_type); - + idx += pm->partition_map_lenght; } } - + return EOK; } @@ -608,18 +608,18 @@ if (rc != EOK) return rc; - + aoff64_t pos = addr.location; aoff64_t end = pos + (addr.length / instance->sector_size) - 1; - + if (pos == end) return EINVAL; - + size_t max_descriptors = ALL_UP(addr.length, instance->sector_size); - + udf_primary_volume_descriptor_t *pvd = calloc(max_descriptors, sizeof(udf_primary_volume_descriptor_t)); if (pvd == NULL) return ENOMEM; - + udf_logical_volume_descriptor_t *lvd = calloc(max_descriptors, instance->sector_size); @@ -628,5 +628,5 @@ return ENOMEM; } - + udf_partition_descriptor_t *pd = calloc(max_descriptors, sizeof(udf_partition_descriptor_t)); @@ -636,9 +636,9 @@ return ENOMEM; } - + size_t pvd_cnt = 0; size_t lvd_cnt = 0; size_t pd_cnt = 0; - + while (pos <= end) { block_t *block = NULL; @@ -650,13 +650,13 @@ return rc; } - + udf_volume_descriptor_t *vol = (udf_volume_descriptor_t *) block->data; - + switch (FLE16(vol->common.tag.id)) { /* One sector size descriptors */ case UDF_TAG_PVD: log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume: Primary volume descriptor found"); - + if (!udf_check_prevailing_pvd(pvd, pvd_cnt, &vol->volume)) { memcpy(&pvd[pvd_cnt], &vol->volume, @@ -664,13 +664,13 @@ pvd_cnt++; } - + pos++; break; - + case UDF_TAG_VDP: log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume: Volume descriptor pointer found"); pos++; break; - + case UDF_TAG_IUVD: log_msg(LOG_DEFAULT, LVL_DEBUG, @@ -678,5 +678,5 @@ pos++; break; - + case UDF_TAG_PD: log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume: Partition descriptor found"); @@ -688,5 +688,5 @@ FLE32(vol->partition.starting_location), FLE32(vol->partition.length)); - + if (!udf_check_prevailing_pd(pd, pd_cnt, &vol->partition)) { memcpy(&pd[pd_cnt], &vol->partition, @@ -694,5 +694,5 @@ pd_cnt++; } - + udf_partition_header_descriptor_t *phd = (udf_partition_header_descriptor_t *) vol->partition.contents_use; @@ -702,5 +702,5 @@ FLE32(phd->unallocated_space_table.length), FLE32(phd->unallocated_space_table.position)); - + instance->space_type = SPACE_TABLE; instance->uaspace_start = @@ -710,5 +710,5 @@ FLE32(phd->unallocated_space_table.length); } - + if (FLE32(phd->unallocated_space_bitmap.length)) { log_msg(LOG_DEFAULT, LVL_DEBUG, @@ -716,5 +716,5 @@ FLE32(phd->unallocated_space_bitmap.length), FLE32(phd->unallocated_space_bitmap.position)); - + instance->space_type = SPACE_BITMAP; instance->uaspace_start = @@ -724,12 +724,12 @@ FLE32(phd->unallocated_space_bitmap.length); } - + pos++; break; - + /* Relative size descriptors */ case UDF_TAG_LVD: log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume: Logical volume descriptor found"); - + aoff64_t sct = ALL_UP((sizeof(udf_logical_volume_descriptor_t) + @@ -738,9 +738,9 @@ pos += sct; char tmp[130]; - + udf_to_unix_name(tmp, 129, (char *) vol->logical.logical_volume_id, 128, &vol->logical.charset); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Logical Volume ID: '%s', " "logical block size: %" PRIu32 " (bytes)", tmp, @@ -750,5 +750,5 @@ FLE32(vol->logical.map_table_length), FLE32(vol->logical.number_of_partitions_maps)); - + if (!udf_check_prevailing_lvd(lvd, lvd_cnt, &vol->logical)) { memcpy(&lvd[lvd_cnt], &vol->logical, @@ -757,10 +757,10 @@ lvd_cnt++; } - + break; - + case UDF_TAG_USD: log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume: Unallocated space descriptor found"); - + sct = ALL_UP((sizeof(udf_unallocated_space_descriptor_t) + FLE32(vol->unallocated.allocation_descriptors_num)* @@ -774,27 +774,27 @@ return ENOMEM; } - + memcpy(instance->uasd, block->data, instance->sector_size); pos += sct; break; - + case UDF_TAG_LVID: log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume: Logical volume integrity descriptor found"); - + pos++; break; - + case UDF_TAG_TD: log_msg(LOG_DEFAULT, LVL_DEBUG, "Volume: Terminating descriptor found"); - + /* Found terminating descriptor. Exiting */ pos = end + 1; break; - + default: pos++; } - + rc = block_put(block); if (rc != EOK) { @@ -805,12 +805,12 @@ } } - + /* Fill the instance */ udf_fill_volume_info(lvd, lvd_cnt, pd, pd_cnt, instance); - + for (size_t i = 0; i < lvd_cnt; i++) { pos = udf_long_ad_to_pos(instance, (udf_long_ad_t *) &lvd[i].logical_volume_conents_use); - + block_t *block = NULL; rc = block_get(&block, instance->service_id, pos, @@ -820,24 +820,24 @@ return rc; } - + udf_descriptor_tag_t *desc = block->data; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "First tag ID=%" PRIu16, desc->id); - + if (desc->checksum != udf_tag_checksum((uint8_t *) desc)) { // FIXME: Memory leak, cleanup missing return EINVAL; } - + udf_prepare_tag(desc); - + udf_fileset_descriptor_t *fd = block->data; memcpy((uint8_t *) &instance->charset, (uint8_t *) &fd->fileset_charset, sizeof(fd->fileset_charset)); - + instance->volumes[i].root_dir = udf_long_ad_to_pos(instance, &fd->root_dir_icb); } - + free(pvd); free(lvd); Index: uspace/srv/hid/compositor/compositor.c =================================================================== --- uspace/srv/hid/compositor/compositor.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/compositor/compositor.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -177,5 +177,5 @@ if (!p) return NULL; - + link_initialize(&p->link); p->pos.x = coord_origin; @@ -189,5 +189,5 @@ p->state = 0; cursor_init(&p->cursor, CURSOR_DECODER_EMBEDDED, NULL); - + /* Ghost window for transformation animation. */ transform_identity(&p->ghost.transform); @@ -202,5 +202,5 @@ p->accum_ghost.x = 0; p->accum_ghost.y = 0; - + return p; } @@ -219,5 +219,5 @@ if (!win) return NULL; - + link_initialize(&win->link); atomic_set(&win->ref_cnt, 0); @@ -232,5 +232,5 @@ win->opacity = 255; win->surface = NULL; - + return win; } @@ -244,8 +244,8 @@ free(event); } - + if (win->surface) surface_destroy(win->surface); - + free(win); } @@ -259,5 +259,5 @@ transform_invert(&win_trans); transform_apply_affine(&win_trans, &x, &y); - + /* * Since client coordinate origin is (0, 0), it is necessary to check @@ -268,11 +268,11 @@ if ((x < 0) || (y < 0)) return false; - + (*x_out) = (sysarg_t) (x + 0.5); (*y_out) = (sysarg_t) (y + 0.5); - + if (((*x_out) >= x_lim) || ((*y_out) >= y_lim)) return false; - + return true; } @@ -284,5 +284,5 @@ double y = y_in; transform_apply_affine(&win_trans, &x, &y); - + /* * It is assumed that compositor coordinate origin is chosen in such way, @@ -300,15 +300,15 @@ sysarg_t x[4]; sysarg_t y[4]; - + comp_coord_from_client(x_in, y_in, win_trans, &x[0], &y[0]); comp_coord_from_client(x_in + w_in - 1, y_in, win_trans, &x[1], &y[1]); comp_coord_from_client(x_in + w_in - 1, y_in + h_in - 1, win_trans, &x[2], &y[2]); comp_coord_from_client(x_in, y_in + h_in - 1, win_trans, &x[3], &y[3]); - + (*x_out) = x[0]; (*y_out) = y[0]; (*w_out) = x[0]; (*h_out) = y[0]; - + for (unsigned int i = 1; i < 4; ++i) { (*x_out) = (x[i] < (*x_out)) ? x[i] : (*x_out); @@ -317,5 +317,5 @@ (*h_out) = (y[i] > (*h_out)) ? y[i] : (*h_out); } - + (*w_out) = (*w_out) - (*x_out) + 1; (*h_out) = (*h_out) - (*y_out) + 1; @@ -331,10 +331,10 @@ { fibril_mutex_lock(&viewport_list_mtx); - + sysarg_t x_res = coord_origin; sysarg_t y_res = coord_origin; sysarg_t w_res = 0; sysarg_t h_res = 0; - + if (!list_empty(&viewport_list)) { viewport_t *vp = (viewport_t *) list_first(&viewport_list); @@ -343,5 +343,5 @@ surface_get_resolution(vp->surface, &w_res, &h_res); } - + list_foreach(viewport_list, link, viewport_t, vp) { sysarg_t w_vp, h_vp; @@ -351,10 +351,10 @@ &x_res, &y_res, &w_res, &h_res); } - + viewport_bound_rect.x = x_res; viewport_bound_rect.y = y_res; viewport_bound_rect.w = w_res; viewport_bound_rect.h = h_res; - + fibril_mutex_unlock(&viewport_list_mtx); } @@ -363,7 +363,7 @@ { comp_update_viewport_bound_rect(); - + fibril_mutex_lock(&pointer_list_mtx); - + list_foreach(pointer_list, link, pointer_t, ptr) { ptr->pos.x = ptr->pos.x > viewport_bound_rect.x ? ptr->pos.x : viewport_bound_rect.x; @@ -374,5 +374,5 @@ ptr->pos.y : viewport_bound_rect.y + viewport_bound_rect.h; } - + fibril_mutex_unlock(&pointer_list_mtx); } @@ -585,5 +585,5 @@ } } - + fibril_mutex_unlock(&viewport_list_mtx); } @@ -601,5 +601,5 @@ return; } - + errno_t rc = async_data_read_finalize(callid, event, len); if (rc != EOK) { @@ -608,5 +608,5 @@ return; } - + async_answer_0(iid, EOK); free(event); @@ -638,5 +638,5 @@ sysarg_t pos_id = IPC_GET_ARG1(*icall); sysarg_t grab_flags = IPC_GET_ARG2(*icall); - + /* * Filter out resize grab flags if the window @@ -669,15 +669,15 @@ transform_identity(&translate); transform_translate(&translate, win->dx, win->dy); - + transform_t scale; transform_identity(&scale); if ((win->fx != 1) || (win->fy != 1)) transform_scale(&scale, win->fx, win->fy); - + transform_t rotate; transform_identity(&rotate); if (win->angle != 0) transform_rotate(&rotate, win->angle); - + transform_t transform; transform_t temp; @@ -689,5 +689,5 @@ temp = transform; transform_product(&transform, &temp, &scale); - + win->transform = transform; } @@ -698,5 +698,5 @@ size_t size; unsigned int flags; - + /* Start sharing resized window with client. */ if (!async_share_out_receive(&callid, &size, &flags)) { @@ -704,5 +704,5 @@ return; } - + void *new_cell_storage; errno_t rc = async_share_out_finalize(callid, &new_cell_storage); @@ -711,5 +711,5 @@ return; } - + /* Create new surface for the resized window. */ surface_t *new_surface = surface_create(IPC_GET_ARG3(*icall), @@ -720,57 +720,57 @@ return; } - + sysarg_t offset_x = IPC_GET_ARG1(*icall); sysarg_t offset_y = IPC_GET_ARG2(*icall); window_placement_flags_t placement_flags = (window_placement_flags_t) IPC_GET_ARG5(*icall); - + comp_update_viewport_bound_rect(); - + /* Switch new surface with old surface and calculate damage. */ fibril_mutex_lock(&window_list_mtx); - + sysarg_t old_width = 0; sysarg_t old_height = 0; - + if (win->surface) { surface_get_resolution(win->surface, &old_width, &old_height); surface_destroy(win->surface); } - + win->surface = new_surface; - + sysarg_t new_width = 0; sysarg_t new_height = 0; surface_get_resolution(win->surface, &new_width, &new_height); - + if (placement_flags & WINDOW_PLACEMENT_CENTER_X) win->dx = viewport_bound_rect.x + viewport_bound_rect.w / 2 - new_width / 2; - + if (placement_flags & WINDOW_PLACEMENT_CENTER_Y) win->dy = viewport_bound_rect.y + viewport_bound_rect.h / 2 - new_height / 2; - + if (placement_flags & WINDOW_PLACEMENT_LEFT) win->dx = viewport_bound_rect.x; - + if (placement_flags & WINDOW_PLACEMENT_TOP) win->dy = viewport_bound_rect.y; - + if (placement_flags & WINDOW_PLACEMENT_RIGHT) win->dx = viewport_bound_rect.x + viewport_bound_rect.w - new_width; - + if (placement_flags & WINDOW_PLACEMENT_BOTTOM) win->dy = viewport_bound_rect.y + viewport_bound_rect.h - new_height; - + if (placement_flags & WINDOW_PLACEMENT_ABSOLUTE_X) win->dx = coord_origin + offset_x; - + if (placement_flags & WINDOW_PLACEMENT_ABSOLUTE_Y) win->dy = coord_origin + offset_y; - + /* Transform the window and calculate damage. */ sysarg_t x1; @@ -778,30 +778,30 @@ sysarg_t width1; sysarg_t height1; - + comp_coord_bounding_rect(0, 0, old_width, old_height, win->transform, &x1, &y1, &width1, &height1); - + comp_recalc_transform(win); - + sysarg_t x2; sysarg_t y2; sysarg_t width2; sysarg_t height2; - + comp_coord_bounding_rect(0, 0, new_width, new_height, win->transform, &x2, &y2, &width2, &height2); - + sysarg_t x; sysarg_t y; sysarg_t width; sysarg_t height; - + rectangle_union(x1, y1, width1, height1, x2, y2, width2, height2, &x, &y, &width, &height); - + fibril_mutex_unlock(&window_list_mtx); - + comp_damage(x, y, width, height); - + async_answer_0(iid, EOK); } @@ -810,5 +810,5 @@ { fibril_mutex_lock(&window_list_mtx); - + list_foreach(window_list, link, window_t, window) { if (window == target) { @@ -818,5 +818,5 @@ } } - + fibril_mutex_unlock(&window_list_mtx); free(event); @@ -826,5 +826,5 @@ { fibril_mutex_lock(&window_list_mtx); - + window_t *win = (window_t *) list_first(&window_list); if (win) @@ -832,5 +832,5 @@ else free(event); - + fibril_mutex_unlock(&window_list_mtx); } @@ -914,5 +914,5 @@ return; } - + win->flags = IPC_GET_ARG1(call); @@ -950,8 +950,8 @@ event_unfocus->type = ET_WINDOW_UNFOCUS; } - + async_answer_2(callid, EOK, win->in_dsid, win->out_dsid); fibril_mutex_unlock(&window_list_mtx); - + if (event_unfocus && win_unfocus) { comp_post_event_win(event_unfocus, win_unfocus); @@ -1102,5 +1102,5 @@ loc_service_unregister(winreg_id); input_disconnect(); - + /* Close all clients and their windows. */ fibril_mutex_lock(&window_list_mtx); @@ -1114,7 +1114,7 @@ } fibril_mutex_unlock(&window_list_mtx); - + async_answer_0(iid, EOK); - + /* All fibrils of the compositor will terminate soon. */ } @@ -1125,12 +1125,12 @@ /* Release viewport resources. */ fibril_mutex_lock(&viewport_list_mtx); - + list_remove(&vp->link); viewport_destroy(vp); - + fibril_mutex_unlock(&viewport_list_mtx); - + async_answer_0(iid, EOK); - + comp_restrict_pointers(); comp_damage(0, 0, UINT32_MAX, UINT32_MAX); @@ -1187,9 +1187,9 @@ async_exch_t *exch = async_exchange_begin(sess); - + port_id_t port; rc = async_create_callback_port(exch, INTERFACE_VISUALIZER_CB, 0, 0, vsl_notifications, NULL, &port); - + async_exchange_end(exch); @@ -1265,8 +1265,8 @@ if (claimed) visualizer_yield(vp->sess); - + if (vp->sess != NULL) async_hangup(vp->sess); - + free(vp); free(vsl_name); @@ -1295,22 +1295,22 @@ double cx = 0; double cy = 0; - + if (pointer->grab_flags & GF_MOVE_X) cx = 1; - + if (pointer->grab_flags & GF_MOVE_Y) cy = 1; - + if (((scale) || (resize)) && (win->angle != 0)) { transform_t rotate; transform_identity(&rotate); - + transform_rotate(&rotate, win->angle); transform_apply_linear(&rotate, &cx, &cy); } - + cx = (cx < 0) ? (-1 * cx) : cx; cy = (cy < 0) ? (-1 * cy) : cy; - + win->dx += (cx * dx); win->dy += (cy * dy); @@ -1468,5 +1468,5 @@ rect3->w = w_u - w_i - x_i + x_u + 1; rect3->h = h_u; - + rect4->x = x_u; rect4->y = y_i + h_i - 1; @@ -1481,9 +1481,9 @@ { /* XXX TODO Use absolute coordinates directly */ - + pointer_t *pointer = input_pointer(input); - + sysarg_t width, height; - + fibril_mutex_lock(&viewport_list_mtx); if (list_empty(&viewport_list)) { @@ -1501,5 +1501,5 @@ pos_in_viewport.x = x * width / max_x; pos_in_viewport.y = y * height / max_y; - + /* Calculate offset from pointer */ fibril_mutex_lock(&pointer_list_mtx); @@ -1508,5 +1508,5 @@ delta.y = (vp_pos.y + pos_in_viewport.y) - pointer->pos.y; fibril_mutex_unlock(&pointer_list_mtx); - + return comp_mouse_move(input, delta.x, delta.y); } @@ -1515,29 +1515,29 @@ { pointer_t *pointer = input_pointer(input); - + comp_update_viewport_bound_rect(); - + /* Update pointer position. */ fibril_mutex_lock(&pointer_list_mtx); - + desktop_point_t old_pos = pointer->pos; - + sysarg_t cursor_width; sysarg_t cursor_height; surface_get_resolution(pointer->cursor.states[pointer->state], &cursor_width, &cursor_height); - + if (pointer->pos.x + dx < viewport_bound_rect.x) dx = -1 * (pointer->pos.x - viewport_bound_rect.x); - + if (pointer->pos.y + dy < viewport_bound_rect.y) dy = -1 * (pointer->pos.y - viewport_bound_rect.y); - + if (pointer->pos.x + dx > viewport_bound_rect.x + viewport_bound_rect.w) dx = (viewport_bound_rect.x + viewport_bound_rect.w - pointer->pos.x); - + if (pointer->pos.y + dy > viewport_bound_rect.y + viewport_bound_rect.h) dy = (viewport_bound_rect.y + viewport_bound_rect.h - pointer->pos.y); - + pointer->pos.x += dx; pointer->pos.y += dy; @@ -1545,5 +1545,5 @@ comp_damage(old_pos.x, old_pos.y, cursor_width, cursor_height); comp_damage(old_pos.x + dx, old_pos.y + dy, cursor_width, cursor_height); - + fibril_mutex_lock(&window_list_mtx); fibril_mutex_lock(&pointer_list_mtx); @@ -1663,5 +1663,5 @@ sysarg_t dmg_width = 0; sysarg_t dmg_height = 0; - + #if ANIMATE_WINDOW_TRANSFORMS == 0 desktop_rect_t dmg_rect1, dmg_rect2, dmg_rect3, dmg_rect4; @@ -1738,11 +1738,11 @@ link_initialize(&event_top->link); event_top->type = ET_WINDOW_RESIZE; - + event_top->data.resize.offset_x = 0; event_top->data.resize.offset_y = 0; - + int dx = (int) (((double) width) * (scale_back_x - 1.0)); int dy = (int) (((double) height) * (scale_back_y - 1.0)); - + if (pointer->grab_flags & GF_RESIZE_X) event_top->data.resize.width = @@ -1750,5 +1750,5 @@ else event_top->data.resize.width = width; - + if (pointer->grab_flags & GF_RESIZE_Y) event_top->data.resize.height = @@ -1756,5 +1756,5 @@ else event_top->data.resize.height = height; - + event_top->data.resize.placement_flags = WINDOW_PLACEMENT_ANY; @@ -1764,5 +1764,5 @@ } else if (within_client && (pointer->grab_flags == GF_EMPTY) && (top == win)) { - + /* Notify top-level window about mouse release. */ event_top = (window_event_t *) malloc(sizeof(window_event_t)); @@ -1777,5 +1777,5 @@ } pointer->grab_flags = GF_EMPTY; - + } else { pointer->grab_flags = GF_EMPTY; @@ -1813,5 +1813,5 @@ active = true; comp_damage(0, 0, UINT32_MAX, UINT32_MAX); - + return EOK; } @@ -1910,14 +1910,14 @@ return ENOMEM; } - + sysarg_t width, height; surface_get_resolution(win->surface, &width, &height); - + link_initialize(&event->link); event->type = ET_WINDOW_RESIZE; - + event->data.resize.offset_x = 0; event->data.resize.offset_y = 0; - + switch (key) { case KC_T: @@ -1942,7 +1942,7 @@ break; } - + event->data.resize.placement_flags = WINDOW_PLACEMENT_ANY; - + fibril_mutex_unlock(&window_list_mtx); comp_post_event_top(event); @@ -2075,5 +2075,5 @@ break; } - + sysarg_t x = vp->pos.x; sysarg_t y = vp->pos.y; @@ -2196,5 +2196,5 @@ { fibril_mutex_lock(&discovery_mtx); - + /* Create viewports and connect them to visualizers. */ category_id_t cat_id; @@ -2202,5 +2202,5 @@ if (rc != EOK) goto ret; - + service_id_t *svcs; size_t svcs_cnt = 0; @@ -2208,5 +2208,5 @@ if (rc != EOK) goto ret; - + fibril_mutex_lock(&viewport_list_mtx); for (size_t i = 0; i < svcs_cnt; ++i) { @@ -2218,8 +2218,8 @@ } } - + if (exists) continue; - + viewport_t *vp = viewport_create(svcs[i]); if (vp != NULL) @@ -2227,8 +2227,8 @@ } fibril_mutex_unlock(&viewport_list_mtx); - + if (!list_empty(&viewport_list)) input_activate(input); - + ret: fibril_mutex_unlock(&discovery_mtx); @@ -2244,11 +2244,11 @@ /* Coordinates of the central pixel. */ coord_origin = UINT32_MAX / 4; - + /* Color of the viewport background. Must be opaque. */ bg_color = PIXEL(255, 69, 51, 103); - + /* Register compositor server. */ async_set_fallback_port_handler(client_connection, NULL); - + errno_t rc = loc_server_register(NAME); if (rc != EOK) { @@ -2256,10 +2256,10 @@ return -1; } - + server_name = name; - + char svc[LOC_NAME_MAXLEN + 1]; snprintf(svc, LOC_NAME_MAXLEN, "%s/%s", NAMESPACE, server_name); - + service_id_t service_id; rc = loc_service_register(svc, &service_id); @@ -2268,5 +2268,5 @@ return rc; } - + /* Prepare window registrator (entrypoint for clients). */ char winreg[LOC_NAME_MAXLEN + 1]; @@ -2276,5 +2276,5 @@ return -1; } - + /* Establish input bidirectional connection. */ rc = input_connect(input_svc); @@ -2283,5 +2283,5 @@ return rc; } - + rc = loc_register_cat_change_cb(category_change_cb); if (rc != EOK) { @@ -2290,10 +2290,10 @@ return rc; } - + discover_viewports(); - + comp_restrict_pointers(); comp_damage(0, 0, UINT32_MAX, UINT32_MAX); - + return EOK; } @@ -2310,15 +2310,15 @@ return 1; } - + printf("%s: HelenOS Compositor server\n", NAME); - + errno_t rc = compositor_srv_init(argv[1], argv[2]); if (rc != EOK) return rc; - + printf("%s: Accepting connections\n", NAME); task_retval(0); async_manager(); - + /* Never reached */ return 0; Index: uspace/srv/hid/console/console.c =================================================================== --- uspace/srv/hid/console/console.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/console/console.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -62,5 +62,5 @@ atomic_t refcnt; /**< Connection reference count */ prodcons_t input_pc; /**< Incoming keyboard events */ - + /** * Not yet sent bytes of last char event. @@ -68,14 +68,14 @@ char char_remains[UTF8_CHAR_BUFFER_SIZE]; size_t char_remains_len; /**< Number of not yet sent bytes. */ - + fibril_mutex_t mtx; /**< Lock protecting mutable fields */ - + size_t index; /**< Console index */ service_id_t dsid; /**< Service handle */ - + sysarg_t cols; /**< Number of columns */ sysarg_t rows; /**< Number of rows */ console_caps_t ccaps; /**< Console capabilities */ - + chargrid_t *frontbuf; /**< Front buffer */ frontbuf_handle_t fbid; /**< Front buffer handle */ @@ -162,10 +162,10 @@ fibril_mutex_lock(&switch_mtx); fibril_mutex_lock(&cons->mtx); - + if ((active) && (cons == active_console)) { output_update(output_sess, cons->fbid); output_cursor_update(output_sess, cons->fbid); } - + fibril_mutex_unlock(&cons->mtx); fibril_mutex_unlock(&switch_mtx); @@ -176,8 +176,8 @@ fibril_mutex_lock(&switch_mtx); fibril_mutex_lock(&cons->mtx); - + if ((active) && (cons == active_console)) output_cursor_update(output_sess, cons->fbid); - + fibril_mutex_unlock(&cons->mtx); fibril_mutex_unlock(&switch_mtx); @@ -188,5 +188,5 @@ fibril_mutex_lock(&switch_mtx); fibril_mutex_lock(&cons->mtx); - + if ((active) && (cons == active_console)) { output_damage(output_sess, cons->fbid, 0, 0, cons->cols, @@ -194,5 +194,5 @@ output_cursor_update(output_sess, cons->fbid); } - + fibril_mutex_unlock(&cons->mtx); fibril_mutex_unlock(&switch_mtx); @@ -208,24 +208,24 @@ if (console_kcon()) active = false; - + return; } - + if (index > CONSOLE_COUNT) return; - + console_t *cons = &consoles[index]; - + fibril_mutex_lock(&switch_mtx); - + if (cons == active_console) { fibril_mutex_unlock(&switch_mtx); return; } - + active_console = cons; - + fibril_mutex_unlock(&switch_mtx); - + cons_damage(cons); } @@ -236,5 +236,5 @@ output_claim(output_sess); cons_damage(active_console); - + return EOK; } @@ -244,5 +244,5 @@ active = false; output_yield(output_sess); - + return EOK; } @@ -261,5 +261,5 @@ return ENOMEM; } - + link_initialize(&event->link); event->type = type; @@ -267,9 +267,9 @@ event->mods = mods; event->c = c; - + prodcons_produce(&active_console->input_pc, &event->link); } - + return EOK; } @@ -295,7 +295,7 @@ { sysarg_t updated = 0; - - fibril_mutex_lock(&cons->mtx); - + + fibril_mutex_lock(&cons->mtx); + switch (ch) { case '\n': @@ -313,7 +313,7 @@ updated = chargrid_putchar(cons->frontbuf, ch, true); } - - fibril_mutex_unlock(&cons->mtx); - + + fibril_mutex_unlock(&cons->mtx); + if (updated > 1) cons_update(cons); @@ -325,5 +325,5 @@ chargrid_set_cursor_visibility(cons->frontbuf, visible); fibril_mutex_unlock(&cons->mtx); - + cons_update_cursor(cons); } @@ -344,5 +344,5 @@ console_t *cons = srv_to_console(srv); size_t pos = 0; - + /* * Read input from keyboard and copy it to the buffer. @@ -355,17 +355,17 @@ bbuf[pos] = cons->char_remains[0]; pos++; - + /* Unshift the array. */ for (size_t i = 1; i < cons->char_remains_len; i++) cons->char_remains[i - 1] = cons->char_remains[i]; - + cons->char_remains_len--; } - + /* Still not enough? Then get another key from the queue. */ if (pos < size) { link_t *link = prodcons_consume(&cons->input_pc); kbd_event_t *event = list_get_instance(link, kbd_event_t, link); - + /* Accept key presses of printable chars only. */ if ((event->type == KEY_PRESS) && (event->c != 0)) { @@ -374,9 +374,9 @@ cons->char_remains_len = str_size(cons->char_remains); } - + free(event); } } - + *nread = size; return EOK; @@ -390,5 +390,5 @@ while (off < size) cons_write_char(cons, str_decode(data, &off, size)); - + *nwritten = size; return EOK; @@ -398,5 +398,5 @@ { console_t *cons = srv_to_console(srv); - + cons_update(cons); } @@ -405,9 +405,9 @@ { console_t *cons = srv_to_console(srv); - + fibril_mutex_lock(&cons->mtx); chargrid_clear(cons->frontbuf); fibril_mutex_unlock(&cons->mtx); - + cons_update(cons); } @@ -416,9 +416,9 @@ { console_t *cons = srv_to_console(srv); - + fibril_mutex_lock(&cons->mtx); chargrid_set_cursor(cons->frontbuf, col, row); fibril_mutex_unlock(&cons->mtx); - + cons_update_cursor(cons); } @@ -427,9 +427,9 @@ { console_t *cons = srv_to_console(srv); - + fibril_mutex_lock(&cons->mtx); chargrid_get_cursor(cons->frontbuf, col, row); fibril_mutex_unlock(&cons->mtx); - + return EOK; } @@ -438,10 +438,10 @@ { console_t *cons = srv_to_console(srv); - + fibril_mutex_lock(&cons->mtx); *cols = cons->cols; *rows = cons->rows; fibril_mutex_unlock(&cons->mtx); - + return EOK; } @@ -450,9 +450,9 @@ { console_t *cons = srv_to_console(srv); - + fibril_mutex_lock(&cons->mtx); *ccaps = cons->ccaps; fibril_mutex_unlock(&cons->mtx); - + return EOK; } @@ -461,5 +461,5 @@ { console_t *cons = srv_to_console(srv); - + fibril_mutex_lock(&cons->mtx); chargrid_set_style(cons->frontbuf, style); @@ -471,5 +471,5 @@ { console_t *cons = srv_to_console(srv); - + fibril_mutex_lock(&cons->mtx); chargrid_set_color(cons->frontbuf, bgcolor, fgcolor, attr); @@ -481,5 +481,5 @@ { console_t *cons = srv_to_console(srv); - + fibril_mutex_lock(&cons->mtx); chargrid_set_rgb_color(cons->frontbuf, bgcolor, fgcolor); @@ -490,5 +490,5 @@ { console_t *cons = srv_to_console(srv); - + cons_set_cursor_vis(cons, visible); } @@ -499,8 +499,8 @@ link_t *link = prodcons_consume(&cons->input_pc); kbd_event_t *kevent = list_get_instance(link, kbd_event_t, link); - + event->type = CEV_KEY; event->ev.key = *kevent; - + free(kevent); return EOK; @@ -510,5 +510,5 @@ { console_t *cons = NULL; - + for (size_t i = 0; i < CONSOLE_COUNT; i++) { if (consoles[i].dsid == (service_id_t) IPC_GET_ARG2(*icall)) { @@ -517,13 +517,13 @@ } } - + if (cons == NULL) { async_answer_0(iid, ENOENT); return; } - + if (atomic_postinc(&cons->refcnt) == 0) cons_set_cursor_vis(cons, true); - + con_conn(iid, icall, &cons->srvs); } @@ -533,5 +533,5 @@ async_sess_t *sess; service_id_t dsid; - + errno_t rc = loc_service_get_id(svc, &dsid, 0); if (rc != EOK) { @@ -546,5 +546,5 @@ return EIO; } - + rc = input_open(sess, &input_ev_ops, NULL, &input); if (rc != EOK) { @@ -554,5 +554,5 @@ return rc; } - + return EOK; } @@ -562,5 +562,5 @@ async_sess_t *sess; service_id_t dsid; - + errno_t rc = loc_service_get_id(svc, &dsid, 0); if (rc == EOK) { @@ -573,5 +573,5 @@ } else return NULL; - + return sess; } @@ -583,10 +583,10 @@ if (rc != EOK) return false; - + /* Connect to output service */ output_sess = output_connect(output_svc); if (output_sess == NULL) return false; - + /* Register server */ async_set_fallback_port_handler(client_connection, NULL); @@ -597,11 +597,11 @@ return false; } - + output_get_dimensions(output_sess, &cols, &rows); output_set_style(output_sess, STYLE_NORMAL); - + console_caps_t ccaps; output_get_caps(output_sess, &ccaps); - + /* * Inititalize consoles only if there are @@ -615,5 +615,5 @@ prodcons_initialize(&consoles[i].input_pc); consoles[i].char_remains_len = 0; - + consoles[i].cols = cols; consoles[i].rows = rows; @@ -621,10 +621,10 @@ consoles[i].frontbuf = chargrid_create(cols, rows, CHARGRID_FLAG_SHARED); - + if (consoles[i].frontbuf == NULL) { printf("%s: Unable to allocate frontbuffer %zu\n", NAME, i); return false; } - + consoles[i].fbid = output_frontbuf_create(output_sess, consoles[i].frontbuf); @@ -633,12 +633,12 @@ return false; } - + con_srvs_init(&consoles[i].srvs); consoles[i].srvs.ops = &con_ops; consoles[i].srvs.sarg = &consoles[i]; - + char vc[LOC_NAME_MAXLEN + 1]; snprintf(vc, LOC_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i); - + if (loc_service_register(vc, &consoles[i].dsid) != EOK) { printf("%s: Unable to register device %s\n", NAME, vc); @@ -646,8 +646,8 @@ } } - + input_activate(input); } - + return true; } @@ -664,14 +664,14 @@ return -1; } - + printf("%s: HelenOS Console service\n", NAME); - + if (!console_srv_init(argv[1], argv[2])) return -1; - + printf("%s: Accepting connections\n", NAME); task_retval(0); async_manager(); - + /* Never reached */ return 0; Index: uspace/srv/hid/input/ctl/kbdev.c =================================================================== --- uspace/srv/hid/input/ctl/kbdev.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/input/ctl/kbdev.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -66,5 +66,5 @@ /** Link to generic keyboard device */ kbd_dev_t *kbd_dev; - + /** Session with kbdev device */ async_sess_t *sess; @@ -76,5 +76,5 @@ if (kbdev == NULL) return NULL; - + kbdev->kbd_dev = kdev; @@ -86,5 +86,5 @@ if (kbdev->sess != NULL) async_hangup(kbdev->sess); - + free(kbdev); } @@ -99,5 +99,5 @@ return ENOENT; } - + kbdev_t *kbdev = kbdev_new(kdev); if (kbdev == NULL) { @@ -107,7 +107,7 @@ return ENOMEM; } - + kbdev->sess = sess; - + async_exch_t *exch = async_exchange_begin(sess); if (exch == NULL) { @@ -117,9 +117,9 @@ return ENOENT; } - + port_id_t port; errno_t rc = async_create_callback_port(exch, INTERFACE_KBD_CB, 0, 0, kbdev_callback_conn, kbdev, &port); - + if (rc != EOK) { printf("%s: Failed creating callback connection from '%s'.\n", @@ -129,7 +129,7 @@ return rc; } - + async_exchange_end(exch); - + kdev->ctl_private = (void *) kbdev; return 0; @@ -142,5 +142,5 @@ if (!exch) return; - + async_msg_1(exch, KBDEV_SET_IND, mods); async_exchange_end(exch); Index: uspace/srv/hid/input/gsp.c =================================================================== --- uspace/srv/hid/input/gsp.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/input/gsp.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -79,5 +79,5 @@ trans_key_t *trans_key = (trans_key_t *)key; gsp_trans_t *t = hash_table_get_inst(item, gsp_trans_t, link); - + return trans_key->input == t->input && trans_key->old_state == t->old_state; } @@ -245,5 +245,5 @@ { ht_link_t *item; - + trans_key_t key = { .input = input, Index: uspace/srv/hid/input/input.c =================================================================== --- uspace/srv/hid/input/input.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/input/input.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -78,8 +78,8 @@ /** Link into the list of clients */ link_t link; - + /** Indicate whether the client is active */ bool active; - + /** Client callback session */ async_sess_t *sess; @@ -112,11 +112,11 @@ if (client == NULL) return NULL; - + link_initialize(&client->link); client->active = false; client->sess = NULL; - + list_append(&client->link, &clients); - + return client; } @@ -125,5 +125,5 @@ { client_t *client = (client_t *) data; - + list_remove(&client->link); free(client); @@ -144,5 +144,5 @@ kbd_event_t ev; unsigned int mod_mask; - + switch (key) { case KC_LCTRL: @@ -167,5 +167,5 @@ mod_mask = 0; } - + if (mod_mask != 0) { if (type == KEY_PRESS) @@ -174,5 +174,5 @@ kdev->mods = kdev->mods & ~mod_mask; } - + switch (key) { case KC_CAPS_LOCK: @@ -188,5 +188,5 @@ mod_mask = 0; } - + if (mod_mask != 0) { if (type == KEY_PRESS) { @@ -198,5 +198,5 @@ kdev->mods = kdev->mods ^ (mod_mask & ~kdev->lock_keys); kdev->lock_keys = kdev->lock_keys | mod_mask; - + /* Update keyboard lock indicator lights. */ (*kdev->ctl_ops->set_ind)(kdev, kdev->mods); @@ -205,7 +205,7 @@ } } - + // TODO: More elegant layout switching - + if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) && (key == KC_F1)) { @@ -214,5 +214,5 @@ return; } - + if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) && (key == KC_F2)) { @@ -221,5 +221,5 @@ return; } - + if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) && (key == KC_F3)) { @@ -228,5 +228,5 @@ return; } - + if ((type == KEY_PRESS) && (kdev->mods & KM_LCTRL) && (key == KC_F4)) { @@ -235,11 +235,11 @@ return; } - + ev.type = type; ev.key = key; ev.mods = kdev->mods; - + ev.c = layout_parse_ev(kdev->active_layout, &ev); - + list_foreach(clients, link, client_t, client) { if (client->active) { @@ -257,18 +257,18 @@ if (client->active) { async_exch_t *exch = async_exchange_begin(client->sess); - + if ((dx) || (dy)) async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy); - + if (dz) { // TODO: Implement proper wheel support keycode_t code = dz > 0 ? KC_UP : KC_DOWN; - + for (unsigned int i = 0; i < 3; i++) async_msg_4(exch, INPUT_EVENT_KEY, KEY_PRESS, code, 0, 0); - + async_msg_4(exch, INPUT_EVENT_KEY, KEY_RELEASE, code, 0, 0); } - + async_exchange_end(exch); } @@ -309,5 +309,5 @@ list_foreach(clients, link, client_t, client) client->active = ((active) && (client == active_client)); - + /* Notify clients about the arbitration */ list_foreach(clients, link, client_t, client) { @@ -327,11 +327,11 @@ return; } - + async_answer_0(iid, EOK); - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) { if (client->sess != NULL) { @@ -339,9 +339,9 @@ client->sess = NULL; } - + async_answer_0(callid, EOK); return; } - + async_sess_t *sess = async_callback_receive_start(EXCHANGE_SERIALIZE, &call); @@ -375,5 +375,5 @@ active = true; } - + client_arbitration(); } @@ -387,11 +387,11 @@ return NULL; } - + link_initialize(&kdev->link); - + kdev->mods = KM_NUM_LOCK; kdev->lock_keys = 0; kdev->active_layout = layout_create(layout[0]); - + return kdev; } @@ -405,7 +405,7 @@ return NULL; } - + link_initialize(&mdev->link); - + return mdev; } @@ -419,5 +419,5 @@ return NULL; } - + sdev->kdev = kbd_dev_new(); if (sdev->kdev == NULL) { @@ -427,5 +427,5 @@ link_initialize(&sdev->link); - + return sdev; } @@ -437,13 +437,13 @@ if (kdev == NULL) return; - + kdev->port_ops = port; kdev->ctl_ops = ctl; kdev->svc_id = 0; - + /* Initialize port driver. */ if ((*kdev->port_ops->init)(kdev) != 0) goto fail; - + /* Initialize controller driver. */ if ((*kdev->ctl_ops->init)(kdev) != 0) { @@ -451,8 +451,8 @@ goto fail; } - + list_append(&kdev->link, &kbd_devs); return; - + fail: free(kdev); @@ -469,9 +469,9 @@ if (kdev == NULL) return -1; - + kdev->svc_id = service_id; kdev->port_ops = NULL; kdev->ctl_ops = &kbdev_ctl; - + errno_t rc = loc_service_get_name(service_id, &kdev->svc_name); if (rc != EOK) { @@ -479,14 +479,14 @@ goto fail; } - + /* Initialize controller driver. */ if ((*kdev->ctl_ops->init)(kdev) != 0) { goto fail; } - + list_append(&kdev->link, &kbd_devs); *kdevp = kdev; return 0; - + fail: if (kdev->svc_name != NULL) @@ -506,9 +506,9 @@ if (mdev == NULL) return -1; - + mdev->svc_id = service_id; mdev->port_ops = NULL; mdev->proto_ops = &mousedev_proto; - + errno_t rc = loc_service_get_name(service_id, &mdev->svc_name); if (rc != EOK) { @@ -516,14 +516,14 @@ goto fail; } - + /* Initialize controller driver. */ if ((*mdev->proto_ops->init)(mdev) != 0) { goto fail; } - + list_append(&mdev->link, &mouse_devs); *mdevp = mdev; return 0; - + fail: free(mdev); @@ -560,7 +560,7 @@ if (sdev == NULL) return -1; - + sdev->kdev->svc_id = service_id; - + rc = loc_service_get_name(service_id, &sdev->kdev->svc_name); if (rc != EOK) @@ -598,8 +598,8 @@ fibril_add_ready(fid); } - + *sdevp = sdev; return 0; - + fail: if (sdev->kdev->svc_name != NULL) @@ -641,5 +641,5 @@ bool already_known; errno_t rc; - + rc = loc_category_get_id("keyboard", &keyboard_cat, IPC_FLAG_BLOCKING); if (rc != EOK) { @@ -647,5 +647,5 @@ return ENOENT; } - + /* * Check for new keyboard devices @@ -660,5 +660,5 @@ for (i = 0; i < count; i++) { already_known = false; - + /* Determine whether we already know this device. */ list_foreach(kbd_devs, link, kbd_dev_t, kdev) { @@ -668,5 +668,5 @@ } } - + if (!already_known) { kbd_dev_t *kdev; @@ -677,9 +677,9 @@ } } - + free(svcs); - + /* XXX Handle device removal */ - + return EOK; } @@ -692,5 +692,5 @@ bool already_known; errno_t rc; - + rc = loc_category_get_id("mouse", &mouse_cat, IPC_FLAG_BLOCKING); if (rc != EOK) { @@ -698,5 +698,5 @@ return ENOENT; } - + /* * Check for new mouse devices @@ -708,8 +708,8 @@ return EIO; } - + for (i = 0; i < count; i++) { already_known = false; - + /* Determine whether we already know this device. */ list_foreach(mouse_devs, link, mouse_dev_t, mdev) { @@ -719,5 +719,5 @@ } } - + if (!already_known) { mouse_dev_t *mdev; @@ -728,9 +728,9 @@ } } - + free(svcs); - + /* XXX Handle device removal */ - + return EOK; } @@ -743,5 +743,5 @@ bool already_known; errno_t rc; - + rc = loc_category_get_id("serial", &serial_cat, IPC_FLAG_BLOCKING); if (rc != EOK) { @@ -749,5 +749,5 @@ return ENOENT; } - + /* * Check for new serial devices @@ -762,5 +762,5 @@ for (i = 0; i < count; i++) { already_known = false; - + /* Determine whether we already know this device. */ list_foreach(serial_devs, link, serial_dev_t, sdev) { @@ -770,5 +770,5 @@ } } - + if (!already_known) { serial_dev_t *sdev; @@ -779,9 +779,9 @@ } } - + free(svcs); - + /* XXX Handle device removal */ - + return EOK; } @@ -790,7 +790,7 @@ { errno_t rc; - + fibril_mutex_lock(&discovery_lock); - + if (!serial_console) { rc = dev_check_new_kbdevs(); @@ -799,5 +799,5 @@ return rc; } - + rc = dev_check_new_mousedevs(); if (rc != EOK) { @@ -812,7 +812,7 @@ } } - + fibril_mutex_unlock(&discovery_lock); - + return EOK; } @@ -832,5 +832,5 @@ return rc; } - + return dev_check_new(); } @@ -849,22 +849,22 @@ return 1; } - + printf("%s: HelenOS input service\n", NAME); - + list_initialize(&clients); list_initialize(&kbd_devs); list_initialize(&mouse_devs); list_initialize(&serial_devs); - + serial_console = config_get_value("console"); - + /* Add legacy keyboard devices. */ kbd_add_legacy_devs(); - + /* Register driver */ async_set_client_data_constructor(client_data_create); async_set_client_data_destructor(client_data_destroy); async_set_fallback_port_handler(client_connection, NULL); - + rc = loc_server_register(NAME); if (rc != EOK) { @@ -872,5 +872,5 @@ return rc; } - + service_id_t service_id; rc = loc_service_register(argv[1], &service_id); @@ -879,5 +879,5 @@ return rc; } - + /* Receive kernel notifications */ rc = async_event_subscribe(EVENT_KCONSOLE, kconsole_event_handler, NULL); @@ -885,12 +885,12 @@ printf("%s: Failed to register kconsole notifications (%s)\n", NAME, str_error(rc)); - + /* Start looking for new input devices */ input_start_dev_discovery(); - + printf("%s: Accepting connections\n", NAME); task_retval(0); async_manager(); - + /* Not reached. */ return 0; Index: uspace/srv/hid/input/layout/ar.c =================================================================== --- uspace/srv/hid/input/layout/ar.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/input/layout/ar.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -76,5 +76,5 @@ [KC_PERIOD] = L'ز', [KC_SLASH] = L'ظ', - + [KC_Q] = L'ض', [KC_W] = L'ص', @@ -134,5 +134,5 @@ [KC_PERIOD] = '.', [KC_SLASH] = L'؟', - + [KC_Q] = L'َ', [KC_W] = L'ً', @@ -220,5 +220,5 @@ if (c != 0) return c; - + if ((ev->mods & KM_SHIFT) != 0) c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(wchar_t)); Index: uspace/srv/hid/input/layout/cz.c =================================================================== --- uspace/srv/hid/input/layout/cz.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/input/layout/cz.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -412,8 +412,8 @@ if (ev->type != KEY_PRESS) return 0; - + if (key_is_mod(ev->key)) return 0; - + switch (cz_state->mstate) { case ms_start: @@ -424,5 +424,5 @@ return parse_ms_carka(cz_state, ev); } - + return 0; } Index: uspace/srv/hid/input/mouse.h =================================================================== --- uspace/srv/hid/input/mouse.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/input/mouse.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -47,14 +47,14 @@ /** Link to mouse_devs list */ link_t link; - + /** Service ID (only for mousedev devices) */ service_id_t svc_id; - + /** Device service name (only for mousedev devices) */ char *svc_name; - + /** Port ops */ struct mouse_port_ops *port_ops; - + /** Protocol ops */ struct mouse_proto_ops *proto_ops; Index: uspace/srv/hid/input/port/chardev.c =================================================================== --- uspace/srv/hid/input/port/chardev.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/input/port/chardev.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -75,5 +75,5 @@ fid_t fid; errno_t rc; - + kbd_dev = kdev; again: @@ -83,5 +83,5 @@ break; } - + if (i >= num_devs) { /* XXX This is just a hack. */ @@ -90,5 +90,5 @@ goto again; } - + dev_sess = loc_service_connect(service_id, INTERFACE_DDF, IPC_FLAG_BLOCKING); @@ -97,5 +97,5 @@ return ENOENT; } - + rc = chardev_open(dev_sess, &chardev); if (rc != EOK) { @@ -104,5 +104,5 @@ return ENOMEM; } - + fid = fibril_create(kbd_port_fibril, NULL); if (fid == 0) { @@ -114,5 +114,5 @@ fibril_add_ready(fid); - + printf("%s: Found input device '%s'\n", NAME, in_devs[i]); return 0; Index: uspace/srv/hid/input/proto/mousedev.c =================================================================== --- uspace/srv/hid/input/proto/mousedev.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/input/proto/mousedev.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -59,7 +59,7 @@ if (mousedev == NULL) return NULL; - + mousedev->mouse_dev = mdev; - + return mousedev; } @@ -75,16 +75,16 @@ /* Mousedev device structure */ mousedev_t *mousedev = (mousedev_t *) arg; - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) { mousedev_destroy(mousedev); return; } - + errno_t retval; - + switch (IPC_GET_IMETHOD(call)) { case MOUSEEV_MOVE_EVENT: @@ -109,5 +109,5 @@ break; } - + async_answer_0(callid, retval); } @@ -122,5 +122,5 @@ return ENOENT; } - + mousedev_t *mousedev = mousedev_new(mdev); if (mousedev == NULL) { @@ -130,5 +130,5 @@ return ENOMEM; } - + async_exch_t *exch = async_exchange_begin(sess); if (exch == NULL) { @@ -139,12 +139,12 @@ return ENOENT; } - + port_id_t port; errno_t rc = async_create_callback_port(exch, INTERFACE_MOUSE_CB, 0, 0, mousedev_callback_conn, mousedev, &port); - + async_exchange_end(exch); async_hangup(sess); - + if (rc != EOK) { printf("%s: Failed creating callback connection from '%s'.\n", @@ -153,5 +153,5 @@ return rc; } - + return EOK; } Index: uspace/srv/hid/isdv4_tablet/isdv4.c =================================================================== --- uspace/srv/hid/isdv4_tablet/isdv4.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/isdv4_tablet/isdv4.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -282,5 +282,5 @@ state->touch_max_y = ((packet[2] >> 3) & 3) | ((packet[5] & 127) << 7) | (packet[6] & 124); - + if (touch_resolution == 0) touch_resolution = 10; Index: uspace/srv/hid/isdv4_tablet/main.c =================================================================== --- uspace/srv/hid/isdv4_tablet/main.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/isdv4_tablet/main.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -66,13 +66,13 @@ { async_answer_0(iid, EOK); - + async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE); - + fibril_mutex_lock(&client_mutex); - + if (client_sess == NULL) client_sess = sess; - + fibril_mutex_unlock(&client_mutex); @@ -80,8 +80,8 @@ ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) break; - + async_answer_0(callid, ENOTSUP); } @@ -93,7 +93,7 @@ async_sess_t *sess = client_sess; fibril_mutex_unlock(&client_mutex); - + if (!sess) return; - + async_exch_t *exch = async_exchange_begin(sess); if (exch) { @@ -153,5 +153,5 @@ printf("%s %s %u %u %u %u\n", type, source, event->x, event->y, event->pressure, event->button); - + emit_event(event); } @@ -307,5 +307,5 @@ printf(" Touch: %ux%u type: %s\n", state.touch_max_x, state.touch_max_y, touch_type(state.touch_type)); - + fid_t fibril = fibril_create(read_fibril, NULL); /* From this on, state is to be used only by read_fibril */ Index: uspace/srv/hid/output/ctl/serial.c =================================================================== --- uspace/srv/hid/output/ctl/serial.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/ctl/serial.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -63,5 +63,5 @@ { vt100_state_t *state = (vt100_state_t *) dev->data; - + return vt100_yield(state); } @@ -70,5 +70,5 @@ { vt100_state_t *state = (vt100_state_t *) dev->data; - + return vt100_claim(state); } @@ -78,5 +78,5 @@ { vt100_state_t *state = (vt100_state_t *) dev->data; - + vt100_get_dimensions(state, cols, rows); } @@ -91,5 +91,5 @@ { vt100_state_t *state = (vt100_state_t *) dev->data; - + vt100_goto(state, col, row); vt100_cursor_visibility(state, visible); @@ -101,5 +101,5 @@ charfield_t *field = chargrid_charfield_at(dev->backbuf, col, row); - + draw_char(state, field, col, row); } @@ -130,5 +130,5 @@ if (state == NULL) return ENOMEM; - + outdev_t *dev = outdev_register(&serial_ops, state); if (dev == NULL) { @@ -136,5 +136,5 @@ return ENOMEM; } - + return EOK; } Index: uspace/srv/hid/output/gfx/font-8x16.c =================================================================== --- uspace/srv/hid/output/gfx/font-8x16.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/gfx/font-8x16.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -49,317 +49,317 @@ if (ch == 0x0000) return 0; - + if ((ch >= 0x0020) && (ch <= 0x007f)) return (ch - 32); - + if ((ch >= 0x00a0) && (ch <= 0x021f)) return (ch - 64); - + if ((ch >= 0x0222) && (ch <= 0x0233)) return (ch - 66); - + if ((ch >= 0x0250) && (ch <= 0x02ad)) return (ch - 94); - + if ((ch >= 0x02b0) && (ch <= 0x02cf)) return (ch - 96); - + if ((ch >= 0x02d8) && (ch <= 0x02dd)) return (ch - 104); - + if (ch == 0x02ee) return 630; - + if ((ch >= 0x0300) && (ch <= 0x0301)) return (ch - 137); - + if (ch == 0x0303) return 633; - + if (ch == 0x0309) return 634; - + if ((ch >= 0x0312) && (ch <= 0x0314)) return (ch - 151); - + if (ch == 0x0323) return 638; - + if ((ch >= 0x0340) && (ch <= 0x0341)) return (ch - 193); - + if ((ch >= 0x0374) && (ch <= 0x0375)) return (ch - 243); - + if (ch == 0x037a) return 643; - + if (ch == 0x037e) return 644; - + if ((ch >= 0x0384) && (ch <= 0x038a)) return (ch - 255); - + if (ch == 0x038c) return 652; - + if ((ch >= 0x038e) && (ch <= 0x03a1)) return (ch - 257); - + if ((ch >= 0x03a3) && (ch <= 0x03ce)) return (ch - 258); - + if ((ch >= 0x03d0) && (ch <= 0x03d7)) return (ch - 259); - + if ((ch >= 0x03da) && (ch <= 0x03f3)) return (ch - 261); - + if ((ch >= 0x0400) && (ch <= 0x0486)) return (ch - 273); - + if ((ch >= 0x0488) && (ch <= 0x04ce)) return (ch - 274); - + if ((ch >= 0x04d0) && (ch <= 0x04f5)) return (ch - 275); - + if ((ch >= 0x04f8) && (ch <= 0x04f9)) return (ch - 277); - + if ((ch >= 0x0500) && (ch <= 0x050f)) return (ch - 283); - + if ((ch >= 0x0530) && (ch <= 0x0556)) return (ch - 315); - + if ((ch >= 0x0559) && (ch <= 0x055f)) return (ch - 317); - + if ((ch >= 0x0561) && (ch <= 0x0587)) return (ch - 318); - + if ((ch >= 0x0589) && (ch <= 0x058a)) return (ch - 319); - + if ((ch >= 0x0591) && (ch <= 0x05a1)) return (ch - 325); - + if ((ch >= 0x05a3) && (ch <= 0x05b9)) return (ch - 326); - + if ((ch >= 0x05bb) && (ch <= 0x05c4)) return (ch - 327); - + if ((ch >= 0x05d0) && (ch <= 0x05ea)) return (ch - 338); - + if ((ch >= 0x05f0) && (ch <= 0x05f4)) return (ch - 343); - + if (ch == 0x060c) return 1182; - + if (ch == 0x061b) return 1183; - + if (ch == 0x061f) return 1184; - + if ((ch >= 0x0621) && (ch <= 0x063a)) return (ch - 384); - + if ((ch >= 0x0640) && (ch <= 0x0655)) return (ch - 389); - + if ((ch >= 0x0660) && (ch <= 0x066d)) return (ch - 399); - + if ((ch >= 0x0670) && (ch <= 0x06ed)) return (ch - 401); - + if ((ch >= 0x06f0) && (ch <= 0x06fe)) return (ch - 403); - + if (ch == 0x10d3) return 1388; - + if (ch == 0x10d7) return 1389; - + if (ch == 0x10da) return 1390; - + if (ch == 0x10dd) return 1391; - + if (ch == 0x10e6) return 1392; - + if ((ch >= 0x1e00) && (ch <= 0x1e9b)) return (ch - 6287); - + if ((ch >= 0x1ea0) && (ch <= 0x1ef9)) return (ch - 6291); - + if ((ch >= 0x1f00) && (ch <= 0x1f07)) return (ch - 6297); - + if ((ch >= 0x2000) && (ch <= 0x2027)) return (ch - 6545); - + if ((ch >= 0x2030) && (ch <= 0x2046)) return (ch - 6553); - + if ((ch >= 0x2048) && (ch <= 0x204d)) return (ch - 6554); - + if (ch == 0x2070) return 1716; - + if ((ch >= 0x2074) && (ch <= 0x208f)) return (ch - 6591); - + if ((ch >= 0x20a0) && (ch <= 0x20af)) return (ch - 6607); - + if ((ch >= 0x2100) && (ch <= 0x213a)) return (ch - 6687); - + if ((ch >= 0x2153) && (ch <= 0x2183)) return (ch - 6711); - + if ((ch >= 0x2190) && (ch <= 0x21f3)) return (ch - 6723); - + if ((ch >= 0x2200) && (ch <= 0x22f1)) return (ch - 6735); - + if (ch == 0x2300) return 2211; - + if (ch == 0x2302) return 2212; - + if ((ch >= 0x2308) && (ch <= 0x230b)) return (ch - 6755); - + if (ch == 0x2310) return 2217; - + if (ch == 0x2318) return 2218; - + if ((ch >= 0x231a) && (ch <= 0x231b)) return (ch - 6767); - + if ((ch >= 0x2320) && (ch <= 0x2321)) return (ch - 6771); - + if ((ch >= 0x2329) && (ch <= 0x232a)) return (ch - 6778); - + if ((ch >= 0x239b) && (ch <= 0x23bd)) return (ch - 6890); - + if (ch == 0x23ce) return 2260; - + if ((ch >= 0x2409) && (ch <= 0x240d)) return (ch - 6964); - + if ((ch >= 0x2423) && (ch <= 0x2424)) return (ch - 6985); - + if (ch == 0x2426) return 2268; - + if ((ch >= 0x2500) && (ch <= 0x2595)) return (ch - 7203); - + if ((ch >= 0x25a0) && (ch <= 0x25f7)) return (ch - 7213); - + if ((ch >= 0x2600) && (ch <= 0x2602)) return (ch - 7221); - + if ((ch >= 0x2605) && (ch <= 0x260d)) return (ch - 7223); - + if ((ch >= 0x2610) && (ch <= 0x2613)) return (ch - 7225); - + if (ch == 0x2620) return 2523; - + if (ch == 0x2622) return 2524; - + if (ch == 0x2626) return 2525; - + if ((ch >= 0x2628) && (ch <= 0x262b)) return (ch - 7242); - + if ((ch >= 0x262e) && (ch <= 0x2637)) return (ch - 7244); - + if ((ch >= 0x2639) && (ch <= 0x2653)) return (ch - 7245); - + if ((ch >= 0x2660) && (ch <= 0x2667)) return (ch - 7257); - + if ((ch >= 0x2669) && (ch <= 0x266f)) return (ch - 7258); - + if ((ch >= 0xfb00) && (ch <= 0xfb05)) return (ch - 61674); - + if ((ch >= 0xfb50) && (ch <= 0xfbb1)) return (ch - 61748); - + if ((ch >= 0xfbd3) && (ch <= 0xfbe9)) return (ch - 61781); - + if ((ch >= 0xfbfc) && (ch <= 0xfbff)) return (ch - 61799); - + if ((ch >= 0xfc5b) && (ch <= 0xfc63)) return (ch - 61890); - + if (ch == 0xfc90) return 2722; - + if ((ch >= 0xfcf2) && (ch <= 0xfcf4)) return (ch - 62031); - + if ((ch >= 0xfd3c) && (ch <= 0xfd3f)) return (ch - 62102); - + if (ch == 0xfdf2) return 2730; - + if ((ch >= 0xfe50) && (ch <= 0xfe52)) return (ch - 62373); - + if ((ch >= 0xfe54) && (ch <= 0xfe66)) return (ch - 62374); - + if ((ch >= 0xfe68) && (ch <= 0xfe6b)) return (ch - 62375); - + if ((ch >= 0xfe70) && (ch <= 0xfe72)) return (ch - 62379); - + if (ch == 0xfe74) return 2760; - + if ((ch >= 0xfe76) && (ch <= 0xfefc)) return (ch - 62381); - + if (ch == 0xfeff) return 2896; - + return 2898; } @@ -3264,5 +3264,5 @@ {0xf1, 0x35, 0x55, 0x8a, 0xe0, 0x06, 0x95, 0xd6, 0xb5, 0x97, 0x00, 0xee, 0x8a, 0xee, 0x28, 0xe8}, {0x00, 0x38, 0x7c, 0x7c, 0xc6, 0x92, 0xf2, 0xe6, 0xfe, 0xe6, 0x7c, 0x7c, 0x38, 0x00, 0x00, 0x00}, - + /* Special glyph for unknown character */ {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00} Index: uspace/srv/hid/output/output.c =================================================================== --- uspace/srv/hid/output/output.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/output.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -44,5 +44,5 @@ typedef struct { link_t link; - + size_t size; unsigned int flags; @@ -56,14 +56,14 @@ { assert(ops->get_dimensions); - + outdev_t *dev = (outdev_t *) malloc(sizeof(outdev_t)); if (dev == NULL) return NULL; - + link_initialize(&dev->link); - + dev->ops = *ops; dev->data = data; - + ops->get_dimensions(dev, &dev->cols, &dev->rows); dev->backbuf = chargrid_create(dev->cols, dev->rows, @@ -73,5 +73,5 @@ return NULL; } - + list_append(&dev->link, &outdevs); return dev; @@ -81,13 +81,13 @@ { errno_t ret = EOK; - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.yield); - + errno_t rc = dev->ops.yield(dev); if (rc != EOK) ret = rc; } - + async_answer_0(iid, ret); } @@ -96,13 +96,13 @@ { errno_t ret = EOK; - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.claim); - + errno_t rc = dev->ops.claim(dev); if (rc != EOK) ret = rc; } - + async_answer_0(iid, ret); } @@ -112,10 +112,10 @@ sysarg_t cols = MAX_COLS; sysarg_t rows = MAX_ROWS; - + list_foreach(outdevs, link, outdev_t, dev) { cols = min(cols, dev->cols); rows = min(rows, dev->rows); } - + async_answer_2(iid, EOK, cols, rows); } @@ -124,11 +124,11 @@ { console_caps_t caps = 0; - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.get_caps); - + caps |= dev->ops.get_caps(dev); } - + async_answer_1(iid, EOK, caps); } @@ -143,10 +143,10 @@ } } - + if (frontbuf == NULL) { async_answer_0(iid, ENOENT); return NULL; } - + return frontbuf; } @@ -159,7 +159,7 @@ return; } - + link_initialize(&frontbuf->link); - + ipc_callid_t callid; if (!async_share_out_receive(&callid, &frontbuf->size, @@ -169,5 +169,5 @@ return; } - + errno_t rc = async_share_out_finalize(callid, &frontbuf->data); if ((rc != EOK) || (frontbuf->data == AS_MAP_FAILED)) { @@ -176,5 +176,5 @@ return; } - + list_append(&frontbuf->link, &frontbufs); async_answer_1(iid, EOK, (sysarg_t) frontbuf); @@ -186,9 +186,9 @@ if (frontbuf == NULL) return; - + list_remove(&frontbuf->link); as_area_destroy(frontbuf->data); free(frontbuf); - + async_answer_0(iid, EOK); } @@ -199,22 +199,22 @@ if (frontbuf == NULL) return; - + chargrid_t *buf = (chargrid_t *) frontbuf->data; bool visible = chargrid_get_cursor_visibility(buf); - + sysarg_t col; sysarg_t row; chargrid_get_cursor(buf, &col, &row); - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.cursor_update); - + sysarg_t prev_col; sysarg_t prev_row; chargrid_get_cursor(dev->backbuf, &prev_col, &prev_row); - + chargrid_set_cursor(dev->backbuf, col, row); chargrid_set_cursor_visibility(dev->backbuf, visible); - + dev->ops.cursor_update(dev, prev_col, prev_row, col, row, visible); @@ -222,5 +222,5 @@ } - + async_answer_0(iid, EOK); } @@ -233,5 +233,5 @@ (console_style_t) IPC_GET_ARG1(*icall); } - + async_answer_0(iid, EOK); } @@ -248,5 +248,5 @@ (console_color_attr_t) IPC_GET_ARG3(*icall); } - + async_answer_0(iid, EOK); } @@ -259,5 +259,5 @@ dev->attrs.val.rgb.fgcolor = IPC_GET_ARG2(*icall); } - + async_answer_0(iid, EOK); } @@ -266,12 +266,12 @@ { assert(dev->ops.char_update); - + sysarg_t top_row = chargrid_get_top_row(buf); - + if (dev->top_row == top_row) return false; - + dev->top_row = top_row; - + for (sysarg_t y = 0; y < dev->rows; y++) { for (sysarg_t x = 0; x < dev->cols; x++) { @@ -281,22 +281,22 @@ chargrid_charfield_at(dev->backbuf, x, y); bool update = false; - + if (front_field->ch != back_field->ch) { back_field->ch = front_field->ch; update = true; } - + if (!attrs_same(front_field->attrs, back_field->attrs)) { back_field->attrs = front_field->attrs; update = true; } - + front_field->flags &= ~CHAR_FLAG_DIRTY; - + if (update) dev->ops.char_update(dev, x, y); } } - + return true; } @@ -307,13 +307,13 @@ if (frontbuf == NULL) return; - + chargrid_t *buf = (chargrid_t *) frontbuf->data; - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.char_update); - + if (srv_update_scroll(dev, buf)) continue; - + for (sysarg_t y = 0; y < dev->rows; y++) { for (sysarg_t x = 0; x < dev->cols; x++) { @@ -323,5 +323,5 @@ chargrid_charfield_at(dev->backbuf, x, y); bool update = false; - + if ((front_field->flags & CHAR_FLAG_DIRTY) == CHAR_FLAG_DIRTY) { @@ -330,5 +330,5 @@ update = true; } - + if (!attrs_same(front_field->attrs, back_field->attrs)) { @@ -336,17 +336,17 @@ update = true; } - + front_field->flags &= ~CHAR_FLAG_DIRTY; } - + if (update) dev->ops.char_update(dev, x, y); } } - + dev->ops.flush(dev); } - - + + async_answer_0(iid, EOK); } @@ -357,19 +357,19 @@ if (frontbuf == NULL) return; - + chargrid_t *buf = (chargrid_t *) frontbuf->data; - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.char_update); - + if (srv_update_scroll(dev, buf)) continue; - + sysarg_t col = IPC_GET_ARG2(*icall); sysarg_t row = IPC_GET_ARG3(*icall); - + sysarg_t cols = IPC_GET_ARG4(*icall); sysarg_t rows = IPC_GET_ARG5(*icall); - + for (sysarg_t y = 0; y < rows; y++) { for (sysarg_t x = 0; x < cols; x++) { @@ -378,5 +378,5 @@ charfield_t *back_field = chargrid_charfield_at(dev->backbuf, col + x, row + y); - + back_field->ch = front_field->ch; back_field->attrs = front_field->attrs; @@ -395,14 +395,14 @@ /* Accept the connection */ async_answer_0(iid, EOK); - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) { async_answer_0(callid, EOK); break; } - + switch (IPC_GET_IMETHOD(call)) { case OUTPUT_YIELD: @@ -418,5 +418,5 @@ srv_get_caps(callid, &call); break; - + case OUTPUT_FRONTBUF_CREATE: srv_frontbuf_create(callid, &call); @@ -425,5 +425,5 @@ srv_frontbuf_destroy(callid, &call); break; - + case OUTPUT_CURSOR_UPDATE: srv_cursor_update(callid, &call); @@ -444,5 +444,5 @@ srv_damage(callid, &call); break; - + default: async_answer_0(callid, EINVAL); @@ -462,7 +462,7 @@ return 1; } - + printf("%s: HelenOS output service\n", NAME); - + /* Register server */ async_set_fallback_port_handler(client_connection, NULL); @@ -472,5 +472,5 @@ return rc; } - + service_id_t service_id; rc = loc_service_register(argv[1], &service_id); @@ -479,15 +479,15 @@ return rc; } - + if (!config_key_exists("console")) { ega_init(); } - + chardev_init(); - + printf("%s: Accepting connections\n", NAME); task_retval(0); async_manager(); - + /* Never reached */ return 0; Index: uspace/srv/hid/output/output.h =================================================================== --- uspace/srv/hid/output/output.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/output.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -44,9 +44,9 @@ errno_t (*yield)(struct outdev *dev); errno_t (*claim)(struct outdev *dev); - + void (*get_dimensions)(struct outdev *dev, sysarg_t *cols, sysarg_t *rows); console_caps_t (*get_caps)(struct outdev *dev); - + void (*cursor_update)(struct outdev *dev, sysarg_t prev_col, sysarg_t prev_row, sysarg_t col, sysarg_t row, bool visible); @@ -57,12 +57,12 @@ typedef struct outdev { link_t link; - + sysarg_t cols; sysarg_t rows; char_attrs_t attrs; - + chargrid_t *backbuf; sysarg_t top_row; - + outdev_ops_t ops; void *data; Index: uspace/srv/hid/output/port/ega.c =================================================================== --- uspace/srv/hid/output/port/ega.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/port/ega.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -47,8 +47,8 @@ sysarg_t cols; sysarg_t rows; - + uint8_t style_normal; uint8_t style_inverted; - + size_t size; uint8_t *addr; @@ -60,5 +60,5 @@ { uint8_t attr = 0; - + switch (attrs.type) { case CHAR_ATTR_STYLE: @@ -81,8 +81,8 @@ attr = ((attrs.val.index.bgcolor & 7) << 4) | (attrs.val.index.fgcolor & 7); - + if (attrs.val.index.attr & CATTR_BRIGHT) attr |= 0x08; - + break; case CHAR_ATTR_RGB: @@ -91,5 +91,5 @@ break; } - + return attr; } @@ -105,12 +105,12 @@ { uint8_t glyph; - + if (ascii_check(field->ch)) glyph = field->ch; else glyph = '?'; - + uint8_t attr = attrs_attr(field->attrs); - + ega.addr[FB_POS(col, row)] = glyph; ega.addr[FB_POS(col, row) + 1] = attr; @@ -143,16 +143,16 @@ /* Cursor position */ uint16_t cursor = row * ega.cols + col; - + pio_write_8(EGA_IO_BASE, 0x0e); pio_write_8(EGA_IO_BASE + 1, (cursor >> 8) & 0xff); pio_write_8(EGA_IO_BASE, 0x0f); pio_write_8(EGA_IO_BASE + 1, cursor & 0xff); - + /* Cursor visibility */ pio_write_8(EGA_IO_BASE, 0x0a); uint8_t stat = pio_read_8(EGA_IO_BASE + 1); - + pio_write_8(EGA_IO_BASE, 0x0a); - + if (visible) pio_write_8(EGA_IO_BASE + 1, stat & (~(1 << 5))); @@ -165,5 +165,5 @@ charfield_t *field = chargrid_charfield_at(dev->backbuf, col, row); - + draw_char(field, col, row); } @@ -189,36 +189,36 @@ if (rc != EOK) present = false; - + if (!present) return ENOENT; - + sysarg_t kind; rc = sysinfo_get_value("fb.kind", &kind); if (rc != EOK) kind = (sysarg_t) -1; - + if (kind != 2) return EINVAL; - + sysarg_t paddr; rc = sysinfo_get_value("fb.address.physical", &paddr); if (rc != EOK) return rc; - + rc = sysinfo_get_value("fb.width", &ega.cols); if (rc != EOK) return rc; - + rc = sysinfo_get_value("fb.height", &ega.rows); if (rc != EOK) return rc; - + rc = pio_enable((void*)EGA_IO_BASE, EGA_IO_SIZE, NULL); if (rc != EOK) return rc; - + ega.size = (ega.cols * ega.rows) << 1; ega.addr = AS_AREA_ANY; - + rc = physmem_map(paddr, ALIGN_UP(ega.size, PAGE_SIZE) >> PAGE_WIDTH, @@ -226,18 +226,18 @@ if (rc != EOK) return rc; - + sysarg_t blinking; rc = sysinfo_get_value("fb.blinking", &blinking); if (rc != EOK) blinking = false; - + ega.style_normal = 0xf0; ega.style_inverted = 0x0f; - + if (blinking) { ega.style_normal &= 0x77; ega.style_inverted &= 0x77; } - + outdev_t *dev = outdev_register(&ega_ops, (void *) &ega); if (dev == NULL) { @@ -245,5 +245,5 @@ return EINVAL; } - + return EOK; } Index: uspace/srv/hid/output/port/kfb.c =================================================================== --- uspace/srv/hid/output/port/kfb.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/port/kfb.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -87,18 +87,18 @@ size_t scanline; visual_t visual; - + size_t size; uint8_t *addr; - + pixel2visual_t pixel2visual; visual2pixel_t visual2pixel; visual_mask_t visual_mask; size_t pixel_bytes; - + sysarg_t pointer_x; sysarg_t pointer_y; bool pointer_visible; imgmap_t *pointer_imgmap; - + /* * Pre-rendered mask for rendering @@ -106,9 +106,9 @@ * visual. */ - + size_t glyph_scanline; size_t glyph_bytes; uint8_t *glyphs; - + uint8_t *backbuf; } kfb_t; @@ -135,5 +135,5 @@ [COLOR_YELLOW] = 0xf0f000, [COLOR_WHITE] = 0xf0f0f0, - + [COLOR_BLACK + 8] = 0x000000, [COLOR_BLUE + 8] = 0x0000ff, @@ -150,5 +150,5 @@ if ((x >= kfb.width) || (y >= kfb.height)) return; - + kfb.pixel2visual(kfb.addr + FB_POS(x, y), pixel); } @@ -158,5 +158,5 @@ if ((x >= kfb.width) || (y >= kfb.height)) return 0; - + return kfb.visual2pixel(kfb.addr + FB_POS(x, y)); } @@ -169,11 +169,11 @@ sysarg_t dx = kfb.pointer_x + x; sysarg_t dy = kfb.pointer_y + y; - + pixel_t pixel = get_pixel(dx, dy); imgmap_put_pixel(kfb.pointer_imgmap, x, y, pixel); - + size_t offset = y * ((POINTER_WIDTH - 1) / 8 + 1) + x / 8; bool visible = pointer_mask[offset] & (1 << (x % 8)); - + if (visible) { pixel = (pointer[offset] & (1 << (x % 8))) ? @@ -193,5 +193,5 @@ sysarg_t dx = kfb.pointer_x + x; sysarg_t dy = kfb.pointer_y + y; - + pixel_t pixel = imgmap_get_pixel(kfb.pointer_imgmap, x, y); @@ -210,11 +210,11 @@ if ((y1 >= y2) || (x1 >= x2)) return; - + uint8_t cbuf[4]; kfb.pixel2visual(cbuf, color); - + for (sysarg_t y = y1; y < y2; y++) { uint8_t *dst = kfb.addr + FB_POS(x1, y); - + for (sysarg_t x = x1; x < x2; x++) { memcpy(dst, cbuf, kfb.pixel_bytes); @@ -290,5 +290,5 @@ { size_t word_size = sizeof(unsigned long); - + /* * Prepare a pair of words, one filled with foreground-color @@ -297,5 +297,5 @@ unsigned long fg_buf; unsigned long bg_buf; - + for (size_t i = 0; i < word_size / kfb.pixel_bytes; i++) { kfb.pixel2visual(&((uint8_t *) &bg_buf)[i * kfb.pixel_bytes], @@ -304,20 +304,20 @@ fgcolor); } - + /* Pointer to the current position in the mask. */ unsigned long *maskp = (unsigned long *) &kfb.glyphs[GLYPH_POS( fb_font_glyph(ch), 0, inverted)]; - + /* Pointer to the current position on the screen. */ unsigned long *dst = (unsigned long *) &kfb.addr[FB_POS(x, y)]; - + /* Width of the character cell in words. */ size_t ww = FONT_WIDTH * kfb.pixel_bytes / word_size; - + /* Offset to add when moving to another screen scanline. */ size_t d_add = kfb.scanline - FONT_WIDTH * kfb.pixel_bytes; - + for (size_t yd = 0; yd < FONT_SCANLINES; yd++) { /* @@ -329,5 +329,5 @@ *dst++ = (fg_buf & mask) | (bg_buf & ~mask); } - + /* Move to the beginning of the next scanline of the cell. */ dst = (unsigned long *) ((uint8_t *) dst + d_add); @@ -353,9 +353,9 @@ /* Character glyph */ uint16_t glyph = fb_font_glyph(ch); - + /* Pre-render the foreground and background color pixels. */ uint8_t fg_buf[4]; uint8_t bg_buf[4]; - + if (inverted) { kfb.pixel2visual(bg_buf, fgcolor); @@ -365,27 +365,27 @@ kfb.pixel2visual(fg_buf, fgcolor); } - + /* Pointer to the current position on the screen. */ uint8_t *dst = (uint8_t *) &kfb.addr[FB_POS(x, y)]; - + /* Offset to add when moving to another screen scanline. */ size_t d_add = kfb.scanline - FONT_WIDTH * kfb.pixel_bytes; - + for (size_t yd = 0; yd < FONT_SCANLINES; yd++) { /* Byte containing bits of the glyph scanline. */ uint8_t byte = fb_font[glyph][yd]; - + for (size_t i = 0; i < FONT_WIDTH; i++) { /* Choose color based on the current bit. */ uint8_t *src = (byte & 0x80) ? fg_buf : bg_buf; - + /* Copy the pixel. */ for (size_t j = 0; j < kfb.pixel_bytes; j++) *dst++ = *src++; - + /* Move to the next bit. */ byte <<= 1; } - + /* Move to the beginning of the next scanline of the cell. */ dst += d_add; @@ -403,17 +403,17 @@ { kfb_vp_t *kfb_vp = (kfb_vp_t *) vp->data; - + sysarg_t x = vp->x + COL2X(col); sysarg_t y = vp->y + ROW2Y(row); - + charfield_t *field = screenbuffer_field_at(vp->backbuf, col, row); - + pixel_t bgcolor = 0; pixel_t fgcolor = 0; attrs_rgb(field->attrs, &bgcolor, &fgcolor); - + bool inverted = (vp->cursor_flash) && screenbuffer_cursor_at(vp->backbuf, col, row); - + (*kfb_vp->draw_char)(x, y, inverted, field->ch, bgcolor, fgcolor); } @@ -427,9 +427,9 @@ return ENOMEM; } - + for (sysarg_t y = 0; y < kfb.height; y++) memcpy(kfb.backbuf + y * kfb.width * kfb.pixel_bytes, kfb.addr + FB_POS(0, y), kfb.width * kfb.pixel_bytes); - + return EOK; } @@ -439,10 +439,10 @@ if (kfb.backbuf == NULL) return ENOENT; - + for (sysarg_t y = 0; y < kfb.height; y++) memcpy(kfb.addr + FB_POS(0, y), kfb.backbuf + y * kfb.width * kfb.pixel_bytes, kfb.width * kfb.pixel_bytes); - + return EOK; } @@ -452,9 +452,9 @@ { pointer_hide(); - + kfb.pointer_x = x; kfb.pointer_y = y; kfb.pointer_visible = visible; - + pointer_show(); } @@ -479,5 +479,5 @@ if (kfb_vp == NULL) return ENOMEM; - + /* * Conditions necessary to select aligned glyph @@ -489,5 +489,5 @@ */ size_t word_size = sizeof(unsigned long); - + if (((word_size % kfb.pixel_bytes) == 0) && ((FONT_WIDTH * kfb.pixel_bytes) % word_size == 0) @@ -497,10 +497,10 @@ else kfb_vp->draw_char = draw_char_fallback; - + vp->attrs.type = CHAR_ATTR_RGB; vp->attrs.val.rgb.bgcolor = DEFAULT_BGCOLOR; vp->attrs.val.rgb.fgcolor = DEFAULT_FGCOLOR; vp->data = (void *) kfb_vp; - + return EOK; } @@ -514,22 +514,22 @@ { pointer_hide(); - + for (sysarg_t row = 0; row < vp->rows; row++) { for (sysarg_t col = 0; col < vp->cols; col++) { charfield_t *field = screenbuffer_field_at(vp->backbuf, col, row); - + field->ch = 0; field->attrs = vp->attrs; } } - + pixel_t bgcolor = 0; pixel_t fgcolor = 0; attrs_rgb(vp->attrs, &bgcolor, &fgcolor); - + draw_filled_rect(vp->x, vp->y, vp->x + vp->width, vp->y + vp->height, bgcolor); - + pointer_show(); } @@ -569,5 +569,5 @@ { pointer_hide(); - + for (sysarg_t y = 0; y < height; y++) { for (sysarg_t x = 0; x < width; x++) { @@ -576,5 +576,5 @@ } } - + pointer_show(); } @@ -605,5 +605,5 @@ { memset(kfb.glyphs, 0, sz); - + for (unsigned int glyph = 0; glyph < FONT_GLYPHS; glyph++) { for (unsigned int y = 0; y < FONT_SCANLINES; y++) { @@ -626,46 +626,46 @@ if (rc != EOK) present = false; - + if (!present) return ENOENT; - + sysarg_t kind; rc = sysinfo_get_value("fb.kind", &kind); if (rc != EOK) kind = (sysarg_t) -1; - + if (kind != 1) return EINVAL; - + sysarg_t paddr; rc = sysinfo_get_value("fb.address.physical", &paddr); if (rc != EOK) return rc; - + sysarg_t offset; rc = sysinfo_get_value("fb.offset", &offset); if (rc != EOK) offset = 0; - + sysarg_t width; rc = sysinfo_get_value("fb.width", &width); if (rc != EOK) return rc; - + sysarg_t height; rc = sysinfo_get_value("fb.height", &height); if (rc != EOK) return rc; - + sysarg_t scanline; rc = sysinfo_get_value("fb.scanline", &scanline); if (rc != EOK) return rc; - + sysarg_t visual; rc = sysinfo_get_value("fb.visual", &visual); if (rc != EOK) return rc; - + kfb.width = width; kfb.height = height; @@ -673,5 +673,5 @@ kfb.scanline = scanline; kfb.visual = visual; - + switch (visual) { case VISUAL_INDIRECT_8: @@ -744,17 +744,17 @@ return EINVAL; } - + kfb.glyph_scanline = FONT_WIDTH * kfb.pixel_bytes; kfb.glyph_bytes = kfb.glyph_scanline * FONT_SCANLINES; - + size_t sz = 2 * FONT_GLYPHS * kfb.glyph_bytes; kfb.glyphs = (uint8_t *) malloc(sz); if (kfb.glyphs == NULL) return EINVAL; - + render_glyphs(sz); - + kfb.size = scanline * height; - + rc = physmem_map((void *) paddr + offset, ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH, @@ -764,5 +764,5 @@ return rc; } - + kfb.pointer_x = 0; kfb.pointer_y = 0; @@ -770,7 +770,7 @@ kfb.pointer_imgmap = imgmap_create(POINTER_WIDTH, POINTER_HEIGHT, VISUAL_RGB_0_8_8_8, IMGMAP_FLAG_NONE); - + kfb.backbuf = NULL; - + fbdev_t *dev = fbdev_register(&kfb_ops, (void *) &kfb); if (dev == NULL) { @@ -779,5 +779,5 @@ return EINVAL; } - + return EOK; } Index: uspace/srv/hid/output/proto/vt100.c =================================================================== --- uspace/srv/hid/output/proto/vt100.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/proto/vt100.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -77,5 +77,5 @@ { char control[MAX_CONTROL]; - + snprintf(control, MAX_CONTROL, "\033[%um", mode); state->control_puts(control); @@ -85,5 +85,5 @@ { char control[MAX_CONTROL]; - + snprintf(control, MAX_CONTROL, "\033[%" PRIun ";%" PRIun "f", row + 1, col + 1); @@ -123,15 +123,15 @@ vt100_sgr(state, SGR_BGCOLOR + color_map[attrs.val.index.bgcolor & 7]); vt100_sgr(state, SGR_FGCOLOR + color_map[attrs.val.index.fgcolor & 7]); - + if (attrs.val.index.attr & CATTR_BRIGHT) vt100_sgr(state, SGR_BOLD); - + break; case CHAR_ATTR_RGB: vt100_sgr(state, SGR_RESET); - + if (attrs.val.rgb.bgcolor <= attrs.val.rgb.fgcolor) vt100_sgr(state, SGR_REVERSE); - + break; } @@ -145,18 +145,18 @@ if (state == NULL) return NULL; - + state->putchar = putchar_fn; state->control_puts = control_puts_fn; state->flush = flush_fn; - + state->cols = cols; state->rows = rows; - + state->cur_col = (sysarg_t) -1; state->cur_row = (sysarg_t) -1; - + state->cur_attrs.type = CHAR_ATTR_STYLE; state->cur_attrs.val.style = STYLE_NORMAL; - + /* Initialize graphic rendition attributes */ vt100_sgr(state, SGR_RESET); @@ -195,5 +195,5 @@ if ((col >= state->cols) || (row >= state->rows)) return; - + if ((col != state->cur_col) || (row != state->cur_row)) { vt100_set_pos(state, col, row); @@ -223,5 +223,5 @@ state->putchar(ch == 0 ? ' ' : ch); state->cur_col++; - + if (state->cur_col >= state->cols) { state->cur_row += state->cur_col / state->cols; Index: uspace/srv/hid/output/proto/vt100.h =================================================================== --- uspace/srv/hid/output/proto/vt100.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/output/proto/vt100.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -42,9 +42,9 @@ sysarg_t cols; sysarg_t rows; - + sysarg_t cur_col; sysarg_t cur_row; char_attrs_t cur_attrs; - + vt100_putchar_t putchar; vt100_control_puts_t control_puts; Index: uspace/srv/hid/remcons/remcons.c =================================================================== --- uspace/srv/hid/remcons/remcons.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/remcons/remcons.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -236,5 +236,5 @@ { telnet_user_t *user = arg; - + task_id_t task; task_wait_t wait; Index: uspace/srv/hid/rfb/main.c =================================================================== --- uspace/srv/hid/rfb/main.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/rfb/main.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -78,10 +78,10 @@ { fibril_mutex_lock(&rfb.lock); - + if (x0 + width > rfb.width || y0 + height > rfb.height) { fibril_mutex_unlock(&rfb.lock); return EINVAL; } - + /* TODO update surface_t and use it */ if (!rfb.damage_valid) { @@ -112,7 +112,7 @@ } } - + pixelmap_t *map = &vs->cells; - + for (sysarg_t y = y0; y < height + y0; ++y) { for (sysarg_t x = x0; x < width + x0; ++x) { @@ -122,5 +122,5 @@ } } - + fibril_mutex_unlock(&rfb.lock); return EOK; @@ -161,5 +161,5 @@ const char *rfb_name = argv[1]; - + char *endptr; unsigned long width = strtoul(argv[2], &endptr, 0); @@ -169,5 +169,5 @@ return 1; } - + unsigned long height = strtoul(argv[3], &endptr, 0); if (*endptr != 0) { @@ -176,5 +176,5 @@ return 1; } - + unsigned long port = 5900; if (argc > 4) { @@ -186,7 +186,7 @@ } } - + rfb_init(&rfb, width, height, rfb_name); - + vis = malloc(sizeof(visualizer_t)); if (vis == NULL) { @@ -194,7 +194,7 @@ return 3; } - + graph_init_visualizer(vis); - + pixel_mode.mode.index = 0; pixel_mode.mode.version = 0; @@ -207,10 +207,10 @@ pixel_mode.mode.cell_aspect.height = 1; pixel_mode.mode.cell_visual.pixel_visual = VISUAL_RGB_8_8_8; - + link_initialize(&pixel_mode.link); list_append(&pixel_mode.link, &vis->modes); - + vis->def_mode_idx = 0; - + vis->ops = rfb_ops; vis->dev_ctx = NULL; @@ -232,5 +232,5 @@ service_id_t service_id; - + rc = loc_service_register(service_name, &service_id); if (rc != EOK) { @@ -238,5 +238,5 @@ return rc; } - + free(service_name); @@ -247,5 +247,5 @@ return 1; } - + rc = loc_service_add_to_cat(service_id, visualizer_category); if (rc != EOK) { @@ -253,5 +253,5 @@ return 1; } - + rc = rfb_listen(&rfb, port); if (rc != EOK) { @@ -259,5 +259,5 @@ return 2; } - + printf("%s: Accepting connections\n", NAME); task_retval(0); Index: uspace/srv/hid/rfb/rfb.c =================================================================== --- uspace/srv/hid/rfb/rfb.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/rfb/rfb.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -70,12 +70,12 @@ rbuf_out = 0; rbuf_in = 0; - + rc = tcp_conn_recv_wait(conn, rbuf, BUFFER_SIZE, &nrecv); if (rc != EOK) return rc; - + rbuf_in = nrecv; } - + *c = rbuf[rbuf_out++]; return EOK; @@ -177,5 +177,5 @@ memset(rfb, 0, sizeof(rfb_t)); fibril_mutex_initialize(&rfb->lock); - + rfb_pixel_format_t *pf = &rfb->pixel_format; pf->bpp = 32; @@ -189,8 +189,8 @@ pf->g_shift = 8; pf->b_shift = 16; - + rfb->name = str_dup(name); rfb->supports_trle = false; - + return rfb_set_size(rfb, width, height); } @@ -209,8 +209,8 @@ rfb->width = width; rfb->height = height; - + /* Fill with white */ memset(rfb->framebuffer.data, 255, new_size); - + return EOK; } @@ -242,5 +242,5 @@ } } - + if (first_free_index != -1) { rfb->palette[first_free_index] = PIXEL(255, RED(pixel), GREEN(pixel), @@ -250,5 +250,5 @@ return; } - + /* TODO find nearest color index. We are lazy so return index 0 for now */ *buf = 0; @@ -262,5 +262,5 @@ pix |= rfb_scale_channel(GREEN(pixel), pf->g_max) << pf->g_shift; pix |= rfb_scale_channel(BLUE(pixel), pf->b_max) << pf->b_shift; - + if (pf->bpp == 8) { uint8_t pix8 = pix; @@ -317,11 +317,11 @@ size_t size = sizeof(rfb_set_color_map_entries_t) + rfb->palette_used * sizeof(rfb_color_map_entry_t); - + void *buf = malloc(size); if (buf == NULL) return NULL; - + void *pos = buf; - + rfb_set_color_map_entries_t *scme = pos; scme->message_type = RFB_SMSG_SET_COLOR_MAP_ENTRIES; @@ -330,5 +330,5 @@ rfb_set_color_map_entries_to_be(scme, scme); pos += sizeof(rfb_set_color_map_entries_t); - + rfb_color_map_entry_t *entries = pos; for (unsigned i = 0; i < rfb->palette_used; i++) { @@ -338,5 +338,5 @@ rfb_color_map_entry_to_be(&entries[i], &entries[i]); } - + *psize = size; return buf; @@ -347,8 +347,8 @@ size_t pixel_size = rfb->pixel_format.bpp / 8; size_t size = (rect->width * rect->height * pixel_size); - + if (buf == NULL) return size; - + for (uint16_t y = 0; y < rect->height; y++) { for (uint16_t x = 0; x < rect->width; x++) { @@ -359,5 +359,5 @@ } } - + return size; } @@ -376,5 +376,5 @@ ctx->size = pixel_format->bpp / 8; ctx->compress_type = COMP_NONE; - + if (pixel_format->bpp == 32 && pixel_format->depth <= 24) { uint32_t mask = 0; @@ -382,5 +382,5 @@ mask |= pixel_format->g_max << pixel_format->g_shift; mask |= pixel_format->b_max << pixel_format->b_shift; - + if (pixel_format->big_endian) { mask = host2uint32_t_be(mask); @@ -389,5 +389,5 @@ mask = host2uint32_t_le(mask); } - + uint8_t *mask_data = (uint8_t *) &mask; if (mask_data[0] == 0) { @@ -407,5 +407,5 @@ uint8_t data[4]; rfb_encode_pixel(rfb, data, pixel); - + switch (cpixel->compress_type) { case COMP_NONE: @@ -424,5 +424,5 @@ if (buf == NULL) return size; - + for (uint16_t y = tile->y; y < tile->y + tile->height; y++) { for (uint16_t x = tile->x; x < tile->x + tile->width; x++) { @@ -431,5 +431,5 @@ } } - + return size; } @@ -446,5 +446,5 @@ } } - + /* OK, encode it */ if (buf) @@ -458,5 +458,5 @@ cpixel_ctx_t cpixel; cpixel_context_init(&cpixel, &rfb->pixel_format); - + size_t size = 0; for (uint16_t y = 0; y < rect->height; y += 16) { @@ -468,10 +468,10 @@ .height = (y + 16 <= rect->height ? 16 : rect->height - y) }; - + size += 1; uint8_t *tile_enctype_ptr = buf; if (buf) buf += 1; - + uint8_t tile_enctype = RFB_TILE_ENCODING_SOLID; size_t tile_size; @@ -482,5 +482,5 @@ tile_enctype = RFB_TILE_ENCODING_RAW; } - + if (buf) { *tile_enctype_ptr = tile_enctype; @@ -502,5 +502,5 @@ rfb->damage_rect.height = rfb->height; } - + /* We send only single raw rectangle right now */ @@ -509,5 +509,5 @@ rfb_rect_encode_raw(rfb, &rfb->damage_rect, NULL) ; - + void *buf = malloc(buf_size); if (buf == NULL) { @@ -516,5 +516,5 @@ } memset(buf, 0, buf_size); - + void *pos = buf; rfb_framebuffer_update_t *fbu = buf; @@ -523,10 +523,10 @@ rfb_framebuffer_update_to_be(fbu, fbu); pos += sizeof(rfb_framebuffer_update_t); - + rfb_rectangle_t *rect = pos; pos += sizeof(rfb_rectangle_t); - + *rect = rfb->damage_rect; - + if (rfb->supports_trle) { rect->enctype = RFB_ENCODING_TRLE; @@ -538,10 +538,10 @@ } rfb_rectangle_to_be(rect, rect); - + rfb->damage_valid = false; - + size_t send_palette_size = 0; void *send_palette = NULL; - + if (!rfb->pixel_format.true_color) { send_palette = rfb_send_palette_message(rfb, &send_palette_size); @@ -552,7 +552,7 @@ } } - + fibril_mutex_unlock(&rfb->lock); - + if (!rfb->pixel_format.true_color) { errno_t rc = tcp_conn_send(conn, send_palette, send_palette_size); @@ -562,8 +562,8 @@ } } - + errno_t rc = tcp_conn_send(conn, buf, buf_size); free(buf); - + return rc; } @@ -605,5 +605,5 @@ return; } - + char client_version[12]; rc = recv_chars(conn, client_version, 12); @@ -613,10 +613,10 @@ return; } - + if (memcmp(client_version, "RFB 003.008\n", 12) != 0) { log_msg(LOG_DEFAULT, LVL_WARN, "Client version is not RFB 3.8"); return; } - + /* Security handshake * 1 security type supported, which is 1 - None @@ -631,5 +631,5 @@ return; } - + char selected_sec_type = 0; rc = recv_char(conn, &selected_sec_type); @@ -651,5 +651,5 @@ return; } - + /* Client init */ char shared_flag; @@ -660,5 +660,5 @@ return; } - + /* Server init */ fibril_mutex_lock(&rfb->lock); @@ -684,5 +684,5 @@ return; } - + while (true) { char message_type = 0; @@ -693,5 +693,5 @@ return; } - + rfb_set_pixel_format_t spf; rfb_set_encodings_t se; @@ -765,5 +765,5 @@ inet_ep_t ep; errno_t rc; - + rc = tcp_create(&tcp); if (rc != EOK) { @@ -771,8 +771,8 @@ goto error; } - + inet_ep_init(&ep); ep.port = port; - + rc = tcp_listener_create(tcp, &ep, &listen_cb, rfb, &conn_cb, rfb, &lst); @@ -781,8 +781,8 @@ goto error; } - + rfb->tcp = tcp; rfb->lst = lst; - + return EOK; error: Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c =================================================================== --- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -83,5 +83,5 @@ { printf("%s: S3C24xx touchscreen driver\n", NAME); - + async_set_fallback_port_handler(s3c24xx_ts_connection, NULL); errno_t rc = loc_server_register(NAME); @@ -278,5 +278,5 @@ button = 1; press = 0; - + async_exch_t *exch = async_exchange_begin(ts->client_sess); async_msg_2(exch, MOUSEEV_BUTTON_EVENT, button, press); @@ -377,9 +377,9 @@ { async_answer_0(iid, EOK); - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) { if (ts->client_sess != NULL) { @@ -387,9 +387,9 @@ ts->client_sess = NULL; } - + async_answer_0(callid, EOK); return; } - + async_sess_t *sess = async_callback_receive_start(EXCHANGE_SERIALIZE, &call); Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c =================================================================== --- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -80,5 +80,5 @@ { printf("%s: S3C24xx on-chip UART driver\n", NAME); - + async_set_fallback_port_handler(s3c24xx_uart_connection, uart); errno_t rc = loc_server_register(NAME); Index: uspace/srv/klog/klog.c =================================================================== --- uspace/srv/klog/klog.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/klog/klog.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -61,5 +61,5 @@ uint32_t level; char message[0]; - + } __attribute__((__packed__)) log_entry_t; @@ -107,16 +107,16 @@ return; } - + size_t offset = 0; while (offset < len) { size_t entry_len = *((unaligned_size_t *) (buffer + offset)); - + if (offset + entry_len > len || entry_len < sizeof(log_entry_t)) break; - + log_entry_t *buf = malloc(entry_len + 1); if (buf == NULL) break; - + item_t *item = malloc(sizeof(item_t)); if (item == NULL) { @@ -124,5 +124,5 @@ break; } - + memcpy(buf, buffer + offset, entry_len); *((uint8_t *) buf + entry_len) = 0; @@ -131,5 +131,5 @@ item->data = buf; prodcons_produce(&pc, &item->link); - + offset += entry_len; } @@ -148,9 +148,9 @@ static errno_t consumer(void *data) { - + while (true) { link_t *link = prodcons_consume(&pc); item_t *item = list_get_instance(link, item_t, link); - + if (item->size < sizeof(log_entry_t)) { free(item->data); @@ -158,5 +158,5 @@ continue; } - + if (item->data->facility == LF_USPACE) { /* Avoid reposting messages */ @@ -165,20 +165,20 @@ continue; } - + log_t ctx = kernel_ctx; if (item->data->facility < facility_len) { ctx = facility_ctx[item->data->facility]; } - + log_level_t lvl = item->data->level; if (lvl > LVL_LIMIT) lvl = LVL_NOTE; - + log_msg(ctx, lvl, "%s", item->data->message); - + free(item->data); free(item); } - + return EOK; } @@ -199,9 +199,9 @@ * starving. */ - + fibril_mutex_lock(&mtx); - + producer(); - + async_event_unmask(EVENT_KLOG); fibril_mutex_unlock(&mtx); @@ -215,10 +215,10 @@ return rc; } - + kernel_ctx = log_create("kernel", LOG_NO_PARENT); for (unsigned int i = 0; i < facility_len; i++) { facility_ctx[i] = log_create(facility_name[i], kernel_ctx); } - + buffer = malloc(BUFFER_SIZE); if (buffer == NULL) { @@ -226,5 +226,5 @@ return 1; } - + prodcons_initialize(&pc); rc = async_event_subscribe(EVENT_KLOG, klog_notification_received, NULL); @@ -234,5 +234,5 @@ return rc; } - + fid_t fid = fibril_create(consumer, NULL); if (!fid) { @@ -241,15 +241,15 @@ return ENOMEM; } - + fibril_add_ready(fid); async_event_unmask(EVENT_KLOG); - + fibril_mutex_lock(&mtx); producer(); fibril_mutex_unlock(&mtx); - + task_retval(0); async_manager(); - + return 0; } Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/loader/main.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -95,7 +95,7 @@ task_id_t task_id; size_t len; - + task_id = task_get_id(); - + if (!async_data_read_receive(&callid, &len)) { async_answer_0(callid, EINVAL); @@ -103,8 +103,8 @@ return; } - + if (len > sizeof(task_id)) len = sizeof(task_id); - + async_data_read_finalize(callid, &task_id, len); async_answer_0(rid, EOK); @@ -120,12 +120,12 @@ char *buf; errno_t rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, NULL); - + if (rc == EOK) { if (cwd != NULL) free(cwd); - + cwd = buf; } - + async_answer_0(rid, rc); } @@ -158,5 +158,5 @@ return; } - + progname = name; program_fd = file; @@ -174,5 +174,5 @@ size_t buf_size; errno_t rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, &buf_size); - + if (rc == EOK) { /* @@ -181,5 +181,5 @@ char *cur = buf; int count = 0; - + while (cur < buf + buf_size) { size_t arg_size = str_size(cur); @@ -187,5 +187,5 @@ count++; } - + /* * Allocate new argv @@ -197,5 +197,5 @@ return; } - + /* * Fill the new argv with argument pointers @@ -205,5 +205,5 @@ while (cur < buf + buf_size) { _argv[count] = cur; - + size_t arg_size = str_size(cur); cur += arg_size + 1; @@ -211,5 +211,5 @@ } _argv[count] = NULL; - + /* * Copy temporary data to global variables @@ -217,13 +217,13 @@ if (arg_buf != NULL) free(arg_buf); - + if (argv != NULL) free(argv); - + argc = count; arg_buf = buf; argv = _argv; } - + async_answer_0(rid, rc); } @@ -289,15 +289,15 @@ return 1; } - + elf_set_pcb(&prog_info, &pcb); - + pcb.cwd = cwd; - + pcb.argc = argc; pcb.argv = argv; - + pcb.inbox = inbox; pcb.inbox_entries = inbox_entries; - + async_answer_0(rid, EOK); return 0; @@ -317,5 +317,5 @@ /* Set the task name. */ task_set_name(progname); - + /* Run program */ DPRINTF("Reply OK\n"); @@ -323,5 +323,5 @@ DPRINTF("Jump to entry point at %p\n", pcb.entry); entry_point_jmp(prog_info.finfo.entry, &pcb); - + /* Not reached */ } @@ -339,21 +339,21 @@ return; } - + connected = true; - + /* Accept the connection */ async_answer_0(iid, EOK); - + /* Ignore parameters, the connection is already open */ (void) icall; - + while (true) { errno_t retval; ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) exit(0); - + switch (IPC_GET_IMETHOD(call)) { case LOADER_GET_TASKID: @@ -382,5 +382,5 @@ break; } - + async_answer_0(callid, retval); } @@ -392,5 +392,5 @@ { async_set_fallback_port_handler(ldr_connection, NULL); - + /* Introduce this task to the NS (give it our task ID). */ task_id_t id = task_get_id(); @@ -398,5 +398,5 @@ if (rc != EOK) return rc; - + /* Create port */ port_id_t port; @@ -404,12 +404,12 @@ if (rc != EOK) return rc; - + /* Register at naming service. */ rc = service_register(SERVICE_LOADER); if (rc != EOK) return rc; - + async_manager(); - + /* Never reached */ return 0; Index: uspace/srv/locsrv/category.h =================================================================== --- uspace/srv/locsrv/category.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/locsrv/category.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -73,5 +73,5 @@ /** Link to loc_service_t.cat_memb list */ link_t svc_link; - + /** Category */ category_t *cat; Index: uspace/srv/locsrv/locsrv.c =================================================================== --- uspace/srv/locsrv/locsrv.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/locsrv/locsrv.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -100,9 +100,9 @@ * and implement some version of LRU algorithm, avoid overflow */ - + fibril_mutex_lock(&create_id_mutex); last_id++; fibril_mutex_unlock(&create_id_mutex); - + return last_id; } @@ -121,9 +121,9 @@ size_t slash_offset = 0; size_t slash_after = 0; - + size_t offset = 0; size_t offset_prev = 0; wchar_t c; - + while ((c = str_decode(fqsn, &offset, STR_NO_LIMIT)) != 0) { if (c == '/') { @@ -134,9 +134,9 @@ offset_prev = offset; } - + /* More than one slash */ if (cnt > 1) return false; - + /* No slash -> namespace is empty */ if (cnt == 0) { @@ -144,5 +144,5 @@ if (*ns_name == NULL) return false; - + *name = str_dup(fqsn); if (*name == NULL) { @@ -150,5 +150,5 @@ return false; } - + if (str_cmp(*name, "") == 0) { free(*name); @@ -156,13 +156,13 @@ return false; } - + return true; } - + /* Exactly one slash */ *ns_name = str_ndup(fqsn, slash_offset); if (*ns_name == NULL) return false; - + *name = str_dup(fqsn + slash_after); if (*name == NULL) { @@ -170,5 +170,5 @@ return false; } - + if (str_cmp(*name, "") == 0) { free(*name); @@ -176,5 +176,5 @@ return false; } - + return true; } @@ -184,10 +184,10 @@ { assert(fibril_mutex_is_locked(&services_list_mutex)); - + list_foreach(namespaces_list, namespaces, loc_namespace_t, namespace) { if (str_cmp(namespace->name, name) == 0) return namespace; } - + return NULL; } @@ -201,10 +201,10 @@ { assert(fibril_mutex_is_locked(&services_list_mutex)); - + list_foreach(namespaces_list, namespaces, loc_namespace_t, namespace) { if (namespace->id == id) return namespace; } - + return NULL; } @@ -215,5 +215,5 @@ { assert(fibril_mutex_is_locked(&services_list_mutex)); - + list_foreach(services_list, services, loc_service_t, service) { if ((str_cmp(service->namespace->name, ns_name) == 0) @@ -221,5 +221,5 @@ return service; } - + return NULL; } @@ -233,10 +233,10 @@ { assert(fibril_mutex_is_locked(&services_list_mutex)); - + list_foreach(services_list, services, loc_service_t, service) { if (service->id == id) return service; } - + return NULL; } @@ -246,15 +246,15 @@ { loc_namespace_t *namespace; - + assert(fibril_mutex_is_locked(&services_list_mutex)); - + namespace = loc_namespace_find_name(ns_name); if (namespace != NULL) return namespace; - + namespace = (loc_namespace_t *) malloc(sizeof(loc_namespace_t)); if (namespace == NULL) return NULL; - + namespace->name = str_dup(ns_name); if (namespace->name == NULL) { @@ -262,13 +262,13 @@ return NULL; } - + namespace->id = loc_create_id(); namespace->refcnt = 0; - + /* * Insert new namespace into list of registered namespaces */ list_append(&(namespace->namespaces), &namespaces_list); - + return namespace; } @@ -281,5 +281,5 @@ if (namespace->refcnt == 0) { list_remove(&(namespace->namespaces)); - + free(namespace->name); free(namespace); @@ -311,9 +311,9 @@ assert(fibril_mutex_is_locked(&services_list_mutex)); assert(fibril_mutex_is_locked(&cdir.mutex)); - + loc_namespace_delref(service->namespace); list_remove(&(service->services)); list_remove(&(service->server_services)); - + /* Remove service from all categories. */ while (!list_empty(&service->cat_memb)) { @@ -322,10 +322,10 @@ svc_link); category_t *cat = memb->cat; - + fibril_mutex_lock(&cat->mutex); category_remove_service(memb); fibril_mutex_unlock(&cat->mutex); } - + free(service->name); free(service); @@ -340,10 +340,10 @@ ipc_call_t icall; ipc_callid_t iid = async_get_call(&icall); - + if (IPC_GET_IMETHOD(icall) != LOC_SERVER_REGISTER) { async_answer_0(iid, EREFUSED); return NULL; } - + loc_server_t *server = (loc_server_t *) malloc(sizeof(loc_server_t)); @@ -352,5 +352,5 @@ return NULL; } - + /* * Get server name @@ -363,5 +363,5 @@ return NULL; } - + /* * Create connection to the server @@ -374,5 +374,5 @@ return NULL; } - + /* * Initialize mutex for list of services @@ -380,5 +380,5 @@ */ fibril_mutex_initialize(&server->services_mutex); - + /* * Initialize list of supplied services @@ -386,12 +386,12 @@ list_initialize(&server->services); link_initialize(&server->servers); - + fibril_mutex_lock(&servers_list_mutex); - + /* TODO: * Check that no server with name equal to * server->name is registered */ - + /* * Insert new server into list of registered servers @@ -399,7 +399,7 @@ list_append(&(server->servers), &servers_list); fibril_mutex_unlock(&servers_list_mutex); - + async_answer_0(iid, EOK); - + return server; } @@ -414,18 +414,18 @@ if (server == NULL) return EEXIST; - + fibril_mutex_lock(&servers_list_mutex); - + if (server->sess) async_hangup(server->sess); - + /* Remove it from list of servers */ list_remove(&(server->servers)); - + /* Unregister all its services */ fibril_mutex_lock(&services_list_mutex); fibril_mutex_lock(&server->services_mutex); fibril_mutex_lock(&cdir.mutex); - + while (!list_empty(&server->services)) { loc_service_t *service = list_get_instance( @@ -434,16 +434,16 @@ loc_service_unregister_core(service); } - + fibril_mutex_unlock(&cdir.mutex); fibril_mutex_unlock(&server->services_mutex); fibril_mutex_unlock(&services_list_mutex); fibril_mutex_unlock(&servers_list_mutex); - + /* Free name and server */ if (server->name != NULL) free(server->name); - + free(server); - + loc_category_change_event(); return EOK; @@ -460,5 +460,5 @@ return; } - + /* Create new service entry */ loc_service_t *service = @@ -468,5 +468,5 @@ return; } - + /* Get fqsn */ char *fqsn; @@ -478,5 +478,5 @@ return; } - + char *ns_name; if (!loc_fqsn_split(fqsn, &ns_name, &service->name)) { @@ -486,9 +486,9 @@ return; } - + free(fqsn); - + fibril_mutex_lock(&services_list_mutex); - + loc_namespace_t *namespace = loc_namespace_create(ns_name); free(ns_name); @@ -500,9 +500,9 @@ return; } - + link_initialize(&service->services); link_initialize(&service->server_services); list_initialize(&service->cat_memb); - + /* Check that service is not already registered */ if (loc_service_find_name(namespace->name, service->name) != NULL) { @@ -516,5 +516,5 @@ return; } - + /* Get unique service ID */ service->id = loc_create_id(); @@ -522,17 +522,17 @@ loc_namespace_addref(namespace, service); service->server = server; - + /* Insert service into list of all services */ list_append(&service->services, &services_list); - + /* Insert service into list of services supplied by one server */ fibril_mutex_lock(&service->server->services_mutex); - + list_append(&service->server_services, &service->server->services); - + fibril_mutex_unlock(&service->server->services_mutex); fibril_condvar_broadcast(&services_list_cv); fibril_mutex_unlock(&services_list_mutex); - + async_answer_1(iid, EOK, service->id); } @@ -545,5 +545,5 @@ { loc_service_t *svc; - + fibril_mutex_lock(&services_list_mutex); svc = loc_service_find_id(IPC_GET_ARG1(*icall)); @@ -553,5 +553,5 @@ return; } - + fibril_mutex_lock(&cdir.mutex); loc_service_unregister_core(svc); @@ -574,5 +574,5 @@ size_t act_size; category_t *cat; - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -580,7 +580,7 @@ return; } - + fibril_mutex_lock(&cdir.mutex); - + cat = category_get(&cdir, IPC_GET_ARG1(*icall)); if (cat == NULL) { @@ -590,5 +590,5 @@ return; } - + act_size = str_size(cat->name); if (act_size > size) { @@ -598,10 +598,10 @@ return; } - + errno_t retval = async_data_read_finalize(callid, cat->name, min(size, act_size)); - + fibril_mutex_unlock(&cdir.mutex); - + async_answer_0(iid, retval); } @@ -614,5 +614,5 @@ loc_service_t *svc; char *fqn; - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -620,7 +620,7 @@ return; } - + fibril_mutex_lock(&services_list_mutex); - + svc = loc_service_find_id(IPC_GET_ARG1(*icall)); if (svc == NULL) { @@ -630,5 +630,5 @@ return; } - + if (asprintf(&fqn, "%s/%s", svc->namespace->name, svc->name) < 0) { fibril_mutex_unlock(&services_list_mutex); @@ -637,5 +637,5 @@ return; } - + act_size = str_size(fqn); if (act_size > size) { @@ -646,11 +646,11 @@ return; } - + errno_t retval = async_data_read_finalize(callid, fqn, min(size, act_size)); free(fqn); - + fibril_mutex_unlock(&services_list_mutex); - + async_answer_0(iid, retval); } @@ -662,5 +662,5 @@ size_t act_size; loc_service_t *svc; - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -668,7 +668,7 @@ return; } - + fibril_mutex_lock(&services_list_mutex); - + svc = loc_service_find_id(IPC_GET_ARG1(*icall)); if (svc == NULL) { @@ -678,5 +678,5 @@ return; } - + if (svc->server == NULL) { fibril_mutex_unlock(&services_list_mutex); @@ -685,5 +685,5 @@ return; } - + act_size = str_size(svc->server->name); if (act_size > size) { @@ -693,10 +693,10 @@ return; } - + errno_t retval = async_data_read_finalize(callid, svc->server->name, min(size, act_size)); - + fibril_mutex_unlock(&services_list_mutex); - + async_answer_0(iid, retval); } @@ -711,5 +711,5 @@ { fibril_mutex_lock(&services_list_mutex); - + /* * Get ID from request @@ -718,5 +718,5 @@ service_id_t id = IPC_GET_ARG2(*call); loc_service_t *svc = loc_service_find_id(id); - + if ((svc == NULL) || (svc->server == NULL) || (!svc->server->sess)) { fibril_mutex_unlock(&services_list_mutex); @@ -724,9 +724,9 @@ return; } - + async_exch_t *exch = async_exchange_begin(svc->server->sess); async_forward_fast(callid, exch, iface, svc->id, 0, IPC_FF_NONE); async_exchange_end(exch); - + fibril_mutex_unlock(&services_list_mutex); } @@ -741,5 +741,5 @@ { char *fqsn; - + /* Get fqsn */ errno_t rc = async_data_write_accept((void **) &fqsn, true, 0, @@ -749,5 +749,5 @@ return; } - + char *ns_name; char *name; @@ -757,17 +757,17 @@ return; } - + free(fqsn); - + fibril_mutex_lock(&services_list_mutex); const loc_service_t *svc; - + recheck: - + /* * Find service name in the list of known services. */ svc = loc_service_find_name(ns_name, name); - + /* * Device was not found. @@ -780,5 +780,5 @@ goto recheck; } - + async_answer_0(iid, ENOENT); free(ns_name); @@ -787,7 +787,7 @@ return; } - + async_answer_1(iid, EOK, svc->id); - + fibril_mutex_unlock(&services_list_mutex); free(ns_name); @@ -804,5 +804,5 @@ { char *name; - + /* Get service name */ errno_t rc = async_data_write_accept((void **) &name, true, 0, @@ -812,15 +812,15 @@ return; } - + fibril_mutex_lock(&services_list_mutex); const loc_namespace_t *namespace; - + recheck: - + /* * Find namespace name in the list of known namespaces. */ namespace = loc_namespace_find_name(name); - + /* * Namespace was not found. @@ -833,5 +833,5 @@ goto recheck; } - + async_answer_0(iid, ENOENT); free(name); @@ -839,7 +839,7 @@ return; } - + async_answer_1(iid, EOK, namespace->id); - + fibril_mutex_unlock(&services_list_mutex); free(name); @@ -862,5 +862,5 @@ return; } - + async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE); if (sess == NULL) { @@ -869,12 +869,12 @@ return; } - + cb_sess->sess = sess; link_initialize(&cb_sess->cb_sess_list); - + fibril_mutex_lock(&callback_sess_mutex); list_append(&cb_sess->cb_sess_list, &callback_sess_list); fibril_mutex_unlock(&callback_sess_mutex); - + async_answer_0(iid, EOK); } @@ -883,5 +883,5 @@ { fibril_mutex_lock(&callback_sess_mutex); - + list_foreach(callback_sess_list, cb_sess_list, cb_sess_t, cb_sess) { async_exch_t *exch = async_exchange_begin(cb_sess->sess); @@ -889,5 +889,5 @@ async_exchange_end(exch); } - + fibril_mutex_unlock(&callback_sess_mutex); } @@ -903,5 +903,5 @@ char *name; category_t *cat; - + /* Get service name */ errno_t rc = async_data_write_accept((void **) &name, true, 0, @@ -911,5 +911,5 @@ return; } - + fibril_mutex_lock(&cdir.mutex); @@ -920,5 +920,5 @@ goto cleanup; } - + async_answer_1(iid, EOK, cat->id); cleanup: @@ -930,5 +930,5 @@ { fibril_mutex_lock(&services_list_mutex); - + loc_namespace_t *namespace = loc_namespace_find_id(IPC_GET_ARG1(*icall)); @@ -942,5 +942,5 @@ } else async_answer_1(iid, EOK, LOC_OBJECT_NAMESPACE); - + fibril_mutex_unlock(&services_list_mutex); } @@ -956,5 +956,5 @@ { fibril_mutex_lock(&services_list_mutex); - + loc_namespace_t *namespace = loc_namespace_find_id(IPC_GET_ARG1(*icall)); @@ -963,5 +963,5 @@ else async_answer_1(iid, EOK, namespace->refcnt); - + fibril_mutex_unlock(&services_list_mutex); } @@ -973,5 +973,5 @@ size_t act_size; errno_t rc; - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -979,5 +979,5 @@ return; } - + category_id_t *id_buf = (category_id_t *) malloc(size); if (id_buf == NULL) { @@ -987,7 +987,7 @@ return; } - + fibril_mutex_lock(&cdir.mutex); - + rc = categ_dir_get_categories(&cdir, id_buf, size, &act_size); if (rc != EOK) { @@ -997,10 +997,10 @@ return; } - + fibril_mutex_unlock(&cdir.mutex); - + errno_t retval = async_data_read_finalize(callid, id_buf, size); free(id_buf); - + async_answer_1(iid, retval, act_size); } @@ -1015,5 +1015,5 @@ return; } - + if ((size % sizeof(loc_sdesc_t)) != 0) { async_answer_0(callid, EINVAL); @@ -1021,7 +1021,7 @@ return; } - + fibril_mutex_lock(&services_list_mutex); - + size_t count = size / sizeof(loc_sdesc_t); if (count != list_count(&namespaces_list)) { @@ -1031,5 +1031,5 @@ return; } - + loc_sdesc_t *desc = (loc_sdesc_t *) malloc(size); if (desc == NULL) { @@ -1039,5 +1039,5 @@ return; } - + size_t pos = 0; list_foreach(namespaces_list, namespaces, loc_namespace_t, namespace) { @@ -1046,10 +1046,10 @@ pos++; } - + errno_t retval = async_data_read_finalize(callid, desc, size); - + free(desc); fibril_mutex_unlock(&services_list_mutex); - + async_answer_0(iid, retval); } @@ -1059,5 +1059,5 @@ /* FIXME: Use faster algorithm which can make better use of namespaces */ - + ipc_callid_t callid; size_t size; @@ -1067,5 +1067,5 @@ return; } - + if ((size % sizeof(loc_sdesc_t)) != 0) { async_answer_0(callid, EINVAL); @@ -1073,7 +1073,7 @@ return; } - + fibril_mutex_lock(&services_list_mutex); - + loc_namespace_t *namespace = loc_namespace_find_id(IPC_GET_ARG1(*icall)); @@ -1084,5 +1084,5 @@ return; } - + size_t count = size / sizeof(loc_sdesc_t); if (count != namespace->refcnt) { @@ -1092,5 +1092,5 @@ return; } - + loc_sdesc_t *desc = (loc_sdesc_t *) malloc(size); if (desc == NULL) { @@ -1100,5 +1100,5 @@ return; } - + size_t pos = 0; list_foreach(services_list, services, loc_service_t, service) { @@ -1109,10 +1109,10 @@ } } - + errno_t retval = async_data_read_finalize(callid, desc, size); - + free(desc); fibril_mutex_unlock(&services_list_mutex); - + async_answer_0(iid, retval); } @@ -1124,5 +1124,5 @@ size_t act_size; errno_t rc; - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -1130,7 +1130,7 @@ return; } - + fibril_mutex_lock(&cdir.mutex); - + category_t *cat = category_get(&cdir, IPC_GET_ARG1(*icall)); if (cat == NULL) { @@ -1140,5 +1140,5 @@ return; } - + category_id_t *id_buf = (category_id_t *) malloc(size); if (id_buf == NULL) { @@ -1148,7 +1148,7 @@ return; } - + fibril_mutex_lock(&cat->mutex); - + rc = category_get_services(cat, id_buf, size, &act_size); if (rc != EOK) { @@ -1159,11 +1159,11 @@ return; } - + fibril_mutex_unlock(&cat->mutex); fibril_mutex_unlock(&cdir.mutex); - + errno_t retval = async_data_read_finalize(callid, id_buf, size); free(id_buf); - + async_answer_1(iid, retval, act_size); } @@ -1173,8 +1173,8 @@ { fibril_mutex_lock(&null_services_mutex); - + unsigned int i; bool fnd = false; - + for (i = 0; i < NULL_SERVICES; i++) { if (null_services[i] == NULL) { @@ -1183,5 +1183,5 @@ } } - + if (!fnd) { fibril_mutex_unlock(&null_services_mutex); @@ -1189,8 +1189,8 @@ return; } - + char null[LOC_NAME_MAXLEN]; snprintf(null, LOC_NAME_MAXLEN, "%u", i); - + char *dev_name = str_dup(null); if (dev_name == NULL) { @@ -1199,5 +1199,5 @@ return; } - + loc_service_t *service = (loc_service_t *) malloc(sizeof(loc_service_t)); @@ -1207,7 +1207,7 @@ return; } - + fibril_mutex_lock(&services_list_mutex); - + loc_namespace_t *namespace = loc_namespace_create("null"); if (namespace == NULL) { @@ -1217,16 +1217,16 @@ return; } - + link_initialize(&service->services); link_initialize(&service->server_services); list_initialize(&service->cat_memb); - + /* Get unique service ID */ service->id = loc_create_id(); service->server = NULL; - + loc_namespace_addref(namespace, service); service->name = dev_name; - + /* * Insert service into list of all services and into null services array. @@ -1237,8 +1237,8 @@ list_append(&service->server_services, &dummy_null_services); null_services[i] = service; - + fibril_mutex_unlock(&services_list_mutex); fibril_mutex_unlock(&null_services_mutex); - + async_answer_1(iid, EOK, (sysarg_t) i); } @@ -1251,7 +1251,7 @@ return; } - + fibril_mutex_lock(&null_services_mutex); - + if (null_services[i] == NULL) { fibril_mutex_unlock(&null_services_mutex); @@ -1259,5 +1259,5 @@ return; } - + fibril_mutex_lock(&services_list_mutex); fibril_mutex_lock(&cdir.mutex); @@ -1265,7 +1265,7 @@ fibril_mutex_unlock(&cdir.mutex); fibril_mutex_unlock(&services_list_mutex); - + null_services[i] = NULL; - + fibril_mutex_unlock(&null_services_mutex); async_answer_0(iid, EOK); @@ -1279,14 +1279,14 @@ service_id_t svc_id; errno_t retval; - + svc_id = IPC_GET_ARG1(*icall); cat_id = IPC_GET_ARG2(*icall); - + fibril_mutex_lock(&services_list_mutex); fibril_mutex_lock(&cdir.mutex); - + cat = category_get(&cdir, cat_id); svc = loc_service_find_id(svc_id); - + if (cat == NULL || svc == NULL) { fibril_mutex_unlock(&cdir.mutex); @@ -1295,5 +1295,5 @@ return; } - + fibril_mutex_lock(&cat->mutex); retval = category_add_service(cat, svc); @@ -1324,5 +1324,5 @@ for (i = 0; i < NULL_SERVICES; i++) null_services[i] = NULL; - + categ_dir_init(&cdir); @@ -1368,8 +1368,8 @@ cat = category_new("virtual"); categ_dir_add_cat(&cdir, cat); - + cat = category_new("nic"); categ_dir_add_cat(&cdir, cat); - + cat = category_new("ieee80211"); categ_dir_add_cat(&cdir, cat); @@ -1383,8 +1383,8 @@ cat = category_new("renderer"); categ_dir_add_cat(&cdir, cat); - + cat = category_new("audio-pcm"); categ_dir_add_cat(&cdir, cat); - + return true; } @@ -1397,16 +1397,16 @@ /* Accept connection */ async_answer_0(iid, EOK); - + loc_server_t *server = loc_server_register(); if (server == NULL) return; - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) break; - + switch (IPC_GET_IMETHOD(call)) { case LOC_SERVER_UNREGISTER: @@ -1438,5 +1438,5 @@ } } - + if (server != NULL) { /* @@ -1455,12 +1455,12 @@ /* Accept connection */ async_answer_0(iid, EOK); - + while (true) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) break; - + switch (IPC_GET_IMETHOD(call)) { case LOC_SERVICE_GET_ID: @@ -1524,10 +1524,10 @@ { printf("%s: HelenOS Location Service\n", NAME); - + if (!loc_init()) { printf("%s: Error while initializing service\n", NAME); return -1; } - + port_id_t port; errno_t rc = async_create_port(INTERFACE_LOC_SUPPLIER, @@ -1537,5 +1537,5 @@ return rc; } - + rc = async_create_port(INTERFACE_LOC_CONSUMER, loc_connection_consumer, NULL, &port); @@ -1544,8 +1544,8 @@ return rc; } - + /* Set a handler of incomming connections */ async_set_fallback_port_handler(loc_forward, NULL); - + /* Register location service at naming service */ rc = service_register(SERVICE_LOC); @@ -1554,8 +1554,8 @@ return rc; } - + printf("%s: Accepting connections\n", NAME); async_manager(); - + /* Never reached */ return 0; Index: uspace/srv/locsrv/locsrv.h =================================================================== --- uspace/srv/locsrv/locsrv.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/locsrv/locsrv.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -49,14 +49,14 @@ /** Link to servers_list */ link_t servers; - + /** List of services supplied by this server */ list_t services; - + /** Session asociated with this server */ async_sess_t *sess; - + /** Server name */ char *name; - + /** Fibril mutex for list of services owned by this server */ fibril_mutex_t services_mutex; @@ -69,11 +69,11 @@ /** Link to namespaces_list */ link_t namespaces; - + /** Unique namespace identifier */ service_id_t id; - + /** Namespace name */ char *name; - + /** Reference count */ size_t refcnt; @@ -86,23 +86,23 @@ /** Link to global list of services (services_list) */ link_t services; - + /** Link to server list of services (loc_server_t.services) */ link_t server_services; - + /** Link to list of services in category (category_t.services) */ link_t cat_services; - + /** List of category memberships (svc_categ_t) */ list_t cat_memb; - + /** Unique service identifier */ service_id_t id; - + /** Service namespace */ loc_namespace_t *namespace; - + /** Service name */ char *name; - + /** Supplier of this service */ loc_server_t *server; Index: uspace/srv/logger/main.c =================================================================== --- uspace/srv/logger/main.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/logger/main.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -63,10 +63,10 @@ { printf(NAME ": HelenOS Logging Service\n"); - + parse_initial_settings(); for (int i = 1; i < argc; i++) { parse_level_settings(argv[i]); } - + port_id_t port; errno_t rc = async_create_port(INTERFACE_LOGGER_CONTROL, @@ -76,5 +76,5 @@ return rc; } - + rc = async_create_port(INTERFACE_LOGGER_WRITER, connection_handler_writer, NULL, &port); @@ -83,5 +83,5 @@ return rc; } - + rc = service_register(SERVICE_LOGGER); if (rc != EOK) { @@ -89,8 +89,8 @@ return -1; } - + printf(NAME ": Accepting connections\n"); async_manager(); - + /* Never reached */ return 0; Index: uspace/srv/net/dhcp/dhcp.c =================================================================== --- uspace/srv/net/dhcp/dhcp.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/dhcp/dhcp.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -430,10 +430,10 @@ dlink->retries_left = dhcp_discover_retries; - + if ((dlink->timeout->state == fts_not_set) || (dlink->timeout->state == fts_fired)) fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val, dhcpsrv_discover_timeout, dlink); - + return rc; } @@ -507,7 +507,7 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id); - + dhcp_link_t *dlink = dhcpsrv_link_find(link_id); - + if (dlink == NULL) { log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu doesn't exist", @@ -515,5 +515,5 @@ return EINVAL; } - + return dhcp_discover_proc(dlink); } Index: uspace/srv/net/dnsrsrv/dns_msg.c =================================================================== --- uspace/srv/net/dnsrsrv/dns_msg.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/dnsrsrv/dns_msg.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -298,10 +298,10 @@ { assert(buf_size >= 4); - + uint32_t w = ((uint32_t) buf[0] << 24) + ((uint32_t) buf[1] << 16) + ((uint32_t) buf[2] << 8) + buf[3]; - + return w; } @@ -311,5 +311,5 @@ { assert(buf_size >= 16); - + addr128_t_be2host(buf, addr); } Index: uspace/srv/net/dnsrsrv/dnsrsrv.c =================================================================== --- uspace/srv/net/dnsrsrv/dnsrsrv.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/dnsrsrv/dnsrsrv.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -90,7 +90,7 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()"); - + ip_ver_t ver = IPC_GET_ARG1(*icall); - + char *name; errno_t rc = async_data_write_accept((void **) &name, true, 0, @@ -100,5 +100,5 @@ return; } - + dns_host_info_t *hinfo; rc = dns_name2host(name, &hinfo, ver); @@ -107,5 +107,5 @@ return; } - + ipc_callid_t callid; size_t size; @@ -115,5 +115,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -121,5 +121,5 @@ return; } - + rc = async_data_read_finalize(callid, &hinfo->addr, size); if (rc != EOK) { @@ -128,5 +128,5 @@ return; } - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -134,5 +134,5 @@ return; } - + size_t act_size = str_size(hinfo->cname); if (act_size > size) { @@ -141,11 +141,11 @@ return; } - + rc = async_data_read_finalize(callid, hinfo->cname, act_size); if (rc != EOK) async_answer_0(callid, rc); - + async_answer_0(iid, rc); - + dns_hostinfo_destroy(hinfo); } @@ -155,5 +155,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()"); - + ipc_callid_t callid; size_t size; @@ -163,5 +163,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -169,11 +169,11 @@ return; } - + // FIXME locking - + errno_t rc = async_data_read_finalize(callid, &dns_server_addr, size); if (rc != EOK) async_answer_0(callid, rc); - + async_answer_0(iid, rc); } @@ -183,5 +183,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "dnsr_set_srvaddr_srv()"); - + ipc_callid_t callid; size_t size; @@ -191,5 +191,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -197,7 +197,7 @@ return; } - + // FIXME locking - + errno_t rc = async_data_write_finalize(callid, &dns_server_addr, size); if (rc != EOK) { @@ -205,5 +205,5 @@ async_answer_0(iid, rc); } - + async_answer_0(iid, rc); } Index: uspace/srv/net/dnsrsrv/query.c =================================================================== --- uspace/srv/net/dnsrsrv/query.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/dnsrsrv/query.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -54,5 +54,5 @@ if (sname == NULL) return ENOMEM; - + char *qname = str_dup(name); if (qname == NULL) { @@ -60,5 +60,5 @@ return ENOMEM; } - + dns_question_t *question = calloc(1, sizeof(dns_question_t)); if (question == NULL) { @@ -67,9 +67,9 @@ return ENOMEM; } - + question->qname = qname; question->qtype = qtype; question->qclass = DC_IN; - + dns_message_t *msg = dns_message_new(); if (msg == NULL) { @@ -79,5 +79,5 @@ return ENOMEM; } - + msg->id = msg_id++; msg->qr = QR_QUERY; @@ -87,7 +87,7 @@ msg->rd = true; msg->ra = false; - + list_append(&question->msg, &msg->question); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "dns_name_query: send DNS request"); dns_message_t *amsg; @@ -98,15 +98,15 @@ return rc; } - + list_foreach(amsg->answer, msg, dns_rr_t, rr) { log_msg(LOG_DEFAULT, LVL_DEBUG, " - '%s' %u/%u, dsize %zu", rr->name, rr->rtype, rr->rclass, rr->rdata_size); - + if ((rr->rtype == DTYPE_CNAME) && (rr->rclass == DC_IN) && (str_cmp(rr->name, sname) == 0)) { - + log_msg(LOG_DEFAULT, LVL_DEBUG, "decode cname (%p, %zu, %zu)", amsg->pdu.data, amsg->pdu.size, rr->roff); - + char *cname; size_t eoff; @@ -114,26 +114,26 @@ if (rc != EOK) { assert((rc == EINVAL) || (rc == ENOMEM)); - + log_msg(LOG_DEFAULT, LVL_DEBUG, "error decoding cname"); - + dns_message_destroy(msg); dns_message_destroy(amsg); free(sname); - + return rc; } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "name = '%s' " "cname = '%s'", sname, cname); - + /* Continue looking for the more canonical name */ free(sname); sname = cname; } - + if ((qtype == DTYPE_A) && (rr->rtype == DTYPE_A) && (rr->rclass == DC_IN) && (rr->rdata_size == sizeof(addr32_t)) && (str_cmp(rr->name, sname) == 0)) { - + info->cname = str_dup(rr->name); if (info->cname == NULL) { @@ -141,22 +141,22 @@ dns_message_destroy(amsg); free(sname); - + return ENOMEM; } - + inet_addr_set(dns_uint32_t_decode(rr->rdata, rr->rdata_size), &info->addr); - + dns_message_destroy(msg); dns_message_destroy(amsg); free(sname); - + return EOK; } - + if ((qtype == DTYPE_AAAA) && (rr->rtype == DTYPE_AAAA) && (rr->rclass == DC_IN) && (rr->rdata_size == sizeof(addr128_t)) && (str_cmp(rr->name, sname) == 0)) { - + info->cname = str_dup(rr->name); if (info->cname == NULL) { @@ -164,27 +164,27 @@ dns_message_destroy(amsg); free(sname); - + return ENOMEM; } - + addr128_t addr; dns_addr128_t_decode(rr->rdata, rr->rdata_size, addr); - + inet_addr_set6(addr, &info->addr); - + dns_message_destroy(msg); dns_message_destroy(amsg); free(sname); - + return EOK; } } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "'%s' not resolved, fail", sname); - + dns_message_destroy(msg); dns_message_destroy(amsg); free(sname); - + return EIO; } @@ -195,14 +195,14 @@ if (info == NULL) return ENOMEM; - + errno_t rc; - + switch (ver) { case ip_any: rc = dns_name_query(name, DTYPE_AAAA, info); - + if (rc != EOK) rc = dns_name_query(name, DTYPE_A, info); - + break; case ip_v4: @@ -215,10 +215,10 @@ rc = EINVAL; } - + if (rc == EOK) *rinfo = info; else free(info); - + return rc; } Index: uspace/srv/net/ethip/arp.c =================================================================== --- uspace/srv/net/ethip/arp.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/ethip/arp.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -55,33 +55,33 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_received()"); - + arp_eth_packet_t packet; errno_t rc = arp_pdu_decode(frame->data, frame->size, &packet); if (rc != EOK) return; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "ARP PDU decoded, opcode=%d, tpa=%x", packet.opcode, packet.target_proto_addr); - + inet_addr_t addr; inet_addr_set(packet.target_proto_addr, &addr); - + ethip_link_addr_t *laddr = ethip_nic_addr_find(nic, &addr); if (laddr == NULL) return; - + addr32_t laddr_v4; ip_ver_t laddr_ver = inet_addr_get(&laddr->addr, &laddr_v4, NULL); if (laddr_ver != ip_v4) return; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Request/reply to my address"); - + (void) atrans_add(packet.sender_proto_addr, packet.sender_hw_addr); - + if (packet.opcode == aop_request) { arp_eth_packet_t reply; - + reply.opcode = aop_reply; addr48(nic->mac_addr, reply.sender_hw_addr); @@ -89,5 +89,5 @@ addr48(packet.sender_hw_addr, reply.target_hw_addr); reply.target_proto_addr = packet.sender_proto_addr; - + arp_send_packet(nic, &reply); } @@ -106,7 +106,7 @@ if (rc == EOK) return EOK; - + arp_eth_packet_t packet; - + packet.opcode = aop_request; addr48(nic->mac_addr, packet.sender_hw_addr); @@ -114,9 +114,9 @@ addr48(addr48_broadcast, packet.target_hw_addr); packet.target_proto_addr = ip_addr; - + rc = arp_send_packet(nic, &packet); if (rc != EOK) return rc; - + return atrans_lookup_timeout(ip_addr, ARP_REQUEST_TIMEOUT, mac_addr); } Index: uspace/srv/net/ethip/ethip.c =================================================================== --- uspace/srv/net/ethip/ethip.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/ethip/ethip.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -80,5 +80,5 @@ { async_set_fallback_port_handler(ethip_client_conn, NULL); - + errno_t rc = loc_server_register(NAME); if (rc != EOK) { @@ -86,9 +86,9 @@ return rc; } - + rc = ethip_nic_discovery_start(); if (rc != EOK) return rc; - + return EOK; } @@ -173,8 +173,8 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send()"); - + ethip_nic_t *nic = (ethip_nic_t *) srv->arg; eth_frame_t frame; - + errno_t rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest); if (rc != EOK) { @@ -183,10 +183,10 @@ return rc; } - + addr48(nic->mac_addr, frame.src); frame.etype_len = ETYPE_IP; frame.data = sdu->data; frame.size = sdu->size; - + void *data; size_t size; @@ -194,8 +194,8 @@ if (rc != EOK) return rc; - + rc = ethip_nic_send(nic, data, size); free(data); - + return rc; } @@ -204,8 +204,8 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send6()"); - + ethip_nic_t *nic = (ethip_nic_t *) srv->arg; eth_frame_t frame; - + addr48(sdu->dest, frame.dest); addr48(nic->mac_addr, frame.src); @@ -213,5 +213,5 @@ frame.data = sdu->data; frame.size = sdu->size; - + void *data; size_t size; @@ -219,8 +219,8 @@ if (rc != EOK) return rc; - + rc = ethip_nic_send(nic, data, size); free(data); - + return rc; } @@ -230,7 +230,7 @@ log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_received(): srv=%p", srv); ethip_nic_t *nic = (ethip_nic_t *) srv->arg; - + log_msg(LOG_DEFAULT, LVL_DEBUG, " - eth_pdu_decode"); - + eth_frame_t frame; errno_t rc = eth_pdu_decode(data, size, &frame); @@ -239,7 +239,7 @@ return rc; } - + iplink_recv_sdu_t sdu; - + switch (frame.etype_len) { case ETYPE_ARP: @@ -264,5 +264,5 @@ frame.etype_len); } - + free(frame.data); return rc; @@ -279,8 +279,8 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mac48()"); - + ethip_nic_t *nic = (ethip_nic_t *) srv->arg; addr48(nic->mac_addr, *mac); - + return EOK; } @@ -289,8 +289,8 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_set_mac48()"); - + ethip_nic_t *nic = (ethip_nic_t *) srv->arg; addr48(*mac, nic->mac_addr); - + return EOK; } @@ -299,5 +299,5 @@ { ethip_nic_t *nic = (ethip_nic_t *) srv->arg; - + return ethip_nic_addr_add(nic, addr); } @@ -306,5 +306,5 @@ { ethip_nic_t *nic = (ethip_nic_t *) srv->arg; - + return ethip_nic_addr_remove(nic, addr); } Index: uspace/srv/net/ethip/ethip.h =================================================================== --- uspace/srv/net/ethip/ethip.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/ethip/ethip.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -62,5 +62,5 @@ /** MAC address */ addr48_t mac_addr; - + /** * List of IP addresses configured on this link Index: uspace/srv/net/ethip/ethip_nic.c =================================================================== --- uspace/srv/net/ethip/ethip_nic.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/ethip/ethip_nic.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -112,8 +112,8 @@ return NULL; } - + link_initialize(&nic->link); list_initialize(&nic->addr_list); - + return nic; } @@ -127,8 +127,8 @@ return NULL; } - + link_initialize(&laddr->link); laddr->addr = *addr; - + return laddr; } @@ -138,5 +138,5 @@ if (nic->svc_name != NULL) free(nic->svc_name); - + free(nic); } @@ -151,10 +151,10 @@ bool in_list = false; nic_address_t nic_address; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_open()"); ethip_nic_t *nic = ethip_nic_new(); if (nic == NULL) return ENOMEM; - + errno_t rc = loc_service_get_name(sid, &nic->svc_name); if (rc != EOK) { @@ -162,5 +162,5 @@ goto error; } - + nic->sess = loc_service_connect(sid, INTERFACE_DDF, 0); if (nic->sess == NULL) { @@ -168,7 +168,7 @@ goto error; } - + nic->svc_id = sid; - + rc = nic_callback_create(nic->sess, ethip_nic_cb_conn, nic); if (rc != EOK) { @@ -192,5 +192,5 @@ goto error; } - + addr48(nic_address.address, nic->mac_addr); @@ -216,8 +216,8 @@ if (in_list) list_remove(&nic->link); - + if (nic->sess != NULL) async_hangup(nic->sess); - + ethip_nic_delete(nic); return rc; @@ -332,5 +332,5 @@ return rc; } - + return ethip_nic_check_new(); } @@ -371,9 +371,9 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_setup_multicast()"); - + /* Count the number of multicast addresses */ - + size_t count = 0; - + list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) { ip_ver_t ver = inet_addr_get(&laddr->addr, NULL, NULL); @@ -381,17 +381,17 @@ count++; } - + if (count == 0) return nic_multicast_set_mode(nic->sess, NIC_MULTICAST_BLOCKED, NULL, 0); - + nic_address_t *mac_list = calloc(count, sizeof(nic_address_t)); if (mac_list == NULL) return ENOMEM; - + /* Create the multicast MAC list */ - + size_t i = 0; - + list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) { addr128_t v6; @@ -399,14 +399,14 @@ if (ver != ip_v6) continue; - + assert(i < count); - + addr48_t mac; addr48_solicited_node(v6, mac); - + /* Avoid duplicate addresses in the list */ - + bool found = false; - + for (size_t j = 0; j < i; j++) { if (addr48_compare(mac_list[j].address, mac)) { @@ -415,5 +415,5 @@ } } - + if (!found) { addr48(mac, mac_list[i].address); @@ -422,10 +422,10 @@ count--; } - + /* Setup the multicast MAC list */ - + errno_t rc = nic_multicast_set_mode(nic->sess, NIC_MULTICAST_LIST, mac_list, count); - + free(mac_list); return rc; @@ -435,11 +435,11 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_add()"); - + ethip_link_addr_t *laddr = ethip_nic_addr_new(addr); if (laddr == NULL) return ENOMEM; - + list_append(&laddr->link, &nic->addr_list); - + return ethip_nic_setup_multicast(nic); } @@ -448,12 +448,12 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_remove()"); - + ethip_link_addr_t *laddr = ethip_nic_addr_find(nic, addr); if (laddr == NULL) return ENOENT; - + list_remove(&laddr->link); ethip_link_addr_delete(laddr); - + return ethip_nic_setup_multicast(nic); } @@ -463,10 +463,10 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()"); - + list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) { if (inet_addr_compare(addr, &laddr->addr)) return laddr; } - + return NULL; } Index: uspace/srv/net/inetsrv/addrobj.c =================================================================== --- uspace/srv/net/inetsrv/addrobj.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/addrobj.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -113,5 +113,5 @@ { fibril_mutex_lock(&addr_list_lock); - + list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) { switch (find) { @@ -134,8 +134,8 @@ } } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: Not found"); fibril_mutex_unlock(&addr_list_lock); - + return NULL; } Index: uspace/srv/net/inetsrv/icmpv6.c =================================================================== --- uspace/srv/net/inetsrv/icmpv6.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/icmpv6.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -50,32 +50,32 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv_echo_request()"); - + if (dgram->size < sizeof(icmpv6_message_t)) return EINVAL; - + icmpv6_message_t *request = (icmpv6_message_t *) dgram->data; size_t size = dgram->size; - + addr128_t src_v6; ip_ver_t src_ver = inet_addr_get(&dgram->src, NULL, &src_v6); - + addr128_t dest_v6; ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &dest_v6); - + if ((src_ver != dest_ver) || (src_ver != ip_v6)) return EINVAL; - + icmpv6_message_t *reply = calloc(1, size); if (reply == NULL) return ENOMEM; - + memcpy(reply, request, size); - + reply->type = ICMPV6_ECHO_REPLY; reply->code = 0; reply->checksum = 0; - + inet_dgram_t rdgram; - + inet_get_srcaddr(&dgram->src, 0, &rdgram.src); rdgram.dest = dgram->src; @@ -84,7 +84,7 @@ rdgram.data = reply; rdgram.size = size; - + icmpv6_phdr_t phdr; - + host2addr128_t_be(dest_v6, phdr.src_addr); host2addr128_t_be(src_v6, phdr.dest_addr); @@ -92,18 +92,18 @@ memset(phdr.zeroes, 0, 3); phdr.next = IP_PROTO_ICMPV6; - + uint16_t cs_phdr = inet_checksum_calc(INET_CHECKSUM_INIT, &phdr, sizeof(icmpv6_phdr_t)); - + uint16_t cs_all = inet_checksum_calc(cs_phdr, reply, size); - + reply->checksum = host2uint16_t_be(cs_all); - + errno_t rc = inet_route_packet(&rdgram, IP_PROTO_ICMPV6, INET6_HOP_LIMIT_MAX, 0); - + free(reply); - + return rc; } @@ -112,21 +112,21 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv_echo_reply()"); - + if (dgram->size < sizeof(icmpv6_message_t)) return EINVAL; - + inetping_sdu_t sdu; - + sdu.src = dgram->src; sdu.dest = dgram->dest; - + icmpv6_message_t *reply = (icmpv6_message_t *) dgram->data; - + sdu.seq_no = uint16_t_be2host(reply->un.echo.seq_no); sdu.data = reply + sizeof(icmpv6_message_t); sdu.size = dgram->size - sizeof(icmpv6_message_t); - + uint16_t ident = uint16_t_be2host(reply->un.echo.ident); - + return inetping_recv(ident, &sdu); } @@ -135,10 +135,10 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv()"); - + if (dgram->size < 1) return EINVAL; - + uint8_t type = *(uint8_t *) dgram->data; - + switch (type) { case ICMPV6_ECHO_REQUEST: @@ -153,5 +153,5 @@ break; } - + return EINVAL; } @@ -163,7 +163,7 @@ if (rdata == NULL) return ENOMEM; - + icmpv6_message_t *request = (icmpv6_message_t *) rdata; - + request->type = ICMPV6_ECHO_REQUEST; request->code = 0; @@ -171,9 +171,9 @@ request->un.echo.ident = host2uint16_t_be(ident); request->un.echo.seq_no = host2uint16_t_be(sdu->seq_no); - + memcpy(rdata + sizeof(icmpv6_message_t), sdu->data, sdu->size); - + inet_dgram_t dgram; - + dgram.src = sdu->src; dgram.dest = sdu->dest; @@ -182,10 +182,10 @@ dgram.data = rdata; dgram.size = rsize; - + icmpv6_phdr_t phdr; - + assert(sdu->src.version == ip_v6); assert(sdu->dest.version == ip_v6); - + host2addr128_t_be(sdu->src.addr6, phdr.src_addr); host2addr128_t_be(sdu->dest.addr6, phdr.dest_addr); @@ -193,18 +193,18 @@ memset(phdr.zeroes, 0, 3); phdr.next = IP_PROTO_ICMPV6; - + uint16_t cs_phdr = inet_checksum_calc(INET_CHECKSUM_INIT, &phdr, sizeof(icmpv6_phdr_t)); - + uint16_t cs_all = inet_checksum_calc(cs_phdr, rdata, rsize); - + request->checksum = host2uint16_t_be(cs_all); - + errno_t rc = inet_route_packet(&dgram, IP_PROTO_ICMPV6, INET6_HOP_LIMIT_MAX, 0); - + free(rdata); - + return rc; } Index: uspace/srv/net/inetsrv/inet_link.c =================================================================== --- uspace/srv/net/inetsrv/inet_link.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/inet_link.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -154,5 +154,5 @@ if (ilink->svc_name != NULL) free(ilink->svc_name); - + free(ilink); } @@ -197,5 +197,5 @@ goto error; } - + /* * Get the MAC address of the link. If the link has a MAC @@ -221,17 +221,17 @@ inet_addrobj_t *addr = NULL; - + /* XXX FIXME Cannot rely on loopback being the first IP link service!! */ if (first_link) { addr = inet_addrobj_new(); - + inet_naddr(&addr->naddr, 127, 0, 0, 1, 24); first_link = false; } - + if (addr != NULL) { addr->ilink = ilink; addr->name = str_dup("v4a"); - + rc = inet_addrobj_add(addr); if (rc == EOK) { @@ -249,25 +249,25 @@ } } - + inet_addrobj_t *addr6 = NULL; - + if (first_link6) { addr6 = inet_addrobj_new(); - + inet_naddr6(&addr6->naddr, 0, 0, 0, 0, 0, 0, 0, 1, 128); first_link6 = false; } else if (ilink->mac_valid) { addr6 = inet_addrobj_new(); - + addr128_t link_local; inet_link_local_node_ip(ilink->mac, link_local); - + inet_naddr_set6(link_local, 64, &addr6->naddr); } - + if (addr6 != NULL) { addr6->ilink = ilink; addr6->name = str_dup("v6a"); - + rc = inet_addrobj_add(addr6); if (rc == EOK) { @@ -285,12 +285,12 @@ } } - + log_msg(LOG_DEFAULT, LVL_DEBUG, "Configured link '%s'.", ilink->svc_name); return EOK; - + error: if (ilink->iplink != NULL) iplink_close(ilink->iplink); - + inet_link_delete(ilink); return rc; @@ -319,22 +319,22 @@ if (src_ver != ip_v4) return EINVAL; - + addr32_t dest_v4; ip_ver_t dest_ver = inet_addr_get(&dgram->dest, &dest_v4, NULL); if (dest_ver != ip_v4) return EINVAL; - + /* * Fill packet structure. Fragmentation is performed by * inet_pdu_encode(). */ - + iplink_sdu_t sdu; - + sdu.src = lsrc; sdu.dest = ldest; - + inet_packet_t packet; - + packet.src = dgram->src; packet.dest = dgram->dest; @@ -342,20 +342,20 @@ packet.proto = proto; packet.ttl = ttl; - + /* Allocate identifier */ fibril_mutex_lock(&ip_ident_lock); packet.ident = ++ip_ident; fibril_mutex_unlock(&ip_ident_lock); - + packet.df = df; packet.data = dgram->data; packet.size = dgram->size; - + errno_t rc; size_t offs = 0; - + do { /* Encode one fragment */ - + size_t roffs; rc = inet_pdu_encode(&packet, src_v4, dest_v4, offs, ilink->def_mtu, @@ -363,12 +363,12 @@ if (rc != EOK) return rc; - + /* Send the PDU */ rc = iplink_send(ilink->iplink, &sdu); - + free(sdu.data); offs = roffs; } while (offs < packet.size); - + return rc; } @@ -394,20 +394,20 @@ if (src_ver != ip_v6) return EINVAL; - + addr128_t dest_v6; ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &dest_v6); if (dest_ver != ip_v6) return EINVAL; - + iplink_sdu6_t sdu6; addr48(ldest, sdu6.dest); - + /* * Fill packet structure. Fragmentation is performed by * inet_pdu_encode6(). */ - + inet_packet_t packet; - + packet.src = dgram->src; packet.dest = dgram->dest; @@ -415,20 +415,20 @@ packet.proto = proto; packet.ttl = ttl; - + /* Allocate identifier */ fibril_mutex_lock(&ip_ident_lock); packet.ident = ++ip_ident; fibril_mutex_unlock(&ip_ident_lock); - + packet.df = df; packet.data = dgram->data; packet.size = dgram->size; - + errno_t rc; size_t offs = 0; - + do { /* Encode one fragment */ - + size_t roffs; rc = inet_pdu_encode6(&packet, src_v6, dest_v6, offs, ilink->def_mtu, @@ -436,12 +436,12 @@ if (rc != EOK) return rc; - + /* Send the PDU */ rc = iplink_send6(ilink->iplink, &sdu6); - + free(sdu6.data); offs = roffs; } while (offs < packet.size); - + return rc; } Index: uspace/srv/net/inetsrv/inetcfg.c =================================================================== --- uspace/srv/net/inetsrv/inetcfg.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/inetcfg.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -257,7 +257,7 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_create_static_srv()"); - + sysarg_t link_id = IPC_GET_ARG1(*icall); - + ipc_callid_t callid; size_t size; @@ -267,5 +267,5 @@ return; } - + if (size != sizeof(inet_naddr_t)) { async_answer_0(callid, EINVAL); @@ -273,5 +273,5 @@ return; } - + inet_naddr_t naddr; errno_t rc = async_data_write_finalize(callid, &naddr, size); @@ -281,5 +281,5 @@ return; } - + char *name; rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN, @@ -289,5 +289,5 @@ return; } - + sysarg_t addr_id = 0; rc = inetcfg_addr_create_static(name, &naddr, link_id, &addr_id); @@ -312,13 +312,13 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_srv()"); - + sysarg_t addr_id = IPC_GET_ARG1(*icall); - + inet_addr_info_t ainfo; - + inet_naddr_any(&ainfo.naddr); ainfo.ilink = 0; ainfo.name = NULL; - + errno_t rc = inetcfg_addr_get(addr_id, &ainfo); if (rc != EOK) { @@ -326,5 +326,5 @@ return; } - + ipc_callid_t callid; size_t size; @@ -334,5 +334,5 @@ return; } - + if (size != sizeof(inet_naddr_t)) { async_answer_0(callid, EINVAL); @@ -340,5 +340,5 @@ return; } - + rc = async_data_read_finalize(callid, &ainfo.naddr, size); if (rc != EOK) { @@ -347,5 +347,5 @@ return; } - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -353,15 +353,15 @@ return; } - + rc = async_data_read_finalize(callid, ainfo.name, min(size, str_size(ainfo.name))); free(ainfo.name); - - if (rc != EOK) { - async_answer_0(callid, rc); - async_answer_0(iid, rc); - return; - } - + + if (rc != EOK) { + async_answer_0(callid, rc); + async_answer_0(iid, rc); + return; + } + async_answer_1(iid, rc, ainfo.ilink); } @@ -584,5 +584,5 @@ return; } - + if (size != sizeof(inet_naddr_t)) { async_answer_0(callid, EINVAL); @@ -590,5 +590,5 @@ return; } - + inet_naddr_t dest; errno_t rc = async_data_write_finalize(callid, &dest, size); @@ -598,5 +598,5 @@ return; } - + if (!async_data_write_receive(&callid, &size)) { async_answer_0(callid, EINVAL); @@ -604,5 +604,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -610,5 +610,5 @@ return; } - + inet_addr_t router; rc = async_data_write_finalize(callid, &router, size); @@ -618,5 +618,5 @@ return; } - + char *name; rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN, @@ -626,5 +626,5 @@ return; } - + sysarg_t sroute_id = 0; rc = inetcfg_sroute_create(name, &dest, &router, &sroute_id); @@ -649,13 +649,13 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_srv()"); - + sysarg_t sroute_id = IPC_GET_ARG1(*icall); - + inet_sroute_info_t srinfo; - + inet_naddr_any(&srinfo.dest); inet_addr_any(&srinfo.router); srinfo.name = NULL; - + errno_t rc = inetcfg_sroute_get(sroute_id, &srinfo); if (rc != EOK) { @@ -663,5 +663,5 @@ return; } - + ipc_callid_t callid; size_t size; @@ -671,5 +671,5 @@ return; } - + if (size != sizeof(inet_naddr_t)) { async_answer_0(callid, EINVAL); @@ -677,5 +677,5 @@ return; } - + rc = async_data_read_finalize(callid, &srinfo.dest, size); if (rc != EOK) { @@ -684,5 +684,5 @@ return; } - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -690,5 +690,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -696,5 +696,5 @@ return; } - + rc = async_data_read_finalize(callid, &srinfo.router, size); if (rc != EOK) { @@ -703,5 +703,5 @@ return; } - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -709,9 +709,9 @@ return; } - + rc = async_data_read_finalize(callid, srinfo.name, min(size, str_size(srinfo.name))); free(srinfo.name); - + async_answer_0(iid, rc); } Index: uspace/srv/net/inetsrv/inetsrv.c =================================================================== --- uspace/srv/net/inetsrv/inetsrv.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/inetsrv.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -87,5 +87,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()"); - + port_id_t port; errno_t rc = async_create_port(INTERFACE_INET, @@ -93,15 +93,15 @@ if (rc != EOK) return rc; - + rc = async_create_port(INTERFACE_INETCFG, inet_cfg_conn, NULL, &port); if (rc != EOK) return rc; - + rc = async_create_port(INTERFACE_INETPING, inetping_conn, NULL, &port); if (rc != EOK) return rc; - + rc = loc_server_register(NAME); if (rc != EOK) { @@ -109,5 +109,5 @@ return EEXIST; } - + service_id_t sid; rc = loc_service_register(SERVICE_NAME_INET, &sid); @@ -116,5 +116,5 @@ return EEXIST; } - + return EOK; } @@ -234,7 +234,7 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srcaddr_srv()"); - + uint8_t tos = IPC_GET_ARG1(*icall); - + ipc_callid_t callid; size_t size; @@ -244,5 +244,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -250,5 +250,5 @@ return; } - + inet_addr_t remote; errno_t rc = async_data_write_finalize(callid, &remote, size); @@ -257,5 +257,5 @@ async_answer_0(iid, rc); } - + inet_addr_t local; rc = inet_get_srcaddr(&remote, tos, &local); @@ -264,5 +264,5 @@ return; } - + if (!async_data_read_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -270,5 +270,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -276,5 +276,5 @@ return; } - + rc = async_data_read_finalize(callid, &local, size); if (rc != EOK) { @@ -283,5 +283,5 @@ return; } - + async_answer_0(iid, rc); } @@ -291,13 +291,13 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_send_srv()"); - + inet_dgram_t dgram; - + dgram.iplink = IPC_GET_ARG1(*icall); dgram.tos = IPC_GET_ARG2(*icall); - + uint8_t ttl = IPC_GET_ARG3(*icall); int df = IPC_GET_ARG4(*icall); - + ipc_callid_t callid; size_t size; @@ -307,5 +307,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -313,5 +313,5 @@ return; } - + errno_t rc = async_data_write_finalize(callid, &dgram.src, size); if (rc != EOK) { @@ -319,5 +319,5 @@ async_answer_0(iid, rc); } - + if (!async_data_write_receive(&callid, &size)) { async_answer_0(callid, EREFUSED); @@ -325,5 +325,5 @@ return; } - + if (size != sizeof(inet_addr_t)) { async_answer_0(callid, EINVAL); @@ -331,5 +331,5 @@ return; } - + rc = async_data_write_finalize(callid, &dgram.dest, size); if (rc != EOK) { @@ -337,5 +337,5 @@ async_answer_0(iid, rc); } - + rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size); @@ -344,7 +344,7 @@ return; } - + rc = inet_send(client, &dgram, client->protocol, ttl, df); - + free(dgram.data); async_answer_0(iid, rc); Index: uspace/srv/net/inetsrv/ndp.c =================================================================== --- uspace/srv/net/inetsrv/ndp.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/ndp.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -68,10 +68,10 @@ inet_dgram_t dgram; ndp_pdu_encode(packet, &dgram); - + inet_link_send_dgram6(link, packet->target_hw_addr, &dgram, IP_PROTO_ICMPV6, INET6_HOP_LIMIT_MAX, 0); - + free(dgram.data); - + return EOK; } @@ -86,21 +86,21 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "ndp_received()"); - + ndp_packet_t packet; errno_t rc = ndp_pdu_decode(dgram, &packet); if (rc != EOK) return rc; - + inet_addr_t sender; inet_addr_set6(packet.sender_proto_addr, &sender); - + inet_addr_t target; inet_addr_set6(packet.target_proto_addr, &target); - + inet_addrobj_t *laddr; - + log_msg(LOG_DEFAULT, LVL_DEBUG, "NDP PDU decoded; opcode: %d", packet.opcode); - + switch (packet.opcode) { case ICMPV6_NEIGHBOUR_SOLICITATION: @@ -111,7 +111,7 @@ if (rc != EOK) return rc; - + ndp_packet_t reply; - + reply.opcode = ICMPV6_NEIGHBOUR_ADVERTISEMENT; addr48(laddr->ilink->mac, reply.sender_hw_addr); @@ -119,8 +119,8 @@ addr48(packet.sender_hw_addr, reply.target_hw_addr); addr128(packet.sender_proto_addr, reply.target_proto_addr); - + ndp_send_packet(laddr->ilink, &reply); } - + break; case ICMPV6_NEIGHBOUR_ADVERTISEMENT: @@ -129,5 +129,5 @@ return ntrans_add(packet.sender_proto_addr, packet.sender_hw_addr); - + break; case ICMPV6_ROUTER_ADVERTISEMENT: @@ -136,5 +136,5 @@ return ENOTSUP; } - + return EOK; } @@ -159,11 +159,11 @@ return EOK; } - + errno_t rc = ntrans_lookup(ip_addr, mac_addr); if (rc == EOK) return EOK; - + ndp_packet_t packet; - + packet.opcode = ICMPV6_NEIGHBOUR_SOLICITATION; addr48(ilink->mac, packet.sender_hw_addr); @@ -172,11 +172,11 @@ addr48_solicited_node(ip_addr, packet.target_hw_addr); ndp_solicited_node_ip(ip_addr, packet.target_proto_addr); - + rc = ndp_send_packet(ilink, &packet); if (rc != EOK) return rc; - + (void) ntrans_wait_timeout(NDP_REQUEST_TIMEOUT); - + return ntrans_lookup(ip_addr, mac_addr); } Index: uspace/srv/net/inetsrv/ntrans.c =================================================================== --- uspace/srv/net/inetsrv/ntrans.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/ntrans.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -142,5 +142,5 @@ return ENOENT; } - + fibril_mutex_unlock(&ntrans_list_lock); addr48(ntrans->mac_addr, mac_addr); @@ -162,5 +162,5 @@ timeout); fibril_mutex_unlock(&ntrans_list_lock); - + return rc; } Index: uspace/srv/net/inetsrv/pdu.c =================================================================== --- uspace/srv/net/inetsrv/pdu.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/pdu.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -107,33 +107,33 @@ /* Upper bound for fragment offset field */ size_t fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l + 1); - + /* Verify that total size of datagram is within reasonable bounds */ if (packet->size > FRAG_OFFS_UNIT * fragoff_limit) return ELIMIT; - + size_t hdr_size = sizeof(ip_header_t); if (hdr_size >= mtu) return EINVAL; - + assert(hdr_size % 4 == 0); assert(offs % FRAG_OFFS_UNIT == 0); assert(offs / FRAG_OFFS_UNIT < fragoff_limit); - + /* Value for the fragment offset field */ uint16_t foff = offs / FRAG_OFFS_UNIT; - + /* Amount of space in the PDU available for payload */ size_t spc_avail = mtu - hdr_size; spc_avail -= (spc_avail % FRAG_OFFS_UNIT); - + /* Amount of data (payload) to transfer */ size_t xfer_size = min(packet->size - offs, spc_avail); - + /* Total PDU size */ size_t size = hdr_size + xfer_size; - + /* Offset of remaining payload */ size_t rem_offs = offs + xfer_size; - + /* Flags */ uint16_t flags_foff = @@ -141,12 +141,12 @@ (rem_offs < packet->size ? BIT_V(uint16_t, FF_FLAG_MF) : 0) + (foff << FF_FRAGOFF_l); - + void *data = calloc(size, 1); if (data == NULL) return ENOMEM; - + /* Encode header fields */ ip_header_t *hdr = (ip_header_t *) data; - + hdr->ver_ihl = (4 << VI_VERSION_l) | (hdr_size / sizeof(uint32_t)); @@ -160,17 +160,17 @@ hdr->src_addr = host2uint32_t_be(src); hdr->dest_addr = host2uint32_t_be(dest); - + /* Compute checksum */ uint16_t chksum = inet_checksum_calc(INET_CHECKSUM_INIT, (void *) hdr, hdr_size); hdr->chksum = host2uint16_t_be(chksum); - + /* Copy payload */ memcpy((uint8_t *) data + hdr_size, packet->data + offs, xfer_size); - + *rdata = data; *rsize = size; *roffs = rem_offs; - + return EOK; } @@ -200,12 +200,12 @@ if (mtu < 1280) return ELIMIT; - + /* Upper bound for fragment offset field */ size_t fragoff_limit = 1 << (OF_FRAGOFF_h - OF_FRAGOFF_l); - + /* Verify that total size of datagram is within reasonable bounds */ if (offs + packet->size > FRAG_OFFS_UNIT * fragoff_limit) return ELIMIT; - + /* Determine whether we need the Fragment extension header */ bool fragment; @@ -214,5 +214,5 @@ else fragment = true; - + size_t hdr_size; if (fragment) @@ -220,59 +220,59 @@ else hdr_size = sizeof(ip6_header_t); - + if (hdr_size >= mtu) return EINVAL; - + static_assert(sizeof(ip6_header_t) % 8 == 0); assert(hdr_size % 8 == 0); assert(offs % FRAG_OFFS_UNIT == 0); assert(offs / FRAG_OFFS_UNIT < fragoff_limit); - + /* Value for the fragment offset field */ uint16_t foff = offs / FRAG_OFFS_UNIT; - + /* Amount of space in the PDU available for payload */ size_t spc_avail = mtu - hdr_size; spc_avail -= (spc_avail % FRAG_OFFS_UNIT); - + /* Amount of data (payload) to transfer */ size_t xfer_size = min(packet->size - offs, spc_avail); - + /* Total PDU size */ size_t size = hdr_size + xfer_size; - + /* Offset of remaining payload */ size_t rem_offs = offs + xfer_size; - + /* Flags */ uint16_t offsmf = (rem_offs < packet->size ? BIT_V(uint16_t, OF_FLAG_M) : 0) + (foff << OF_FRAGOFF_l); - + void *data = calloc(size, 1); if (data == NULL) return ENOMEM; - + /* Encode header fields */ ip6_header_t *hdr6 = (ip6_header_t *) data; - + hdr6->ver_tc = (6 << (VI_VERSION_l)); memset(hdr6->tc_fl, 0, 3); hdr6->hop_limit = packet->ttl; - + host2addr128_t_be(src, hdr6->src_addr); host2addr128_t_be(dest, hdr6->dest_addr); - + /* Optionally encode Fragment extension header fields */ if (fragment) { assert(offsmf != 0); - + hdr6->payload_len = host2uint16_t_be(packet->size + sizeof(ip6_header_fragment_t)); hdr6->next = IP6_NEXT_FRAGMENT; - + ip6_header_fragment_t *hdr6f = (ip6_header_fragment_t *) (hdr6 + 1); - + hdr6f->next = packet->proto; hdr6f->reserved = 0; @@ -281,16 +281,16 @@ } else { assert(offsmf == 0); - + hdr6->payload_len = host2uint16_t_be(packet->size); hdr6->next = packet->proto; } - + /* Copy payload */ memcpy((uint8_t *) data + hdr_size, packet->data + offs, xfer_size); - + *rdata = data; *rsize = size; *roffs = rem_offs; - + return EOK; } @@ -312,12 +312,12 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_pdu_decode()"); - + if (size < sizeof(ip_header_t)) { log_msg(LOG_DEFAULT, LVL_DEBUG, "PDU too short (%zu)", size); return EINVAL; } - + ip_header_t *hdr = (ip_header_t *) data; - + uint8_t version = BIT_RANGE_EXTRACT(uint8_t, VI_VERSION_h, VI_VERSION_l, hdr->ver_ihl); @@ -326,5 +326,5 @@ return EINVAL; } - + size_t tot_len = uint16_t_be2host(hdr->tot_len); if (tot_len < sizeof(ip_header_t)) { @@ -332,5 +332,5 @@ return EINVAL; } - + if (tot_len > size) { log_msg(LOG_DEFAULT, LVL_DEBUG, "Total Length = %zu > PDU size = %zu", @@ -338,5 +338,5 @@ return EINVAL; } - + uint16_t ident = uint16_t_be2host(hdr->id); uint16_t flags_foff = uint16_t_be2host(hdr->flags_foff); @@ -344,5 +344,5 @@ flags_foff); /* XXX Checksum */ - + inet_addr_set(uint32_t_be2host(hdr->src_addr), &packet->src); inet_addr_set(uint32_t_be2host(hdr->dest_addr), &packet->dest); @@ -351,13 +351,13 @@ packet->ttl = hdr->ttl; packet->ident = ident; - + packet->df = (flags_foff & BIT_V(uint16_t, FF_FLAG_DF)) != 0; packet->mf = (flags_foff & BIT_V(uint16_t, FF_FLAG_MF)) != 0; packet->offs = foff * FRAG_OFFS_UNIT; - + /* XXX IP options */ size_t data_offs = sizeof(uint32_t) * BIT_RANGE_EXTRACT(uint8_t, VI_IHL_h, VI_IHL_l, hdr->ver_ihl); - + packet->size = tot_len - data_offs; packet->data = calloc(packet->size, 1); @@ -366,8 +366,8 @@ return ENOMEM; } - + memcpy(packet->data, (uint8_t *) data + data_offs, packet->size); packet->link_id = link_id; - + return EOK; } @@ -389,12 +389,12 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_pdu_decode6()"); - + if (size < sizeof(ip6_header_t)) { log_msg(LOG_DEFAULT, LVL_DEBUG, "PDU too short (%zu)", size); return EINVAL; } - + ip6_header_t *hdr6 = (ip6_header_t *) data; - + uint8_t version = BIT_RANGE_EXTRACT(uint8_t, VI_VERSION_h, VI_VERSION_l, hdr6->ver_tc); @@ -403,5 +403,5 @@ return EINVAL; } - + size_t payload_len = uint16_t_be2host(hdr6->payload_len); if (payload_len + sizeof(ip6_header_t) > size) { @@ -410,5 +410,5 @@ return EINVAL; } - + uint32_t ident; uint16_t offsmf; @@ -416,10 +416,10 @@ uint16_t next; size_t data_offs = sizeof(ip6_header_t); - + /* Fragment extension header */ if (hdr6->next == IP6_NEXT_FRAGMENT) { ip6_header_fragment_t *hdr6f = (ip6_header_fragment_t *) (hdr6 + 1); - + ident = uint32_t_be2host(hdr6f->id); offsmf = uint16_t_be2host(hdr6f->offsmf); @@ -435,23 +435,23 @@ next = hdr6->next; } - + addr128_t src; addr128_t dest; - + addr128_t_be2host(hdr6->src_addr, src); inet_addr_set6(src, &packet->src); - + addr128_t_be2host(hdr6->dest_addr, dest); inet_addr_set6(dest, &packet->dest); - + packet->tos = 0; packet->proto = next; packet->ttl = hdr6->hop_limit; packet->ident = ident; - + packet->df = 1; packet->mf = (offsmf & BIT_V(uint16_t, OF_FLAG_M)) != 0; packet->offs = foff * FRAG_OFFS_UNIT; - + packet->size = payload_len; packet->data = calloc(packet->size, 1); @@ -460,5 +460,5 @@ return ENOMEM; } - + memcpy(packet->data, (uint8_t *) data + data_offs, packet->size); packet->link_id = link_id; @@ -480,17 +480,17 @@ dgram->tos = 0; dgram->size = sizeof(icmpv6_message_t) + sizeof(ndp_message_t); - + dgram->data = calloc(1, dgram->size); if (dgram->data == NULL) return ENOMEM; - + icmpv6_message_t *icmpv6 = (icmpv6_message_t *) dgram->data; - + icmpv6->type = ndp->opcode; icmpv6->code = 0; memset(icmpv6->un.ndp.reserved, 0, 3); - + ndp_message_t *message = (ndp_message_t *) (icmpv6 + 1); - + if (ndp->opcode == ICMPV6_NEIGHBOUR_SOLICITATION) { host2addr128_t_be(ndp->solicited_ip, message->target_address); @@ -502,10 +502,10 @@ icmpv6->un.ndp.flags = NDP_FLAG_OVERRIDE | NDP_FLAG_SOLICITED; } - + message->length = 1; addr48(ndp->sender_hw_addr, message->mac); - + icmpv6_phdr_t phdr; - + host2addr128_t_be(ndp->sender_proto_addr, phdr.src_addr); host2addr128_t_be(ndp->target_proto_addr, phdr.dest_addr); @@ -513,14 +513,14 @@ memset(phdr.zeroes, 0, 3); phdr.next = IP_PROTO_ICMPV6; - + uint16_t cs_phdr = inet_checksum_calc(INET_CHECKSUM_INIT, &phdr, sizeof(icmpv6_phdr_t)); - + uint16_t cs_all = inet_checksum_calc(cs_phdr, dgram->data, dgram->size); - + icmpv6->checksum = host2uint16_t_be(cs_all); - + return EOK; } @@ -541,17 +541,17 @@ if (src_ver != ip_v6) return EINVAL; - + if (dgram->size < sizeof(icmpv6_message_t) + sizeof(ndp_message_t)) return EINVAL; - + icmpv6_message_t *icmpv6 = (icmpv6_message_t *) dgram->data; - + ndp->opcode = icmpv6->type; - + ndp_message_t *message = (ndp_message_t *) (icmpv6 + 1); - + addr128_t_be2host(message->target_address, ndp->target_proto_addr); addr48(message->mac, ndp->sender_hw_addr); - + return EOK; } Index: uspace/srv/net/inetsrv/sroute.c =================================================================== --- uspace/srv/net/inetsrv/sroute.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/inetsrv/sroute.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -96,37 +96,37 @@ { ip_ver_t addr_ver = inet_addr_get(addr, NULL, NULL); - + inet_sroute_t *best = NULL; uint8_t best_bits = 0; - - fibril_mutex_lock(&sroute_list_lock); - + + fibril_mutex_lock(&sroute_list_lock); + list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) { uint8_t dest_bits; ip_ver_t dest_ver = inet_naddr_get(&sroute->dest, NULL, NULL, &dest_bits); - + /* Skip comparison with different address family */ if (addr_ver != dest_ver) continue; - + /* Look for the most specific route */ if ((best != NULL) && (best_bits >= dest_bits)) continue; - + if (inet_naddr_compare_mask(&sroute->dest, addr)) { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: found candidate %p", sroute); - + best = sroute; best_bits = dest_bits; } } - + if (best == NULL) log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: Not found"); - - fibril_mutex_unlock(&sroute_list_lock); - + + fibril_mutex_unlock(&sroute_list_lock); + return best; } Index: uspace/srv/net/loopip/loopip.c =================================================================== --- uspace/srv/net/loopip/loopip.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/loopip/loopip.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -77,5 +77,5 @@ typedef struct { link_t link; - + /* XXX Version should be part of SDU */ ip_ver_t ver; @@ -90,11 +90,11 @@ rqueue_entry_t *rqe = list_get_instance(link, rqueue_entry_t, link); - + (void) iplink_ev_recv(&loopip_iplink, &rqe->sdu, rqe->ver); - + free(rqe->sdu.data); free(rqe); } - + return 0; } @@ -103,5 +103,5 @@ { async_set_fallback_port_handler(loopip_client_conn, NULL); - + errno_t rc = loc_server_register(NAME); if (rc != EOK) { @@ -109,11 +109,11 @@ return rc; } - + iplink_srv_init(&loopip_iplink); loopip_iplink.ops = &loopip_iplink_ops; loopip_iplink.arg = NULL; - + prodcons_initialize(&loopip_rcv_queue); - + const char *svc_name = "net/loopback"; service_id_t sid; @@ -124,5 +124,5 @@ return rc; } - + category_id_t iplink_cat; rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING); @@ -131,5 +131,5 @@ return rc; } - + rc = loc_service_add_to_cat(sid, iplink_cat); if (rc != EOK) { @@ -138,11 +138,11 @@ return rc; } - + fid_t fid = fibril_create(loopip_recv_fibril, NULL); if (fid == 0) return ENOMEM; - + fibril_add_ready(fid); - + return EOK; } @@ -169,9 +169,9 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_send()"); - + rqueue_entry_t *rqe = calloc(1, sizeof(rqueue_entry_t)); if (rqe == NULL) return ENOMEM; - + /* * Clone SDU @@ -183,13 +183,13 @@ return ENOMEM; } - + memcpy(rqe->sdu.data, sdu->data, sdu->size); rqe->sdu.size = sdu->size; - + /* * Insert to receive queue */ prodcons_produce(&loopip_rcv_queue, &rqe->link); - + return EOK; } @@ -198,9 +198,9 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip6_send()"); - + rqueue_entry_t *rqe = calloc(1, sizeof(rqueue_entry_t)); if (rqe == NULL) return ENOMEM; - + /* * Clone SDU @@ -212,13 +212,13 @@ return ENOMEM; } - + memcpy(rqe->sdu.data, sdu->data, sdu->size); rqe->sdu.size = sdu->size; - + /* * Insert to receive queue */ prodcons_produce(&loopip_rcv_queue, &rqe->link); - + return EOK; } @@ -250,5 +250,5 @@ { printf("%s: HelenOS loopback IP link provider\n", NAME); - + errno_t rc = log_init(NAME); if (rc != EOK) { @@ -256,5 +256,5 @@ return rc; } - + rc = loopip_init(); if (rc != EOK) { @@ -262,9 +262,9 @@ return rc; } - + printf("%s: Accepting connections.\n", NAME); task_retval(0); async_manager(); - + /* Not reached */ return 0; Index: uspace/srv/net/slip/slip.c =================================================================== --- uspace/srv/net/slip/slip.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/net/slip/slip.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -129,8 +129,8 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send()"); - + chardev_t *chardev = (chardev_t *) srv->arg; uint8_t *data = sdu->data; - + /* * Strictly speaking, this is not prescribed by the RFC, but the RFC @@ -139,5 +139,5 @@ */ write_buffered(chardev, SLIP_END); - + for (size_t i = 0; i < sdu->size; i++) { switch (data[i]) { @@ -155,8 +155,8 @@ } } - + write_buffered(chardev, SLIP_END); write_flush(chardev); - + return EOK; } @@ -165,5 +165,5 @@ { log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_send6()"); - + return ENOTSUP; } @@ -272,5 +272,5 @@ break; } - + } Index: uspace/srv/ns/clonable.c =================================================================== --- uspace/srv/ns/clonable.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/ns/clonable.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -84,22 +84,22 @@ return; } - + cs_req_t *csr = list_get_instance(req_link, cs_req_t, link); list_remove(req_link); - + /* Currently we can only handle a single type of clonable service. */ assert(csr->service == SERVICE_LOADER); - + async_answer_0(callid, EOK); - + async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE); if (sess == NULL) async_answer_0(callid, EIO); - + async_exch_t *exch = async_exchange_begin(sess); async_forward_fast(csr->callid, exch, csr->iface, csr->arg3, 0, IPC_FF_NONE); async_exchange_end(exch); - + free(csr); async_hangup(sess); @@ -120,5 +120,5 @@ { assert(service == SERVICE_LOADER); - + cs_req_t *csr = malloc(sizeof(cs_req_t)); if (csr == NULL) { @@ -126,8 +126,8 @@ return; } - + /* Spawn a loader. */ errno_t rc = loader_spawn("loader"); - + if (rc != EOK) { free(csr); @@ -135,5 +135,5 @@ return; } - + link_initialize(&csr->link); csr->service = service; @@ -141,5 +141,5 @@ csr->callid = callid; csr->arg3 = IPC_GET_ARG3(*call); - + /* * We can forward the call only after the server we spawned connects Index: uspace/srv/ns/ns.c =================================================================== --- uspace/srv/ns/ns.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/ns/ns.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -69,25 +69,25 @@ return; } - + async_answer_0(iid, EOK); while (true) { process_pending_conn(); - + callid = async_get_call(&call); if (!IPC_GET_IMETHOD(call)) break; - + task_id_t id; errno_t retval; - + service_t service; sysarg_t phone; - + switch (IPC_GET_IMETHOD(call)) { case NS_REGISTER: service = IPC_GET_ARG1(call); phone = IPC_GET_ARG5(call); - + /* * Server requests service registration. @@ -99,5 +99,5 @@ retval = register_service(service, phone, &call); } - + break; case NS_PING: @@ -120,5 +120,5 @@ break; } - + async_answer_0(callid, retval); } @@ -130,22 +130,22 @@ { printf("%s: HelenOS IPC Naming Service\n", NAME); - + errno_t rc = service_init(); if (rc != EOK) return rc; - + rc = clonable_init(); if (rc != EOK) return rc; - + rc = task_init(); if (rc != EOK) return rc; - + async_set_fallback_port_handler(ns_connection, NULL); - + printf("%s: Accepting connections\n", NAME); async_manager(); - + /* Not reached */ return 0; Index: uspace/srv/ns/service.c =================================================================== --- uspace/srv/ns/service.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/ns/service.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -43,8 +43,8 @@ typedef struct { ht_link_t link; - + /** Service ID */ service_t service; - + /** Session to the service */ async_sess_t *sess; @@ -60,5 +60,5 @@ hashed_service_t *service = hash_table_get_inst(item, hashed_service_t, link); - + return service->service; } @@ -68,5 +68,5 @@ hashed_service_t *service = hash_table_get_inst(item, hashed_service_t, link); - + return service->service == *(service_t *) key; } @@ -102,7 +102,7 @@ return ENOMEM; } - + list_initialize(&pending_conn); - + return EOK; } @@ -116,5 +116,5 @@ if (!link) continue; - + hashed_service_t *hashed_service = hash_table_get_inst(link, hashed_service_t, link); async_exch_t *exch = async_exchange_begin(hashed_service->sess); @@ -122,8 +122,8 @@ pending->arg3, 0, IPC_FF_NONE); async_exchange_end(exch); - + list_remove(&pending->link); free(pending); - + goto loop; } @@ -143,15 +143,15 @@ if (hash_table_find(&service_hash_table, &service)) return EEXIST; - + hashed_service_t *hashed_service = (hashed_service_t *) malloc(sizeof(hashed_service_t)); if (!hashed_service) return ENOMEM; - + hashed_service->service = service; hashed_service->sess = async_callback_receive(EXCHANGE_SERIALIZE); if (hashed_service->sess == NULL) return EIO; - + hash_table_insert(&service_hash_table, &hashed_service->link); return EOK; @@ -174,5 +174,5 @@ sysarg_t flags = IPC_GET_ARG4(*call); errno_t retval; - + ht_link_t *link = hash_table_find(&service_hash_table, &service); if (!link) { @@ -185,5 +185,5 @@ goto out; } - + link_initialize(&pending->link); pending->service = service; @@ -191,13 +191,13 @@ pending->callid = callid; pending->arg3 = arg3; - + list_append(&pending->link, &pending_conn); return; } - + retval = ENOENT; goto out; } - + hashed_service_t *hashed_service = hash_table_get_inst(link, hashed_service_t, link); async_exch_t *exch = async_exchange_begin(hashed_service->sess); @@ -205,5 +205,5 @@ async_exchange_end(exch); return; - + out: async_answer_0(callid, retval); Index: uspace/srv/ns/task.c =================================================================== --- uspace/srv/ns/task.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/ns/task.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -48,5 +48,5 @@ typedef struct { ht_link_t link; - + task_id_t id; /**< Task ID. */ bool finished; /**< Task is done. */ @@ -115,5 +115,5 @@ sysarg_t in_phone_hash = *(sysarg_t*)key; p2i_entry_t *entry = hash_table_get_inst(item, p2i_entry_t, link); - + return (in_phone_hash == entry->in_phone_hash); } @@ -157,10 +157,10 @@ return ENOMEM; } - + if (!hash_table_create(&phone_to_id, 0, 0, &p2i_ops)) { printf(NAME ": No memory available for tasks\n"); return ENOMEM; } - + list_initialize(&pending_wait); return EOK; @@ -171,5 +171,5 @@ { task_exit_t texit; - + loop: list_foreach(pending_wait, link, pending_wait_t, pr) { @@ -177,13 +177,13 @@ if (!link) continue; - + hashed_task_t *ht = hash_table_get_inst(link, hashed_task_t, link); if (!ht->finished) continue; - + texit = ht->have_rval ? TASK_EXIT_NORMAL : TASK_EXIT_UNEXPECTED; async_answer_2(pr->callid, EOK, texit, ht->retval); - + list_remove(&pr->link); free(pr); @@ -197,5 +197,5 @@ hashed_task_t *ht = (link != NULL) ? hash_table_get_inst(link, hashed_task_t, link) : NULL; - + if (ht == NULL) { /* No such task exists. */ @@ -203,5 +203,5 @@ return; } - + if (ht->finished) { task_exit_t texit = ht->have_rval ? TASK_EXIT_NORMAL : @@ -210,5 +210,5 @@ return; } - + /* Add to pending list */ pending_wait_t *pr = @@ -218,5 +218,5 @@ return; } - + link_initialize(&pr->link); pr->id = id; @@ -228,13 +228,13 @@ { task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call)); - + ht_link_t *link = hash_table_find(&phone_to_id, &call->in_phone_hash); if (link != NULL) return EEXIST; - + p2i_entry_t *entry = (p2i_entry_t *) malloc(sizeof(p2i_entry_t)); if (entry == NULL) return ENOMEM; - + hashed_task_t *ht = (hashed_task_t *) malloc(sizeof(hashed_task_t)); if (ht == NULL) { @@ -242,17 +242,17 @@ return ENOMEM; } - + /* * Insert into the phone-to-id map. */ - + entry->in_phone_hash = call->in_phone_hash; entry->id = id; hash_table_insert(&phone_to_id, &entry->link); - + /* * Insert into the main table. */ - + ht->id = id; ht->finished = false; @@ -260,5 +260,5 @@ ht->retval = -1; hash_table_insert(&task_hash_table, &ht->link); - + return EOK; } @@ -269,8 +269,8 @@ if (link == NULL) return ENOENT; - + p2i_entry_t *entry = hash_table_get_inst(link, p2i_entry_t, link); *id = entry->id; - + return EOK; } @@ -279,18 +279,18 @@ { task_id_t id = call->in_task_id; - + ht_link_t *link = hash_table_find(&task_hash_table, &id); hashed_task_t *ht = (link != NULL) ? hash_table_get_inst(link, hashed_task_t, link) : NULL; - + if ((ht == NULL) || (ht->finished)) return EINVAL; - + ht->finished = true; ht->have_rval = true; ht->retval = IPC_GET_ARG1(*call); - + process_pending_wait(); - + return EOK; } @@ -302,8 +302,8 @@ if (rc != EOK) return rc; - + /* Delete from phone-to-id map. */ hash_table_remove(&phone_to_id, &call->in_phone_hash); - + /* Mark task as finished. */ ht_link_t *link = hash_table_find(&task_hash_table, &id); @@ -312,10 +312,10 @@ hashed_task_t *ht = hash_table_get_inst(link, hashed_task_t, link); - + ht->finished = true; - + process_pending_wait(); hash_table_remove(&task_hash_table, &id); - + return EOK; } Index: uspace/srv/taskmon/taskmon.c =================================================================== --- uspace/srv/taskmon/taskmon.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/taskmon/taskmon.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -135,5 +135,5 @@ { printf("%s: Task Monitoring Service\n", NAME); - + #ifdef CONFIG_WRITE_CORE_FILES write_core_files = true; @@ -145,7 +145,7 @@ return -1; } - + async_set_fallback_port_handler(corecfg_client_conn, NULL); - + errno_t rc = loc_server_register(NAME); if (rc != EOK) { @@ -154,5 +154,5 @@ return -1; } - + service_id_t sid; rc = loc_service_register(SERVICE_NAME_CORECFG, &sid); @@ -162,8 +162,8 @@ return -1; } - + task_retval(0); async_manager(); - + return 0; } Index: uspace/srv/vfs/vfs.c =================================================================== --- uspace/srv/vfs/vfs.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/vfs/vfs.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -62,8 +62,8 @@ ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) break; - + switch (IPC_GET_IMETHOD(call)) { case IPC_M_PAGE_IN: @@ -91,5 +91,5 @@ printf("%s: HelenOS VFS server\n", NAME); - + /* * Initialize VFS node hash table. @@ -100,5 +100,5 @@ return ENOMEM; } - + /* * Allocate and initialize the Path Lookup Buffer. @@ -111,5 +111,5 @@ } memset(plb, 0, PLB_SIZE); - + /* * Set client data constructor and destructor. @@ -138,5 +138,5 @@ async_event_task_subscribe(EVENT_TASK_STATE_CHANGE, notification_handler, NULL); - + /* * Register at the naming service. @@ -147,5 +147,5 @@ return rc; } - + /* * Start accepting connections. Index: uspace/srv/vfs/vfs.h =================================================================== --- uspace/srv/vfs/vfs.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/vfs/vfs.h (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -110,5 +110,5 @@ */ unsigned refcnt; - + ht_link_t nh_link; /**< Node hash-table link. */ @@ -121,5 +121,5 @@ */ fibril_rwlock_t contents_rwlock; - + struct _vfs_node *mount; } vfs_node_t; @@ -134,5 +134,5 @@ vfs_node_t *node; - + /** Number of file handles referencing this file. */ unsigned refcnt; Index: uspace/srv/vfs/vfs_file.c =================================================================== --- uspace/srv/vfs/vfs_file.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/vfs/vfs_file.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -94,5 +94,5 @@ (void) _vfs_fd_free(vfs_data, i); } - + free(vfs_data->files); @@ -100,5 +100,5 @@ link_t *lnk; vfs_boxed_handle_t *bh; - + lnk = list_first(&vfs_data->passed_handles); list_remove(lnk); @@ -120,5 +120,5 @@ vfs_data->files = NULL; } - + return vfs_data; } @@ -136,16 +136,16 @@ { assert(!file->refcnt); - + async_exch_t *exch = vfs_exchange_grab(file->node->fs_handle); - + ipc_call_t answer; aid_t msg = async_send_2(exch, VFS_OUT_CLOSE, file->node->service_id, file->node->index, &answer); - + vfs_exchange_release(exch); - + errno_t rc; async_wait_for(msg, &rc); - + return IPC_GET_RETVAL(answer); } @@ -179,5 +179,5 @@ * endpoint FS and drop our reference to the underlying VFS node. */ - + if (file->node != NULL) { if (file->open_read || file->open_write) { @@ -196,5 +196,5 @@ if (!vfs_files_init(vfs_data)) return ENOMEM; - + unsigned int i; if (desc) @@ -202,5 +202,5 @@ else i = 0; - + fibril_mutex_lock(&vfs_data->lock); while (true) { @@ -211,34 +211,34 @@ return ENOMEM; } - - + + memset(vfs_data->files[i], 0, sizeof(vfs_file_t)); - + fibril_mutex_initialize(&vfs_data->files[i]->_lock); fibril_mutex_lock(&vfs_data->files[i]->_lock); vfs_file_addref(vfs_data, vfs_data->files[i]); - + *file = vfs_data->files[i]; vfs_file_addref(vfs_data, *file); - + fibril_mutex_unlock(&vfs_data->lock); *out_fd = (int) i; return EOK; } - + if (desc) { if (i == 0) break; - + i--; } else { if (i == MAX_OPEN_FILES - 1) break; - + i++; } } fibril_mutex_unlock(&vfs_data->lock); - + return EMFILE; } @@ -280,5 +280,5 @@ rc = _vfs_fd_free_locked(vfs_data, fd); fibril_mutex_unlock(&vfs_data->lock); - + return rc; } @@ -319,9 +319,9 @@ (void) _vfs_fd_free_locked(VFS_DATA, fd); assert(FILES[fd] == NULL); - + FILES[fd] = file; vfs_file_addref(VFS_DATA, FILES[fd]); fibril_mutex_unlock(&VFS_DATA->lock); - + return EOK; } @@ -330,5 +330,5 @@ { fibril_mutex_unlock(&file->_lock); - + fibril_mutex_lock(&vfs_data->lock); vfs_file_delref(vfs_data, file); @@ -340,5 +340,5 @@ if (!vfs_files_init(vfs_data)) return NULL; - + fibril_mutex_lock(&vfs_data->lock); if ((fd >= 0) && (fd < MAX_OPEN_FILES)) { @@ -347,5 +347,5 @@ vfs_file_addref(vfs_data, file); fibril_mutex_unlock(&vfs_data->lock); - + fibril_mutex_lock(&file->_lock); if (file->node == NULL) { @@ -359,5 +359,5 @@ } fibril_mutex_unlock(&vfs_data->lock); - + return NULL; } @@ -432,5 +432,5 @@ { vfs_client_data_t *vfs_data = VFS_DATA; - + fibril_mutex_lock(&vfs_data->lock); while (list_empty(&vfs_data->passed_handles)) @@ -449,5 +449,5 @@ return rc; } - + file->node = bh->node; file->permissions = bh->permissions; Index: uspace/srv/vfs/vfs_ipc.c =================================================================== --- uspace/srv/vfs/vfs_ipc.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/vfs/vfs_ipc.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -40,5 +40,5 @@ int newfd = IPC_GET_ARG2(*request); bool desc = IPC_GET_ARG3(*request); - + int outfd = -1; errno_t rc = vfs_op_clone(oldfd, newfd, desc, &outfd); @@ -54,5 +54,5 @@ size_t len; errno_t rc; - + /* * Now we expect the client to send us data with the name of the file @@ -65,10 +65,10 @@ return; } - + rc = vfs_op_fsprobe(fs_name, service_id, &info); async_answer_0(rid, rc); if (rc != EOK) goto out; - + /* Now we should get a read request */ if (!async_data_read_receive(&callid, &len)) @@ -114,5 +114,5 @@ { int mpfd = IPC_GET_ARG1(*request); - + /* * We expect the library to do the device-name to device-handle @@ -121,11 +121,11 @@ */ service_id_t service_id = (service_id_t) IPC_GET_ARG2(*request); - + unsigned int flags = (unsigned int) IPC_GET_ARG3(*request); unsigned int instance = IPC_GET_ARG4(*request); - + char *opts = NULL; char *fs_name = NULL; - + /* Now we expect to receive the mount options. */ errno_t rc = async_data_write_accept((void **) &opts, true, 0, @@ -135,5 +135,5 @@ return; } - + /* Now, we expect the client to send us data with the name of the file * system. @@ -146,10 +146,10 @@ return; } - + int outfd = 0; rc = vfs_op_mount(mpfd, service_id, flags, instance, opts, fs_name, &outfd); async_answer_1(rid, rc, outfd); - + free(opts); free(fs_name); @@ -190,30 +190,30 @@ char *new = NULL; errno_t rc; - + basefd = IPC_GET_ARG1(*request); - + /* Retrieve the old path. */ rc = async_data_write_accept((void **) &old, true, 0, 0, 0, NULL); if (rc != EOK) goto out; - + /* Retrieve the new path. */ rc = async_data_write_accept((void **) &new, true, 0, 0, 0, NULL); if (rc != EOK) goto out; - + size_t olen; size_t nlen; char *oldc = canonify(old, &olen); char *newc = canonify(new, &nlen); - + if ((!oldc) || (!newc)) { rc = EINVAL; goto out; } - + assert(oldc[olen] == '\0'); assert(newc[nlen] == '\0'); - + rc = vfs_op_rename(basefd, oldc, newc); @@ -245,5 +245,5 @@ { int fd = (int) IPC_GET_ARG1(*request); - + errno_t rc = vfs_op_statfs(fd); async_answer_0(rid, rc); @@ -261,10 +261,10 @@ int parentfd = IPC_GET_ARG1(*request); int expectfd = IPC_GET_ARG2(*request); - + char *path; errno_t rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL); if (rc == EOK) rc = vfs_op_unlink(parentfd, expectfd, path); - + async_answer_0(rid, rc); } @@ -293,5 +293,5 @@ int parentfd = IPC_GET_ARG1(*request); int flags = IPC_GET_ARG2(*request); - + int fd = 0; char *path; @@ -318,5 +318,5 @@ { bool cont = true; - + /* * The connection was opened via the IPC_CONNECT_ME_TO call. @@ -324,12 +324,12 @@ */ async_answer_0(iid, EOK); - + while (cont) { ipc_call_t call; ipc_callid_t callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) break; - + switch (IPC_GET_IMETHOD(call)) { case VFS_IN_CLONE: @@ -393,5 +393,5 @@ } } - + /* * Open files for this client will be cleaned up when its last Index: uspace/srv/vfs/vfs_lookup.c =================================================================== --- uspace/srv/vfs/vfs_lookup.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/vfs/vfs_lookup.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -108,5 +108,5 @@ */ list_append(&entry->plb_link, &plb_entries); - + fibril_mutex_unlock(&plb_mutex); @@ -116,5 +116,5 @@ size_t cnt1 = min(len, (PLB_SIZE - first) + 1); size_t cnt2 = len - cnt1; - + memcpy(&plb[first], path, cnt1); memcpy(plb, &path[cnt1], cnt2); @@ -145,9 +145,9 @@ assert(child->fs_handle); assert(path != NULL); - + vfs_lookup_res_t res; char component[NAME_MAX + 1]; errno_t rc; - + size_t len; char *npath = canonify(path, &len); @@ -157,7 +157,7 @@ } path = npath; - + vfs_triplet_t *triplet; - + char *slash = str_rchr(path, L'/'); if (slash && slash != path) { @@ -166,13 +166,13 @@ goto out; } - + memcpy(component, slash + 1, str_size(slash)); *slash = 0; - + rc = vfs_lookup_internal(base, path, L_DIRECTORY, &res); if (rc != EOK) goto out; triplet = &res.triplet; - + *slash = '/'; } else { @@ -181,9 +181,9 @@ goto out; } - + memcpy(component, path + 1, str_size(path)); triplet = (vfs_triplet_t *) base; } - + if (triplet->fs_handle != child->fs_handle || triplet->service_id != child->service_id) { @@ -191,9 +191,9 @@ goto out; } - + async_exch_t *exch = vfs_exchange_grab(triplet->fs_handle); aid_t req = async_send_3(exch, VFS_OUT_LINK, triplet->service_id, triplet->index, child->index, NULL); - + rc = async_data_write_start(exch, component, str_size(component) + 1); errno_t orig_rc; @@ -202,5 +202,5 @@ if (orig_rc != EOK) rc = orig_rc; - + out: return rc; @@ -212,5 +212,5 @@ assert(base); assert(result); - + errno_t rc; ipc_call_t answer; @@ -221,12 +221,12 @@ async_wait_for(req, &rc); vfs_exchange_release(exch); - + if (rc != EOK) return rc; - + unsigned last = *pfirst + *plen; *pfirst = IPC_GET_ARG3(answer) & 0xffff; *plen = last - *pfirst; - + result->triplet.fs_handle = (fs_handle_t) IPC_GET_ARG1(answer); result->triplet.service_id = base->service_id; @@ -248,10 +248,10 @@ if (rc != EOK) return rc; - + size_t next = first; size_t nlen = len; - + vfs_lookup_res_t res; - + /* Resolve path as long as there are mount points to cross. */ while (nlen > 0) { @@ -261,13 +261,13 @@ goto out; } - + base = base->mount; } - + rc = out_lookup((vfs_triplet_t *) base, &next, &nlen, lflag, &res); if (rc != EOK) goto out; - + if (nlen > 0) { base = vfs_node_peek(&res); @@ -288,8 +288,8 @@ } } - + assert(nlen == 0); rc = EOK; - + if (result != NULL) { /* The found file may be a mount point. Try to cross it. */ @@ -303,5 +303,5 @@ base = nbase; } - + result->triplet = *((vfs_triplet_t *) base); result->type = base->type; @@ -316,5 +316,5 @@ *result = res; } - + out: plb_clear_entry(&entry, first, len); @@ -339,5 +339,5 @@ assert(base != NULL); assert(path != NULL); - + size_t len; errno_t rc; @@ -348,5 +348,5 @@ } path = npath; - + assert(path[0] == '/'); @@ -367,5 +367,5 @@ char *slash = str_rchr(path, L'/'); vfs_node_t *parent = base; - + if (slash != path) { int tflag = lflag; @@ -392,5 +392,5 @@ rc = _vfs_lookup_internal(base, path, lflag, result, len); } - + return rc; } Index: uspace/srv/vfs/vfs_node.c =================================================================== --- uspace/srv/vfs/vfs_node.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/vfs/vfs_node.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -108,7 +108,7 @@ { bool free_node = false; - - fibril_mutex_lock(&nodes_mutex); - + + fibril_mutex_lock(&nodes_mutex); + node->refcnt--; if (node->refcnt == 0) { @@ -117,11 +117,11 @@ * Remove it from the VFS node hash table. */ - + hash_table_remove_item(&nodes, &node->nh_link); free_node = true; } - - fibril_mutex_unlock(&nodes_mutex); - + + fibril_mutex_unlock(&nodes_mutex); + if (free_node) { /* @@ -129,5 +129,5 @@ * are no more hard links. */ - + async_exch_t *exch = vfs_exchange_grab(node->fs_handle); async_msg_2(exch, VFS_OUT_DESTROY, (sysarg_t) node->service_id, @@ -239,5 +239,5 @@ (node->service_id == rd->service_id)) rd->refcnt += node->refcnt; - + return true; } @@ -268,14 +268,14 @@ { async_exch_t *exch = vfs_exchange_grab(node->fs_handle); - + ipc_call_t answer; aid_t req = async_send_2(exch, VFS_OUT_OPEN_NODE, (sysarg_t) node->service_id, (sysarg_t) node->index, &answer); - + vfs_exchange_release(exch); errno_t rc; async_wait_for(req, &rc); - + return rc; } @@ -311,5 +311,5 @@ .index = node->index }; - + return tri; } Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/vfs/vfs_ops.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -64,11 +64,11 @@ { size_t res = 0; - + while (a[res] == b[res] && a[res] != 0) res++; - + if (a[res] == b[res]) return res; - + res--; while (a[res] != '/') @@ -93,5 +93,5 @@ if (oldfd == newfd) return EOK; - + /* Lookup the file structure corresponding to fd. */ vfs_file_t *oldfile = vfs_file_get(oldfd); @@ -112,10 +112,10 @@ newfile->permissions = oldfile->permissions; vfs_node_addref(newfile->node); - + vfs_file_put(newfile); } } vfs_file_put(oldfile); - + return rc; } @@ -131,12 +131,12 @@ { fs_handle_t fs_handle = 0; - + fibril_mutex_lock(&fs_list_lock); while (true) { fs_handle = fs_name_to_handle(instance, fsname, false); - + if (fs_handle != 0 || !(flags & VFS_MOUNT_BLOCKING)) break; - + fibril_condvar_wait(&fs_list_cv, &fs_list_lock); } @@ -145,5 +145,5 @@ if (fs_handle == 0) return ENOFS; - + /* Tell the mountee that it is being mounted. */ ipc_call_t answer; @@ -164,5 +164,5 @@ return rc; } - + vfs_lookup_res_t res; res.triplet.fs_handle = fs_handle; @@ -172,5 +172,5 @@ IPC_GET_ARG3(answer)); res.type = VFS_NODE_DIRECTORY; - + /* Add reference to the mounted root. */ *root = vfs_node_get(&res); @@ -182,5 +182,5 @@ return ENOMEM; } - + vfs_exchange_release(exch); @@ -194,12 +194,12 @@ errno_t rc; errno_t retval; - + fibril_mutex_lock(&fs_list_lock); fs_handle = fs_name_to_handle(0, fs_name, false); fibril_mutex_unlock(&fs_list_lock); - + if (fs_handle == 0) return ENOFS; - + /* Send probe request to the file system server */ ipc_call_t answer; @@ -209,5 +209,5 @@ if (msg == 0) return EINVAL; - + /* Read probe information */ retval = async_data_read_start(exch, info, sizeof(*info)); @@ -216,5 +216,5 @@ return retval; } - + async_wait_for(msg, &rc); vfs_exchange_release(exch); @@ -229,5 +229,5 @@ vfs_file_t *file = NULL; *out_fd = -1; - + if (!(flags & VFS_MOUNT_CONNECT_ONLY)) { mp = vfs_file_get(mpfd); @@ -236,15 +236,15 @@ goto out; } - + if (mp->node->mount != NULL) { rc = EBUSY; goto out; } - + if (mp->node->type != VFS_NODE_DIRECTORY) { rc = ENOTDIR; goto out; } - + if (vfs_node_has_children(mp->node)) { rc = ENOTEMPTY; @@ -252,5 +252,5 @@ } } - + if (!(flags & VFS_MOUNT_NO_REF)) { rc = vfs_fd_alloc(&file, false, out_fd); @@ -259,7 +259,7 @@ } } - + vfs_node_t *root = NULL; - + fibril_rwlock_write_lock(&namespace_rwlock); @@ -271,15 +271,15 @@ mp->node->mount = root; } - + fibril_rwlock_write_unlock(&namespace_rwlock); - + if (rc != EOK) goto out; - + if (flags & VFS_MOUNT_NO_REF) { vfs_node_delref(root); } else { assert(file != NULL); - + file->node = root; file->permissions = MODE_READ | MODE_WRITE | MODE_APPEND; @@ -287,5 +287,5 @@ file->open_write = false; } - + out: if (mp) @@ -298,5 +298,5 @@ *out_fd = -1; } - + return rc; } @@ -310,24 +310,24 @@ if (!file) return EBADF; - + if ((mode & ~file->permissions) != 0) { vfs_file_put(file); return EPERM; } - + if (file->open_read || file->open_write) { vfs_file_put(file); return EBUSY; } - + file->open_read = (mode & MODE_READ) != 0; file->open_write = (mode & (MODE_WRITE | MODE_APPEND)) != 0; file->append = (mode & MODE_APPEND) != 0; - + if (!file->open_read && !file->open_write) { vfs_file_put(file); return EINVAL; } - + if (file->node->type == VFS_NODE_DIRECTORY && file->open_write) { file->open_read = file->open_write = false; @@ -335,5 +335,5 @@ return EINVAL; } - + errno_t rc = vfs_open_node_remote(file->node); if (rc != EOK) { @@ -342,5 +342,5 @@ return rc; } - + vfs_file_put(file); return EOK; @@ -385,5 +385,5 @@ if (exch == NULL) return ENOENT; - + aid_t msg = async_send_fast(exch, read ? VFS_OUT_READ : VFS_OUT_WRITE, file->node->service_id, file->node->index, LOWER32(pos), @@ -397,8 +397,8 @@ return retval; } - + errno_t rc; async_wait_for(msg, &rc); - + chunk->size = IPC_GET_ARG1(*answer); @@ -418,21 +418,21 @@ * open files supports parallel access! */ - + /* Lookup the file structure corresponding to the file descriptor. */ vfs_file_t *file = vfs_file_get(fd); if (!file) return EBADF; - + if ((read && !file->open_read) || (!read && !file->open_write)) { vfs_file_put(file); return EINVAL; } - + vfs_info_t *fs_info = fs_handle_to_info(file->node->fs_handle); assert(fs_info); - + bool rlock = read || (fs_info->concurrent_read_write && fs_info->write_retains_size); - + /* * Lock the file's node so that no other client can read/write to it at @@ -444,5 +444,5 @@ else fibril_rwlock_write_lock(&file->node->contents_rwlock); - + if (file->node->type == VFS_NODE_DIRECTORY) { /* @@ -450,5 +450,5 @@ * while we are in readdir(). */ - + if (!read) { if (rlock) { @@ -462,13 +462,13 @@ return EINVAL; } - + fibril_rwlock_read_lock(&namespace_rwlock); } - + async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle); - + if (!read && file->append) pos = file->node->size; - + /* * Handle communication with the endpoint FS. @@ -476,10 +476,10 @@ ipc_call_t answer; errno_t rc = ipc_cb(fs_exch, file, pos, &answer, read, ipc_cb_data); - + vfs_exchange_release(fs_exch); - + if (file->node->type == VFS_NODE_DIRECTORY) fibril_rwlock_read_unlock(&namespace_rwlock); - + /* Unlock the VFS node. */ if (rlock) { @@ -493,5 +493,5 @@ fibril_rwlock_write_unlock(&file->node->contents_rwlock); } - + vfs_file_put(file); @@ -518,14 +518,14 @@ vfs_node_addref(base); vfs_file_put(base_file); - + vfs_lookup_res_t base_lr; vfs_lookup_res_t old_lr; vfs_lookup_res_t new_lr_orig; bool orig_unlinked = false; - + errno_t rc; - + size_t shared = shared_path(old, new); - + /* Do not allow one path to be a prefix of the other. */ if (old[shared] == 0 || new[shared] == 0) { @@ -535,7 +535,7 @@ assert(old[shared] == '/'); assert(new[shared] == '/'); - + fibril_rwlock_write_lock(&namespace_rwlock); - + /* Resolve the shared portion of the path first. */ if (shared != 0) { @@ -547,5 +547,5 @@ return rc; } - + vfs_node_put(base); base = vfs_node_get(&base_lr); @@ -565,5 +565,5 @@ return rc; } - + rc = vfs_lookup_internal(base, new, L_UNLINK | L_DISABLE_MOUNTS, &new_lr_orig); @@ -595,5 +595,5 @@ return rc; } - + /* If the node is not held by anyone, try to destroy it. */ if (orig_unlinked) { @@ -604,5 +604,5 @@ vfs_node_put(node); } - + vfs_node_put(base); fibril_rwlock_write_unlock(&namespace_rwlock); @@ -617,10 +617,10 @@ fibril_rwlock_write_lock(&file->node->contents_rwlock); - + errno_t rc = vfs_truncate_internal(file->node->fs_handle, file->node->service_id, file->node->index, size); if (rc == EOK) file->node->size = size; - + fibril_rwlock_write_unlock(&file->node->contents_rwlock); vfs_file_put(file); @@ -640,5 +640,5 @@ node->service_id, node->index, true, 0, NULL); vfs_exchange_release(exch); - + vfs_file_put(file); return rc; @@ -667,20 +667,20 @@ if (!file) return EBADF; - + async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle); - + aid_t msg; ipc_call_t answer; msg = async_send_2(fs_exch, VFS_OUT_SYNC, file->node->service_id, file->node->index, &answer); - + vfs_exchange_release(fs_exch); - + errno_t rc; async_wait_for(msg, &rc); - + vfs_file_put(file); return rc; - + } @@ -693,5 +693,5 @@ UPPER32(size)); vfs_exchange_release(exch); - + return (errno_t) rc; } @@ -702,10 +702,10 @@ vfs_file_t *parent = NULL; vfs_file_t *expect = NULL; - + if (parentfd == expectfd) return EINVAL; - + fibril_rwlock_write_lock(&namespace_rwlock); - + /* * Files are retrieved in order of file descriptors, to prevent @@ -719,5 +719,5 @@ } } - + if (expectfd >= 0) { expect = vfs_file_get(expectfd); @@ -727,5 +727,5 @@ } } - + if (parentfd > expectfd) { parent = vfs_file_get(parentfd); @@ -735,7 +735,7 @@ } } - + assert(parent != NULL); - + if (expectfd >= 0) { vfs_lookup_res_t lr; @@ -743,5 +743,5 @@ if (rc != EOK) goto exit; - + vfs_node_t *found_node = vfs_node_peek(&lr); vfs_node_put(found_node); @@ -750,9 +750,9 @@ goto exit; } - + vfs_file_put(expect); expect = NULL; } - + vfs_lookup_res_t lr; rc = vfs_lookup_internal(parent->node, path, L_UNLINK, &lr); @@ -783,12 +783,12 @@ if (mp == NULL) return EBADF; - + if (mp->node->mount == NULL) { vfs_file_put(mp); return ENOENT; } - + fibril_rwlock_write_lock(&namespace_rwlock); - + /* * Count the total number of references for the mounted file system. We @@ -804,10 +804,10 @@ return EBUSY; } - + async_exch_t *exch = vfs_exchange_grab(mp->node->mount->fs_handle); errno_t rc = async_req_1_0(exch, VFS_OUT_UNMOUNTED, mp->node->mount->service_id); vfs_exchange_release(exch); - + if (rc != EOK) { vfs_file_put(mp); @@ -815,11 +815,11 @@ return rc; } - + vfs_node_forget(mp->node->mount); vfs_node_put(mp->node); mp->node->mount = NULL; - + fibril_rwlock_write_unlock(&namespace_rwlock); - + vfs_file_put(mp); return EOK; @@ -866,11 +866,11 @@ if (!walk_flags_valid(flags)) return EINVAL; - + vfs_file_t *parent = vfs_file_get(parentfd); if (!parent) return EBADF; - + fibril_rwlock_read_lock(&namespace_rwlock); - + vfs_lookup_res_t lr; errno_t rc = vfs_lookup_internal(parent->node, path, @@ -881,5 +881,5 @@ return rc; } - + vfs_node_t *node = vfs_node_get(&lr); if (!node) { @@ -888,5 +888,5 @@ return ENOMEM; } - + vfs_file_t *file; rc = vfs_fd_alloc(&file, false, out_fd); @@ -897,13 +897,13 @@ } assert(file != NULL); - + file->node = node; file->permissions = parent->permissions; file->open_read = false; file->open_write = false; - + vfs_file_put(file); vfs_file_put(parent); - + fibril_rwlock_read_unlock(&namespace_rwlock); Index: uspace/srv/vfs/vfs_register.c =================================================================== --- uspace/srv/vfs/vfs_register.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/srv/vfs/vfs_register.c (revision d5e5fd1214ee9617b9a936d6f09efec4c9a91b48) @@ -71,5 +71,5 @@ { int i; - + /* * Check if the name is non-empty and is composed solely of ASCII @@ -80,5 +80,5 @@ return false; } - + for (i = 1; i < FS_NAME_MAXLEN; i++) { if (!(islower(info->name[i]) || isdigit(info->name[i])) && @@ -93,5 +93,5 @@ } } - + /* * This check is not redundant. It ensures that the name is @@ -102,5 +102,5 @@ return false; } - + return true; } @@ -116,9 +116,9 @@ dprintf("Processing VFS_REGISTER request received from %zx.\n", request->in_phone_hash); - + vfs_info_t *vfs_info; errno_t rc = async_data_write_accept((void **) &vfs_info, false, sizeof(vfs_info_t), sizeof(vfs_info_t), 0, NULL); - + if (rc != EOK) { dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n", @@ -127,5 +127,5 @@ return; } - + /* * Allocate and initialize a buffer for the fs_info structure. @@ -137,11 +137,11 @@ return; } - + link_initialize(&fs_info->fs_link); fs_info->vfs_info = *vfs_info; free(vfs_info); - + dprintf("VFS info delivered.\n"); - + if (!vfs_info_sane(&fs_info->vfs_info)) { free(fs_info); @@ -149,7 +149,7 @@ return; } - + fibril_mutex_lock(&fs_list_lock); - + /* * Check for duplicit registrations. @@ -166,5 +166,5 @@ return; } - + /* * Add fs_info to the list of registered FS's. @@ -172,5 +172,5 @@ dprintf("Inserting FS into the list of registered file systems.\n"); list_append(&fs_info->fs_link, &fs_list); - + /* * Now we want the client to send us the IPC_M_CONNECT_TO_ME call so @@ -187,11 +187,11 @@ return; } - + dprintf("Callback connection to FS created.\n"); - + /* * The client will want us to send him the address space area with PLB. */ - + size_t size; ipc_callid_t callid; @@ -206,5 +206,5 @@ return; } - + /* * We can only send the client address space area PLB_SIZE bytes long. @@ -220,5 +220,5 @@ return; } - + /* * Commit to read-only sharing the PLB with the client. @@ -226,7 +226,7 @@ (void) async_share_in_finalize(callid, plb, AS_AREA_READ | AS_AREA_CACHEABLE); - + dprintf("Sharing PLB.\n"); - + /* * That was it. The FS has been registered. @@ -236,8 +236,8 @@ fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next); async_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle); - + fibril_condvar_broadcast(&fs_list_cv); fibril_mutex_unlock(&fs_list_lock); - + dprintf("\"%.*s\" filesystem successfully registered, handle=%d.\n", FS_NAME_MAXLEN, fs_info->vfs_info.name, fs_info->fs_handle); @@ -260,19 +260,19 @@ */ fibril_mutex_lock(&fs_list_lock); - + list_foreach(fs_list, fs_link, fs_info_t, fs) { if (fs->fs_handle == handle) { fibril_mutex_unlock(&fs_list_lock); - + assert(fs->sess); async_exch_t *exch = async_exchange_begin(fs->sess); - + assert(exch); return exch; } } - + fibril_mutex_unlock(&fs_list_lock); - + return NULL; } @@ -300,8 +300,8 @@ { int handle = 0; - + if (lock) fibril_mutex_lock(&fs_list_lock); - + list_foreach(fs_list, fs_link, fs_info_t, fs) { if (str_cmp(fs->vfs_info.name, name) == 0 && @@ -311,8 +311,8 @@ } } - + if (lock) fibril_mutex_unlock(&fs_list_lock); - + return handle; } @@ -328,5 +328,5 @@ { vfs_info_t *info = NULL; - + fibril_mutex_lock(&fs_list_lock); list_foreach(fs_list, fs_link, fs_info_t, fs) { @@ -337,5 +337,5 @@ } fibril_mutex_unlock(&fs_list_lock); - + return info; } @@ -355,5 +355,5 @@ fibril_mutex_lock(&fs_list_lock); - + size = 0; count = 0; @@ -362,8 +362,8 @@ count++; } - + if (size == 0) size = 1; - + fstypes->buf = calloc(1, size); if (fstypes->buf == NULL) { @@ -371,5 +371,5 @@ return ENOMEM; } - + fstypes->fstypes = calloc(sizeof(char *), count); if (fstypes->fstypes == NULL) { @@ -379,7 +379,7 @@ return ENOMEM; } - + fstypes->size = size; - + size = 0; count = 0; list_foreach(fs_list, fs_link, fs_info_t, fs) {