Index: uspace/srv/bd/ata_bd/ata_bd.c =================================================================== --- uspace/srv/bd/ata_bd/ata_bd.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/bd/ata_bd/ata_bd.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -57,5 +57,5 @@ #include #include -#include +#include #include #include @@ -176,5 +176,5 @@ snprintf(name, 16, "%s/ata%udisk%d", NAMESPACE, ctl_num, i); - rc = devmap_device_register(name, &disk[i].devmap_handle); + rc = loc_service_register(name, &disk[i].service_id); if (rc != EOK) { printf(NAME ": Unable to register device %s.\n", name); @@ -244,5 +244,5 @@ int rc; - rc = devmap_driver_register(NAME, ata_bd_connection); + rc = loc_server_register(NAME, ata_bd_connection); if (rc < 0) { printf(NAME ": Unable to register driver.\n"); @@ -277,5 +277,5 @@ ipc_call_t call; sysarg_t method; - devmap_handle_t dh; + service_id_t dsid; size_t comm_size; /**< Size of the communication area. */ unsigned int flags; @@ -285,11 +285,11 @@ int disk_id, i; - /* Get the device handle. */ - dh = IPC_GET_ARG1(*icall); + /* Get the device service ID. */ + dsid = IPC_GET_ARG1(*icall); /* Determine which disk device is the client connecting to. */ disk_id = -1; for (i = 0; i < MAX_DISKS; i++) - if (disk[i].devmap_handle == dh) + if (disk[i].service_id == dsid) disk_id = i; Index: uspace/srv/bd/ata_bd/ata_bd.h =================================================================== --- uspace/srv/bd/ata_bd/ata_bd.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/bd/ata_bd/ata_bd.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -116,5 +116,5 @@ fibril_mutex_t lock; - devmap_handle_t devmap_handle; + service_id_t service_id; } disk_t; Index: uspace/srv/bd/file_bd/file_bd.c =================================================================== --- uspace/srv/bd/file_bd/file_bd.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/bd/file_bd/file_bd.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -45,5 +45,5 @@ #include #include -#include +#include #include #include @@ -61,5 +61,5 @@ static FILE *img; -static devmap_handle_t devmap_handle; +static service_id_t service_id; static fibril_mutex_t dev_lock; @@ -117,5 +117,5 @@ return -1; - rc = devmap_device_register(device_name, &devmap_handle); + rc = loc_service_register(device_name, &service_id); if (rc != EOK) { printf(NAME ": Unable to register device '%s'.\n", @@ -142,5 +142,5 @@ long img_size; - rc = devmap_driver_register(NAME, file_bd_connection); + rc = loc_server_register(NAME, file_bd_connection); if (rc < 0) { printf(NAME ": Unable to register driver.\n"); Index: uspace/srv/bd/gxe_bd/gxe_bd.c =================================================================== --- uspace/srv/bd/gxe_bd/gxe_bd.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/bd/gxe_bd/gxe_bd.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -43,5 +43,5 @@ #include #include -#include +#include #include #include @@ -92,5 +92,5 @@ static gxe_bd_t *dev; -static devmap_handle_t devmap_handle[MAX_DISKS]; +static service_id_t service_id[MAX_DISKS]; static fibril_mutex_t dev_lock[MAX_DISKS]; @@ -126,5 +126,5 @@ char name[16]; - rc = devmap_driver_register(NAME, gxe_bd_connection); + rc = loc_server_register(NAME, gxe_bd_connection); if (rc < 0) { printf(NAME ": Unable to register driver.\n"); @@ -142,5 +142,5 @@ for (i = 0; i < MAX_DISKS; i++) { snprintf(name, 16, "%s/disk%d", NAMESPACE, i); - rc = devmap_device_register(name, &devmap_handle[i]); + rc = loc_service_register(name, &service_id[i]); if (rc != EOK) { printf(NAME ": Unable to register device %s.\n", name); @@ -159,5 +159,5 @@ ipc_call_t call; sysarg_t method; - devmap_handle_t dh; + service_id_t dsid; unsigned int flags; int retval; @@ -167,10 +167,10 @@ /* Get the device handle. */ - dh = IPC_GET_ARG1(*icall); + dsid = IPC_GET_ARG1(*icall); /* Determine which disk device is the client connecting to. */ disk_id = -1; for (i = 0; i < MAX_DISKS; i++) - if (devmap_handle[i] == dh) + if (service_id[i] == dsid) disk_id = i; Index: uspace/srv/bd/part/guid_part/guid_part.c =================================================================== --- uspace/srv/bd/part/guid_part/guid_part.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/bd/part/guid_part/guid_part.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -51,10 +51,10 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include @@ -81,6 +81,6 @@ /** Number of blocks */ aoff64_t length; - /** Device representing the partition (outbound device) */ - devmap_handle_t dev; + /** Service representing the partition (outbound device) */ + service_id_t dsid; /** Points to next partition structure. */ struct part *next; @@ -90,5 +90,5 @@ /** Partitioned device (inbound device) */ -static devmap_handle_t indev_handle; +static service_id_t indev_sid; /** List of partitions. This structure is an empty head. */ @@ -129,9 +129,9 @@ int i; char *name; - devmap_handle_t dev; + service_id_t dsid; uint64_t size_mb; part_t *part; - rc = devmap_device_get_handle(dev_name, &indev_handle, 0); + rc = loc_service_get_id(dev_name, &indev_sid, 0); if (rc != EOK) { printf(NAME ": could not resolve device `%s'.\n", dev_name); @@ -139,5 +139,5 @@ } - rc = block_init(EXCHANGE_SERIALIZE, indev_handle, 2048); + rc = block_init(EXCHANGE_SERIALIZE, indev_sid, 2048); if (rc != EOK) { printf(NAME ": could not init libblock.\n"); @@ -147,5 +147,5 @@ /* Determine and verify block size. */ - rc = block_get_bsize(indev_handle, &block_size); + rc = block_get_bsize(indev_sid, &block_size); if (rc != EOK) { printf(NAME ": error getting block size.\n"); @@ -163,8 +163,8 @@ return rc; - /* Register the driver with device mapper. */ - rc = devmap_driver_register(NAME, gpt_connection); + /* Register server with location service. */ + rc = loc_server_register(NAME, gpt_connection); if (rc != EOK) { - printf(NAME ": Unable to register driver.\n"); + printf(NAME ": Unable to register server.\n"); return rc; } @@ -188,7 +188,7 @@ return ENOMEM; - rc = devmap_device_register(name, &dev); + rc = loc_service_register(name, &dsid); if (rc != EOK) { - printf(NAME ": Unable to register device %s.\n", name); + printf(NAME ": Unable to register service %s.\n", name); return rc; } @@ -199,5 +199,5 @@ "%" PRIuOFF64 " MB.\n", name, part->length, size_mb); - part->dev = dev; + part->dsid = dsid; free(name); @@ -228,5 +228,5 @@ } - rc = block_read_direct(indev_handle, GPT_HDR_BA, 1, gpt_hdr); + rc = block_read_direct(indev_sid, GPT_HDR_BA, 1, gpt_hdr); if (rc != EOK) { printf(NAME ": Failed reading GPT header block.\n"); @@ -256,5 +256,5 @@ } - rc = block_read_direct(indev_handle, ba, bcnt, etable); + rc = block_read_direct(indev_sid, ba, bcnt, etable); if (rc != EOK) { printf(NAME ": Failed reading GPT entries.\n"); @@ -303,5 +303,5 @@ } - part->dev = 0; + part->dsid = 0; part->next = NULL; } @@ -314,5 +314,5 @@ ipc_call_t call; sysarg_t method; - devmap_handle_t dh; + service_id_t dh; unsigned int flags; int retval; @@ -330,5 +330,5 @@ */ part = plist_head.next; - while (part != NULL && part->dev != dh) + while (part != NULL && part->dsid != dh) part = part->next; @@ -410,5 +410,5 @@ return ELIMIT; - return block_read_direct(indev_handle, gba, cnt, buf); + return block_read_direct(indev_sid, gba, cnt, buf); } @@ -421,5 +421,5 @@ return ELIMIT; - return block_write_direct(indev_handle, gba, cnt, buf); + return block_write_direct(indev_sid, gba, cnt, buf); } Index: uspace/srv/bd/part/mbr_part/mbr_part.c =================================================================== --- uspace/srv/bd/part/mbr_part/mbr_part.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/bd/part/mbr_part/mbr_part.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -61,10 +61,9 @@ #include #include -#include +#include #include #include #include #include -#include #include #include @@ -100,5 +99,5 @@ aoff64_t length; /** Device representing the partition (outbound device) */ - devmap_handle_t dev; + service_id_t dsid; /** Points to next partition structure. */ struct part *next; @@ -141,5 +140,5 @@ /** Partitioned device (inbound device) */ -static devmap_handle_t indev_handle; +static service_id_t indef_sid; /** List of partitions. This structure is an empty head. */ @@ -180,9 +179,9 @@ int i; char *name; - devmap_handle_t dev; + service_id_t dsid; uint64_t size_mb; part_t *part; - rc = devmap_device_get_handle(dev_name, &indev_handle, 0); + rc = loc_service_get_id(dev_name, &indef_sid, 0); if (rc != EOK) { printf(NAME ": could not resolve device `%s'.\n", dev_name); @@ -190,5 +189,5 @@ } - rc = block_init(EXCHANGE_SERIALIZE, indev_handle, 2048); + rc = block_init(EXCHANGE_SERIALIZE, indef_sid, 2048); if (rc != EOK) { printf(NAME ": could not init libblock.\n"); @@ -198,5 +197,5 @@ /* Determine and verify block size. */ - rc = block_get_bsize(indev_handle, &block_size); + rc = block_get_bsize(indef_sid, &block_size); if (rc != EOK) { printf(NAME ": error getting block size.\n"); @@ -214,8 +213,8 @@ return rc; - /* Register the driver with device mapper. */ - rc = devmap_driver_register(NAME, mbr_connection); + /* Register server with location service. */ + rc = loc_server_register(NAME, mbr_connection); if (rc != EOK) { - printf(NAME ": Unable to register driver.\n"); + printf(NAME ": Unable to register server.\n"); return rc; } @@ -239,7 +238,7 @@ return ENOMEM; - rc = devmap_device_register(name, &dev); + rc = loc_service_register(name, &dsid); if (rc != EOK) { - printf(NAME ": Unable to register device %s.\n", name); + printf(NAME ": Unable to register service %s.\n", name); return rc; } @@ -250,5 +249,5 @@ "%" PRIu64 " MB.\n", name, part->length, size_mb); - part->dev = dev; + part->dsid = dsid; free(name); @@ -281,5 +280,5 @@ */ - rc = block_read_direct(indev_handle, 0, 1, brb); + rc = block_read_direct(indef_sid, 0, 1, brb); if (rc != EOK) { printf(NAME ": Failed reading MBR block.\n"); @@ -332,5 +331,5 @@ */ ba = cp.start_addr; - rc = block_read_direct(indev_handle, ba, 1, brb); + rc = block_read_direct(indef_sid, ba, 1, brb); if (rc != EOK) { printf(NAME ": Failed reading EBR block at %" @@ -381,5 +380,5 @@ part->present = (pte->ptype != PT_UNUSED) ? true : false; - part->dev = 0; + part->dsid = 0; part->next = NULL; } @@ -392,5 +391,5 @@ ipc_call_t call; sysarg_t method; - devmap_handle_t dh; + service_id_t dh; unsigned int flags; int retval; @@ -408,5 +407,5 @@ */ part = plist_head.next; - while (part != NULL && part->dev != dh) + while (part != NULL && part->dsid != dh) part = part->next; @@ -488,5 +487,5 @@ return ELIMIT; - return block_read_direct(indev_handle, gba, cnt, buf); + return block_read_direct(indef_sid, gba, cnt, buf); } @@ -499,5 +498,5 @@ return ELIMIT; - return block_write_direct(indev_handle, gba, cnt, buf); + return block_write_direct(indef_sid, gba, cnt, buf); } Index: uspace/srv/bd/rd/rd.c =================================================================== --- uspace/srv/bd/rd/rd.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/bd/rd/rd.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -52,5 +52,5 @@ #include #include -#include +#include #include #include @@ -235,5 +235,5 @@ (void *) rd_ph_addr, rd_size); - int rc = devmap_driver_register(NAME, rd_connection); + int rc = loc_server_register(NAME, rd_connection); if (rc < 0) { printf("%s: Unable to register driver (%d)\n", NAME, rc); @@ -241,7 +241,7 @@ } - devmap_handle_t devmap_handle; - if (devmap_device_register("bd/initrd", &devmap_handle) != EOK) { - printf("%s: Unable to register device\n", NAME); + service_id_t service_id; + if (loc_service_register("bd/initrd", &service_id) != EOK) { + printf("%s: Unable to register device service\n", NAME); return false; } Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/devman/devman.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -37,5 +37,5 @@ #include #include -#include +#include #include #include @@ -66,19 +66,9 @@ } -static int devmap_functions_compare(unsigned long key[], hash_count_t keys, +static int loc_functions_compare(unsigned long key[], hash_count_t keys, link_t *item) { - fun_node_t *fun = hash_table_get_instance(item, fun_node_t, devmap_fun); - return (fun->devmap_handle == (devmap_handle_t) key[0]); -} - -static int devmap_devices_class_compare(unsigned long key[], hash_count_t keys, - link_t *item) -{ - dev_class_info_t *class_info - = hash_table_get_instance(item, dev_class_info_t, devmap_link); - assert(class_info != NULL); - - return (class_info->devmap_handle == (devmap_handle_t) key[0]); + fun_node_t *fun = hash_table_get_instance(item, fun_node_t, loc_fun); + return (fun->service_id == (service_id_t) key[0]); } @@ -99,13 +89,7 @@ }; -static hash_table_operations_t devmap_devices_ops = { +static hash_table_operations_t loc_devices_ops = { .hash = devices_hash, - .compare = devmap_functions_compare, - .remove_callback = devices_remove_callback -}; - -static hash_table_operations_t devmap_devices_class_ops = { - .hash = devices_hash, - .compare = devmap_devices_class_compare, + .compare = loc_functions_compare, .remove_callback = devices_remove_callback }; @@ -564,14 +548,4 @@ fibril_mutex_lock(&driver->driver_mutex); - - async_exch_t *exch = async_exchange_begin(driver->sess); - async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch, - DRIVER_DEVMAN, 0, 0); - async_exchange_end(exch); - - if (!sess) { - fibril_mutex_unlock(&driver->driver_mutex); - return; - } /* @@ -599,5 +573,5 @@ fibril_mutex_unlock(&driver->driver_mutex); - add_device(sess, driver, dev, tree); + add_device(driver, dev, tree); /* @@ -619,6 +593,4 @@ link = driver->devices.head.next; } - - async_hangup(sess); /* @@ -701,30 +673,30 @@ } -/** Create devmap path and name for the function. */ -void devmap_register_tree_function(fun_node_t *fun, dev_tree_t *tree) -{ - char *devmap_pathname = NULL; - char *devmap_name = NULL; - - asprintf(&devmap_name, "%s", fun->pathname); - if (devmap_name == NULL) +/** Create loc path and name for the function. */ +void loc_register_tree_function(fun_node_t *fun, dev_tree_t *tree) +{ + char *loc_pathname = NULL; + char *loc_name = NULL; + + asprintf(&loc_name, "%s", fun->pathname); + if (loc_name == NULL) return; - replace_char(devmap_name, '/', DEVMAP_SEPARATOR); - - asprintf(&devmap_pathname, "%s/%s", DEVMAP_DEVICE_NAMESPACE, - devmap_name); - if (devmap_pathname == NULL) { - free(devmap_name); + replace_char(loc_name, '/', LOC_SEPARATOR); + + asprintf(&loc_pathname, "%s/%s", LOC_DEVICE_NAMESPACE, + loc_name); + if (loc_pathname == NULL) { + free(loc_name); return; } - devmap_device_register_with_iface(devmap_pathname, - &fun->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP); - - tree_add_devmap_function(tree, fun); - - free(devmap_name); - free(devmap_pathname); + loc_service_register_with_iface(loc_pathname, + &fun->service_id, DEVMAN_CONNECT_FROM_LOC); + + tree_add_loc_function(tree, fun); + + free(loc_name); + free(loc_pathname); } @@ -734,6 +706,5 @@ * @param node The device's node in the device tree. */ -void add_device(async_sess_t *sess, driver_t *drv, dev_node_t *dev, - dev_tree_t *tree) +void add_device(driver_t *drv, dev_node_t *dev, dev_tree_t *tree) { /* @@ -752,5 +723,5 @@ } - async_exch_t *exch = async_exchange_begin(sess); + async_exch_t *exch = async_exchange_begin(drv->sess); ipc_call_t answer; @@ -822,16 +793,7 @@ fibril_mutex_unlock(&drv->driver_mutex); - if (is_running) { - /* Notify the driver about the new device. */ - async_exch_t *exch = async_exchange_begin(drv->sess); - async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE, exch, - DRIVER_DEVMAN, 0, 0); - async_exchange_end(exch); - - if (sess) { - add_device(sess, drv, dev, tree); - async_hangup(sess); - } - } + /* Notify the driver about the new device. */ + if (is_running) + add_device(drv, dev, tree); return true; @@ -856,6 +818,6 @@ hash_table_create(&tree->devman_functions, DEVICE_BUCKETS, 1, &devman_functions_ops); - hash_table_create(&tree->devmap_functions, DEVICE_BUCKETS, 1, - &devmap_devices_ops); + hash_table_create(&tree->loc_functions, DEVICE_BUCKETS, 1, + &loc_devices_ops); fibril_rwlock_initialize(&tree->rwlock); @@ -936,4 +898,35 @@ } +/** Get list of device functions. */ +int dev_get_functions(dev_tree_t *tree, dev_node_t *dev, + devman_handle_t *hdl_buf, size_t buf_size, size_t *act_size) +{ + size_t act_cnt; + size_t buf_cnt; + + assert(fibril_rwlock_is_locked(&tree->rwlock)); + + buf_cnt = buf_size / sizeof(devman_handle_t); + + act_cnt = list_count(&dev->functions); + *act_size = act_cnt * sizeof(devman_handle_t); + + if (buf_size % sizeof(devman_handle_t) != 0) + return EINVAL; + + size_t pos = 0; + list_foreach(dev->functions, item) { + fun_node_t *fun = + list_get_instance(item, fun_node_t, dev_functions); + + if (pos < buf_cnt) + hdl_buf[pos] = fun->handle; + pos++; + } + + return EOK; +} + + /* Function nodes */ @@ -950,7 +943,6 @@ link_initialize(&res->dev_functions); list_initialize(&res->match_ids.ids); - list_initialize(&res->classes); link_initialize(&res->devman_fun); - link_initialize(&res->devmap_fun); + link_initialize(&res->loc_fun); } @@ -1115,4 +1107,24 @@ return true; +} + +/** Remove function from device tree. + * + * @param tree Device tree + * @param node Function node to remove + */ +void remove_fun_node(dev_tree_t *tree, fun_node_t *fun) +{ + assert(tree != NULL); + assert(fun != NULL); + assert(fibril_rwlock_is_write_locked(&tree->rwlock)); + + /* Remove the node from the handle-to-node map. */ + unsigned long key = fun->handle; + hash_table_remove(&tree->devman_functions, &key, 1); + + /* Remove the node from the list of its parent's children. */ + if (fun->dev != NULL) + list_remove(&fun->dev_functions); } @@ -1142,5 +1154,5 @@ char *rel_path = path; char *next_path_elem = NULL; - bool cont = true; + bool cont = (rel_path[1] != '\0'); while (cont && fun != NULL) { @@ -1193,34 +1205,4 @@ } -/** Find function node by its class name and index. */ -fun_node_t *find_fun_node_by_class(class_list_t *class_list, - const char *class_name, const char *dev_name) -{ - assert(class_list != NULL); - assert(class_name != NULL); - assert(dev_name != NULL); - - fibril_rwlock_read_lock(&class_list->rwlock); - - dev_class_t *cl = find_dev_class_no_lock(class_list, class_name); - if (cl == NULL) { - fibril_rwlock_read_unlock(&class_list->rwlock); - return NULL; - } - - dev_class_info_t *dev = find_dev_in_class(cl, dev_name); - if (dev == NULL) { - fibril_rwlock_read_unlock(&class_list->rwlock); - return NULL; - } - - fun_node_t *fun = dev->fun; - - fibril_rwlock_read_unlock(&class_list->rwlock); - - return fun; -} - - /** Find child function node with a specified name. * @@ -1236,199 +1218,16 @@ } -/* Device classes */ - -/** Create device class. - * - * @return Device class. - */ -dev_class_t *create_dev_class(void) -{ - dev_class_t *cl; - - cl = (dev_class_t *) malloc(sizeof(dev_class_t)); - if (cl != NULL) { - memset(cl, 0, sizeof(dev_class_t)); - list_initialize(&cl->devices); - fibril_mutex_initialize(&cl->mutex); - } - - return cl; -} - -/** Create device class info. - * - * @return Device class info. - */ -dev_class_info_t *create_dev_class_info(void) -{ - dev_class_info_t *info; - - info = (dev_class_info_t *) malloc(sizeof(dev_class_info_t)); - if (info != NULL) { - memset(info, 0, sizeof(dev_class_info_t)); - link_initialize(&info->dev_classes); - link_initialize(&info->devmap_link); - link_initialize(&info->link); - } - - return info; -} - -size_t get_new_class_dev_idx(dev_class_t *cl) -{ - size_t dev_idx; - - fibril_mutex_lock(&cl->mutex); - dev_idx = ++cl->curr_dev_idx; - fibril_mutex_unlock(&cl->mutex); - - return dev_idx; -} - - -/** Create unique device name within the class. - * - * @param cl The class. - * @param base_dev_name Contains the base name for the device if it was - * specified by the driver when it registered the device by - * the class; NULL if driver specified no base name. - * @return The unique name for the device within the class. - */ -char *create_dev_name_for_class(dev_class_t *cl, const char *base_dev_name) -{ - char *dev_name; - const char *base_name; - - if (base_dev_name != NULL) - base_name = base_dev_name; - else - base_name = cl->base_dev_name; - - size_t idx = get_new_class_dev_idx(cl); - asprintf(&dev_name, "%s%zu", base_name, idx); - - return dev_name; -} - -/** Add the device function to the class. - * - * The device may be added to multiple classes and a class may contain multiple - * devices. The class and the device are associated with each other by the - * dev_class_info_t structure. - * - * @param dev The device. - * @param class The class. - * @param base_dev_name The base name of the device within the class if - * specified by the driver, NULL otherwise. - * @return dev_class_info_t structure which associates the device - * with the class. - */ -dev_class_info_t *add_function_to_class(fun_node_t *fun, dev_class_t *cl, - const char *base_dev_name) -{ - dev_class_info_t *info; - - assert(fun != NULL); - assert(cl != NULL); - - info = create_dev_class_info(); - - - if (info != NULL) { - info->dev_class = cl; - info->fun = fun; - - /* Add the device to the class. */ - fibril_mutex_lock(&cl->mutex); - list_append(&info->link, &cl->devices); - fibril_mutex_unlock(&cl->mutex); - - /* Add the class to the device. */ - list_append(&info->dev_classes, &fun->classes); - - /* Create unique name for the device within the class. */ - info->dev_name = create_dev_name_for_class(cl, base_dev_name); - } - - return info; -} - -dev_class_t *get_dev_class(class_list_t *class_list, char *class_name) -{ - dev_class_t *cl; - - fibril_rwlock_write_lock(&class_list->rwlock); - cl = find_dev_class_no_lock(class_list, class_name); - if (cl == NULL) { - cl = create_dev_class(); - if (cl != NULL) { - cl->name = class_name; - cl->base_dev_name = ""; - add_dev_class_no_lock(class_list, cl); - } - } - - fibril_rwlock_write_unlock(&class_list->rwlock); - return cl; -} - -dev_class_t *find_dev_class_no_lock(class_list_t *class_list, - const char *class_name) -{ - dev_class_t *cl; - - list_foreach(class_list->classes, link) { - cl = list_get_instance(link, dev_class_t, link); - if (str_cmp(cl->name, class_name) == 0) { - return cl; - } - } - - return NULL; -} - -void add_dev_class_no_lock(class_list_t *class_list, dev_class_t *cl) -{ - list_append(&cl->link, &class_list->classes); -} - -dev_class_info_t *find_dev_in_class(dev_class_t *dev_class, const char *dev_name) -{ - assert(dev_class != NULL); - assert(dev_name != NULL); - - list_foreach(dev_class->devices, link) { - dev_class_info_t *dev = list_get_instance(link, - dev_class_info_t, link); - - if (str_cmp(dev->dev_name, dev_name) == 0) { - return dev; - } - } - - return NULL; -} - -void init_class_list(class_list_t *class_list) -{ - list_initialize(&class_list->classes); - fibril_rwlock_initialize(&class_list->rwlock); - hash_table_create(&class_list->devmap_functions, DEVICE_BUCKETS, 1, - &devmap_devices_class_ops); -} - - -/* Devmap devices */ - -fun_node_t *find_devmap_tree_function(dev_tree_t *tree, devmap_handle_t devmap_handle) +/* loc devices */ + +fun_node_t *find_loc_tree_function(dev_tree_t *tree, service_id_t service_id) { fun_node_t *fun = NULL; link_t *link; - unsigned long key = (unsigned long) devmap_handle; + unsigned long key = (unsigned long) service_id; fibril_rwlock_read_lock(&tree->rwlock); - link = hash_table_find(&tree->devmap_functions, &key); + link = hash_table_find(&tree->loc_functions, &key); if (link != NULL) - fun = hash_table_get_instance(link, fun_node_t, devmap_fun); + fun = hash_table_get_instance(link, fun_node_t, loc_fun); fibril_rwlock_read_unlock(&tree->rwlock); @@ -1436,40 +1235,9 @@ } -fun_node_t *find_devmap_class_function(class_list_t *classes, - devmap_handle_t devmap_handle) -{ - fun_node_t *fun = NULL; - dev_class_info_t *cli; - link_t *link; - unsigned long key = (unsigned long)devmap_handle; - - fibril_rwlock_read_lock(&classes->rwlock); - link = hash_table_find(&classes->devmap_functions, &key); - if (link != NULL) { - cli = hash_table_get_instance(link, dev_class_info_t, - devmap_link); - fun = cli->fun; - } - fibril_rwlock_read_unlock(&classes->rwlock); - - return fun; -} - -void class_add_devmap_function(class_list_t *class_list, dev_class_info_t *cli) -{ - unsigned long key = (unsigned long) cli->devmap_handle; - - fibril_rwlock_write_lock(&class_list->rwlock); - hash_table_insert(&class_list->devmap_functions, &key, &cli->devmap_link); - fibril_rwlock_write_unlock(&class_list->rwlock); - - assert(find_devmap_class_function(class_list, cli->devmap_handle) != NULL); -} - -void tree_add_devmap_function(dev_tree_t *tree, fun_node_t *fun) -{ - unsigned long key = (unsigned long) fun->devmap_handle; +void tree_add_loc_function(dev_tree_t *tree, fun_node_t *fun) +{ + unsigned long key = (unsigned long) fun->service_id; fibril_rwlock_write_lock(&tree->rwlock); - hash_table_insert(&tree->devmap_functions, &key, &fun->devmap_fun); + hash_table_insert(&tree->loc_functions, &key, &fun->loc_fun); fibril_rwlock_write_unlock(&tree->rwlock); } Index: uspace/srv/devman/devman.h =================================================================== --- uspace/srv/devman/devman.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/devman/devman.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -1,4 +1,5 @@ /* * Copyright (c) 2010 Lenka Trochtova + * Copyright (c) 2011 Jiri Svoboda * All rights reserved. * @@ -41,5 +42,5 @@ #include #include -#include +#include #include #include @@ -53,7 +54,6 @@ #define DEVICE_BUCKETS 256 -#define DEVMAP_CLASS_NAMESPACE "class" -#define DEVMAP_DEVICE_NAMESPACE "devices" -#define DEVMAP_SEPARATOR '\\' +#define LOC_DEVICE_NAMESPACE "devices" +#define LOC_SEPARATOR '\\' struct dev_node; @@ -62,4 +62,9 @@ struct fun_node; typedef struct fun_node fun_node_t; + +typedef struct { + fibril_mutex_t mutex; + struct driver *driver; +} client_t; typedef enum { @@ -155,4 +160,6 @@ /** Name of the function, assigned by the device driver */ char *name; + /** Function type */ + fun_type_t ftype; /** Full path and name of the device in device hierarchy */ @@ -170,8 +177,6 @@ match_id_list_t match_ids; - /** List of device classes to which this device function belongs. */ - list_t classes; - /** Devmap handle if the device function is registered by devmap. */ - devmap_handle_t devmap_handle; + /** Service ID if the device function is registered with loc. */ + service_id_t service_id; /** @@ -181,7 +186,7 @@ /** - * Used by the hash table of functions indexed by devmap device handles. - */ - link_t devmap_fun; + * Used by the hash table of functions indexed by service IDs. + */ + link_t loc_fun; }; @@ -208,87 +213,9 @@ /** - * Hash table of devices registered by devmapper, indexed by devmap - * handles. - */ - hash_table_t devmap_functions; + * Hash table of services registered with location service, indexed by + * service IDs. + */ + hash_table_t loc_functions; } dev_tree_t; - -typedef struct dev_class { - /** The name of the class. */ - const char *name; - - /** - * Pointer to the previous and next class in the list of registered - * classes. - */ - link_t link; - - /** - * List of dev_class_info structures - one for each device registered by - * this class. - */ - list_t devices; - - /** - * Default base name for the device within the class, might be overrided - * by the driver. - */ - const char *base_dev_name; - - /** Unique numerical identifier of the newly added device. */ - size_t curr_dev_idx; - /** Synchronize access to the list of devices in this class. */ - fibril_mutex_t mutex; -} dev_class_t; - -/** - * Provides n-to-m mapping between function nodes and classes - each function - * can register in an arbitrary number of classes and each class can contain - * an arbitrary number of device functions. - */ -typedef struct dev_class_info { - /** The class. */ - dev_class_t *dev_class; - /** The device. */ - fun_node_t *fun; - - /** - * Pointer to the previous and next class info in the list of devices - * registered by the class. - */ - link_t link; - - /** - * Pointer to the previous and next class info in the list of classes - * by which the device is registered. - */ - link_t dev_classes; - - /** The name of the device function within the class. */ - char *dev_name; - /** The handle of the device by device mapper in the class namespace. */ - devmap_handle_t devmap_handle; - - /** - * Link in the hash table of devices registered by the devmapper using - * their class names. - */ - link_t devmap_link; -} dev_class_info_t; - -/** The list of device classes. */ -typedef struct class_list { - /** List of classes. */ - list_t classes; - - /** - * Hash table of devices registered by devmapper using their class name, - * indexed by devmap handles. - */ - hash_table_t devmap_functions; - - /** Fibril mutex for list of classes. */ - fibril_rwlock_t rwlock; -} class_list_t; /* Match ids and scores */ @@ -313,5 +240,5 @@ extern void add_driver(driver_list_t *, driver_t *); extern void attach_driver(dev_node_t *, driver_t *); -extern void add_device(async_sess_t *, driver_t *, dev_node_t *, dev_tree_t *); +extern void add_device(driver_t *, dev_node_t *, dev_tree_t *); extern bool start_driver(driver_t *); @@ -331,4 +258,6 @@ extern dev_node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle); extern dev_node_t *find_dev_function(dev_node_t *, const char *); +extern int dev_get_functions(dev_tree_t *tree, dev_node_t *, devman_handle_t *, + size_t, size_t *); extern fun_node_t *create_fun_node(void); @@ -339,5 +268,4 @@ extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *); extern fun_node_t *find_fun_node_in_device(dev_node_t *, const char *); -extern fun_node_t *find_fun_node_by_class(class_list_t *, const char *, const char *); /* Device tree */ @@ -347,30 +275,13 @@ extern bool insert_dev_node(dev_tree_t *, dev_node_t *, fun_node_t *); extern bool insert_fun_node(dev_tree_t *, fun_node_t *, char *, dev_node_t *); - -/* Device classes */ - -extern dev_class_t *create_dev_class(void); -extern dev_class_info_t *create_dev_class_info(void); -extern size_t get_new_class_dev_idx(dev_class_t *); -extern char *create_dev_name_for_class(dev_class_t *, const char *); -extern dev_class_info_t *add_function_to_class(fun_node_t *, dev_class_t *, - const char *); - -extern void init_class_list(class_list_t *); - -extern dev_class_t *get_dev_class(class_list_t *, char *); -extern dev_class_t *find_dev_class_no_lock(class_list_t *, const char *); -extern dev_class_info_t *find_dev_in_class(dev_class_t *, const char *); -extern void add_dev_class_no_lock(class_list_t *, dev_class_t *); - -/* Devmap devices */ - -extern void devmap_register_tree_function(fun_node_t *, dev_tree_t *); - -extern fun_node_t *find_devmap_tree_function(dev_tree_t *, devmap_handle_t); -extern fun_node_t *find_devmap_class_function(class_list_t *, devmap_handle_t); - -extern void class_add_devmap_function(class_list_t *, dev_class_info_t *); -extern void tree_add_devmap_function(dev_tree_t *, fun_node_t *); +extern void remove_fun_node(dev_tree_t *, fun_node_t *); + +/* Loc services */ + +extern void loc_register_tree_function(fun_node_t *, dev_tree_t *); + +extern fun_node_t *find_loc_tree_function(dev_tree_t *, service_id_t); + +extern void tree_add_loc_function(dev_tree_t *, fun_node_t *); #endif Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/devman/main.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -56,5 +56,5 @@ #include #include -#include +#include #include "devman.h" @@ -64,27 +64,19 @@ static driver_list_t drivers_list; static dev_tree_t device_tree; -static class_list_t class_list; + +static int init_running_drv(void *drv); /** Register running driver. */ -static driver_t *devman_driver_register(void) -{ - ipc_call_t icall; - ipc_callid_t iid; +static driver_t *devman_driver_register(ipc_callid_t callid, ipc_call_t *call) +{ driver_t *driver = NULL; + char *drv_name = NULL; log_msg(LVL_DEBUG, "devman_driver_register"); - - iid = async_get_call(&icall); - if (IPC_GET_IMETHOD(icall) != DEVMAN_DRIVER_REGISTER) { - async_answer_0(iid, EREFUSED); - return NULL; - } - - char *drv_name = NULL; /* Get driver name. */ int rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0); if (rc != EOK) { - async_answer_0(iid, rc); + async_answer_0(callid, rc); return NULL; } @@ -99,5 +91,5 @@ free(drv_name); drv_name = NULL; - async_answer_0(iid, ENOENT); + async_answer_0(callid, ENOENT); return NULL; } @@ -113,5 +105,5 @@ driver->name); fibril_mutex_unlock(&driver->driver_mutex); - async_answer_0(iid, EEXISTS); + async_answer_0(callid, EEXISTS); return NULL; } @@ -135,12 +127,12 @@ log_msg(LVL_DEBUG, "Creating connection to the `%s' driver.", driver->name); - driver->sess = async_callback_receive(EXCHANGE_SERIALIZE); + driver->sess = async_callback_receive(EXCHANGE_PARALLEL); if (!driver->sess) { fibril_mutex_unlock(&driver->driver_mutex); - async_answer_0(iid, ENOTSUP); + async_answer_0(callid, ENOTSUP); return NULL; } - - fibril_mutex_unlock(&driver->driver_mutex); + /* FIXME: Work around problem with callback sessions */ + async_sess_args_set(driver->sess, DRIVER_DEVMAN, 0, 0); log_msg(LVL_NOTE, @@ -148,6 +140,22 @@ driver->name); - async_answer_0(iid, EOK); - + /* + * Initialize the driver as running (e.g. pass assigned devices to it) + * in a separate fibril; the separate fibril is used to enable the + * driver to use devman service during the driver's initialization. + */ + fid_t fid = fibril_create(init_running_drv, driver); + if (fid == 0) { + log_msg(LVL_ERROR, "Failed to create initialization fibril " \ + "for driver `%s'.", driver->name); + fibril_mutex_unlock(&driver->driver_mutex); + async_answer_0(callid, ENOMEM); + return NULL; + } + + fibril_add_ready(fid); + fibril_mutex_unlock(&driver->driver_mutex); + + async_answer_0(callid, EOK); return driver; } @@ -279,6 +287,8 @@ return; } - + fun_node_t *fun = create_fun_node(); + fun->ftype = ftype; + if (!insert_fun_node(&device_tree, fun, fun_name, pdev)) { fibril_rwlock_write_unlock(&tree->rwlock); @@ -326,5 +336,5 @@ } } else { - devmap_register_tree_function(fun, tree); + loc_register_tree_function(fun, tree); } @@ -333,37 +343,13 @@ } -static void devmap_register_class_dev(dev_class_info_t *cli) -{ - /* Create devmap path and name for the device. */ - char *devmap_pathname = NULL; - - asprintf(&devmap_pathname, "%s/%s%c%s", DEVMAP_CLASS_NAMESPACE, - cli->dev_class->name, DEVMAP_SEPARATOR, cli->dev_name); - if (devmap_pathname == NULL) - return; - - /* - * Register the device by the device mapper and remember its devmap - * handle. - */ - devmap_device_register_with_iface(devmap_pathname, - &cli->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP); - - /* - * Add device to the hash map of class devices registered by device - * mapper. - */ - class_add_devmap_function(&class_list, cli); - - free(devmap_pathname); -} - -static void devman_add_function_to_class(ipc_callid_t callid, ipc_call_t *call) +static void devman_add_function_to_cat(ipc_callid_t callid, ipc_call_t *call) { devman_handle_t handle = IPC_GET_ARG1(*call); - - /* Get class name. */ - char *class_name; - int rc = async_data_write_accept((void **) &class_name, true, + category_id_t cat_id; + int rc; + + /* Get category name. */ + char *cat_name; + rc = async_data_write_accept((void **) &cat_name, true, 0, 0, 0, 0); if (rc != EOK) { @@ -378,13 +364,57 @@ } - dev_class_t *cl = get_dev_class(&class_list, class_name); - dev_class_info_t *class_info = add_function_to_class(fun, cl, NULL); - - /* Register the device's class alias by devmapper. */ - devmap_register_class_dev(class_info); - - log_msg(LVL_NOTE, "Function `%s' added to class `%s' as `%s'.", - fun->pathname, class_name, class_info->dev_name); - + rc = loc_category_get_id(cat_name, &cat_id, IPC_FLAG_BLOCKING); + if (rc == EOK) { + loc_service_add_to_cat(fun->service_id, cat_id); + } else { + log_msg(LVL_ERROR, "Failed adding function `%s' to category " + "`%s'.", fun->pathname, cat_name); + } + + log_msg(LVL_NOTE, "Function `%s' added to category `%s'.", + fun->pathname, cat_name); + + async_answer_0(callid, EOK); +} + +/** Remove function. */ +static void devman_remove_function(ipc_callid_t callid, ipc_call_t *call) +{ + devman_handle_t fun_handle = IPC_GET_ARG1(*call); + dev_tree_t *tree = &device_tree; + int rc; + + fibril_rwlock_write_lock(&tree->rwlock); + + fun_node_t *fun = find_fun_node_no_lock(&device_tree, fun_handle); + if (fun == NULL) { + fibril_rwlock_write_unlock(&tree->rwlock); + async_answer_0(callid, ENOENT); + return; + } + + log_msg(LVL_DEBUG, "devman_remove_function(fun='%s')", fun->pathname); + + if (fun->ftype == fun_inner) { + /* Handle possible descendants */ + /* TODO */ + log_msg(LVL_WARN, "devman_remove_function(): not handling " + "descendants\n"); + } else { + /* Unregister from location service */ + rc = loc_service_unregister(fun->service_id); + if (rc != EOK) { + log_msg(LVL_ERROR, "Failed unregistering tree service."); + fibril_rwlock_write_unlock(&tree->rwlock); + async_answer_0(callid, EIO); + return; + } + } + + remove_fun_node(&device_tree, fun); + fibril_rwlock_write_unlock(&tree->rwlock); + delete_fun_node(fun); + + log_msg(LVL_DEBUG, "devman_remove_function() succeeded."); async_answer_0(callid, EOK); } @@ -408,23 +438,15 @@ static void devman_connection_driver(ipc_callid_t iid, ipc_call_t *icall) { + client_t *client; + driver_t *driver; + /* Accept the connection. */ async_answer_0(iid, EOK); - driver_t *driver = devman_driver_register(); - if (driver == NULL) - return; - - /* - * Initialize the driver as running (e.g. pass assigned devices to it) - * in a separate fibril; the separate fibril is used to enable the - * driver to use devman service during the driver's initialization. - */ - fid_t fid = fibril_create(init_running_drv, driver); - if (fid == 0) { - log_msg(LVL_ERROR, "Failed to create initialization fibril " \ - "for driver `%s'.", driver->name); - return; - } - fibril_add_ready(fid); + client = async_get_client_data(); + if (client == NULL) { + log_msg(LVL_ERROR, "Failed to allocate client data."); + return; + } while (true) { @@ -435,10 +457,34 @@ break; + if (IPC_GET_IMETHOD(call) != DEVMAN_DRIVER_REGISTER) { + fibril_mutex_lock(&client->mutex); + driver = client->driver; + fibril_mutex_unlock(&client->mutex); + if (driver == NULL) { + /* First call must be to DEVMAN_DRIVER_REGISTER */ + async_answer_0(callid, ENOTSUP); + continue; + } + } + switch (IPC_GET_IMETHOD(call)) { + case DEVMAN_DRIVER_REGISTER: + fibril_mutex_lock(&client->mutex); + if (client->driver != NULL) { + fibril_mutex_unlock(&client->mutex); + async_answer_0(callid, EINVAL); + continue; + } + client->driver = devman_driver_register(callid, &call); + fibril_mutex_unlock(&client->mutex); + break; case DEVMAN_ADD_FUNCTION: devman_add_function(callid, &call); break; - case DEVMAN_ADD_DEVICE_TO_CLASS: - devman_add_function_to_class(callid, &call); + case DEVMAN_ADD_DEVICE_TO_CATEGORY: + devman_add_function_to_cat(callid, &call); + break; + case DEVMAN_REMOVE_FUNCTION: + devman_remove_function(callid, &call); break; default: @@ -473,41 +519,6 @@ } -/** Find handle for the device instance identified by device class name. */ -static void devman_function_get_handle_by_class(ipc_callid_t iid, - ipc_call_t *icall) -{ - char *classname; - char *devname; - - int rc = async_data_write_accept((void **) &classname, true, 0, 0, 0, 0); - if (rc != EOK) { - async_answer_0(iid, rc); - return; - } - rc = async_data_write_accept((void **) &devname, true, 0, 0, 0, 0); - if (rc != EOK) { - free(classname); - async_answer_0(iid, rc); - return; - } - - - fun_node_t *fun = find_fun_node_by_class(&class_list, - classname, devname); - - free(classname); - free(devname); - - if (fun == NULL) { - async_answer_0(iid, ENOENT); - return; - } - - async_answer_1(iid, EOK, fun->handle); -} - -/** Find device path by its handle. */ -static void devman_get_device_path_by_handle(ipc_callid_t iid, - ipc_call_t *icall) +/** Get device name. */ +static void devman_fun_get_name(ipc_callid_t iid, ipc_call_t *icall) { devman_handle_t handle = IPC_GET_ARG1(*icall); @@ -533,4 +544,41 @@ } + size_t sent_length = str_size(fun->name); + if (sent_length > data_len) { + sent_length = data_len; + } + + async_data_read_finalize(data_callid, fun->name, sent_length); + async_answer_0(iid, EOK); + + free(buffer); +} + + +/** Get device path. */ +static void devman_fun_get_path(ipc_callid_t iid, ipc_call_t *icall) +{ + devman_handle_t handle = IPC_GET_ARG1(*icall); + + fun_node_t *fun = find_fun_node(&device_tree, handle); + if (fun == NULL) { + async_answer_0(iid, ENOMEM); + return; + } + + ipc_callid_t data_callid; + size_t data_len; + if (!async_data_read_receive(&data_callid, &data_len)) { + async_answer_0(iid, EINVAL); + return; + } + + void *buffer = malloc(data_len); + if (buffer == NULL) { + async_answer_0(data_callid, ENOMEM); + async_answer_0(iid, ENOMEM); + return; + } + size_t sent_length = str_size(fun->pathname); if (sent_length > data_len) { @@ -544,4 +592,92 @@ } +static void devman_dev_get_functions(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + size_t size; + size_t act_size; + int rc; + + if (!async_data_read_receive(&callid, &size)) { + async_answer_0(callid, EREFUSED); + async_answer_0(iid, EREFUSED); + return; + } + + fibril_rwlock_read_lock(&device_tree.rwlock); + + dev_node_t *dev = find_dev_node_no_lock(&device_tree, + IPC_GET_ARG1(*icall)); + if (dev == NULL) { + fibril_rwlock_read_unlock(&device_tree.rwlock); + async_answer_0(callid, ENOENT); + async_answer_0(iid, ENOENT); + return; + } + + devman_handle_t *hdl_buf = (devman_handle_t *) malloc(size); + if (hdl_buf == NULL) { + fibril_rwlock_read_unlock(&device_tree.rwlock); + async_answer_0(callid, ENOMEM); + async_answer_0(iid, ENOMEM); + return; + } + + rc = dev_get_functions(&device_tree, dev, hdl_buf, size, &act_size); + if (rc != EOK) { + fibril_rwlock_read_unlock(&device_tree.rwlock); + async_answer_0(callid, rc); + async_answer_0(iid, rc); + return; + } + + fibril_rwlock_read_unlock(&device_tree.rwlock); + + sysarg_t retval = async_data_read_finalize(callid, hdl_buf, size); + free(hdl_buf); + + async_answer_1(iid, retval, act_size); +} + + +/** Get handle for child device of a function. */ +static void devman_fun_get_child(ipc_callid_t iid, ipc_call_t *icall) +{ + fun_node_t *fun; + + fibril_rwlock_read_lock(&device_tree.rwlock); + + fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall)); + if (fun == NULL) { + fibril_rwlock_read_unlock(&device_tree.rwlock); + async_answer_0(iid, ENOENT); + return; + } + + if (fun->child == NULL) { + fibril_rwlock_read_unlock(&device_tree.rwlock); + async_answer_0(iid, ENOENT); + return; + } + + async_answer_1(iid, EOK, fun->child->handle); + + fibril_rwlock_read_unlock(&device_tree.rwlock); +} + +/** Find handle for the function instance identified by its service ID. */ +static void devman_fun_sid_to_handle(ipc_callid_t iid, ipc_call_t *icall) +{ + fun_node_t *fun; + + fun = find_loc_tree_function(&device_tree, IPC_GET_ARG1(*icall)); + + if (fun == NULL) { + async_answer_0(iid, ENOENT); + return; + } + + async_answer_1(iid, EOK, fun->handle); +} /** Function for handling connections from a client to the device manager. */ @@ -562,9 +698,18 @@ devman_function_get_handle(callid, &call); break; - case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS: - devman_function_get_handle_by_class(callid, &call); - break; - case DEVMAN_DEVICE_GET_DEVICE_PATH: - devman_get_device_path_by_handle(callid, &call); + case DEVMAN_DEV_GET_FUNCTIONS: + devman_dev_get_functions(callid, &call); + break; + case DEVMAN_FUN_GET_CHILD: + devman_fun_get_child(callid, &call); + break; + case DEVMAN_FUN_GET_NAME: + devman_fun_get_name(callid, &call); + break; + case DEVMAN_FUN_GET_PATH: + devman_fun_get_path(callid, &call); + break; + case DEVMAN_FUN_SID_TO_HANDLE: + devman_fun_sid_to_handle(callid, &call); break; default: @@ -659,17 +804,17 @@ } -/** Function for handling connections from a client forwarded by the device - * mapper to the device manager. */ -static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall) -{ - devmap_handle_t devmap_handle = IPC_GET_ARG2(*icall); +/** Function for handling connections from a client forwarded by the location + * service to the device manager. */ +static void devman_connection_loc(ipc_callid_t iid, ipc_call_t *icall) +{ + service_id_t service_id = IPC_GET_ARG2(*icall); fun_node_t *fun; dev_node_t *dev; - fun = find_devmap_tree_function(&device_tree, devmap_handle); - if (fun == NULL) - fun = find_devmap_class_function(&class_list, devmap_handle); + fun = find_loc_tree_function(&device_tree, service_id); if (fun == NULL || fun->dev->drv == NULL) { + log_msg(LVL_WARN, "devman_connection_loc(): function " + "not found.\n"); async_answer_0(iid, ENOENT); return; @@ -677,9 +822,4 @@ dev = fun->dev; - - if ((dev->state != DEVICE_USABLE) || (!dev->drv->sess)) { - async_answer_0(iid, EINVAL); - return; - } async_exch_t *exch = async_exchange_begin(dev->drv->sess); @@ -689,5 +829,5 @@ log_msg(LVL_DEBUG, - "Forwarding devmapper request for `%s' function to driver `%s'.", + "Forwarding loc service request for `%s' function to driver `%s'.", fun->pathname, dev->drv->name); } @@ -696,5 +836,5 @@ static void devman_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) { - /* Select interface. */ + /* Select port. */ switch ((sysarg_t) (IPC_GET_ARG1(*icall))) { case DEVMAN_DRIVER: @@ -708,7 +848,7 @@ devman_forward(iid, icall, false); break; - case DEVMAN_CONNECT_FROM_DEVMAP: - /* Someone connected through devmap node. */ - devman_connection_devmapper(iid, icall); + case DEVMAN_CONNECT_FROM_LOC: + /* Someone connected through loc node. */ + devman_connection_loc(iid, icall); break; case DEVMAN_CONNECT_TO_PARENTS_DEVICE: @@ -722,4 +862,21 @@ } +static void *devman_client_data_create(void) +{ + client_t *client; + + client = calloc(1, sizeof(client_t)); + if (client == NULL) + return NULL; + + fibril_mutex_initialize(&client->mutex); + return client; +} + +static void devman_client_data_destroy(void *data) +{ + free(data); +} + /** Initialize device manager internal structures. */ static bool devman_init(void) @@ -743,13 +900,11 @@ } - init_class_list(&class_list); - /* - * !!! devman_connection ... as the device manager is not a real devmap + * !!! devman_connection ... as the device manager is not a real loc * driver (it uses a completely different ipc protocol than an ordinary - * devmap driver) forwarding a connection from client to the devman by - * devmapper would not work. + * loc driver) forwarding a connection from client to the devman by + * location service would not work. */ - devmap_driver_register(NAME, devman_connection); + loc_server_register(NAME, devman_connection); return true; @@ -760,5 +915,5 @@ printf(NAME ": HelenOS Device Manager\n"); - if (log_init(NAME, LVL_ERROR) != EOK) { + if (log_init(NAME, LVL_WARN) != EOK) { printf(NAME ": Error initializing logging subsystem.\n"); return -1; @@ -770,5 +925,7 @@ } - /* Set a handler of incomming connections. */ + /* Set handlers for incoming connections. */ + async_set_client_data_constructor(devman_client_data_create); + async_set_client_data_destructor(devman_client_data_destroy); async_set_client_connection(devman_connection); Index: uspace/srv/devmap/Makefile =================================================================== --- uspace/srv/devmap/Makefile (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../.. -BINARY = devmap -STATIC_NEEDED = y - -SOURCES = \ - devmap.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/devmap/devmap.c =================================================================== --- uspace/srv/devmap/devmap.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,1163 +1,0 @@ -/* - * Copyright (c) 2007 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @defgroup devmap Device mapper. - * @brief HelenOS device mapper. - * @{ - */ - -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define NAME "devmap" -#define NULL_DEVICES 256 - -/** Representation of device driver. - * - * Each driver is responsible for a set of devices. - * - */ -typedef struct { - /** Link to drivers_list */ - link_t drivers; - - /** List of devices controlled by this driver */ - list_t devices; - - /** Session asociated with this driver */ - async_sess_t *sess; - - /** Device driver name */ - char *name; - - /** Fibril mutex for list of devices owned by this driver */ - fibril_mutex_t devices_mutex; -} devmap_driver_t; - -/** Info about registered namespaces - * - */ -typedef struct { - /** Link to namespaces_list */ - link_t namespaces; - - /** Unique namespace identifier */ - devmap_handle_t handle; - - /** Namespace name */ - char *name; - - /** Reference count */ - size_t refcnt; -} devmap_namespace_t; - -/** Info about registered device - * - */ -typedef struct { - /** Link to global list of devices (devices_list) */ - link_t devices; - /** Link to driver list of devices (devmap_driver_t.devices) */ - link_t driver_devices; - /** Unique device identifier */ - devmap_handle_t handle; - /** Device namespace */ - devmap_namespace_t *namespace; - /** Device name */ - char *name; - /** Device driver handling this device */ - devmap_driver_t *driver; - /** Use this interface when forwarding to driver. */ - sysarg_t forward_interface; -} devmap_device_t; - -LIST_INITIALIZE(devices_list); -LIST_INITIALIZE(namespaces_list); -LIST_INITIALIZE(drivers_list); - -/* Locking order: - * drivers_list_mutex - * devices_list_mutex - * (devmap_driver_t *)->devices_mutex - * create_handle_mutex - **/ - -static FIBRIL_MUTEX_INITIALIZE(devices_list_mutex); -static FIBRIL_CONDVAR_INITIALIZE(devices_list_cv); -static FIBRIL_MUTEX_INITIALIZE(drivers_list_mutex); -static FIBRIL_MUTEX_INITIALIZE(create_handle_mutex); -static FIBRIL_MUTEX_INITIALIZE(null_devices_mutex); - -static devmap_handle_t last_handle = 0; -static devmap_device_t *null_devices[NULL_DEVICES]; - -/* - * Dummy list for null devices. This is necessary so that null devices can - * be used just as any other devices, e.g. in devmap_device_unregister_core(). - */ -static LIST_INITIALIZE(dummy_null_driver_devices); - -static devmap_handle_t devmap_create_handle(void) -{ - /* TODO: allow reusing old handles after their unregistration - * and implement some version of LRU algorithm, avoid overflow - */ - - fibril_mutex_lock(&create_handle_mutex); - last_handle++; - fibril_mutex_unlock(&create_handle_mutex); - - return last_handle; -} - -/** Convert fully qualified device name to namespace and device name. - * - * A fully qualified device name can be either a plain device name - * (then the namespace is considered to be an empty string) or consist - * of two components separated by a slash. No more than one slash - * is allowed. - * - */ -static bool devmap_fqdn_split(const char *fqdn, char **ns_name, char **name) -{ - size_t cnt = 0; - 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(fqdn, &offset, STR_NO_LIMIT)) != 0) { - if (c == '/') { - cnt++; - slash_offset = offset_prev; - slash_after = offset; - } - offset_prev = offset; - } - - /* More than one slash */ - if (cnt > 1) - return false; - - /* No slash -> namespace is empty */ - if (cnt == 0) { - *ns_name = str_dup(""); - if (*ns_name == NULL) - return false; - - *name = str_dup(fqdn); - if (*name == NULL) { - free(*ns_name); - return false; - } - - if (str_cmp(*name, "") == 0) { - free(*name); - free(*ns_name); - return false; - } - - return true; - } - - /* Exactly one slash */ - *ns_name = str_ndup(fqdn, slash_offset); - if (*ns_name == NULL) - return false; - - *name = str_dup(fqdn + slash_after); - if (*name == NULL) { - free(*ns_name); - return false; - } - - if (str_cmp(*name, "") == 0) { - free(*name); - free(*ns_name); - return false; - } - - return true; -} - -/** Find namespace with given name. */ -static devmap_namespace_t *devmap_namespace_find_name(const char *name) -{ - assert(fibril_mutex_is_locked(&devices_list_mutex)); - - list_foreach(namespaces_list, item) { - devmap_namespace_t *namespace = - list_get_instance(item, devmap_namespace_t, namespaces); - if (str_cmp(namespace->name, name) == 0) - return namespace; - } - - return NULL; -} - -/** Find namespace with given handle. - * - * @todo: use hash table - * - */ -static devmap_namespace_t *devmap_namespace_find_handle(devmap_handle_t handle) -{ - assert(fibril_mutex_is_locked(&devices_list_mutex)); - - list_foreach(namespaces_list, item) { - devmap_namespace_t *namespace = - list_get_instance(item, devmap_namespace_t, namespaces); - if (namespace->handle == handle) - return namespace; - } - - return NULL; -} - -/** Find device with given name. */ -static devmap_device_t *devmap_device_find_name(const char *ns_name, - const char *name) -{ - assert(fibril_mutex_is_locked(&devices_list_mutex)); - - list_foreach(devices_list, item) { - devmap_device_t *device = - list_get_instance(item, devmap_device_t, devices); - if ((str_cmp(device->namespace->name, ns_name) == 0) - && (str_cmp(device->name, name) == 0)) - return device; - } - - return NULL; -} - -/** Find device with given handle. - * - * @todo: use hash table - * - */ -static devmap_device_t *devmap_device_find_handle(devmap_handle_t handle) -{ - assert(fibril_mutex_is_locked(&devices_list_mutex)); - - list_foreach(devices_list, item) { - devmap_device_t *device = - list_get_instance(item, devmap_device_t, devices); - if (device->handle == handle) - return device; - } - - return NULL; -} - -/** Create a namespace (if not already present). */ -static devmap_namespace_t *devmap_namespace_create(const char *ns_name) -{ - devmap_namespace_t *namespace; - - assert(fibril_mutex_is_locked(&devices_list_mutex)); - - namespace = devmap_namespace_find_name(ns_name); - if (namespace != NULL) - return namespace; - - namespace = (devmap_namespace_t *) malloc(sizeof(devmap_namespace_t)); - if (namespace == NULL) - return NULL; - - namespace->name = str_dup(ns_name); - if (namespace->name == NULL) { - free(namespace); - return NULL; - } - - namespace->handle = devmap_create_handle(); - namespace->refcnt = 0; - - /* - * Insert new namespace into list of registered namespaces - */ - list_append(&(namespace->namespaces), &namespaces_list); - - return namespace; -} - -/** Destroy a namespace (if it is no longer needed). */ -static void devmap_namespace_destroy(devmap_namespace_t *namespace) -{ - assert(fibril_mutex_is_locked(&devices_list_mutex)); - - if (namespace->refcnt == 0) { - list_remove(&(namespace->namespaces)); - - free(namespace->name); - free(namespace); - } -} - -/** Increase namespace reference count by including device. */ -static void devmap_namespace_addref(devmap_namespace_t *namespace, - devmap_device_t *device) -{ - assert(fibril_mutex_is_locked(&devices_list_mutex)); - - device->namespace = namespace; - namespace->refcnt++; -} - -/** Decrease namespace reference count. */ -static void devmap_namespace_delref(devmap_namespace_t *namespace) -{ - assert(fibril_mutex_is_locked(&devices_list_mutex)); - - namespace->refcnt--; - devmap_namespace_destroy(namespace); -} - -/** Unregister device and free it. */ -static void devmap_device_unregister_core(devmap_device_t *device) -{ - assert(fibril_mutex_is_locked(&devices_list_mutex)); - - devmap_namespace_delref(device->namespace); - list_remove(&(device->devices)); - list_remove(&(device->driver_devices)); - - free(device->name); - free(device); -} - -/** - * Read info about new driver and add it into linked list of registered - * drivers. - */ -static devmap_driver_t *devmap_driver_register(void) -{ - ipc_call_t icall; - ipc_callid_t iid = async_get_call(&icall); - - if (IPC_GET_IMETHOD(icall) != DEVMAP_DRIVER_REGISTER) { - async_answer_0(iid, EREFUSED); - return NULL; - } - - devmap_driver_t *driver = - (devmap_driver_t *) malloc(sizeof(devmap_driver_t)); - if (driver == NULL) { - async_answer_0(iid, ENOMEM); - return NULL; - } - - /* - * Get driver name - */ - int rc = async_data_write_accept((void **) &driver->name, true, 0, - DEVMAP_NAME_MAXLEN, 0, NULL); - if (rc != EOK) { - free(driver); - async_answer_0(iid, rc); - return NULL; - } - - /* - * Create connection to the driver - */ - driver->sess = async_callback_receive(EXCHANGE_SERIALIZE); - if (!driver->sess) { - free(driver->name); - free(driver); - async_answer_0(iid, ENOTSUP); - return NULL; - } - - /* - * Initialize mutex for list of devices - * owned by this driver - */ - fibril_mutex_initialize(&driver->devices_mutex); - - /* - * Initialize list of asociated devices - */ - list_initialize(&driver->devices); - - link_initialize(&driver->drivers); - - fibril_mutex_lock(&drivers_list_mutex); - - /* TODO: - * Check that no driver with name equal to - * driver->name is registered - */ - - /* - * Insert new driver into list of registered drivers - */ - list_append(&(driver->drivers), &drivers_list); - fibril_mutex_unlock(&drivers_list_mutex); - - async_answer_0(iid, EOK); - - return driver; -} - -/** - * Unregister device driver, unregister all its devices and free driver - * structure. - * - */ -static int devmap_driver_unregister(devmap_driver_t *driver) -{ - if (driver == NULL) - return EEXISTS; - - fibril_mutex_lock(&drivers_list_mutex); - - if (driver->sess) - async_hangup(driver->sess); - - /* Remove it from list of drivers */ - list_remove(&(driver->drivers)); - - /* Unregister all its devices */ - fibril_mutex_lock(&devices_list_mutex); - fibril_mutex_lock(&driver->devices_mutex); - - while (!list_empty(&driver->devices)) { - devmap_device_t *device = list_get_instance( - list_first(&driver->devices), devmap_device_t, - driver_devices); - devmap_device_unregister_core(device); - } - - fibril_mutex_unlock(&driver->devices_mutex); - fibril_mutex_unlock(&devices_list_mutex); - fibril_mutex_unlock(&drivers_list_mutex); - - /* Free name and driver */ - if (driver->name != NULL) - free(driver->name); - - free(driver); - - return EOK; -} - -/** Register instance of device - * - */ -static void devmap_device_register(ipc_callid_t iid, ipc_call_t *icall, - devmap_driver_t *driver) -{ - if (driver == NULL) { - async_answer_0(iid, EREFUSED); - return; - } - - /* Create new device entry */ - devmap_device_t *device = - (devmap_device_t *) malloc(sizeof(devmap_device_t)); - if (device == NULL) { - async_answer_0(iid, ENOMEM); - return; - } - - /* Set the interface, if any. */ - device->forward_interface = IPC_GET_ARG1(*icall); - - /* Get fqdn */ - char *fqdn; - int rc = async_data_write_accept((void **) &fqdn, true, 0, - DEVMAP_NAME_MAXLEN, 0, NULL); - if (rc != EOK) { - free(device); - async_answer_0(iid, rc); - return; - } - - char *ns_name; - if (!devmap_fqdn_split(fqdn, &ns_name, &device->name)) { - free(fqdn); - free(device); - async_answer_0(iid, EINVAL); - return; - } - - free(fqdn); - - fibril_mutex_lock(&devices_list_mutex); - - devmap_namespace_t *namespace = devmap_namespace_create(ns_name); - free(ns_name); - if (namespace == NULL) { - fibril_mutex_unlock(&devices_list_mutex); - free(device->name); - free(device); - async_answer_0(iid, ENOMEM); - return; - } - - link_initialize(&device->devices); - link_initialize(&device->driver_devices); - - /* Check that device is not already registered */ - if (devmap_device_find_name(namespace->name, device->name) != NULL) { - printf("%s: Device '%s/%s' already registered\n", NAME, - namespace->name, device->name); - devmap_namespace_destroy(namespace); - fibril_mutex_unlock(&devices_list_mutex); - free(device->name); - free(device); - async_answer_0(iid, EEXISTS); - return; - } - - /* Get unique device handle */ - device->handle = devmap_create_handle(); - - devmap_namespace_addref(namespace, device); - device->driver = driver; - - /* Insert device into list of all devices */ - list_append(&device->devices, &devices_list); - - /* Insert device into list of devices that belog to one driver */ - fibril_mutex_lock(&device->driver->devices_mutex); - - list_append(&device->driver_devices, &device->driver->devices); - - fibril_mutex_unlock(&device->driver->devices_mutex); - fibril_condvar_broadcast(&devices_list_cv); - fibril_mutex_unlock(&devices_list_mutex); - - async_answer_1(iid, EOK, device->handle); -} - -/** - * - */ -static int devmap_device_unregister(ipc_callid_t iid, ipc_call_t *icall, - devmap_driver_t *driver) -{ - /* TODO */ - return EOK; -} - -/** Connect client to the device. - * - * Find device driver owning requested device and forward - * the message to it. - * - */ -static void devmap_forward(ipc_callid_t callid, ipc_call_t *call) -{ - fibril_mutex_lock(&devices_list_mutex); - - /* - * Get handle from request - */ - devmap_handle_t handle = IPC_GET_ARG2(*call); - devmap_device_t *dev = devmap_device_find_handle(handle); - - if ((dev == NULL) || (dev->driver == NULL) || (!dev->driver->sess)) { - fibril_mutex_unlock(&devices_list_mutex); - async_answer_0(callid, ENOENT); - return; - } - - async_exch_t *exch = async_exchange_begin(dev->driver->sess); - - if (dev->forward_interface == 0) - async_forward_fast(callid, exch, dev->handle, 0, 0, IPC_FF_NONE); - else - async_forward_fast(callid, exch, dev->forward_interface, - dev->handle, 0, IPC_FF_NONE); - - async_exchange_end(exch); - - fibril_mutex_unlock(&devices_list_mutex); -} - -/** Find handle for device instance identified by name. - * - * In answer will be send EOK and device handle in arg1 or a error - * code from errno.h. - * - */ -static void devmap_device_get_handle(ipc_callid_t iid, ipc_call_t *icall) -{ - char *fqdn; - - /* Get fqdn */ - int rc = async_data_write_accept((void **) &fqdn, true, 0, - DEVMAP_NAME_MAXLEN, 0, NULL); - if (rc != EOK) { - async_answer_0(iid, rc); - return; - } - - char *ns_name; - char *name; - if (!devmap_fqdn_split(fqdn, &ns_name, &name)) { - free(fqdn); - async_answer_0(iid, EINVAL); - return; - } - - free(fqdn); - - fibril_mutex_lock(&devices_list_mutex); - const devmap_device_t *dev; - -recheck: - - /* - * Find device name in the list of known devices. - */ - dev = devmap_device_find_name(ns_name, name); - - /* - * Device was not found. - */ - if (dev == NULL) { - if (IPC_GET_ARG1(*icall) & IPC_FLAG_BLOCKING) { - /* Blocking lookup */ - fibril_condvar_wait(&devices_list_cv, - &devices_list_mutex); - goto recheck; - } - - async_answer_0(iid, ENOENT); - free(ns_name); - free(name); - fibril_mutex_unlock(&devices_list_mutex); - return; - } - - async_answer_1(iid, EOK, dev->handle); - - fibril_mutex_unlock(&devices_list_mutex); - free(ns_name); - free(name); -} - -/** Find handle for namespace identified by name. - * - * In answer will be send EOK and device handle in arg1 or a error - * code from errno.h. - * - */ -static void devmap_namespace_get_handle(ipc_callid_t iid, ipc_call_t *icall) -{ - char *name; - - /* Get device name */ - int rc = async_data_write_accept((void **) &name, true, 0, - DEVMAP_NAME_MAXLEN, 0, NULL); - if (rc != EOK) { - async_answer_0(iid, rc); - return; - } - - fibril_mutex_lock(&devices_list_mutex); - const devmap_namespace_t *namespace; - -recheck: - - /* - * Find namespace name in the list of known namespaces. - */ - namespace = devmap_namespace_find_name(name); - - /* - * Namespace was not found. - */ - if (namespace == NULL) { - if (IPC_GET_ARG1(*icall) & IPC_FLAG_BLOCKING) { - /* Blocking lookup */ - fibril_condvar_wait(&devices_list_cv, - &devices_list_mutex); - goto recheck; - } - - async_answer_0(iid, ENOENT); - free(name); - fibril_mutex_unlock(&devices_list_mutex); - return; - } - - async_answer_1(iid, EOK, namespace->handle); - - fibril_mutex_unlock(&devices_list_mutex); - free(name); -} - -static void devmap_handle_probe(ipc_callid_t iid, ipc_call_t *icall) -{ - fibril_mutex_lock(&devices_list_mutex); - - devmap_namespace_t *namespace = - devmap_namespace_find_handle(IPC_GET_ARG1(*icall)); - if (namespace == NULL) { - devmap_device_t *dev = - devmap_device_find_handle(IPC_GET_ARG1(*icall)); - if (dev == NULL) - async_answer_1(iid, EOK, DEV_HANDLE_NONE); - else - async_answer_1(iid, EOK, DEV_HANDLE_DEVICE); - } else - async_answer_1(iid, EOK, DEV_HANDLE_NAMESPACE); - - fibril_mutex_unlock(&devices_list_mutex); -} - -static void devmap_get_namespace_count(ipc_callid_t iid, ipc_call_t *icall) -{ - fibril_mutex_lock(&devices_list_mutex); - async_answer_1(iid, EOK, list_count(&namespaces_list)); - fibril_mutex_unlock(&devices_list_mutex); -} - -static void devmap_get_device_count(ipc_callid_t iid, ipc_call_t *icall) -{ - fibril_mutex_lock(&devices_list_mutex); - - devmap_namespace_t *namespace = - devmap_namespace_find_handle(IPC_GET_ARG1(*icall)); - if (namespace == NULL) - async_answer_0(iid, EEXISTS); - else - async_answer_1(iid, EOK, namespace->refcnt); - - fibril_mutex_unlock(&devices_list_mutex); -} - -static void devmap_get_namespaces(ipc_callid_t iid, ipc_call_t *icall) -{ - ipc_callid_t callid; - size_t size; - if (!async_data_read_receive(&callid, &size)) { - async_answer_0(callid, EREFUSED); - async_answer_0(iid, EREFUSED); - return; - } - - if ((size % sizeof(dev_desc_t)) != 0) { - async_answer_0(callid, EINVAL); - async_answer_0(iid, EINVAL); - return; - } - - fibril_mutex_lock(&devices_list_mutex); - - size_t count = size / sizeof(dev_desc_t); - if (count != list_count(&namespaces_list)) { - fibril_mutex_unlock(&devices_list_mutex); - async_answer_0(callid, EOVERFLOW); - async_answer_0(iid, EOVERFLOW); - return; - } - - dev_desc_t *desc = (dev_desc_t *) malloc(size); - if (desc == NULL) { - fibril_mutex_unlock(&devices_list_mutex); - async_answer_0(callid, ENOMEM); - async_answer_0(iid, ENOMEM); - return; - } - - size_t pos = 0; - list_foreach(namespaces_list, item) { - devmap_namespace_t *namespace = - list_get_instance(item, devmap_namespace_t, namespaces); - - desc[pos].handle = namespace->handle; - str_cpy(desc[pos].name, DEVMAP_NAME_MAXLEN, namespace->name); - pos++; - } - - sysarg_t retval = async_data_read_finalize(callid, desc, size); - - free(desc); - fibril_mutex_unlock(&devices_list_mutex); - - async_answer_0(iid, retval); -} - -static void devmap_get_devices(ipc_callid_t iid, ipc_call_t *icall) -{ - /* FIXME: Use faster algorithm which can make better use - of namespaces */ - - ipc_callid_t callid; - size_t size; - if (!async_data_read_receive(&callid, &size)) { - async_answer_0(callid, EREFUSED); - async_answer_0(iid, EREFUSED); - return; - } - - if ((size % sizeof(dev_desc_t)) != 0) { - async_answer_0(callid, EINVAL); - async_answer_0(iid, EINVAL); - return; - } - - fibril_mutex_lock(&devices_list_mutex); - - devmap_namespace_t *namespace = - devmap_namespace_find_handle(IPC_GET_ARG1(*icall)); - if (namespace == NULL) { - fibril_mutex_unlock(&devices_list_mutex); - async_answer_0(callid, ENOENT); - async_answer_0(iid, ENOENT); - return; - } - - size_t count = size / sizeof(dev_desc_t); - if (count != namespace->refcnt) { - fibril_mutex_unlock(&devices_list_mutex); - async_answer_0(callid, EOVERFLOW); - async_answer_0(iid, EOVERFLOW); - return; - } - - dev_desc_t *desc = (dev_desc_t *) malloc(size); - if (desc == NULL) { - fibril_mutex_unlock(&devices_list_mutex); - async_answer_0(callid, ENOMEM); - async_answer_0(iid, EREFUSED); - return; - } - - size_t pos = 0; - list_foreach(devices_list, item) { - devmap_device_t *device = - list_get_instance(item, devmap_device_t, devices); - - if (device->namespace == namespace) { - desc[pos].handle = device->handle; - str_cpy(desc[pos].name, DEVMAP_NAME_MAXLEN, device->name); - pos++; - } - } - - sysarg_t retval = async_data_read_finalize(callid, desc, size); - - free(desc); - fibril_mutex_unlock(&devices_list_mutex); - - async_answer_0(iid, retval); -} - -static void devmap_null_create(ipc_callid_t iid, ipc_call_t *icall) -{ - fibril_mutex_lock(&null_devices_mutex); - - unsigned int i; - bool fnd = false; - - for (i = 0; i < NULL_DEVICES; i++) { - if (null_devices[i] == NULL) { - fnd = true; - break; - } - } - - if (!fnd) { - fibril_mutex_unlock(&null_devices_mutex); - async_answer_0(iid, ENOMEM); - return; - } - - char null[DEVMAP_NAME_MAXLEN]; - snprintf(null, DEVMAP_NAME_MAXLEN, "%u", i); - - char *dev_name = str_dup(null); - if (dev_name == NULL) { - fibril_mutex_unlock(&null_devices_mutex); - async_answer_0(iid, ENOMEM); - return; - } - - devmap_device_t *device = - (devmap_device_t *) malloc(sizeof(devmap_device_t)); - if (device == NULL) { - fibril_mutex_unlock(&null_devices_mutex); - async_answer_0(iid, ENOMEM); - return; - } - - fibril_mutex_lock(&devices_list_mutex); - - devmap_namespace_t *namespace = devmap_namespace_create("null"); - if (namespace == NULL) { - fibril_mutex_lock(&devices_list_mutex); - fibril_mutex_unlock(&null_devices_mutex); - async_answer_0(iid, ENOMEM); - return; - } - - link_initialize(&device->devices); - link_initialize(&device->driver_devices); - - /* Get unique device handle */ - device->handle = devmap_create_handle(); - device->driver = NULL; - - devmap_namespace_addref(namespace, device); - device->name = dev_name; - - /* - * Insert device into list of all devices and into null devices array. - * Insert device into a dummy list of null driver's devices so that it - * can be safely removed later. - */ - list_append(&device->devices, &devices_list); - list_append(&device->driver_devices, &dummy_null_driver_devices); - null_devices[i] = device; - - fibril_mutex_unlock(&devices_list_mutex); - fibril_mutex_unlock(&null_devices_mutex); - - async_answer_1(iid, EOK, (sysarg_t) i); -} - -static void devmap_null_destroy(ipc_callid_t iid, ipc_call_t *icall) -{ - sysarg_t i = IPC_GET_ARG1(*icall); - if (i >= NULL_DEVICES) { - async_answer_0(iid, ELIMIT); - return; - } - - fibril_mutex_lock(&null_devices_mutex); - - if (null_devices[i] == NULL) { - fibril_mutex_unlock(&null_devices_mutex); - async_answer_0(iid, ENOENT); - return; - } - - fibril_mutex_lock(&devices_list_mutex); - devmap_device_unregister_core(null_devices[i]); - fibril_mutex_unlock(&devices_list_mutex); - - null_devices[i] = NULL; - - fibril_mutex_unlock(&null_devices_mutex); - async_answer_0(iid, EOK); -} - -/** Initialize device mapper. - * - * - */ -static bool devmap_init(void) -{ - fibril_mutex_lock(&null_devices_mutex); - - unsigned int i; - for (i = 0; i < NULL_DEVICES; i++) - null_devices[i] = NULL; - - fibril_mutex_unlock(&null_devices_mutex); - - return true; -} - -/** Handle connection with device driver. - * - */ -static void devmap_connection_driver(ipc_callid_t iid, ipc_call_t *icall) -{ - /* Accept connection */ - async_answer_0(iid, EOK); - - devmap_driver_t *driver = devmap_driver_register(); - if (driver == 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 DEVMAP_DRIVER_UNREGISTER: - if (NULL == driver) - async_answer_0(callid, ENOENT); - else - async_answer_0(callid, EOK); - break; - case DEVMAP_DEVICE_REGISTER: - /* Register one instance of device */ - devmap_device_register(callid, &call, driver); - break; - case DEVMAP_DEVICE_UNREGISTER: - /* Remove instance of device identified by handler */ - devmap_device_unregister(callid, &call, driver); - break; - case DEVMAP_DEVICE_GET_HANDLE: - devmap_device_get_handle(callid, &call); - break; - case DEVMAP_NAMESPACE_GET_HANDLE: - devmap_namespace_get_handle(callid, &call); - break; - default: - async_answer_0(callid, ENOENT); - } - } - - if (driver != NULL) { - /* - * Unregister the device driver and all its devices. - */ - devmap_driver_unregister(driver); - driver = NULL; - } -} - -/** Handle connection with device client. - * - */ -static void devmap_connection_client(ipc_callid_t iid, ipc_call_t *icall) -{ - /* 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 DEVMAP_DEVICE_GET_HANDLE: - devmap_device_get_handle(callid, &call); - break; - case DEVMAP_NAMESPACE_GET_HANDLE: - devmap_namespace_get_handle(callid, &call); - break; - case DEVMAP_HANDLE_PROBE: - devmap_handle_probe(callid, &call); - break; - case DEVMAP_NULL_CREATE: - devmap_null_create(callid, &call); - break; - case DEVMAP_NULL_DESTROY: - devmap_null_destroy(callid, &call); - break; - case DEVMAP_GET_NAMESPACE_COUNT: - devmap_get_namespace_count(callid, &call); - break; - case DEVMAP_GET_DEVICE_COUNT: - devmap_get_device_count(callid, &call); - break; - case DEVMAP_GET_NAMESPACES: - devmap_get_namespaces(callid, &call); - break; - case DEVMAP_GET_DEVICES: - devmap_get_devices(callid, &call); - break; - default: - async_answer_0(callid, ENOENT); - } - } -} - -/** Function for handling connections to devmap - * - */ -static void devmap_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) -{ - /* Select interface */ - switch ((sysarg_t) (IPC_GET_ARG1(*icall))) { - case DEVMAP_DRIVER: - devmap_connection_driver(iid, icall); - break; - case DEVMAP_CLIENT: - devmap_connection_client(iid, icall); - break; - case DEVMAP_CONNECT_TO_DEVICE: - /* Connect client to selected device */ - devmap_forward(iid, icall); - break; - default: - /* No such interface */ - async_answer_0(iid, ENOENT); - } -} - -/** - * - */ -int main(int argc, char *argv[]) -{ - printf("%s: HelenOS Device Mapper\n", NAME); - - if (!devmap_init()) { - printf("%s: Error while initializing service\n", NAME); - return -1; - } - - /* Set a handler of incomming connections */ - async_set_client_connection(devmap_connection); - - /* Register device mapper at naming service */ - if (service_register(SERVICE_DEVMAP) != EOK) - return -1; - - printf("%s: Accepting connections\n", NAME); - async_manager(); - - /* Never reached */ - return 0; -} - -/** - * @} - */ Index: uspace/srv/fs/devfs/Makefile =================================================================== --- uspace/srv/fs/devfs/Makefile (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,40 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../.. -LIBS = $(LIBFS_PREFIX)/libfs.a -EXTRA_CFLAGS += -I$(LIBFS_PREFIX) -BINARY = devfs -STATIC_NEEDED = y - -SOURCES = \ - devfs.c \ - devfs_ops.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/fs/devfs/devfs.c =================================================================== --- uspace/srv/fs/devfs/devfs.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,93 +1,0 @@ -/* - * Copyright (c) 2009 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup fs - * @{ - */ - -/** - * @file devfs.c - * @brief Devices file system. - * - * Every device registered to device mapper is represented as a file in this - * file system. - */ - -#include -#include -#include -#include -#include -#include -#include -#include "devfs.h" -#include "devfs_ops.h" - -#define NAME "devfs" - -static vfs_info_t devfs_vfs_info = { - .name = NAME, - .concurrent_read_write = false, - .write_retains_size = false, -}; - -int main(int argc, char *argv[]) -{ - printf("%s: HelenOS Device Filesystem\n", NAME); - - if (!devfs_init()) { - printf("%s: failed to initialize devfs\n", NAME); - return -1; - } - - async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE, - SERVICE_VFS, 0, 0); - if (!vfs_sess) { - printf("%s: Unable to connect to VFS\n", NAME); - return -1; - } - - int rc = fs_register(vfs_sess, &devfs_vfs_info, &devfs_ops, - &devfs_libfs_ops); - if (rc != EOK) { - printf("%s: Failed to register file system (%d)\n", NAME, rc); - return rc; - } - - printf("%s: Accepting connections\n", NAME); - task_retval(0); - async_manager(); - - /* Not reached */ - return 0; -} - -/** - * @} - */ - Index: uspace/srv/fs/devfs/devfs.h =================================================================== --- uspace/srv/fs/devfs/devfs.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2009 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup fs - * @{ - */ - -#ifndef DEVFS_DEVFS_H_ -#define DEVFS_DEVFS_H_ - -#include - -extern vfs_out_ops_t devfs_ops; -extern libfs_ops_t devfs_libfs_ops; - -#endif - -/** - * @} - */ Index: uspace/srv/fs/devfs/devfs_ops.c =================================================================== --- uspace/srv/fs/devfs/devfs_ops.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,778 +1,0 @@ -/* - * Copyright (c) 2009 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup fs - * @{ - */ - -/** - * @file devfs_ops.c - * @brief Implementation of VFS operations for the devfs file system server. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "devfs.h" -#include "devfs_ops.h" - -typedef struct { - devmap_handle_type_t type; - devmap_handle_t handle; -} devfs_node_t; - -/** Opened devices structure */ -typedef struct { - devmap_handle_t handle; - async_sess_t *sess; /**< If NULL, the structure is incomplete. */ - size_t refcount; - link_t link; - fibril_condvar_t cv; /**< Broadcast when completed. */ -} device_t; - -/** Hash table of opened devices */ -static hash_table_t devices; - -/** Hash table mutex */ -static FIBRIL_MUTEX_INITIALIZE(devices_mutex); - -#define DEVICES_KEYS 1 -#define DEVICES_KEY_HANDLE 0 -#define DEVICES_BUCKETS 256 - -/* Implementation of hash table interface for the nodes hash table. */ -static hash_index_t devices_hash(unsigned long key[]) -{ - return key[DEVICES_KEY_HANDLE] % DEVICES_BUCKETS; -} - -static int devices_compare(unsigned long key[], hash_count_t keys, link_t *item) -{ - device_t *dev = hash_table_get_instance(item, device_t, link); - return (dev->handle == (devmap_handle_t) key[DEVICES_KEY_HANDLE]); -} - -static void devices_remove_callback(link_t *item) -{ - free(hash_table_get_instance(item, device_t, link)); -} - -static hash_table_operations_t devices_ops = { - .hash = devices_hash, - .compare = devices_compare, - .remove_callback = devices_remove_callback -}; - -static int devfs_node_get_internal(fs_node_t **rfn, devmap_handle_type_t type, - devmap_handle_t handle) -{ - devfs_node_t *node = (devfs_node_t *) malloc(sizeof(devfs_node_t)); - if (node == NULL) { - *rfn = NULL; - return ENOMEM; - } - - *rfn = (fs_node_t *) malloc(sizeof(fs_node_t)); - if (*rfn == NULL) { - free(node); - *rfn = NULL; - return ENOMEM; - } - - fs_node_initialize(*rfn); - node->type = type; - node->handle = handle; - - (*rfn)->data = node; - return EOK; -} - -static int devfs_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle) -{ - return devfs_node_get_internal(rfn, DEV_HANDLE_NONE, 0); -} - -static int devfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component) -{ - devfs_node_t *node = (devfs_node_t *) pfn->data; - int ret; - - if (node->handle == 0) { - /* Root directory */ - - dev_desc_t *devs; - size_t count = devmap_get_namespaces(&devs); - - if (count > 0) { - size_t pos; - for (pos = 0; pos < count; pos++) { - /* Ignore root namespace */ - if (str_cmp(devs[pos].name, "") == 0) - continue; - - if (str_cmp(devs[pos].name, component) == 0) { - ret = devfs_node_get_internal(rfn, DEV_HANDLE_NAMESPACE, devs[pos].handle); - free(devs); - return ret; - } - } - - free(devs); - } - - /* Search root namespace */ - devmap_handle_t namespace; - if (devmap_namespace_get_handle("", &namespace, 0) == EOK) { - count = devmap_get_devices(namespace, &devs); - - if (count > 0) { - size_t pos; - for (pos = 0; pos < count; pos++) { - if (str_cmp(devs[pos].name, component) == 0) { - ret = devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle); - free(devs); - return ret; - } - } - - free(devs); - } - } - - *rfn = NULL; - return EOK; - } - - if (node->type == DEV_HANDLE_NAMESPACE) { - /* Namespace directory */ - - dev_desc_t *devs; - size_t count = devmap_get_devices(node->handle, &devs); - if (count > 0) { - size_t pos; - for (pos = 0; pos < count; pos++) { - if (str_cmp(devs[pos].name, component) == 0) { - ret = devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle); - free(devs); - return ret; - } - } - - free(devs); - } - - *rfn = NULL; - return EOK; - } - - *rfn = NULL; - return EOK; -} - -static int devfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index) -{ - return devfs_node_get_internal(rfn, devmap_handle_probe(index), index); -} - -static int devfs_node_open(fs_node_t *fn) -{ - devfs_node_t *node = (devfs_node_t *) fn->data; - - if (node->handle == 0) { - /* Root directory */ - return EOK; - } - - devmap_handle_type_t type = devmap_handle_probe(node->handle); - - if (type == DEV_HANDLE_NAMESPACE) { - /* Namespace directory */ - return EOK; - } - - if (type == DEV_HANDLE_DEVICE) { - /* Device node */ - - unsigned long key[] = { - [DEVICES_KEY_HANDLE] = (unsigned long) node->handle - }; - link_t *lnk; - - fibril_mutex_lock(&devices_mutex); -restart: - lnk = hash_table_find(&devices, key); - if (lnk == NULL) { - device_t *dev = (device_t *) malloc(sizeof(device_t)); - if (dev == NULL) { - fibril_mutex_unlock(&devices_mutex); - return ENOMEM; - } - - dev->handle = node->handle; - - /* Mark as incomplete */ - dev->sess = NULL; - dev->refcount = 1; - fibril_condvar_initialize(&dev->cv); - - /* - * Insert the incomplete device structure so that other - * fibrils will not race with us when we drop the mutex - * below. - */ - hash_table_insert(&devices, key, &dev->link); - - /* - * Drop the mutex to allow recursive devfs requests. - */ - fibril_mutex_unlock(&devices_mutex); - - async_sess_t *sess = devmap_device_connect(EXCHANGE_SERIALIZE, - node->handle, 0); - - fibril_mutex_lock(&devices_mutex); - - /* - * Notify possible waiters about this device structure - * being completed (or destroyed). - */ - fibril_condvar_broadcast(&dev->cv); - - if (!sess) { - /* - * Connecting failed, need to remove the - * entry and free the device structure. - */ - hash_table_remove(&devices, key, DEVICES_KEYS); - fibril_mutex_unlock(&devices_mutex); - - return ENOENT; - } - - /* Set the correct session. */ - dev->sess = sess; - } else { - device_t *dev = hash_table_get_instance(lnk, device_t, link); - - if (!dev->sess) { - /* - * Wait until the device structure is completed - * and start from the beginning as the device - * structure might have entirely disappeared - * while we were not holding the mutex in - * fibril_condvar_wait(). - */ - fibril_condvar_wait(&dev->cv, &devices_mutex); - goto restart; - } - - dev->refcount++; - } - - fibril_mutex_unlock(&devices_mutex); - - return EOK; - } - - return ENOENT; -} - -static int devfs_node_put(fs_node_t *fn) -{ - free(fn->data); - free(fn); - return EOK; -} - -static int devfs_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int lflag) -{ - assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY)); - - *rfn = NULL; - return ENOTSUP; -} - -static int devfs_destroy_node(fs_node_t *fn) -{ - return ENOTSUP; -} - -static int devfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm) -{ - return ENOTSUP; -} - -static int devfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm) -{ - return ENOTSUP; -} - -static int devfs_has_children(bool *has_children, fs_node_t *fn) -{ - devfs_node_t *node = (devfs_node_t *) fn->data; - - if (node->handle == 0) { - size_t count = devmap_count_namespaces(); - if (count > 0) { - *has_children = true; - return EOK; - } - - /* Root namespace */ - devmap_handle_t namespace; - if (devmap_namespace_get_handle("", &namespace, 0) == EOK) { - count = devmap_count_devices(namespace); - if (count > 0) { - *has_children = true; - return EOK; - } - } - - *has_children = false; - return EOK; - } - - if (node->type == DEV_HANDLE_NAMESPACE) { - size_t count = devmap_count_devices(node->handle); - if (count > 0) { - *has_children = true; - return EOK; - } - - *has_children = false; - return EOK; - } - - *has_children = false; - return EOK; -} - -static fs_index_t devfs_index_get(fs_node_t *fn) -{ - devfs_node_t *node = (devfs_node_t *) fn->data; - return node->handle; -} - -static aoff64_t devfs_size_get(fs_node_t *fn) -{ - return 0; -} - -static unsigned int devfs_lnkcnt_get(fs_node_t *fn) -{ - devfs_node_t *node = (devfs_node_t *) fn->data; - - if (node->handle == 0) - return 0; - - return 1; -} - -static bool devfs_is_directory(fs_node_t *fn) -{ - devfs_node_t *node = (devfs_node_t *) fn->data; - - return ((node->type == DEV_HANDLE_NONE) || (node->type == DEV_HANDLE_NAMESPACE)); -} - -static bool devfs_is_file(fs_node_t *fn) -{ - devfs_node_t *node = (devfs_node_t *) fn->data; - - return (node->type == DEV_HANDLE_DEVICE); -} - -static devmap_handle_t devfs_device_get(fs_node_t *fn) -{ - devfs_node_t *node = (devfs_node_t *) fn->data; - - if (node->type == DEV_HANDLE_DEVICE) - return node->handle; - - return 0; -} - -/** libfs operations */ -libfs_ops_t devfs_libfs_ops = { - .root_get = devfs_root_get, - .match = devfs_match, - .node_get = devfs_node_get, - .node_open = devfs_node_open, - .node_put = devfs_node_put, - .create = devfs_create_node, - .destroy = devfs_destroy_node, - .link = devfs_link_node, - .unlink = devfs_unlink_node, - .has_children = devfs_has_children, - .index_get = devfs_index_get, - .size_get = devfs_size_get, - .lnkcnt_get = devfs_lnkcnt_get, - .is_directory = devfs_is_directory, - .is_file = devfs_is_file, - .device_get = devfs_device_get -}; - -bool devfs_init(void) -{ - if (!hash_table_create(&devices, DEVICES_BUCKETS, - DEVICES_KEYS, &devices_ops)) - return false; - - return true; -} - -static int devfs_mounted(devmap_handle_t devmap_handle, const char *opts, - fs_index_t *index, aoff64_t *size, unsigned *lnkcnt) -{ - *index = 0; - *size = 0; - *lnkcnt = 0; - return EOK; -} - -static int devfs_unmounted(devmap_handle_t devmap_handle) -{ - return ENOTSUP; -} - -static int -devfs_read(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos, - size_t *rbytes) -{ - if (index == 0) { - ipc_callid_t callid; - size_t size; - if (!async_data_read_receive(&callid, &size)) { - async_answer_0(callid, EINVAL); - return EINVAL; - } - - dev_desc_t *desc; - size_t count = devmap_get_namespaces(&desc); - - /* Get rid of root namespace */ - size_t i; - for (i = 0; i < count; i++) { - if (str_cmp(desc[i].name, "") == 0) { - if (pos >= i) - pos++; - - break; - } - } - - if (pos < count) { - async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); - free(desc); - *rbytes = 1; - return EOK; - } - - free(desc); - pos -= count; - - /* Search root namespace */ - devmap_handle_t namespace; - if (devmap_namespace_get_handle("", &namespace, 0) == EOK) { - count = devmap_get_devices(namespace, &desc); - - if (pos < count) { - async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); - free(desc); - *rbytes = 1; - return EOK; - } - - free(desc); - } - - async_answer_0(callid, ENOENT); - return ENOENT; - } - - devmap_handle_type_t type = devmap_handle_probe(index); - - if (type == DEV_HANDLE_NAMESPACE) { - /* Namespace directory */ - ipc_callid_t callid; - size_t size; - if (!async_data_read_receive(&callid, &size)) { - async_answer_0(callid, EINVAL); - return EINVAL; - } - - dev_desc_t *desc; - size_t count = devmap_get_devices(index, &desc); - - if (pos < count) { - async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); - free(desc); - *rbytes = 1; - return EOK; - } - - free(desc); - async_answer_0(callid, ENOENT); - return ENOENT; - } - - if (type == DEV_HANDLE_DEVICE) { - /* Device node */ - - unsigned long key[] = { - [DEVICES_KEY_HANDLE] = (unsigned long) index - }; - - fibril_mutex_lock(&devices_mutex); - link_t *lnk = hash_table_find(&devices, key); - if (lnk == NULL) { - fibril_mutex_unlock(&devices_mutex); - return ENOENT; - } - - device_t *dev = hash_table_get_instance(lnk, device_t, link); - assert(dev->sess); - - ipc_callid_t callid; - if (!async_data_read_receive(&callid, NULL)) { - fibril_mutex_unlock(&devices_mutex); - async_answer_0(callid, EINVAL); - 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, devmap_handle, - 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(&devices_mutex); - - /* Wait for reply from the driver. */ - sysarg_t rc; - async_wait_for(msg, &rc); - - *rbytes = IPC_GET_ARG1(answer); - return rc; - } - - return ENOENT; -} - -static int -devfs_write(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos, - size_t *wbytes, aoff64_t *nsize) -{ - if (index == 0) - return ENOTSUP; - - devmap_handle_type_t type = devmap_handle_probe(index); - - if (type == DEV_HANDLE_NAMESPACE) { - /* Namespace directory */ - return ENOTSUP; - } - - if (type == DEV_HANDLE_DEVICE) { - /* Device node */ - unsigned long key[] = { - [DEVICES_KEY_HANDLE] = (unsigned long) index - }; - - fibril_mutex_lock(&devices_mutex); - link_t *lnk = hash_table_find(&devices, key); - if (lnk == NULL) { - fibril_mutex_unlock(&devices_mutex); - return ENOENT; - } - - device_t *dev = hash_table_get_instance(lnk, device_t, link); - assert(dev->sess); - - ipc_callid_t callid; - if (!async_data_write_receive(&callid, NULL)) { - fibril_mutex_unlock(&devices_mutex); - async_answer_0(callid, EINVAL); - 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, devmap_handle, - 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(&devices_mutex); - - /* Wait for reply from the driver. */ - sysarg_t rc; - async_wait_for(msg, &rc); - - *wbytes = IPC_GET_ARG1(answer); - *nsize = 0; - return rc; - } - - return ENOENT; -} - -static int -devfs_truncate(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t size) -{ - return ENOTSUP; -} - -static int devfs_close(devmap_handle_t devmap_handle, fs_index_t index) -{ - if (index == 0) - return EOK; - - devmap_handle_type_t type = devmap_handle_probe(index); - - if (type == DEV_HANDLE_NAMESPACE) { - /* Namespace directory */ - return EOK; - } - - if (type == DEV_HANDLE_DEVICE) { - unsigned long key[] = { - [DEVICES_KEY_HANDLE] = (unsigned long) index - }; - - fibril_mutex_lock(&devices_mutex); - link_t *lnk = hash_table_find(&devices, key); - if (lnk == NULL) { - fibril_mutex_unlock(&devices_mutex); - return ENOENT; - } - - device_t *dev = hash_table_get_instance(lnk, device_t, link); - assert(dev->sess); - dev->refcount--; - - if (dev->refcount == 0) { - async_hangup(dev->sess); - hash_table_remove(&devices, key, DEVICES_KEYS); - } - - fibril_mutex_unlock(&devices_mutex); - - return EOK; - } - - return ENOENT; -} - -static int devfs_sync(devmap_handle_t devmap_handle, fs_index_t index) -{ - if (index == 0) - return EOK; - - devmap_handle_type_t type = devmap_handle_probe(index); - - if (type == DEV_HANDLE_NAMESPACE) { - /* Namespace directory */ - return EOK; - } - - if (type == DEV_HANDLE_DEVICE) { - unsigned long key[] = { - [DEVICES_KEY_HANDLE] = (unsigned long) index - }; - - fibril_mutex_lock(&devices_mutex); - link_t *lnk = hash_table_find(&devices, key); - if (lnk == NULL) { - fibril_mutex_unlock(&devices_mutex); - return ENOENT; - } - - device_t *dev = hash_table_get_instance(lnk, device_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, devmap_handle, - index, &answer); - - async_exchange_end(exch); - - fibril_mutex_unlock(&devices_mutex); - - /* Wait for reply from the driver */ - sysarg_t rc; - async_wait_for(msg, &rc); - - return rc; - } - - return ENOENT; -} - -static int devfs_destroy(devmap_handle_t devmap_handle, fs_index_t index) -{ - return ENOTSUP; -} - -vfs_out_ops_t devfs_ops = { - .mounted = devfs_mounted, - .unmounted = devfs_unmounted, - .read = devfs_read, - .write = devfs_write, - .truncate = devfs_truncate, - .close = devfs_close, - .destroy = devfs_destroy, - .sync = devfs_sync, -}; - -/** - * @} - */ Index: uspace/srv/fs/devfs/devfs_ops.h =================================================================== --- uspace/srv/fs/devfs/devfs_ops.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,44 +1,0 @@ -/* - * Copyright (c) 2009 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup fs - * @{ - */ - -#ifndef DEVFS_DEVFS_OPS_H_ -#define DEVFS_DEVFS_OPS_H_ - -#include - -extern bool devfs_init(void); - -#endif - -/** - * @} - */ Index: uspace/srv/fs/exfat/exfat.h =================================================================== --- uspace/srv/fs/exfat/exfat.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/exfat/exfat.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -111,5 +111,5 @@ fibril_mutex_t lock; - devmap_handle_t devmap_handle; + service_id_t service_id; fs_index_t index; @@ -169,7 +169,7 @@ extern libfs_ops_t exfat_libfs_ops; -extern int exfat_idx_get_new(exfat_idx_t **, devmap_handle_t); -extern exfat_idx_t *exfat_idx_get_by_pos(devmap_handle_t, exfat_cluster_t, unsigned); -extern exfat_idx_t *exfat_idx_get_by_index(devmap_handle_t, fs_index_t); +extern int exfat_idx_get_new(exfat_idx_t **, service_id_t); +extern exfat_idx_t *exfat_idx_get_by_pos(service_id_t, exfat_cluster_t, unsigned); +extern exfat_idx_t *exfat_idx_get_by_index(service_id_t, fs_index_t); extern void exfat_idx_destroy(exfat_idx_t *); extern void exfat_idx_hashin(exfat_idx_t *); @@ -178,12 +178,12 @@ extern int exfat_idx_init(void); extern void exfat_idx_fini(void); -extern int exfat_idx_init_by_devmap_handle(devmap_handle_t); -extern void exfat_idx_fini_by_devmap_handle(devmap_handle_t); +extern int exfat_idx_init_by_service_id(service_id_t); +extern void exfat_idx_fini_by_service_id(service_id_t); -extern int exfat_node_expand(devmap_handle_t devmap_handle, exfat_node_t *nodep, +extern int exfat_node_expand(service_id_t service_id, exfat_node_t *nodep, exfat_cluster_t clusters); extern int exfat_node_put(fs_node_t *); -extern int exfat_bitmap_get(fs_node_t **, devmap_handle_t); -extern int exfat_uctable_get(fs_node_t **, devmap_handle_t); +extern int exfat_bitmap_get(fs_node_t **, service_id_t); +extern int exfat_uctable_get(fs_node_t **, service_id_t); Index: uspace/srv/fs/exfat/exfat_bitmap.c =================================================================== --- uspace/srv/fs/exfat/exfat_bitmap.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/exfat/exfat_bitmap.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -49,5 +49,5 @@ -int bitmap_is_free(exfat_bs_t *bs, devmap_handle_t devmap_handle, +int bitmap_is_free(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t clst) { @@ -61,5 +61,5 @@ clst -= EXFAT_CLST_FIRST; - rc = exfat_bitmap_get(&fn, devmap_handle); + rc = exfat_bitmap_get(&fn, service_id); if (rc != EOK) return rc; @@ -90,5 +90,5 @@ } -int bitmap_set_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, +int bitmap_set_cluster(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t clst) { @@ -101,5 +101,5 @@ clst -= EXFAT_CLST_FIRST; - rc = exfat_bitmap_get(&fn, devmap_handle); + rc = exfat_bitmap_get(&fn, service_id); if (rc != EOK) return rc; @@ -125,5 +125,5 @@ } -int bitmap_clear_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, +int bitmap_clear_cluster(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t clst) { @@ -136,5 +136,5 @@ clst -= EXFAT_CLST_FIRST; - rc = exfat_bitmap_get(&fn, devmap_handle); + rc = exfat_bitmap_get(&fn, service_id); if (rc != EOK) return rc; @@ -160,5 +160,5 @@ } -int bitmap_set_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, +int bitmap_set_clusters(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t firstc, exfat_cluster_t count) { @@ -168,8 +168,8 @@ while (clst < firstc+count ) { - rc = bitmap_set_cluster(bs, devmap_handle, clst); + rc = bitmap_set_cluster(bs, service_id, clst); if (rc != EOK) { if ((clst-firstc) > 0) - (void) bitmap_clear_clusters(bs, devmap_handle, firstc, clst-firstc); + (void) bitmap_clear_clusters(bs, service_id, firstc, clst-firstc); return rc; } @@ -179,5 +179,5 @@ } -int bitmap_clear_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, +int bitmap_clear_clusters(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t firstc, exfat_cluster_t count) { @@ -187,5 +187,5 @@ while (clst < firstc+count ) { - rc = bitmap_clear_cluster(bs, devmap_handle, clst); + rc = bitmap_clear_cluster(bs, service_id, clst); if (rc != EOK) return rc; @@ -195,5 +195,5 @@ } -int bitmap_alloc_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, +int bitmap_alloc_clusters(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t *firstc, exfat_cluster_t count) { @@ -203,8 +203,8 @@ while (startc < DATA_CNT(bs)+2) { endc = startc; - while (bitmap_is_free(bs, devmap_handle, endc) == EOK) { + while (bitmap_is_free(bs, service_id, endc) == EOK) { if ((endc - startc)+1 == count){ *firstc = startc; - return bitmap_set_clusters(bs, devmap_handle, startc, count); + return bitmap_set_clusters(bs, service_id, startc, count); } else @@ -221,5 +221,5 @@ { if (nodep->firstc == 0) { - return bitmap_alloc_clusters(bs, nodep->idx->devmap_handle, + return bitmap_alloc_clusters(bs, nodep->idx->service_id, &nodep->firstc, count); } else { @@ -228,7 +228,7 @@ clst = lastc+1; - while (bitmap_is_free(bs, nodep->idx->devmap_handle, clst) == EOK) { + while (bitmap_is_free(bs, nodep->idx->service_id, clst) == EOK) { if ((clst - lastc) == count){ - return bitmap_set_clusters(bs, nodep->idx->devmap_handle, + return bitmap_set_clusters(bs, nodep->idx->service_id, lastc+1, count); } @@ -248,5 +248,5 @@ lastc -= count; - return bitmap_clear_clusters(bs, nodep->idx->devmap_handle, lastc+1, count); + return bitmap_clear_clusters(bs, nodep->idx->service_id, lastc+1, count); } @@ -256,14 +256,14 @@ int rc; exfat_cluster_t lastc, clst; - devmap_handle_t devmap_handle = nodep->idx->devmap_handle; + service_id_t service_id = nodep->idx->service_id; lastc = nodep->firstc + ROUND_UP(nodep->size, BPC(bs)) / BPC(bs) - 1; for (clst = nodep->firstc; clst < lastc; clst++) { - rc = exfat_set_cluster(bs, devmap_handle, clst, clst+1); + rc = exfat_set_cluster(bs, service_id, clst, clst+1); if (rc != EOK) return rc; } - return exfat_set_cluster(bs, devmap_handle, lastc, EXFAT_CLST_EOF); + return exfat_set_cluster(bs, service_id, lastc, EXFAT_CLST_EOF); } Index: uspace/srv/fs/exfat/exfat_bitmap.h =================================================================== --- uspace/srv/fs/exfat/exfat_bitmap.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/exfat/exfat_bitmap.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -42,5 +42,5 @@ struct exfat_bs; -extern int bitmap_alloc_clusters(struct exfat_bs *bs, devmap_handle_t devmap_handle, +extern int bitmap_alloc_clusters(struct exfat_bs *bs, service_id_t service_id, exfat_cluster_t *firstc, exfat_cluster_t count); extern int bitmap_append_clusters(struct exfat_bs *bs, struct exfat_node *nodep, @@ -50,14 +50,14 @@ extern int bitmap_replicate_clusters(struct exfat_bs *bs, struct exfat_node *nodep); -extern int bitmap_is_free(struct exfat_bs *bs, devmap_handle_t devmap_handle, +extern int bitmap_is_free(struct exfat_bs *bs, service_id_t service_id, exfat_cluster_t clst); -extern int bitmap_set_cluster(struct exfat_bs *bs, devmap_handle_t devmap_handle, +extern int bitmap_set_cluster(struct exfat_bs *bs, service_id_t service_id, exfat_cluster_t clst); -extern int bitmap_clear_cluster(struct exfat_bs *bs, devmap_handle_t devmap_handle, +extern int bitmap_clear_cluster(struct exfat_bs *bs, service_id_t service_id, exfat_cluster_t clst); -extern int bitmap_set_clusters(struct exfat_bs *bs, devmap_handle_t devmap_handle, +extern int bitmap_set_clusters(struct exfat_bs *bs, service_id_t service_id, exfat_cluster_t firstc, exfat_cluster_t count); -extern int bitmap_clear_clusters(struct exfat_bs *bs, devmap_handle_t devmap_handle, +extern int bitmap_clear_clusters(struct exfat_bs *bs, service_id_t service_id, exfat_cluster_t firstc, exfat_cluster_t count); Index: uspace/srv/fs/exfat/exfat_directory.c =================================================================== --- uspace/srv/fs/exfat/exfat_directory.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/exfat/exfat_directory.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -66,9 +66,9 @@ if (di->nodep->type != EXFAT_DIRECTORY) return EINVAL; - di->devmap_handle = nodep->idx->devmap_handle; + di->service_id = nodep->idx->service_id; di->fragmented = nodep->fragmented; di->firstc = nodep->firstc; - di->bs = block_bb_get(di->devmap_handle); + di->bs = block_bb_get(di->service_id); /* di->blocks = nodep->size / BPS(di->bs); */ di->blocks = ROUND_UP(nodep->size, BPS(di->bs))/BPS(di->bs); @@ -77,11 +77,11 @@ int exfat_directory_open_parent(exfat_directory_t *di, - devmap_handle_t devmap_handle, exfat_cluster_t firstc, bool fragmented) + service_id_t service_id, exfat_cluster_t firstc, bool fragmented) { exfat_directory_init(di); - di->devmap_handle = devmap_handle; + di->service_id = service_id; di->fragmented = fragmented; di->firstc = firstc; - di->bs = block_bb_get(devmap_handle); + di->bs = block_bb_get(service_id); di->blocks = 0; return EOK; @@ -115,5 +115,5 @@ rc = exfat_block_get(&di->b, di->bs, di->nodep, i, BLOCK_FLAGS_NONE); } else { - rc = exfat_block_get_by_clst(&di->b, di->bs, di->devmap_handle, + rc = exfat_block_get_by_clst(&di->b, di->bs, di->service_id, di->fragmented, di->firstc, NULL, i, BLOCK_FLAGS_NONE); } @@ -323,43 +323,4 @@ } -int exfat_directory_print(exfat_directory_t *di) -{ - int rc; - exfat_dentry_t *de; - exfat_directory_seek(di, 0); - do - { - rc = exfat_directory_get(di, &de); - if (rc != EOK) - return rc; - switch (de->type) { - case EXFAT_TYPE_VOLLABEL: - printf("EXFAT_DENTRY_VOLLABEL\n"); break; - case EXFAT_TYPE_BITMAP: - printf("EXFAT_DENTRY_BITMAP\n"); break; - case EXFAT_TYPE_UCTABLE: - printf("EXFAT_DENTRY_UCTABLE\n"); break; - case EXFAT_TYPE_GUID: - printf("EXFAT_DENTRY_GUID\n"); break; - case EXFAT_TYPE_FILE: - printf("EXFAT_DENTRY_FILE\n"); break; - case EXFAT_TYPE_STREAM: - printf("EXFAT_DENTRY_STREAM\n"); break; - case EXFAT_TYPE_NAME: - printf("EXFAT_DENTRY_NAME\n"); break; - case EXFAT_TYPE_UNUSED: - printf("EXFAT_DENTRY_LAST\n"); - return EOK; - default: - if (de->type & EXFAT_TYPE_USED) - printf("EXFAT_DENTRY_SKIP\n"); - else - printf("EXFAT_DENTRY_FREE\n"); - } - } while (exfat_directory_next(di) == EOK); - exfat_directory_seek(di, 0); - return EOK; -} - int exfat_directory_write_file(exfat_directory_t *di, const char *name) { @@ -376,5 +337,5 @@ if (rc != EOK) return rc; - rc = exfat_uctable_get(&fn, di->devmap_handle); + rc = exfat_uctable_get(&fn, di->service_id); if (rc != EOK) return rc; @@ -497,5 +458,5 @@ return ENOSPC; - rc = exfat_node_expand(di->nodep->idx->devmap_handle, di->nodep, 1); + rc = exfat_node_expand(di->nodep->idx->service_id, di->nodep, 1); if (rc != EOK) return rc; Index: uspace/srv/fs/exfat/exfat_directory.h =================================================================== --- uspace/srv/fs/exfat/exfat_directory.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/exfat/exfat_directory.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -43,5 +43,5 @@ exfat_bs_t *bs; exfat_node_t *nodep; - devmap_handle_t devmap_handle; + service_id_t service_id; uint32_t blocks; uint32_t bnum; @@ -57,5 +57,5 @@ extern int exfat_directory_open(exfat_node_t *nodep, exfat_directory_t *di); extern int exfat_directory_open_parent(exfat_directory_t *di, - devmap_handle_t devmap_handle, exfat_cluster_t firstc, bool fragmented); + service_id_t service_id, exfat_cluster_t firstc, bool fragmented); extern int exfat_directory_close(exfat_directory_t *di); Index: uspace/srv/fs/exfat/exfat_fat.c =================================================================== --- uspace/srv/fs/exfat/exfat_fat.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/exfat/exfat_fat.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -62,5 +62,5 @@ * * @param bs Buffer holding the boot sector for the file. - * @param devmap_handle Device handle of the device with the file. + * @param service_id Service ID of the device with the file. * @param firstc First cluster to start the walk with. * @param lastc If non-NULL, output argument hodling the last cluster @@ -73,5 +73,5 @@ */ int -exfat_cluster_walk(exfat_bs_t *bs, devmap_handle_t devmap_handle, +exfat_cluster_walk(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t firstc, exfat_cluster_t *lastc, uint32_t *numc, uint32_t max_clusters) @@ -95,5 +95,5 @@ *lastc = clst; /* remember the last cluster number */ - rc = exfat_get_cluster(bs, devmap_handle, clst, &clst); + rc = exfat_get_cluster(bs, service_id, clst, &clst); if (rc != EOK) return rc; @@ -140,5 +140,5 @@ * when fortunately we have the last cluster number cached. */ - return block_get(block, nodep->idx->devmap_handle, DATA_FS(bs) + + return block_get(block, nodep->idx->service_id, DATA_FS(bs) + (nodep->lastc_cached_value-EXFAT_CLST_FIRST)*SPC(bs) + (bn % SPC(bs)), flags); @@ -155,5 +155,5 @@ } - rc = exfat_block_get_by_clst(block, bs, nodep->idx->devmap_handle, + rc = exfat_block_get_by_clst(block, bs, nodep->idx->service_id, nodep->fragmented, firstc, &currc, relbn, flags); if (rc != EOK) @@ -174,5 +174,5 @@ * @param block Pointer to a block pointer for storing result. * @param bs Buffer holding the boot sector of the file system. - * @param devmap_handle Device handle of the file system. + * @param service_id Service ID of the file system. * @param fcl First cluster used by the file. Can be zero if the file * is empty. @@ -187,5 +187,5 @@ int exfat_block_get_by_clst(block_t **block, exfat_bs_t *bs, - devmap_handle_t devmap_handle, bool fragmented, exfat_cluster_t fcl, + service_id_t service_id, bool fragmented, exfat_cluster_t fcl, exfat_cluster_t *clp, aoff64_t bn, int flags) { @@ -199,14 +199,14 @@ if (!fragmented) { - rc = block_get(block, devmap_handle, DATA_FS(bs) + + rc = block_get(block, service_id, DATA_FS(bs) + (fcl-EXFAT_CLST_FIRST)*SPC(bs) + bn, flags); } else { max_clusters = bn / SPC(bs); - rc = exfat_cluster_walk(bs, devmap_handle, fcl, &c, &clusters, max_clusters); + rc = exfat_cluster_walk(bs, service_id, fcl, &c, &clusters, max_clusters); if (rc != EOK) return rc; assert(clusters == max_clusters); - rc = block_get(block, devmap_handle, DATA_FS(bs) + + rc = block_get(block, service_id, DATA_FS(bs) + (c-EXFAT_CLST_FIRST)*SPC(bs) + (bn % SPC(bs)), flags); @@ -222,5 +222,5 @@ * * @param bs Buffer holding the boot sector for the file system. - * @param devmap_handle Device handle for the file system. + * @param service_id Service ID for the file system. * @param clst Cluster which to get. * @param value Output argument holding the value of the cluster. @@ -229,5 +229,5 @@ */ int -exfat_get_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, +exfat_get_cluster(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t clst, exfat_cluster_t *value) { @@ -238,5 +238,5 @@ offset = clst * sizeof(exfat_cluster_t); - rc = block_get(&b, devmap_handle, FAT_FS(bs) + offset / BPS(bs), BLOCK_FLAGS_NONE); + rc = block_get(&b, service_id, FAT_FS(bs) + offset / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) return rc; @@ -252,5 +252,5 @@ * * @param bs Buffer holding the boot sector for the file system. - * @param devmap_handle Device handle for the file system. + * @param service_id Service ID for the file system. * @param clst Cluster which is to be set. * @param value Value to set the cluster with. @@ -259,5 +259,5 @@ */ int -exfat_set_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, +exfat_set_cluster(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t clst, exfat_cluster_t value) { @@ -268,5 +268,5 @@ offset = clst * sizeof(exfat_cluster_t); - rc = block_get(&b, devmap_handle, FAT_FS(bs) + offset / BPS(bs), BLOCK_FLAGS_NONE); + rc = block_get(&b, service_id, FAT_FS(bs) + offset / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) return rc; @@ -287,5 +287,5 @@ * * @param bs Buffer holding the boot sector of the file system. - * @param devmap_handle Device handle of the file system. + * @param service_id Service ID of the file system. * @param nclsts Number of clusters to allocate. * @param mcl Output parameter where the first cluster in the chain @@ -297,5 +297,5 @@ */ int -exfat_alloc_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, unsigned nclsts, +exfat_alloc_clusters(exfat_bs_t *bs, service_id_t service_id, unsigned nclsts, exfat_cluster_t *mcl, exfat_cluster_t *lcl) { @@ -312,5 +312,5 @@ for (clst=EXFAT_CLST_FIRST; clst < DATA_CNT(bs)+2 && found < nclsts; clst++) { /* Need to rewrite because of multiple exfat_bitmap_get calls */ - if (bitmap_is_free(bs, devmap_handle, clst)==EOK) { + if (bitmap_is_free(bs, service_id, clst)==EOK) { /* * The cluster is free. Put it into our stack @@ -318,10 +318,10 @@ */ lifo[found] = clst; - rc = exfat_set_cluster(bs, devmap_handle, clst, + rc = exfat_set_cluster(bs, service_id, clst, (found == 0) ? EXFAT_CLST_EOF : lifo[found - 1]); if (rc != EOK) break; found++; - rc = bitmap_set_cluster(bs, devmap_handle, clst); + rc = bitmap_set_cluster(bs, service_id, clst); if (rc != EOK) break; @@ -341,6 +341,6 @@ if (found > 0) { while (found--) { - (void) bitmap_clear_cluster(bs, devmap_handle, lifo[found]); - (void) exfat_set_cluster(bs, devmap_handle, lifo[found], 0); + (void) bitmap_clear_cluster(bs, service_id, lifo[found]); + (void) exfat_set_cluster(bs, service_id, lifo[found], 0); } } @@ -354,5 +354,5 @@ * * @param bs Buffer hodling the boot sector of the file system. - * @param devmap_handle Device handle of the file system. + * @param service_id Service ID of the file system. * @param firstc First cluster in the chain which is to be freed. * @@ -360,5 +360,5 @@ */ int -exfat_free_clusters(exfat_bs_t *bs, devmap_handle_t devmap_handle, exfat_cluster_t firstc) +exfat_free_clusters(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t firstc) { exfat_cluster_t nextc; @@ -368,11 +368,11 @@ while (firstc != EXFAT_CLST_EOF) { assert(firstc >= EXFAT_CLST_FIRST && firstc < EXFAT_CLST_BAD); - rc = exfat_get_cluster(bs, devmap_handle, firstc, &nextc); - if (rc != EOK) - return rc; - rc = exfat_set_cluster(bs, devmap_handle, firstc, 0); - if (rc != EOK) - return rc; - rc = bitmap_clear_cluster(bs, devmap_handle, firstc); + rc = exfat_get_cluster(bs, service_id, firstc, &nextc); + if (rc != EOK) + return rc; + rc = exfat_set_cluster(bs, service_id, firstc, 0); + if (rc != EOK) + return rc; + rc = bitmap_clear_cluster(bs, service_id, firstc); if (rc != EOK) return rc; @@ -396,5 +396,5 @@ exfat_cluster_t lcl) { - devmap_handle_t devmap_handle = nodep->idx->devmap_handle; + service_id_t service_id = nodep->idx->service_id; exfat_cluster_t lastc; int rc; @@ -409,5 +409,5 @@ nodep->lastc_cached_valid = false; } else { - rc = exfat_cluster_walk(bs, devmap_handle, nodep->firstc, + rc = exfat_cluster_walk(bs, service_id, nodep->firstc, &lastc, NULL, (uint16_t) -1); if (rc != EOK) @@ -415,5 +415,5 @@ } - rc = exfat_set_cluster(bs, nodep->idx->devmap_handle, lastc, mcl); + rc = exfat_set_cluster(bs, nodep->idx->service_id, lastc, mcl); if (rc != EOK) return rc; @@ -439,5 +439,5 @@ { int rc; - devmap_handle_t devmap_handle = nodep->idx->devmap_handle; + service_id_t service_id = nodep->idx->service_id; /* @@ -450,5 +450,5 @@ if (lcl == 0) { /* The node will have zero size and no clusters allocated. */ - rc = exfat_free_clusters(bs, devmap_handle, nodep->firstc); + rc = exfat_free_clusters(bs, service_id, nodep->firstc); if (rc != EOK) return rc; @@ -458,15 +458,15 @@ exfat_cluster_t nextc; - rc = exfat_get_cluster(bs, devmap_handle, lcl, &nextc); + rc = exfat_get_cluster(bs, service_id, lcl, &nextc); if (rc != EOK) return rc; /* Terminate the cluster chain */ - rc = exfat_set_cluster(bs, devmap_handle, lcl, EXFAT_CLST_EOF); + rc = exfat_set_cluster(bs, service_id, lcl, EXFAT_CLST_EOF); if (rc != EOK) return rc; /* Free all following clusters. */ - rc = exfat_free_clusters(bs, devmap_handle, nextc); + rc = exfat_free_clusters(bs, service_id, nextc); if (rc != EOK) return rc; @@ -483,5 +483,5 @@ int -exfat_zero_cluster(exfat_bs_t *bs, devmap_handle_t devmap_handle, exfat_cluster_t c) +exfat_zero_cluster(exfat_bs_t *bs, service_id_t service_id, exfat_cluster_t c) { size_t i; @@ -490,5 +490,5 @@ for (i = 0; i < SPC(bs); i++) { - rc = exfat_block_get_by_clst(&b, bs, devmap_handle, false, c, NULL, i, + rc = exfat_block_get_by_clst(&b, bs, service_id, false, c, NULL, i, BLOCK_FLAGS_NOREAD); if (rc != EOK) @@ -536,5 +536,5 @@ * does not contain a exfat file system. */ -int exfat_sanity_check(exfat_bs_t *bs, devmap_handle_t devmap_handle) +int exfat_sanity_check(exfat_bs_t *bs, service_id_t service_id) { /* TODO */ Index: uspace/srv/fs/exfat/exfat_fat.h =================================================================== --- uspace/srv/fs/exfat/exfat_fat.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/exfat/exfat_fat.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -59,7 +59,7 @@ -#define exfat_clusters_get(numc, bs, dh, fc) \ - exfat_cluster_walk((bs), (dh), (fc), NULL, (numc), (uint32_t) -1) -extern int exfat_cluster_walk(struct exfat_bs *bs, devmap_handle_t devmap_handle, +#define exfat_clusters_get(numc, bs, sid, fc) \ + exfat_cluster_walk((bs), (sid), (fc), NULL, (numc), (uint32_t) -1) +extern int exfat_cluster_walk(struct exfat_bs *bs, service_id_t service_id, exfat_cluster_t firstc, exfat_cluster_t *lastc, uint32_t *numc, uint32_t max_clusters); @@ -67,12 +67,12 @@ struct exfat_node *nodep, aoff64_t bn, int flags); extern int exfat_block_get_by_clst(block_t **block, struct exfat_bs *bs, - devmap_handle_t devmap_handle, bool fragmented, exfat_cluster_t fcl, + service_id_t service_id, bool fragmented, exfat_cluster_t fcl, exfat_cluster_t *clp, aoff64_t bn, int flags); -extern int exfat_get_cluster(struct exfat_bs *bs, devmap_handle_t devmap_handle, +extern int exfat_get_cluster(struct exfat_bs *bs, service_id_t service_id, exfat_cluster_t clst, exfat_cluster_t *value); -extern int exfat_set_cluster(struct exfat_bs *bs, devmap_handle_t devmap_handle, +extern int exfat_set_cluster(struct exfat_bs *bs, service_id_t service_id, exfat_cluster_t clst, exfat_cluster_t value); -extern int exfat_sanity_check(struct exfat_bs *, devmap_handle_t); +extern int exfat_sanity_check(struct exfat_bs *, service_id_t); extern int exfat_append_clusters(struct exfat_bs *, struct exfat_node *, @@ -80,8 +80,8 @@ extern int exfat_chop_clusters(struct exfat_bs *, struct exfat_node *, exfat_cluster_t); -extern int exfat_alloc_clusters(struct exfat_bs *, devmap_handle_t, unsigned, +extern int exfat_alloc_clusters(struct exfat_bs *, service_id_t, unsigned, exfat_cluster_t *, exfat_cluster_t *); -extern int exfat_free_clusters(struct exfat_bs *, devmap_handle_t, exfat_cluster_t); -extern int exfat_zero_cluster(struct exfat_bs * bs, devmap_handle_t devmap_handle, +extern int exfat_free_clusters(struct exfat_bs *, service_id_t, exfat_cluster_t); +extern int exfat_zero_cluster(struct exfat_bs * bs, service_id_t service_id, exfat_cluster_t mcl); Index: uspace/srv/fs/exfat/exfat_idx.c =================================================================== --- uspace/srv/fs/exfat/exfat_idx.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/exfat/exfat_idx.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -59,5 +59,5 @@ typedef struct { link_t link; - devmap_handle_t devmap_handle; + service_id_t service_id; /** Next unassigned index. */ @@ -76,8 +76,8 @@ static LIST_INITIALIZE(unused_list); -static void unused_initialize(unused_t *u, devmap_handle_t devmap_handle) +static void unused_initialize(unused_t *u, service_id_t service_id) { link_initialize(&u->link); - u->devmap_handle = devmap_handle; + u->service_id = service_id; u->next = 0; u->remaining = ((uint64_t)((fs_index_t)-1)) + 1; @@ -85,5 +85,5 @@ } -static unused_t *unused_find(devmap_handle_t devmap_handle, bool lock) +static unused_t *unused_find(service_id_t service_id, bool lock) { unused_t *u; @@ -93,5 +93,5 @@ list_foreach(unused_list, l) { u = list_get_instance(l, unused_t, link); - if (u->devmap_handle == devmap_handle) + if (u->service_id == service_id) return u; } @@ -107,5 +107,5 @@ /** * Global hash table of all used exfat_idx_t structures. - * The index structures are hashed by the devmap_handle, parent node's first + * The index structures are hashed by the service_id, parent node's first * cluster and index within the parent directory. */ @@ -115,5 +115,5 @@ #define UPH_BUCKETS (1 << UPH_BUCKETS_LOG) -#define UPH_DH_KEY 0 +#define UPH_SID_KEY 0 #define UPH_PFC_KEY 1 #define UPH_PDI_KEY 2 @@ -121,5 +121,5 @@ static hash_index_t pos_hash(unsigned long key[]) { - devmap_handle_t devmap_handle = (devmap_handle_t)key[UPH_DH_KEY]; + service_id_t service_id = (service_id_t)key[UPH_SID_KEY]; exfat_cluster_t pfc = (exfat_cluster_t)key[UPH_PFC_KEY]; unsigned pdi = (unsigned)key[UPH_PDI_KEY]; @@ -141,5 +141,5 @@ h |= (pdi & ((1 << (UPH_BUCKETS_LOG / 4)) - 1)) << (UPH_BUCKETS_LOG / 2); - h |= (devmap_handle & ((1 << (UPH_BUCKETS_LOG / 4)) - 1)) << + h |= (service_id & ((1 << (UPH_BUCKETS_LOG / 4)) - 1)) << (3 * (UPH_BUCKETS_LOG / 4)); @@ -149,5 +149,5 @@ static int pos_compare(unsigned long key[], hash_count_t keys, link_t *item) { - devmap_handle_t devmap_handle = (devmap_handle_t)key[UPH_DH_KEY]; + service_id_t service_id = (service_id_t)key[UPH_SID_KEY]; exfat_cluster_t pfc; unsigned pdi; @@ -156,9 +156,9 @@ switch (keys) { case 1: - return (devmap_handle == fidx->devmap_handle); + return (service_id == fidx->service_id); case 3: pfc = (exfat_cluster_t) key[UPH_PFC_KEY]; pdi = (unsigned) key[UPH_PDI_KEY]; - return (devmap_handle == fidx->devmap_handle) && (pfc == fidx->pfc) && + return (service_id == fidx->service_id) && (pfc == fidx->pfc) && (pdi == fidx->pdi); default: @@ -182,5 +182,5 @@ /** * Global hash table of all used fat_idx_t structures. - * The index structures are hashed by the devmap_handle and index. + * The index structures are hashed by the service_id and index. */ static hash_table_t ui_hash; @@ -189,15 +189,15 @@ #define UIH_BUCKETS (1 << UIH_BUCKETS_LOG) -#define UIH_DH_KEY 0 +#define UIH_SID_KEY 0 #define UIH_INDEX_KEY 1 static hash_index_t idx_hash(unsigned long key[]) { - devmap_handle_t devmap_handle = (devmap_handle_t)key[UIH_DH_KEY]; + service_id_t service_id = (service_id_t)key[UIH_SID_KEY]; fs_index_t index = (fs_index_t)key[UIH_INDEX_KEY]; hash_index_t h; - h = devmap_handle & ((1 << (UIH_BUCKETS_LOG / 2)) - 1); + h = service_id & ((1 << (UIH_BUCKETS_LOG / 2)) - 1); h |= (index & ((1 << (UIH_BUCKETS_LOG / 2)) - 1)) << (UIH_BUCKETS_LOG / 2); @@ -208,5 +208,5 @@ static int idx_compare(unsigned long key[], hash_count_t keys, link_t *item) { - devmap_handle_t devmap_handle = (devmap_handle_t)key[UIH_DH_KEY]; + service_id_t service_id = (service_id_t)key[UIH_SID_KEY]; fs_index_t index; exfat_idx_t *fidx = list_get_instance(item, exfat_idx_t, uih_link); @@ -214,8 +214,8 @@ switch (keys) { case 1: - return (devmap_handle == fidx->devmap_handle); + return (service_id == fidx->service_id); case 2: index = (fs_index_t) key[UIH_INDEX_KEY]; - return (devmap_handle == fidx->devmap_handle) && + return (service_id == fidx->service_id) && (index == fidx->index); default: @@ -240,10 +240,10 @@ /** Allocate a VFS index which is not currently in use. */ -static bool exfat_index_alloc(devmap_handle_t devmap_handle, fs_index_t *index) +static bool exfat_index_alloc(service_id_t service_id, fs_index_t *index) { unused_t *u; assert(index); - u = unused_find(devmap_handle, true); + u = unused_find(service_id, true); if (!u) return false; @@ -302,9 +302,9 @@ /** Free a VFS index, which is no longer in use. */ -static void exfat_index_free(devmap_handle_t devmap_handle, fs_index_t index) +static void exfat_index_free(service_id_t service_id, fs_index_t index) { unused_t *u; - u = unused_find(devmap_handle, true); + u = unused_find(service_id, true); assert(u); @@ -364,5 +364,5 @@ } -static int exfat_idx_create(exfat_idx_t **fidxp, devmap_handle_t devmap_handle) +static int exfat_idx_create(exfat_idx_t **fidxp, service_id_t service_id) { exfat_idx_t *fidx; @@ -371,5 +371,5 @@ if (!fidx) return ENOMEM; - if (!exfat_index_alloc(devmap_handle, &fidx->index)) { + if (!exfat_index_alloc(service_id, &fidx->index)) { free(fidx); return ENOSPC; @@ -379,5 +379,5 @@ link_initialize(&fidx->uih_link); fibril_mutex_initialize(&fidx->lock); - fidx->devmap_handle = devmap_handle; + fidx->service_id = service_id; fidx->pfc = 0; /* no parent yet */ fidx->pdi = 0; @@ -388,5 +388,5 @@ } -int exfat_idx_get_new(exfat_idx_t **fidxp, devmap_handle_t devmap_handle) +int exfat_idx_get_new(exfat_idx_t **fidxp, service_id_t service_id) { exfat_idx_t *fidx; @@ -394,5 +394,5 @@ fibril_mutex_lock(&used_lock); - rc = exfat_idx_create(&fidx, devmap_handle); + rc = exfat_idx_create(&fidx, service_id); if (rc != EOK) { fibril_mutex_unlock(&used_lock); @@ -401,5 +401,5 @@ unsigned long ikey[] = { - [UIH_DH_KEY] = devmap_handle, + [UIH_SID_KEY] = service_id, [UIH_INDEX_KEY] = fidx->index, }; @@ -414,10 +414,10 @@ exfat_idx_t * -exfat_idx_get_by_pos(devmap_handle_t devmap_handle, exfat_cluster_t pfc, unsigned pdi) +exfat_idx_get_by_pos(service_id_t service_id, exfat_cluster_t pfc, unsigned pdi) { exfat_idx_t *fidx; link_t *l; unsigned long pkey[] = { - [UPH_DH_KEY] = devmap_handle, + [UPH_SID_KEY] = service_id, [UPH_PFC_KEY] = pfc, [UPH_PDI_KEY] = pdi, @@ -431,5 +431,5 @@ int rc; - rc = exfat_idx_create(&fidx, devmap_handle); + rc = exfat_idx_create(&fidx, service_id); if (rc != EOK) { fibril_mutex_unlock(&used_lock); @@ -438,5 +438,5 @@ unsigned long ikey[] = { - [UIH_DH_KEY] = devmap_handle, + [UIH_SID_KEY] = service_id, [UIH_INDEX_KEY] = fidx->index, }; @@ -457,5 +457,5 @@ { unsigned long pkey[] = { - [UPH_DH_KEY] = idx->devmap_handle, + [UPH_SID_KEY] = idx->service_id, [UPH_PFC_KEY] = idx->pfc, [UPH_PDI_KEY] = idx->pdi, @@ -470,5 +470,5 @@ { unsigned long pkey[] = { - [UPH_DH_KEY] = idx->devmap_handle, + [UPH_SID_KEY] = idx->service_id, [UPH_PFC_KEY] = idx->pfc, [UPH_PDI_KEY] = idx->pdi, @@ -481,10 +481,10 @@ exfat_idx_t * -exfat_idx_get_by_index(devmap_handle_t devmap_handle, fs_index_t index) +exfat_idx_get_by_index(service_id_t service_id, fs_index_t index) { exfat_idx_t *fidx = NULL; link_t *l; unsigned long ikey[] = { - [UIH_DH_KEY] = devmap_handle, + [UIH_SID_KEY] = service_id, [UIH_INDEX_KEY] = index, }; @@ -508,8 +508,8 @@ { unsigned long ikey[] = { - [UIH_DH_KEY] = idx->devmap_handle, + [UIH_SID_KEY] = idx->service_id, [UIH_INDEX_KEY] = idx->index, }; - devmap_handle_t devmap_handle = idx->devmap_handle; + service_id_t service_id = idx->service_id; fs_index_t index = idx->index; @@ -526,5 +526,5 @@ fibril_mutex_unlock(&used_lock); /* Release the VFS index. */ - exfat_index_free(devmap_handle, index); + exfat_index_free(service_id, index); /* The index structure itself is freed in idx_remove_callback(). */ } @@ -548,5 +548,5 @@ } -int exfat_idx_init_by_devmap_handle(devmap_handle_t devmap_handle) +int exfat_idx_init_by_service_id(service_id_t service_id) { unused_t *u; @@ -556,7 +556,7 @@ if (!u) return ENOMEM; - unused_initialize(u, devmap_handle); + unused_initialize(u, service_id); fibril_mutex_lock(&unused_lock); - if (!unused_find(devmap_handle, false)) { + if (!unused_find(service_id, false)) { list_append(&u->link, &unused_list); } else { @@ -568,11 +568,11 @@ } -void exfat_idx_fini_by_devmap_handle(devmap_handle_t devmap_handle) +void exfat_idx_fini_by_service_id(service_id_t service_id) { unsigned long ikey[] = { - [UIH_DH_KEY] = devmap_handle + [UIH_SID_KEY] = service_id }; unsigned long pkey[] = { - [UPH_DH_KEY] = devmap_handle + [UPH_SID_KEY] = service_id }; @@ -590,5 +590,5 @@ * Free the unused and freed structures for this instance. */ - unused_t *u = unused_find(devmap_handle, true); + unused_t *u = unused_find(service_id, true); assert(u); list_remove(&u->link); Index: uspace/srv/fs/exfat/exfat_ops.c =================================================================== --- uspace/srv/fs/exfat/exfat_ops.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/exfat/exfat_ops.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -46,5 +46,5 @@ #include #include -#include +#include #include #include @@ -71,10 +71,10 @@ */ -static int exfat_root_get(fs_node_t **, devmap_handle_t); +static int exfat_root_get(fs_node_t **, service_id_t); static int exfat_match(fs_node_t **, fs_node_t *, const char *); -static int exfat_node_get(fs_node_t **, devmap_handle_t, fs_index_t); +static int exfat_node_get(fs_node_t **, service_id_t, fs_index_t); static int exfat_node_open(fs_node_t *); /* static int exfat_node_put(fs_node_t *); */ -static int exfat_create_node(fs_node_t **, devmap_handle_t, int); +static int exfat_create_node(fs_node_t **, service_id_t, int); static int exfat_destroy_node(fs_node_t *); static int exfat_link(fs_node_t *, fs_node_t *, const char *); @@ -86,5 +86,5 @@ static bool exfat_is_directory(fs_node_t *); static bool exfat_is_file(fs_node_t *node); -static devmap_handle_t exfat_device_get(fs_node_t *node); +static service_id_t exfat_device_get(fs_node_t *node); /* @@ -135,5 +135,5 @@ ds.data_size = node->size; - exfat_directory_open_parent(&di, node->idx->devmap_handle, node->idx->pfc, + exfat_directory_open_parent(&di, node->idx->service_id, node->idx->pfc, node->idx->parent_fragmented); rc = exfat_directory_seek(&di, node->idx->pdi); @@ -151,5 +151,5 @@ } -static int exfat_node_fini_by_devmap_handle(devmap_handle_t devmap_handle) +static int exfat_node_fini_by_service_id(service_id_t service_id) { exfat_node_t *nodep; @@ -175,5 +175,5 @@ goto restart; } - if (nodep->idx->devmap_handle != devmap_handle) { + if (nodep->idx->service_id != service_id) { fibril_mutex_unlock(&nodep->idx->lock); fibril_mutex_unlock(&nodep->lock); @@ -268,7 +268,7 @@ static int exfat_node_get_new_by_pos(exfat_node_t **nodepp, - devmap_handle_t devmap_handle, exfat_cluster_t pfc, unsigned pdi) -{ - exfat_idx_t *idxp = exfat_idx_get_by_pos(devmap_handle, pfc, pdi); + service_id_t service_id, exfat_cluster_t pfc, unsigned pdi) +{ + exfat_idx_t *idxp = exfat_idx_get_by_pos(service_id, pfc, pdi); if (!idxp) return ENOMEM; @@ -318,5 +318,5 @@ return rc; - exfat_directory_open_parent(&di, idxp->devmap_handle, idxp->pfc, + exfat_directory_open_parent(&di, idxp->service_id, idxp->pfc, idxp->parent_fragmented); rc = exfat_directory_seek(&di, idxp->pdi); @@ -395,9 +395,9 @@ } -int exfat_node_expand(devmap_handle_t devmap_handle, exfat_node_t *nodep, exfat_cluster_t clusters) +int exfat_node_expand(service_id_t service_id, exfat_node_t *nodep, exfat_cluster_t clusters) { exfat_bs_t *bs; int rc; - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); if (!nodep->fragmented) { @@ -418,10 +418,10 @@ /* create an independent chain of nclsts clusters in all FATs */ - rc = exfat_alloc_clusters(bs, devmap_handle, clusters, &mcl, &lcl); - if (rc != EOK) - return rc; - rc = exfat_zero_cluster(bs, devmap_handle, mcl); - if (rc != EOK) { - (void) exfat_free_clusters(bs, devmap_handle, mcl); + rc = exfat_alloc_clusters(bs, service_id, clusters, &mcl, &lcl); + if (rc != EOK) + return rc; + rc = exfat_zero_cluster(bs, service_id, mcl); + if (rc != EOK) { + (void) exfat_free_clusters(bs, service_id, mcl); return rc; } @@ -432,5 +432,5 @@ rc = exfat_append_clusters(bs, nodep, mcl, lcl); if (rc != EOK) { - (void) exfat_free_clusters(bs, devmap_handle, mcl); + (void) exfat_free_clusters(bs, service_id, mcl); return rc; } @@ -439,9 +439,9 @@ } -static int exfat_node_shrink(devmap_handle_t devmap_handle, exfat_node_t *nodep, aoff64_t size) +static int exfat_node_shrink(service_id_t service_id, exfat_node_t *nodep, aoff64_t size) { exfat_bs_t *bs; int rc; - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); if (!nodep->fragmented) { @@ -466,5 +466,5 @@ } else { exfat_cluster_t lastc; - rc = exfat_cluster_walk(bs, devmap_handle, nodep->firstc, + rc = exfat_cluster_walk(bs, service_id, nodep->firstc, &lastc, NULL, (size - 1) / BPC(bs)); if (rc != EOK) @@ -486,17 +486,17 @@ */ -int exfat_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle) -{ - return exfat_node_get(rfn, devmap_handle, EXFAT_ROOT_IDX); -} - -int exfat_bitmap_get(fs_node_t **rfn, devmap_handle_t devmap_handle) -{ - return exfat_node_get(rfn, devmap_handle, EXFAT_BITMAP_IDX); -} - -int exfat_uctable_get(fs_node_t **rfn, devmap_handle_t devmap_handle) -{ - return exfat_node_get(rfn, devmap_handle, EXFAT_UCTABLE_IDX); +int exfat_root_get(fs_node_t **rfn, service_id_t service_id) +{ + return exfat_node_get(rfn, service_id, EXFAT_ROOT_IDX); +} + +int exfat_bitmap_get(fs_node_t **rfn, service_id_t service_id) +{ + return exfat_node_get(rfn, service_id, EXFAT_BITMAP_IDX); +} + +int exfat_uctable_get(fs_node_t **rfn, service_id_t service_id) +{ + return exfat_node_get(rfn, service_id, EXFAT_UCTABLE_IDX); } @@ -508,9 +508,9 @@ exfat_file_dentry_t df; exfat_stream_dentry_t ds; - devmap_handle_t devmap_handle; + service_id_t service_id; int rc; fibril_mutex_lock(&parentp->idx->lock); - devmap_handle = parentp->idx->devmap_handle; + service_id = parentp->idx->service_id; fibril_mutex_unlock(&parentp->idx->lock); @@ -526,5 +526,5 @@ exfat_node_t *nodep; aoff64_t o = di.pos % (BPS(di.bs) / sizeof(exfat_dentry_t)); - exfat_idx_t *idx = exfat_idx_get_by_pos(devmap_handle, + exfat_idx_t *idx = exfat_idx_get_by_pos(service_id, parentp->firstc, di.bnum * DPS(di.bs) + o); if (!idx) { @@ -559,5 +559,5 @@ /** Instantiate a exFAT in-core node. */ -int exfat_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index) +int exfat_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index) { exfat_node_t *nodep; @@ -565,5 +565,5 @@ int rc; - idxp = exfat_idx_get_by_index(devmap_handle, index); + idxp = exfat_idx_get_by_index(service_id, index); if (!idxp) { *rfn = NULL; @@ -616,5 +616,5 @@ } -int exfat_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int flags) +int exfat_create_node(fs_node_t **rfn, service_id_t service_id, int flags) { exfat_idx_t *idxp; @@ -623,10 +623,10 @@ int rc; - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); rc = exfat_node_get_new(&nodep); if (rc != EOK) return rc; - rc = exfat_idx_get_new(&idxp, devmap_handle); + rc = exfat_idx_get_new(&idxp, service_id); if (rc != EOK) { (void) exfat_node_put(FS_NODE(nodep)); @@ -647,5 +647,5 @@ if (flags & L_DIRECTORY) { nodep->type = EXFAT_DIRECTORY; - rc = exfat_node_expand(devmap_handle, nodep, 1); + rc = exfat_node_expand(service_id, nodep, 1); if (rc != EOK) { (void) exfat_node_put(FS_NODE(nodep)); @@ -684,10 +684,10 @@ assert(!has_children); - bs = block_bb_get(nodep->idx->devmap_handle); + bs = block_bb_get(nodep->idx->service_id); if (nodep->firstc != 0) { assert(nodep->size); /* Free all clusters allocated to the node. */ if (nodep->fragmented) - rc = exfat_free_clusters(bs, nodep->idx->devmap_handle, + rc = exfat_free_clusters(bs, nodep->idx->service_id, nodep->firstc); else @@ -893,5 +893,5 @@ } -devmap_handle_t exfat_device_get(fs_node_t *node) +service_id_t exfat_device_get(fs_node_t *node) { return 0; @@ -926,5 +926,5 @@ /* Print debug info */ /* -static void exfat_fsinfo(exfat_bs_t *bs, devmap_handle_t devmap_handle) +static void exfat_fsinfo(exfat_bs_t *bs, service_id_t service_id) { printf("exFAT file system mounted\n"); @@ -945,10 +945,10 @@ exfat_cluster_t clst; for (i=0; i<=7; i++) { - rc = exfat_get_cluster(bs, devmap_handle, i, &clst); + rc = exfat_get_cluster(bs, service_id, i, &clst); if (rc != EOK) return; printf("Clst %d: %x", i, clst); if (i>=2) - printf(", Bitmap: %d\n", bitmap_is_free(bs, devmap_handle, i)!=EOK); + printf(", Bitmap: %d\n", bitmap_is_free(bs, service_id, i)!=EOK); else printf("\n"); @@ -958,5 +958,5 @@ static int -exfat_mounted(devmap_handle_t devmap_handle, const char *opts, fs_index_t *index, +exfat_mounted(service_id_t service_id, const char *opts, fs_index_t *index, aoff64_t *size, unsigned *linkcnt) { @@ -973,47 +973,47 @@ /* initialize libblock */ - rc = block_init(EXCHANGE_SERIALIZE, devmap_handle, BS_SIZE); + rc = block_init(EXCHANGE_SERIALIZE, service_id, BS_SIZE); if (rc != EOK) return rc; /* prepare the boot block */ - rc = block_bb_read(devmap_handle, BS_BLOCK); - if (rc != EOK) { - block_fini(devmap_handle); + rc = block_bb_read(service_id, BS_BLOCK); + if (rc != EOK) { + block_fini(service_id); return rc; } /* get the buffer with the boot sector */ - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); /* Initialize the block cache */ - rc = block_cache_init(devmap_handle, BPS(bs), 0 /* XXX */, cmode); - if (rc != EOK) { - block_fini(devmap_handle); + rc = block_cache_init(service_id, BPS(bs), 0 /* XXX */, cmode); + if (rc != EOK) { + block_fini(service_id); return rc; } /* Do some simple sanity checks on the file system. */ - rc = exfat_sanity_check(bs, devmap_handle); - if (rc != EOK) { - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - return rc; - } - - rc = exfat_idx_init_by_devmap_handle(devmap_handle); - if (rc != EOK) { - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); + rc = exfat_sanity_check(bs, service_id); + if (rc != EOK) { + (void) block_cache_fini(service_id); + block_fini(service_id); + return rc; + } + + rc = exfat_idx_init_by_service_id(service_id); + if (rc != EOK) { + (void) block_cache_fini(service_id); + block_fini(service_id); return rc; } /* Initialize the root node. */ - rc = exfat_node_get_new_by_pos(&rootp, devmap_handle, EXFAT_ROOT_PAR, + rc = exfat_node_get_new_by_pos(&rootp, service_id, EXFAT_ROOT_PAR, EXFAT_ROOT_POS); if (rc!=EOK) { - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - exfat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + exfat_idx_fini_by_service_id(service_id); return ENOMEM; } @@ -1027,10 +1027,10 @@ uint32_t clusters; - rc = exfat_clusters_get(&clusters, bs, devmap_handle, rootp->firstc); + rc = exfat_clusters_get(&clusters, bs, service_id, rootp->firstc); if (rc != EOK) { free(rootp); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - exfat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + exfat_idx_fini_by_service_id(service_id); return ENOTSUP; } @@ -1044,7 +1044,7 @@ if (rc != EOK) { free(rootp); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - exfat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + exfat_idx_fini_by_service_id(service_id); return ENOTSUP; } @@ -1054,17 +1054,17 @@ if (rc != EOK) { free(rootp); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - exfat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + exfat_idx_fini_by_service_id(service_id); return ENOTSUP; } - rc = exfat_node_get_new_by_pos(&bitmapp, devmap_handle, rootp->firstc, + rc = exfat_node_get_new_by_pos(&bitmapp, service_id, rootp->firstc, di.pos); if (rc!=EOK) { free(rootp); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - exfat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + exfat_idx_fini_by_service_id(service_id); return ENOMEM; } @@ -1085,7 +1085,7 @@ free(rootp); free(bitmapp); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - exfat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + exfat_idx_fini_by_service_id(service_id); return ENOTSUP; } @@ -1095,18 +1095,18 @@ free(rootp); free(bitmapp); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - exfat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + exfat_idx_fini_by_service_id(service_id); return ENOTSUP; } - rc = exfat_node_get_new_by_pos(&uctablep, devmap_handle, rootp->firstc, + rc = exfat_node_get_new_by_pos(&uctablep, service_id, rootp->firstc, di.pos); if (rc!=EOK) { free(rootp); free(bitmapp); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - exfat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + exfat_idx_fini_by_service_id(service_id); return ENOMEM; } @@ -1127,11 +1127,11 @@ free(bitmapp); free(uctablep); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - exfat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + exfat_idx_fini_by_service_id(service_id); return ENOMEM; } - /* exfat_fsinfo(bs, devmap_handle); */ + /* exfat_fsinfo(bs, service_id); */ *index = rootp->idx->index; @@ -1142,5 +1142,5 @@ } -static int exfat_unmounted(devmap_handle_t devmap_handle) +static int exfat_unmounted(service_id_t service_id) { fs_node_t *fn; @@ -1148,5 +1148,5 @@ int rc; - rc = exfat_root_get(&fn, devmap_handle); + rc = exfat_root_get(&fn, service_id); if (rc != EOK) return rc; @@ -1173,8 +1173,8 @@ * stop using libblock for this instance. */ - (void) exfat_node_fini_by_devmap_handle(devmap_handle); - exfat_idx_fini_by_devmap_handle(devmap_handle); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); + (void) exfat_node_fini_by_service_id(service_id); + exfat_idx_fini_by_service_id(service_id); + (void) block_cache_fini(service_id); + block_fini(service_id); return EOK; @@ -1182,5 +1182,5 @@ static int -exfat_read(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos, +exfat_read(service_id_t service_id, fs_index_t index, aoff64_t pos, size_t *rbytes) { @@ -1192,5 +1192,5 @@ int rc; - rc = exfat_node_get(&fn, devmap_handle, index); + rc = exfat_node_get(&fn, service_id, index); if (rc != EOK) return rc; @@ -1207,5 +1207,5 @@ } - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); if (nodep->type == EXFAT_FILE) { @@ -1292,13 +1292,13 @@ } -static int exfat_close(devmap_handle_t devmap_handle, fs_index_t index) +static int exfat_close(service_id_t service_id, fs_index_t index) { return EOK; } -static int exfat_sync(devmap_handle_t devmap_handle, fs_index_t index) +static int exfat_sync(service_id_t service_id, fs_index_t index) { fs_node_t *fn; - int rc = exfat_node_get(&fn, devmap_handle, index); + int rc = exfat_node_get(&fn, service_id, index); if (rc != EOK) return rc; @@ -1316,5 +1316,5 @@ static int -exfat_write(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos, +exfat_write(service_id_t service_id, fs_index_t index, aoff64_t pos, size_t *wbytes, aoff64_t *nsize) { @@ -1328,5 +1328,5 @@ int rc; - rc = exfat_node_get(&fn, devmap_handle, index); + rc = exfat_node_get(&fn, service_id, index); if (rc != EOK) return rc; @@ -1343,5 +1343,5 @@ } - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); /* @@ -1360,5 +1360,5 @@ unsigned nclsts; nclsts = (ROUND_UP(pos + bytes, BPC(bs)) - boundary) / BPC(bs); - rc = exfat_node_expand(devmap_handle, nodep, nclsts); + rc = exfat_node_expand(service_id, nodep, nclsts); if (rc != EOK) { /* could not expand node */ @@ -1404,5 +1404,5 @@ static int -exfat_truncate(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t size) +exfat_truncate(service_id_t service_id, fs_index_t index, aoff64_t size) { fs_node_t *fn; @@ -1411,5 +1411,5 @@ int rc; - rc = exfat_node_get(&fn, devmap_handle, index); + rc = exfat_node_get(&fn, service_id, index); if (rc != EOK) return rc; @@ -1418,5 +1418,5 @@ nodep = EXFAT_NODE(fn); - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); if (nodep->size == size) { @@ -1436,5 +1436,5 @@ rc = EOK; } else { - rc = exfat_node_shrink(devmap_handle, nodep, size); + rc = exfat_node_shrink(service_id, nodep, size); } @@ -1443,5 +1443,5 @@ } -static int exfat_destroy(devmap_handle_t devmap_handle, fs_index_t index) +static int exfat_destroy(service_id_t service_id, fs_index_t index) { fs_node_t *fn; @@ -1449,5 +1449,5 @@ int rc; - rc = exfat_node_get(&fn, devmap_handle, index); + rc = exfat_node_get(&fn, service_id, index); if (rc != EOK) return rc; Index: uspace/srv/fs/ext2fs/ext2fs_ops.c =================================================================== --- uspace/srv/fs/ext2fs/ext2fs_ops.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/ext2fs/ext2fs_ops.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -42,5 +42,5 @@ #include #include -#include +#include #include #include @@ -69,5 +69,5 @@ typedef struct ext2fs_instance { link_t link; - devmap_handle_t devmap_handle; + service_id_t service_id; ext2_filesystem_t *filesystem; unsigned int open_nodes_count; @@ -85,5 +85,5 @@ * Forward declarations of auxiliary functions */ -static int ext2fs_instance_get(devmap_handle_t, ext2fs_instance_t **); +static int ext2fs_instance_get(service_id_t, ext2fs_instance_t **); static int ext2fs_read_directory(ipc_callid_t, aoff64_t, size_t, ext2fs_instance_t *, ext2_inode_ref_t *, size_t *); @@ -97,10 +97,10 @@ * Forward declarations of EXT2 libfs operations. */ -static int ext2fs_root_get(fs_node_t **, devmap_handle_t); +static int ext2fs_root_get(fs_node_t **, service_id_t); static int ext2fs_match(fs_node_t **, fs_node_t *, const char *); -static int ext2fs_node_get(fs_node_t **, devmap_handle_t, fs_index_t); +static int ext2fs_node_get(fs_node_t **, service_id_t, fs_index_t); static int ext2fs_node_open(fs_node_t *); static int ext2fs_node_put(fs_node_t *); -static int ext2fs_create_node(fs_node_t **, devmap_handle_t, int); +static int ext2fs_create_node(fs_node_t **, service_id_t, int); static int ext2fs_destroy_node(fs_node_t *); static int ext2fs_link(fs_node_t *, fs_node_t *, const char *); @@ -112,5 +112,5 @@ static bool ext2fs_is_directory(fs_node_t *); static bool ext2fs_is_file(fs_node_t *node); -static devmap_handle_t ext2fs_device_get(fs_node_t *node); +static service_id_t ext2fs_device_get(fs_node_t *node); /* @@ -134,6 +134,6 @@ ext2fs_node_t *enode = hash_table_get_instance(item, ext2fs_node_t, link); assert(keys > 0); - if (enode->instance->devmap_handle != - ((devmap_handle_t) key[OPEN_NODES_DEV_HANDLE_KEY])) { + if (enode->instance->service_id != + ((service_id_t) key[OPEN_NODES_DEV_HANDLE_KEY])) { return false; } @@ -180,9 +180,9 @@ /** - * Find an instance of filesystem for the given devmap_handle - */ -int ext2fs_instance_get(devmap_handle_t devmap_handle, ext2fs_instance_t **inst) -{ - EXT2FS_DBG("(%" PRIun ", -)", devmap_handle); + * Find an instance of filesystem for the given service_id + */ +int ext2fs_instance_get(service_id_t service_id, ext2fs_instance_t **inst) +{ + EXT2FS_DBG("(%" PRIun ", -)", service_id); ext2fs_instance_t *tmp; @@ -198,5 +198,5 @@ tmp = list_get_instance(link, ext2fs_instance_t, link); - if (tmp->devmap_handle == devmap_handle) { + if (tmp->service_id == service_id) { *inst = tmp; fibril_mutex_unlock(&instance_list_mutex); @@ -213,8 +213,8 @@ -int ext2fs_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle) -{ - EXT2FS_DBG("(-, %" PRIun ")", devmap_handle); - return ext2fs_node_get(rfn, devmap_handle, EXT2_INODE_ROOT_INDEX); +int ext2fs_root_get(fs_node_t **rfn, service_id_t service_id) +{ + EXT2FS_DBG("(-, %" PRIun ")", service_id); + return ext2fs_node_get(rfn, service_id, EXT2_INODE_ROOT_INDEX); } @@ -289,12 +289,12 @@ /** Instantiate a EXT2 in-core node. */ -int ext2fs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index) -{ - EXT2FS_DBG("(-,%" PRIun ",%u)", devmap_handle, index); +int ext2fs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index) +{ + EXT2FS_DBG("(-,%" PRIun ",%u)", service_id, index); ext2fs_instance_t *inst = NULL; int rc; - rc = ext2fs_instance_get(devmap_handle, &inst); + rc = ext2fs_instance_get(service_id, &inst); if (rc != EOK) { return rc; @@ -317,5 +317,5 @@ /* Check if the node is not already open */ unsigned long key[] = { - [OPEN_NODES_DEV_HANDLE_KEY] = inst->devmap_handle, + [OPEN_NODES_DEV_HANDLE_KEY] = inst->service_id, [OPEN_NODES_INODE_KEY] = index, }; @@ -411,5 +411,5 @@ unsigned long key[] = { - [OPEN_NODES_DEV_HANDLE_KEY] = enode->instance->devmap_handle, + [OPEN_NODES_DEV_HANDLE_KEY] = enode->instance->service_id, [OPEN_NODES_INODE_KEY] = enode->inode_ref->index, }; @@ -429,5 +429,5 @@ } -int ext2fs_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int flags) +int ext2fs_create_node(fs_node_t **rfn, service_id_t service_id, int flags) { EXT2FS_DBG(""); @@ -557,9 +557,9 @@ } -devmap_handle_t ext2fs_device_get(fs_node_t *fn) +service_id_t ext2fs_device_get(fs_node_t *fn) { EXT2FS_DBG(""); ext2fs_node_t *enode = EXT2FS_NODE(fn); - return enode->instance->devmap_handle; + return enode->instance->service_id; } @@ -588,5 +588,5 @@ */ -static int ext2fs_mounted(devmap_handle_t devmap_handle, const char *opts, +static int ext2fs_mounted(service_id_t service_id, const char *opts, fs_index_t *index, aoff64_t *size, unsigned *lnkcnt) { @@ -610,5 +610,5 @@ /* Initialize the filesystem */ - rc = ext2_filesystem_init(fs, devmap_handle); + rc = ext2_filesystem_init(fs, service_id); if (rc != EOK) { free(fs); @@ -637,5 +637,5 @@ /* Initialize instance */ link_initialize(&inst->link); - inst->devmap_handle = devmap_handle; + inst->service_id = service_id; inst->filesystem = fs; inst->open_nodes_count = 0; @@ -666,5 +666,5 @@ } -static int ext2fs_unmounted(devmap_handle_t devmap_handle) +static int ext2fs_unmounted(service_id_t service_id) { EXT2FS_DBG(""); @@ -672,5 +672,5 @@ int rc; - rc = ext2fs_instance_get(devmap_handle, &inst); + rc = ext2fs_instance_get(service_id, &inst); if (rc != EOK) @@ -698,5 +698,5 @@ static int -ext2fs_read(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos, +ext2fs_read(service_id_t service_id, fs_index_t index, aoff64_t pos, size_t *rbytes) { @@ -717,5 +717,5 @@ } - rc = ext2fs_instance_get(devmap_handle, &inst); + rc = ext2fs_instance_get(service_id, &inst); if (rc != EOK) { async_answer_0(callid, rc); @@ -907,5 +907,5 @@ /* Usual case - we need to read a block from device */ - rc = block_get(&block, inst->devmap_handle, fs_block, BLOCK_FLAGS_NONE); + rc = block_get(&block, inst->service_id, fs_block, BLOCK_FLAGS_NONE); if (rc != EOK) { async_answer_0(callid, rc); @@ -925,5 +925,5 @@ static int -ext2fs_write(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos, +ext2fs_write(service_id_t service_id, fs_index_t index, aoff64_t pos, size_t *wbytes, aoff64_t *nsize) { @@ -933,5 +933,5 @@ static int -ext2fs_truncate(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t size) +ext2fs_truncate(service_id_t service_id, fs_index_t index, aoff64_t size) { EXT2FS_DBG(""); @@ -939,11 +939,11 @@ } -static int ext2fs_close(devmap_handle_t devmap_handle, fs_index_t index) -{ - EXT2FS_DBG(""); - return EOK; -} - -static int ext2fs_destroy(devmap_handle_t devmap_handle, fs_index_t index) +static int ext2fs_close(service_id_t service_id, fs_index_t index) +{ + EXT2FS_DBG(""); + return EOK; +} + +static int ext2fs_destroy(service_id_t service_id, fs_index_t index) { EXT2FS_DBG(""); @@ -951,5 +951,5 @@ } -static int ext2fs_sync(devmap_handle_t devmap_handle, fs_index_t index) +static int ext2fs_sync(service_id_t service_id, fs_index_t index) { EXT2FS_DBG(""); Index: uspace/srv/fs/fat/fat.h =================================================================== --- uspace/srv/fs/fat/fat.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/fat/fat.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -178,5 +178,5 @@ fibril_mutex_t lock; - devmap_handle_t devmap_handle; + service_id_t service_id; fs_index_t index; /** @@ -230,7 +230,7 @@ extern libfs_ops_t fat_libfs_ops; -extern int fat_idx_get_new(fat_idx_t **, devmap_handle_t); -extern fat_idx_t *fat_idx_get_by_pos(devmap_handle_t, fat_cluster_t, unsigned); -extern fat_idx_t *fat_idx_get_by_index(devmap_handle_t, fs_index_t); +extern int fat_idx_get_new(fat_idx_t **, service_id_t); +extern fat_idx_t *fat_idx_get_by_pos(service_id_t, fat_cluster_t, unsigned); +extern fat_idx_t *fat_idx_get_by_index(service_id_t, fs_index_t); extern void fat_idx_destroy(fat_idx_t *); extern void fat_idx_hashin(fat_idx_t *); @@ -239,6 +239,6 @@ extern int fat_idx_init(void); extern void fat_idx_fini(void); -extern int fat_idx_init_by_devmap_handle(devmap_handle_t); -extern void fat_idx_fini_by_devmap_handle(devmap_handle_t); +extern int fat_idx_init_by_service_id(service_id_t); +extern void fat_idx_fini_by_service_id(service_id_t); #endif Index: uspace/srv/fs/fat/fat_directory.c =================================================================== --- uspace/srv/fs/fat/fat_directory.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/fat/fat_directory.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -55,5 +55,5 @@ return EINVAL; - di->bs = block_bb_get(di->nodep->idx->devmap_handle); + di->bs = block_bb_get(di->nodep->idx->service_id); di->blocks = ROUND_UP(nodep->size, BPS(di->bs))/BPS(di->bs); di->pos = 0; @@ -397,15 +397,15 @@ return ENOSPC; } - rc = fat_alloc_clusters(di->bs, di->nodep->idx->devmap_handle, 1, &mcl, &lcl); + rc = fat_alloc_clusters(di->bs, di->nodep->idx->service_id, 1, &mcl, &lcl); if (rc != EOK) return rc; - rc = fat_zero_cluster(di->bs, di->nodep->idx->devmap_handle, mcl); + rc = fat_zero_cluster(di->bs, di->nodep->idx->service_id, mcl); if (rc != EOK) { - (void) fat_free_clusters(di->bs, di->nodep->idx->devmap_handle, mcl); + (void) fat_free_clusters(di->bs, di->nodep->idx->service_id, mcl); return rc; } rc = fat_append_clusters(di->bs, di->nodep, mcl, lcl); if (rc != EOK) { - (void) fat_free_clusters(di->bs, di->nodep->idx->devmap_handle, mcl); + (void) fat_free_clusters(di->bs, di->nodep->idx->service_id, mcl); return rc; } Index: uspace/srv/fs/fat/fat_fat.c =================================================================== --- uspace/srv/fs/fat/fat_fat.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/fat/fat_fat.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -70,5 +70,5 @@ * * @param bs Buffer holding the boot sector for the file. - * @param devmap_handle Device handle of the device with the file. + * @param service_id Service ID of the device with the file. * @param firstc First cluster to start the walk with. * @param lastc If non-NULL, output argument hodling the last cluster @@ -81,5 +81,5 @@ */ int -fat_cluster_walk(fat_bs_t *bs, devmap_handle_t devmap_handle, fat_cluster_t firstc, +fat_cluster_walk(fat_bs_t *bs, service_id_t service_id, fat_cluster_t firstc, fat_cluster_t *lastc, uint32_t *numc, uint32_t max_clusters) { @@ -104,5 +104,5 @@ /* read FAT1 */ - rc = fat_get_cluster(bs, devmap_handle, FAT1, clst, &clst); + rc = fat_get_cluster(bs, service_id, FAT1, clst, &clst); if (rc != EOK) return rc; @@ -151,5 +151,5 @@ * when fortunately we have the last cluster number cached. */ - return block_get(block, nodep->idx->devmap_handle, + return block_get(block, nodep->idx->service_id, CLBN2PBN(bs, nodep->lastc_cached_value, bn), flags); } @@ -165,5 +165,5 @@ fall_through: - rc = _fat_block_get(block, bs, nodep->idx->devmap_handle, firstc, + rc = _fat_block_get(block, bs, nodep->idx->service_id, firstc, &currc, relbn, flags); if (rc != EOK) @@ -184,5 +184,5 @@ * @param block Pointer to a block pointer for storing result. * @param bs Buffer holding the boot sector of the file system. - * @param devmap_handle Device handle of the file system. + * @param service_id Service ID handle of the file system. * @param fcl First cluster used by the file. Can be zero if the file * is empty. @@ -196,5 +196,5 @@ */ int -_fat_block_get(block_t **block, fat_bs_t *bs, devmap_handle_t devmap_handle, +_fat_block_get(block_t **block, fat_bs_t *bs, service_id_t service_id, fat_cluster_t fcl, fat_cluster_t *clp, aoff64_t bn, int flags) { @@ -213,5 +213,5 @@ /* root directory special case */ assert(bn < RDS(bs)); - rc = block_get(block, devmap_handle, + rc = block_get(block, service_id, RSCNT(bs) + FATCNT(bs) * SF(bs) + bn, flags); return rc; @@ -219,10 +219,10 @@ max_clusters = bn / SPC(bs); - rc = fat_cluster_walk(bs, devmap_handle, fcl, &c, &clusters, max_clusters); + rc = fat_cluster_walk(bs, service_id, fcl, &c, &clusters, max_clusters); if (rc != EOK) return rc; assert(clusters == max_clusters); - rc = block_get(block, devmap_handle, CLBN2PBN(bs, c, bn), flags); + rc = block_get(block, service_id, CLBN2PBN(bs, c, bn), flags); if (clp) @@ -272,5 +272,5 @@ /* zero out the initial part of the new cluster chain */ for (o = boundary; o < pos; o += BPS(bs)) { - rc = _fat_block_get(&b, bs, nodep->idx->devmap_handle, mcl, + rc = _fat_block_get(&b, bs, nodep->idx->service_id, mcl, NULL, (o - boundary) / BPS(bs), BLOCK_FLAGS_NOREAD); if (rc != EOK) @@ -289,5 +289,5 @@ * * @param bs Buffer holding the boot sector for the file system. - * @param devmap_handle Device handle for the file system. + * @param service_id Service ID for the file system. * @param clst Cluster which to get. * @param value Output argument holding the value of the cluster. @@ -296,5 +296,5 @@ */ int -fat_get_cluster_fat12(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned fatno, +fat_get_cluster_fat12(fat_bs_t *bs, service_id_t service_id, unsigned fatno, fat_cluster_t clst, fat_cluster_t *value) { @@ -308,5 +308,5 @@ return ERANGE; - rc = block_get(&b, devmap_handle, RSCNT(bs) + SF(bs) * fatno + + rc = block_get(&b, service_id, RSCNT(bs) + SF(bs) * fatno + offset / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) @@ -319,5 +319,5 @@ if (offset / BPS(bs) < SF(bs)) { /* No. Reading next sector */ - rc = block_get(&b1, devmap_handle, 1 + RSCNT(bs) + + rc = block_get(&b1, service_id, 1 + RSCNT(bs) + SF(bs)*fatno + offset / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) { @@ -359,5 +359,5 @@ * * @param bs Buffer holding the boot sector for the file system. - * @param devmap_handle Device handle for the file system. + * @param service_id Service ID for the file system. * @param clst Cluster which to get. * @param value Output argument holding the value of the cluster. @@ -366,5 +366,5 @@ */ int -fat_get_cluster_fat16(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned fatno, +fat_get_cluster_fat16(fat_bs_t *bs, service_id_t service_id, unsigned fatno, fat_cluster_t clst, fat_cluster_t *value) { @@ -375,5 +375,5 @@ offset = (clst * FAT16_CLST_SIZE); - rc = block_get(&b, devmap_handle, RSCNT(bs) + SF(bs) * fatno + + rc = block_get(&b, service_id, RSCNT(bs) + SF(bs) * fatno + offset / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) @@ -390,5 +390,5 @@ * * @param bs Buffer holding the boot sector for the file system. - * @param devmap_handle Device handle for the file system. + * @param service_id Service ID for the file system. * @param clst Cluster which to get. * @param value Output argument holding the value of the cluster. @@ -397,5 +397,5 @@ */ int -fat_get_cluster_fat32(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned fatno, +fat_get_cluster_fat32(fat_bs_t *bs, service_id_t service_id, unsigned fatno, fat_cluster_t clst, fat_cluster_t *value) { @@ -406,5 +406,5 @@ offset = (clst * FAT32_CLST_SIZE); - rc = block_get(&b, devmap_handle, RSCNT(bs) + SF(bs) * fatno + + rc = block_get(&b, service_id, RSCNT(bs) + SF(bs) * fatno + offset / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) @@ -422,5 +422,5 @@ * * @param bs Buffer holding the boot sector for the file system. - * @param devmap_handle Device handle for the file system. + * @param service_id Service ID for the file system. * @param clst Cluster which to get. * @param value Output argument holding the value of the cluster. @@ -429,5 +429,5 @@ */ int -fat_get_cluster(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned fatno, +fat_get_cluster(fat_bs_t *bs, service_id_t service_id, unsigned fatno, fat_cluster_t clst, fat_cluster_t *value) { @@ -437,11 +437,11 @@ if (FAT_IS_FAT12(bs)) { - rc = fat_get_cluster_fat12(bs, devmap_handle, fatno, clst, value); + rc = fat_get_cluster_fat12(bs, service_id, fatno, clst, value); } else { if (FAT_IS_FAT32(bs)) - rc = fat_get_cluster_fat32(bs, devmap_handle, fatno, clst, value); + rc = fat_get_cluster_fat32(bs, service_id, fatno, clst, value); else - rc = fat_get_cluster_fat16(bs, devmap_handle, fatno, clst, value); + rc = fat_get_cluster_fat16(bs, service_id, fatno, clst, value); } @@ -452,5 +452,5 @@ * * @param bs Buffer holding the boot sector for the file system. - * @param devmap_handle Device handle for the file system. + * @param service_id Service ID for the file system. * @param fatno Number of the FAT instance where to make the change. * @param clst Cluster which is to be set. @@ -460,5 +460,5 @@ */ int -fat_set_cluster_fat12(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned fatno, +fat_set_cluster_fat12(fat_bs_t *bs, service_id_t service_id, unsigned fatno, fat_cluster_t clst, fat_cluster_t value) { @@ -472,5 +472,5 @@ return ERANGE; - rc = block_get(&b, devmap_handle, RSCNT(bs) + SF(bs) * fatno + + rc = block_get(&b, service_id, RSCNT(bs) + SF(bs) * fatno + offset / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) @@ -484,5 +484,5 @@ if (offset / BPS(bs) < SF(bs)) { /* No. Reading next sector */ - rc = block_get(&b1, devmap_handle, 1 + RSCNT(bs) + + rc = block_get(&b1, service_id, 1 + RSCNT(bs) + SF(bs)*fatno + offset / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) { @@ -540,5 +540,5 @@ * * @param bs Buffer holding the boot sector for the file system. - * @param devmap_handle Device handle for the file system. + * @param service_id Service ID for the file system. * @param fatno Number of the FAT instance where to make the change. * @param clst Cluster which is to be set. @@ -548,5 +548,5 @@ */ int -fat_set_cluster_fat16(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned fatno, +fat_set_cluster_fat16(fat_bs_t *bs, service_id_t service_id, unsigned fatno, fat_cluster_t clst, fat_cluster_t value) { @@ -557,5 +557,5 @@ offset = (clst * FAT16_CLST_SIZE); - rc = block_get(&b, devmap_handle, RSCNT(bs) + SF(bs) * fatno + + rc = block_get(&b, service_id, RSCNT(bs) + SF(bs) * fatno + offset / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) @@ -572,5 +572,5 @@ * * @param bs Buffer holding the boot sector for the file system. - * @param devmap_handle Device handle for the file system. + * @param service_id Service ID for the file system. * @param fatno Number of the FAT instance where to make the change. * @param clst Cluster which is to be set. @@ -580,5 +580,5 @@ */ int -fat_set_cluster_fat32(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned fatno, +fat_set_cluster_fat32(fat_bs_t *bs, service_id_t service_id, unsigned fatno, fat_cluster_t clst, fat_cluster_t value) { @@ -590,5 +590,5 @@ offset = (clst * FAT32_CLST_SIZE); - rc = block_get(&b, devmap_handle, RSCNT(bs) + SF(bs) * fatno + + rc = block_get(&b, service_id, RSCNT(bs) + SF(bs) * fatno + offset / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) @@ -608,5 +608,5 @@ * * @param bs Buffer holding the boot sector for the file system. - * @param devmap_handle Device handle for the file system. + * @param service_id Device service ID for the file system. * @param fatno Number of the FAT instance where to make the change. * @param clst Cluster which is to be set. @@ -616,5 +616,5 @@ */ int -fat_set_cluster(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned fatno, +fat_set_cluster(fat_bs_t *bs, service_id_t service_id, unsigned fatno, fat_cluster_t clst, fat_cluster_t value) { @@ -624,9 +624,9 @@ if (FAT_IS_FAT12(bs)) - rc = fat_set_cluster_fat12(bs, devmap_handle, fatno, clst, value); + rc = fat_set_cluster_fat12(bs, service_id, fatno, clst, value); else if (FAT_IS_FAT32(bs)) - rc = fat_set_cluster_fat32(bs, devmap_handle, fatno, clst, value); + rc = fat_set_cluster_fat32(bs, service_id, fatno, clst, value); else - rc = fat_set_cluster_fat16(bs, devmap_handle, fatno, clst, value); + rc = fat_set_cluster_fat16(bs, service_id, fatno, clst, value); return rc; @@ -636,5 +636,5 @@ * * @param bs Buffer holding the boot sector of the file system. - * @param devmap_handle Device handle of the file system. + * @param service_id Service ID of the file system. * @param lifo Chain of allocated clusters. * @param nclsts Number of clusters in the lifo chain. @@ -642,5 +642,5 @@ * @return EOK on success or a negative error code. */ -int fat_alloc_shadow_clusters(fat_bs_t *bs, devmap_handle_t devmap_handle, +int fat_alloc_shadow_clusters(fat_bs_t *bs, service_id_t service_id, fat_cluster_t *lifo, unsigned nclsts) { @@ -652,5 +652,5 @@ for (fatno = FAT1 + 1; fatno < FATCNT(bs); fatno++) { for (c = 0; c < nclsts; c++) { - rc = fat_set_cluster(bs, devmap_handle, fatno, lifo[c], + rc = fat_set_cluster(bs, service_id, fatno, lifo[c], c == 0 ? clst_last1 : lifo[c - 1]); if (rc != EOK) @@ -670,5 +670,5 @@ * * @param bs Buffer holding the boot sector of the file system. - * @param devmap_handle Device handle of the file system. + * @param service_id Device service ID of the file system. * @param nclsts Number of clusters to allocate. * @param mcl Output parameter where the first cluster in the chain @@ -680,5 +680,5 @@ */ int -fat_alloc_clusters(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned nclsts, +fat_alloc_clusters(fat_bs_t *bs, service_id_t service_id, unsigned nclsts, fat_cluster_t *mcl, fat_cluster_t *lcl) { @@ -696,5 +696,5 @@ fibril_mutex_lock(&fat_alloc_lock); for (clst=FAT_CLST_FIRST; clst < CC(bs)+2 && found < nclsts; clst++) { - rc = fat_get_cluster(bs, devmap_handle, FAT1, clst, &value); + rc = fat_get_cluster(bs, service_id, FAT1, clst, &value); if (rc != EOK) break; @@ -706,5 +706,5 @@ */ lifo[found] = clst; - rc = fat_set_cluster(bs, devmap_handle, FAT1, clst, + rc = fat_set_cluster(bs, service_id, FAT1, clst, (found == 0) ? clst_last1 : lifo[found - 1]); if (rc != EOK) @@ -716,5 +716,5 @@ if (rc == EOK && found == nclsts) { - rc = fat_alloc_shadow_clusters(bs, devmap_handle, lifo, nclsts); + rc = fat_alloc_shadow_clusters(bs, service_id, lifo, nclsts); if (rc == EOK) { *mcl = lifo[found - 1]; @@ -729,5 +729,5 @@ if (found > 0) { while (found--) { - rc = fat_set_cluster(bs, devmap_handle, FAT1, lifo[found], + rc = fat_set_cluster(bs, service_id, FAT1, lifo[found], FAT_CLST_RES0); } @@ -742,5 +742,5 @@ * * @param bs Buffer hodling the boot sector of the file system. - * @param devmap_handle Device handle of the file system. + * @param service_id Device service ID of the file system. * @param firstc First cluster in the chain which is to be freed. * @@ -748,5 +748,5 @@ */ int -fat_free_clusters(fat_bs_t *bs, devmap_handle_t devmap_handle, fat_cluster_t firstc) +fat_free_clusters(fat_bs_t *bs, service_id_t service_id, fat_cluster_t firstc) { unsigned fatno; @@ -757,9 +757,9 @@ while (firstc < FAT_CLST_LAST1(bs)) { assert(firstc >= FAT_CLST_FIRST && firstc < clst_bad); - rc = fat_get_cluster(bs, devmap_handle, FAT1, firstc, &nextc); + rc = fat_get_cluster(bs, service_id, FAT1, firstc, &nextc); if (rc != EOK) return rc; for (fatno = FAT1; fatno < FATCNT(bs); fatno++) { - rc = fat_set_cluster(bs, devmap_handle, fatno, firstc, + rc = fat_set_cluster(bs, service_id, fatno, firstc, FAT_CLST_RES0); if (rc != EOK) @@ -786,5 +786,5 @@ fat_cluster_t lcl) { - devmap_handle_t devmap_handle = nodep->idx->devmap_handle; + service_id_t service_id = nodep->idx->service_id; fat_cluster_t lastc; uint8_t fatno; @@ -800,5 +800,5 @@ nodep->lastc_cached_valid = false; } else { - rc = fat_cluster_walk(bs, devmap_handle, nodep->firstc, + rc = fat_cluster_walk(bs, service_id, nodep->firstc, &lastc, NULL, (uint16_t) -1); if (rc != EOK) @@ -807,5 +807,5 @@ for (fatno = FAT1; fatno < FATCNT(bs); fatno++) { - rc = fat_set_cluster(bs, nodep->idx->devmap_handle, + rc = fat_set_cluster(bs, nodep->idx->service_id, fatno, lastc, mcl); if (rc != EOK) @@ -834,5 +834,5 @@ fat_cluster_t clst_last1 = FAT_CLST_LAST1(bs); int rc; - devmap_handle_t devmap_handle = nodep->idx->devmap_handle; + service_id_t service_id = nodep->idx->service_id; /* @@ -845,5 +845,5 @@ if (lcl == FAT_CLST_RES0) { /* The node will have zero size and no clusters allocated. */ - rc = fat_free_clusters(bs, devmap_handle, nodep->firstc); + rc = fat_free_clusters(bs, service_id, nodep->firstc); if (rc != EOK) return rc; @@ -854,5 +854,5 @@ unsigned fatno; - rc = fat_get_cluster(bs, devmap_handle, FAT1, lcl, &nextc); + rc = fat_get_cluster(bs, service_id, FAT1, lcl, &nextc); if (rc != EOK) return rc; @@ -860,5 +860,5 @@ /* Terminate the cluster chain in all copies of FAT. */ for (fatno = FAT1; fatno < FATCNT(bs); fatno++) { - rc = fat_set_cluster(bs, devmap_handle, fatno, lcl, + rc = fat_set_cluster(bs, service_id, fatno, lcl, clst_last1); if (rc != EOK) @@ -867,5 +867,5 @@ /* Free all following clusters. */ - rc = fat_free_clusters(bs, devmap_handle, nextc); + rc = fat_free_clusters(bs, service_id, nextc); if (rc != EOK) return rc; @@ -882,5 +882,5 @@ int -fat_zero_cluster(struct fat_bs *bs, devmap_handle_t devmap_handle, fat_cluster_t c) +fat_zero_cluster(struct fat_bs *bs, service_id_t service_id, fat_cluster_t c) { int i; @@ -889,5 +889,5 @@ for (i = 0; i < SPC(bs); i++) { - rc = _fat_block_get(&b, bs, devmap_handle, c, NULL, i, + rc = _fat_block_get(&b, bs, service_id, c, NULL, i, BLOCK_FLAGS_NOREAD); if (rc != EOK) @@ -909,5 +909,5 @@ * does not contain a fat file system. */ -int fat_sanity_check(fat_bs_t *bs, devmap_handle_t devmap_handle) +int fat_sanity_check(fat_bs_t *bs, service_id_t service_id) { fat_cluster_t e0, e1; @@ -947,9 +947,9 @@ /* Check signature of each FAT. */ for (fat_no = 0; fat_no < FATCNT(bs); fat_no++) { - rc = fat_get_cluster(bs, devmap_handle, fat_no, 0, &e0); + rc = fat_get_cluster(bs, service_id, fat_no, 0, &e0); if (rc != EOK) return EIO; - rc = fat_get_cluster(bs, devmap_handle, fat_no, 1, &e1); + rc = fat_get_cluster(bs, service_id, fat_no, 1, &e1); if (rc != EOK) return EIO; Index: uspace/srv/fs/fat/fat_fat.h =================================================================== --- uspace/srv/fs/fat/fat_fat.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/fat/fat_fat.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -103,12 +103,12 @@ typedef uint32_t fat_cluster_t; -#define fat_clusters_get(numc, bs, dh, fc) \ - fat_cluster_walk((bs), (dh), (fc), NULL, (numc), (uint32_t) -1) -extern int fat_cluster_walk(struct fat_bs *, devmap_handle_t, fat_cluster_t, +#define fat_clusters_get(numc, bs, sid, fc) \ + fat_cluster_walk((bs), (sid), (fc), NULL, (numc), (uint32_t) -1) +extern int fat_cluster_walk(struct fat_bs *, service_id_t, fat_cluster_t, fat_cluster_t *, uint32_t *, uint32_t); extern int fat_block_get(block_t **, struct fat_bs *, struct fat_node *, aoff64_t, int); -extern int _fat_block_get(block_t **, struct fat_bs *, devmap_handle_t, +extern int _fat_block_get(block_t **, struct fat_bs *, service_id_t, fat_cluster_t, fat_cluster_t *, aoff64_t, int); @@ -117,29 +117,29 @@ extern int fat_chop_clusters(struct fat_bs *, struct fat_node *, fat_cluster_t); -extern int fat_alloc_clusters(struct fat_bs *, devmap_handle_t, unsigned, +extern int fat_alloc_clusters(struct fat_bs *, service_id_t, unsigned, fat_cluster_t *, fat_cluster_t *); -extern int fat_free_clusters(struct fat_bs *, devmap_handle_t, fat_cluster_t); -extern int fat_alloc_shadow_clusters(struct fat_bs *, devmap_handle_t, +extern int fat_free_clusters(struct fat_bs *, service_id_t, fat_cluster_t); +extern int fat_alloc_shadow_clusters(struct fat_bs *, service_id_t, fat_cluster_t *, unsigned); -extern int fat_get_cluster_fat12(struct fat_bs *, devmap_handle_t, unsigned, +extern int fat_get_cluster_fat12(struct fat_bs *, service_id_t, unsigned, fat_cluster_t, fat_cluster_t *); -extern int fat_get_cluster_fat16(struct fat_bs *, devmap_handle_t, unsigned, +extern int fat_get_cluster_fat16(struct fat_bs *, service_id_t, unsigned, fat_cluster_t, fat_cluster_t *); -extern int fat_get_cluster_fat32(struct fat_bs *, devmap_handle_t, unsigned, +extern int fat_get_cluster_fat32(struct fat_bs *, service_id_t, unsigned, fat_cluster_t, fat_cluster_t *); -extern int fat_get_cluster(struct fat_bs *, devmap_handle_t, unsigned, +extern int fat_get_cluster(struct fat_bs *, service_id_t, unsigned, fat_cluster_t, fat_cluster_t *); -extern int fat_set_cluster_fat12(struct fat_bs *, devmap_handle_t, unsigned, +extern int fat_set_cluster_fat12(struct fat_bs *, service_id_t, unsigned, fat_cluster_t, fat_cluster_t); -extern int fat_set_cluster_fat16(struct fat_bs *, devmap_handle_t, unsigned, +extern int fat_set_cluster_fat16(struct fat_bs *, service_id_t, unsigned, fat_cluster_t, fat_cluster_t); -extern int fat_set_cluster_fat32(struct fat_bs *, devmap_handle_t, unsigned, +extern int fat_set_cluster_fat32(struct fat_bs *, service_id_t, unsigned, fat_cluster_t, fat_cluster_t); -extern int fat_set_cluster(struct fat_bs *, devmap_handle_t, unsigned, +extern int fat_set_cluster(struct fat_bs *, service_id_t, unsigned, fat_cluster_t, fat_cluster_t); extern int fat_fill_gap(struct fat_bs *, struct fat_node *, fat_cluster_t, aoff64_t); -extern int fat_zero_cluster(struct fat_bs *, devmap_handle_t, fat_cluster_t); -extern int fat_sanity_check(struct fat_bs *, devmap_handle_t); +extern int fat_zero_cluster(struct fat_bs *, service_id_t, fat_cluster_t); +extern int fat_sanity_check(struct fat_bs *, service_id_t); #endif Index: uspace/srv/fs/fat/fat_idx.c =================================================================== --- uspace/srv/fs/fat/fat_idx.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/fat/fat_idx.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -59,5 +59,5 @@ typedef struct { link_t link; - devmap_handle_t devmap_handle; + service_id_t service_id; /** Next unassigned index. */ @@ -76,8 +76,8 @@ static LIST_INITIALIZE(unused_list); -static void unused_initialize(unused_t *u, devmap_handle_t devmap_handle) +static void unused_initialize(unused_t *u, service_id_t service_id) { link_initialize(&u->link); - u->devmap_handle = devmap_handle; + u->service_id = service_id; u->next = 0; u->remaining = ((uint64_t)((fs_index_t)-1)) + 1; @@ -85,5 +85,5 @@ } -static unused_t *unused_find(devmap_handle_t devmap_handle, bool lock) +static unused_t *unused_find(service_id_t service_id, bool lock) { unused_t *u; @@ -94,5 +94,5 @@ list_foreach(unused_list, l) { u = list_get_instance(l, unused_t, link); - if (u->devmap_handle == devmap_handle) + if (u->service_id == service_id) return u; } @@ -108,5 +108,5 @@ /** * Global hash table of all used fat_idx_t structures. - * The index structures are hashed by the devmap_handle, parent node's first + * The index structures are hashed by the service_id, parent node's first * cluster and index within the parent directory. */ @@ -122,5 +122,5 @@ static hash_index_t pos_hash(unsigned long key[]) { - devmap_handle_t devmap_handle = (devmap_handle_t)key[UPH_DH_KEY]; + service_id_t service_id = (service_id_t)key[UPH_DH_KEY]; fat_cluster_t pfc = (fat_cluster_t)key[UPH_PFC_KEY]; unsigned pdi = (unsigned)key[UPH_PDI_KEY]; @@ -142,5 +142,5 @@ h |= (pdi & ((1 << (UPH_BUCKETS_LOG / 4)) - 1)) << (UPH_BUCKETS_LOG / 2); - h |= (devmap_handle & ((1 << (UPH_BUCKETS_LOG / 4)) - 1)) << + h |= (service_id & ((1 << (UPH_BUCKETS_LOG / 4)) - 1)) << (3 * (UPH_BUCKETS_LOG / 4)); @@ -150,5 +150,5 @@ static int pos_compare(unsigned long key[], hash_count_t keys, link_t *item) { - devmap_handle_t devmap_handle = (devmap_handle_t)key[UPH_DH_KEY]; + service_id_t service_id = (service_id_t)key[UPH_DH_KEY]; fat_cluster_t pfc; unsigned pdi; @@ -157,9 +157,9 @@ switch (keys) { case 1: - return (devmap_handle == fidx->devmap_handle); + return (service_id == fidx->service_id); case 3: pfc = (fat_cluster_t) key[UPH_PFC_KEY]; pdi = (unsigned) key[UPH_PDI_KEY]; - return (devmap_handle == fidx->devmap_handle) && (pfc == fidx->pfc) && + return (service_id == fidx->service_id) && (pfc == fidx->pfc) && (pdi == fidx->pdi); default: @@ -183,5 +183,5 @@ /** * Global hash table of all used fat_idx_t structures. - * The index structures are hashed by the devmap_handle and index. + * The index structures are hashed by the service_id and index. */ static hash_table_t ui_hash; @@ -195,10 +195,10 @@ static hash_index_t idx_hash(unsigned long key[]) { - devmap_handle_t devmap_handle = (devmap_handle_t)key[UIH_DH_KEY]; + service_id_t service_id = (service_id_t)key[UIH_DH_KEY]; fs_index_t index = (fs_index_t)key[UIH_INDEX_KEY]; hash_index_t h; - h = devmap_handle & ((1 << (UIH_BUCKETS_LOG / 2)) - 1); + h = service_id & ((1 << (UIH_BUCKETS_LOG / 2)) - 1); h |= (index & ((1 << (UIH_BUCKETS_LOG / 2)) - 1)) << (UIH_BUCKETS_LOG / 2); @@ -209,5 +209,5 @@ static int idx_compare(unsigned long key[], hash_count_t keys, link_t *item) { - devmap_handle_t devmap_handle = (devmap_handle_t)key[UIH_DH_KEY]; + service_id_t service_id = (service_id_t)key[UIH_DH_KEY]; fs_index_t index; fat_idx_t *fidx = list_get_instance(item, fat_idx_t, uih_link); @@ -215,8 +215,8 @@ switch (keys) { case 1: - return (devmap_handle == fidx->devmap_handle); + return (service_id == fidx->service_id); case 2: index = (fs_index_t) key[UIH_INDEX_KEY]; - return (devmap_handle == fidx->devmap_handle) && + return (service_id == fidx->service_id) && (index == fidx->index); default: @@ -241,10 +241,10 @@ /** Allocate a VFS index which is not currently in use. */ -static bool fat_index_alloc(devmap_handle_t devmap_handle, fs_index_t *index) +static bool fat_index_alloc(service_id_t service_id, fs_index_t *index) { unused_t *u; assert(index); - u = unused_find(devmap_handle, true); + u = unused_find(service_id, true); if (!u) return false; @@ -303,9 +303,9 @@ /** Free a VFS index, which is no longer in use. */ -static void fat_index_free(devmap_handle_t devmap_handle, fs_index_t index) +static void fat_index_free(service_id_t service_id, fs_index_t index) { unused_t *u; - u = unused_find(devmap_handle, true); + u = unused_find(service_id, true); assert(u); @@ -365,5 +365,5 @@ } -static int fat_idx_create(fat_idx_t **fidxp, devmap_handle_t devmap_handle) +static int fat_idx_create(fat_idx_t **fidxp, service_id_t service_id) { fat_idx_t *fidx; @@ -372,5 +372,5 @@ if (!fidx) return ENOMEM; - if (!fat_index_alloc(devmap_handle, &fidx->index)) { + if (!fat_index_alloc(service_id, &fidx->index)) { free(fidx); return ENOSPC; @@ -380,5 +380,5 @@ link_initialize(&fidx->uih_link); fibril_mutex_initialize(&fidx->lock); - fidx->devmap_handle = devmap_handle; + fidx->service_id = service_id; fidx->pfc = FAT_CLST_RES0; /* no parent yet */ fidx->pdi = 0; @@ -389,5 +389,5 @@ } -int fat_idx_get_new(fat_idx_t **fidxp, devmap_handle_t devmap_handle) +int fat_idx_get_new(fat_idx_t **fidxp, service_id_t service_id) { fat_idx_t *fidx; @@ -395,5 +395,5 @@ fibril_mutex_lock(&used_lock); - rc = fat_idx_create(&fidx, devmap_handle); + rc = fat_idx_create(&fidx, service_id); if (rc != EOK) { fibril_mutex_unlock(&used_lock); @@ -402,5 +402,5 @@ unsigned long ikey[] = { - [UIH_DH_KEY] = devmap_handle, + [UIH_DH_KEY] = service_id, [UIH_INDEX_KEY] = fidx->index, }; @@ -415,10 +415,10 @@ fat_idx_t * -fat_idx_get_by_pos(devmap_handle_t devmap_handle, fat_cluster_t pfc, unsigned pdi) +fat_idx_get_by_pos(service_id_t service_id, fat_cluster_t pfc, unsigned pdi) { fat_idx_t *fidx; link_t *l; unsigned long pkey[] = { - [UPH_DH_KEY] = devmap_handle, + [UPH_DH_KEY] = service_id, [UPH_PFC_KEY] = pfc, [UPH_PDI_KEY] = pdi, @@ -432,5 +432,5 @@ int rc; - rc = fat_idx_create(&fidx, devmap_handle); + rc = fat_idx_create(&fidx, service_id); if (rc != EOK) { fibril_mutex_unlock(&used_lock); @@ -439,5 +439,5 @@ unsigned long ikey[] = { - [UIH_DH_KEY] = devmap_handle, + [UIH_DH_KEY] = service_id, [UIH_INDEX_KEY] = fidx->index, }; @@ -458,5 +458,5 @@ { unsigned long pkey[] = { - [UPH_DH_KEY] = idx->devmap_handle, + [UPH_DH_KEY] = idx->service_id, [UPH_PFC_KEY] = idx->pfc, [UPH_PDI_KEY] = idx->pdi, @@ -471,5 +471,5 @@ { unsigned long pkey[] = { - [UPH_DH_KEY] = idx->devmap_handle, + [UPH_DH_KEY] = idx->service_id, [UPH_PFC_KEY] = idx->pfc, [UPH_PDI_KEY] = idx->pdi, @@ -482,10 +482,10 @@ fat_idx_t * -fat_idx_get_by_index(devmap_handle_t devmap_handle, fs_index_t index) +fat_idx_get_by_index(service_id_t service_id, fs_index_t index) { fat_idx_t *fidx = NULL; link_t *l; unsigned long ikey[] = { - [UIH_DH_KEY] = devmap_handle, + [UIH_DH_KEY] = service_id, [UIH_INDEX_KEY] = index, }; @@ -509,8 +509,8 @@ { unsigned long ikey[] = { - [UIH_DH_KEY] = idx->devmap_handle, + [UIH_DH_KEY] = idx->service_id, [UIH_INDEX_KEY] = idx->index, }; - devmap_handle_t devmap_handle = idx->devmap_handle; + service_id_t service_id = idx->service_id; fs_index_t index = idx->index; @@ -526,5 +526,5 @@ fibril_mutex_unlock(&used_lock); /* Release the VFS index. */ - fat_index_free(devmap_handle, index); + fat_index_free(service_id, index); /* The index structure itself is freed in idx_remove_callback(). */ } @@ -548,5 +548,5 @@ } -int fat_idx_init_by_devmap_handle(devmap_handle_t devmap_handle) +int fat_idx_init_by_service_id(service_id_t service_id) { unused_t *u; @@ -556,7 +556,7 @@ if (!u) return ENOMEM; - unused_initialize(u, devmap_handle); + unused_initialize(u, service_id); fibril_mutex_lock(&unused_lock); - if (!unused_find(devmap_handle, false)) { + if (!unused_find(service_id, false)) { list_append(&u->link, &unused_list); } else { @@ -568,11 +568,11 @@ } -void fat_idx_fini_by_devmap_handle(devmap_handle_t devmap_handle) +void fat_idx_fini_by_service_id(service_id_t service_id) { unsigned long ikey[] = { - [UIH_DH_KEY] = devmap_handle + [UIH_DH_KEY] = service_id }; unsigned long pkey[] = { - [UPH_DH_KEY] = devmap_handle + [UPH_DH_KEY] = service_id }; @@ -590,5 +590,5 @@ * Free the unused and freed structures for this instance. */ - unused_t *u = unused_find(devmap_handle, true); + unused_t *u = unused_find(service_id, true); assert(u); list_remove(&u->link); Index: uspace/srv/fs/fat/fat_ops.c =================================================================== --- uspace/srv/fs/fat/fat_ops.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/fat/fat_ops.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -45,5 +45,5 @@ #include #include -#include +#include #include #include @@ -75,10 +75,10 @@ * Forward declarations of FAT libfs operations. */ -static int fat_root_get(fs_node_t **, devmap_handle_t); +static int fat_root_get(fs_node_t **, service_id_t); static int fat_match(fs_node_t **, fs_node_t *, const char *); -static int fat_node_get(fs_node_t **, devmap_handle_t, fs_index_t); +static int fat_node_get(fs_node_t **, service_id_t, fs_index_t); static int fat_node_open(fs_node_t *); static int fat_node_put(fs_node_t *); -static int fat_create_node(fs_node_t **, devmap_handle_t, int); +static int fat_create_node(fs_node_t **, service_id_t, int); static int fat_destroy_node(fs_node_t *); static int fat_link(fs_node_t *, fs_node_t *, const char *); @@ -90,5 +90,5 @@ static bool fat_is_directory(fs_node_t *); static bool fat_is_file(fs_node_t *node); -static devmap_handle_t fat_device_get(fs_node_t *node); +static service_id_t fat_device_get(fs_node_t *node); /* @@ -122,8 +122,8 @@ assert(node->dirty); - bs = block_bb_get(node->idx->devmap_handle); + bs = block_bb_get(node->idx->service_id); /* Read the block that contains the dentry of interest. */ - rc = _fat_block_get(&b, bs, node->idx->devmap_handle, node->idx->pfc, + rc = _fat_block_get(&b, bs, node->idx->service_id, node->idx->pfc, NULL, (node->idx->pdi * sizeof(fat_dentry_t)) / BPS(bs), BLOCK_FLAGS_NONE); @@ -147,5 +147,5 @@ } -static int fat_node_fini_by_devmap_handle(devmap_handle_t devmap_handle) +static int fat_node_fini_by_service_id(service_id_t service_id) { fat_node_t *nodep; @@ -171,5 +171,5 @@ goto restart; } - if (nodep->idx->devmap_handle != devmap_handle) { + if (nodep->idx->service_id != service_id) { fibril_mutex_unlock(&nodep->idx->lock); fibril_mutex_unlock(&nodep->lock); @@ -301,8 +301,8 @@ return rc; - bs = block_bb_get(idxp->devmap_handle); + bs = block_bb_get(idxp->service_id); /* Read the block that contains the dentry of interest. */ - rc = _fat_block_get(&b, bs, idxp->devmap_handle, idxp->pfc, NULL, + rc = _fat_block_get(&b, bs, idxp->service_id, idxp->pfc, NULL, (idxp->pdi * sizeof(fat_dentry_t)) / BPS(bs), BLOCK_FLAGS_NONE); if (rc != EOK) { @@ -333,5 +333,5 @@ */ uint32_t clusters; - rc = fat_clusters_get(&clusters, bs, idxp->devmap_handle, nodep->firstc); + rc = fat_clusters_get(&clusters, bs, idxp->service_id, nodep->firstc); if (rc != EOK) { (void) block_put(b); @@ -366,7 +366,7 @@ */ -int fat_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle) -{ - return fat_node_get(rfn, devmap_handle, 0); +int fat_root_get(fs_node_t **rfn, service_id_t service_id) +{ + return fat_node_get(rfn, service_id, 0); } @@ -376,9 +376,9 @@ char name[FAT_LFN_NAME_SIZE]; fat_dentry_t *d; - devmap_handle_t devmap_handle; + service_id_t service_id; int rc; fibril_mutex_lock(&parentp->idx->lock); - devmap_handle = parentp->idx->devmap_handle; + service_id = parentp->idx->service_id; fibril_mutex_unlock(&parentp->idx->lock); @@ -393,5 +393,5 @@ fat_node_t *nodep; aoff64_t o = di.pos % (BPS(di.bs) / sizeof(fat_dentry_t)); - fat_idx_t *idx = fat_idx_get_by_pos(devmap_handle, + fat_idx_t *idx = fat_idx_get_by_pos(service_id, parentp->firstc, di.bnum * DPS(di.bs) + o); if (!idx) { @@ -426,5 +426,5 @@ /** Instantiate a FAT in-core node. */ -int fat_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index) +int fat_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index) { fat_node_t *nodep; @@ -432,5 +432,5 @@ int rc; - idxp = fat_idx_get_by_index(devmap_handle, index); + idxp = fat_idx_get_by_index(service_id, index); if (!idxp) { *rfn = NULL; @@ -483,5 +483,5 @@ } -int fat_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int flags) +int fat_create_node(fs_node_t **rfn, service_id_t service_id, int flags) { fat_idx_t *idxp; @@ -491,14 +491,14 @@ int rc; - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); if (flags & L_DIRECTORY) { /* allocate a cluster */ - rc = fat_alloc_clusters(bs, devmap_handle, 1, &mcl, &lcl); + rc = fat_alloc_clusters(bs, service_id, 1, &mcl, &lcl); if (rc != EOK) return rc; /* populate the new cluster with unused dentries */ - rc = fat_zero_cluster(bs, devmap_handle, mcl); - if (rc != EOK) { - (void) fat_free_clusters(bs, devmap_handle, mcl); + rc = fat_zero_cluster(bs, service_id, mcl); + if (rc != EOK) { + (void) fat_free_clusters(bs, service_id, mcl); return rc; } @@ -507,10 +507,10 @@ rc = fat_node_get_new(&nodep); if (rc != EOK) { - (void) fat_free_clusters(bs, devmap_handle, mcl); - return rc; - } - rc = fat_idx_get_new(&idxp, devmap_handle); + (void) fat_free_clusters(bs, service_id, mcl); + return rc; + } + rc = fat_idx_get_new(&idxp, service_id); if (rc != EOK) { - (void) fat_free_clusters(bs, devmap_handle, mcl); + (void) fat_free_clusters(bs, service_id, mcl); (void) fat_node_put(FS_NODE(nodep)); return rc; @@ -561,9 +561,9 @@ assert(!has_children); - bs = block_bb_get(nodep->idx->devmap_handle); + bs = block_bb_get(nodep->idx->service_id); if (nodep->firstc != FAT_CLST_RES0) { assert(nodep->size); /* Free all clusters allocated to the node. */ - rc = fat_free_clusters(bs, nodep->idx->devmap_handle, + rc = fat_free_clusters(bs, nodep->idx->service_id, nodep->firstc); } @@ -601,5 +601,5 @@ fibril_mutex_lock(&parentp->idx->lock); - bs = block_bb_get(parentp->idx->devmap_handle); + bs = block_bb_get(parentp->idx->service_id); rc = fat_directory_open(parentp, &di); if (rc != EOK) @@ -763,5 +763,5 @@ fibril_mutex_lock(&nodep->idx->lock); - bs = block_bb_get(nodep->idx->devmap_handle); + bs = block_bb_get(nodep->idx->service_id); blocks = nodep->size / BPS(bs); @@ -832,5 +832,5 @@ } -devmap_handle_t fat_device_get(fs_node_t *node) +service_id_t fat_device_get(fs_node_t *node) { return 0; @@ -862,5 +862,5 @@ static int -fat_mounted(devmap_handle_t devmap_handle, const char *opts, fs_index_t *index, +fat_mounted(service_id_t service_id, const char *opts, fs_index_t *index, aoff64_t *size, unsigned *linkcnt) { @@ -876,42 +876,42 @@ /* initialize libblock */ - rc = block_init(EXCHANGE_SERIALIZE, devmap_handle, BS_SIZE); + rc = block_init(EXCHANGE_SERIALIZE, service_id, BS_SIZE); if (rc != EOK) return rc; /* prepare the boot block */ - rc = block_bb_read(devmap_handle, BS_BLOCK); + rc = block_bb_read(service_id, BS_BLOCK); if (rc != EOK) { - block_fini(devmap_handle); + block_fini(service_id); return rc; } /* get the buffer with the boot sector */ - bs = block_bb_get(devmap_handle); - + bs = block_bb_get(service_id); + if (BPS(bs) != BS_SIZE) { - block_fini(devmap_handle); + block_fini(service_id); return ENOTSUP; } /* Initialize the block cache */ - rc = block_cache_init(devmap_handle, BPS(bs), 0 /* XXX */, cmode); + rc = block_cache_init(service_id, BPS(bs), 0 /* XXX */, cmode); if (rc != EOK) { - block_fini(devmap_handle); + block_fini(service_id); return rc; } /* Do some simple sanity checks on the file system. */ - rc = fat_sanity_check(bs, devmap_handle); + rc = fat_sanity_check(bs, service_id); if (rc != EOK) { - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - return rc; - } - - rc = fat_idx_init_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + return rc; + } + + rc = fat_idx_init_by_service_id(service_id); if (rc != EOK) { - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); return rc; } @@ -920,7 +920,7 @@ fs_node_t *rfn = (fs_node_t *)malloc(sizeof(fs_node_t)); if (!rfn) { - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - fat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + fat_idx_fini_by_service_id(service_id); return ENOMEM; } @@ -930,18 +930,18 @@ if (!rootp) { free(rfn); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - fat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + fat_idx_fini_by_service_id(service_id); return ENOMEM; } fat_node_initialize(rootp); - fat_idx_t *ridxp = fat_idx_get_by_pos(devmap_handle, FAT_CLST_ROOTPAR, 0); + fat_idx_t *ridxp = fat_idx_get_by_pos(service_id, FAT_CLST_ROOTPAR, 0); if (!ridxp) { free(rfn); free(rootp); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - fat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + fat_idx_fini_by_service_id(service_id); return ENOMEM; } @@ -956,11 +956,11 @@ if (FAT_IS_FAT32(bs)) { uint32_t clusters; - rc = fat_clusters_get(&clusters, bs, devmap_handle, rootp->firstc); + rc = fat_clusters_get(&clusters, bs, service_id, rootp->firstc); if (rc != EOK) { free(rfn); free(rootp); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); - fat_idx_fini_by_devmap_handle(devmap_handle); + (void) block_cache_fini(service_id); + block_fini(service_id); + fat_idx_fini_by_service_id(service_id); return ENOTSUP; } @@ -983,5 +983,5 @@ } -static int fat_unmounted(devmap_handle_t devmap_handle) +static int fat_unmounted(service_id_t service_id) { fs_node_t *fn; @@ -989,5 +989,5 @@ int rc; - rc = fat_root_get(&fn, devmap_handle); + rc = fat_root_get(&fn, service_id); if (rc != EOK) return rc; @@ -1014,8 +1014,8 @@ * stop using libblock for this instance. */ - (void) fat_node_fini_by_devmap_handle(devmap_handle); - fat_idx_fini_by_devmap_handle(devmap_handle); - (void) block_cache_fini(devmap_handle); - block_fini(devmap_handle); + (void) fat_node_fini_by_service_id(service_id); + fat_idx_fini_by_service_id(service_id); + (void) block_cache_fini(service_id); + block_fini(service_id); return EOK; @@ -1023,5 +1023,5 @@ static int -fat_read(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos, +fat_read(service_id_t service_id, fs_index_t index, aoff64_t pos, size_t *rbytes) { @@ -1033,5 +1033,5 @@ int rc; - rc = fat_node_get(&fn, devmap_handle, index); + rc = fat_node_get(&fn, service_id, index); if (rc != EOK) return rc; @@ -1048,5 +1048,5 @@ } - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); if (nodep->type == FAT_FILE) { @@ -1129,5 +1129,5 @@ static int -fat_write(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos, +fat_write(service_id_t service_id, fs_index_t index, aoff64_t pos, size_t *wbytes, aoff64_t *nsize) { @@ -1140,6 +1140,6 @@ int flags = BLOCK_FLAGS_NONE; int rc; - - rc = fat_node_get(&fn, devmap_handle, index); + + rc = fat_node_get(&fn, service_id, index); if (rc != EOK) return rc; @@ -1156,5 +1156,5 @@ } - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); /* @@ -1215,5 +1215,5 @@ nclsts = (ROUND_UP(pos + bytes, BPC(bs)) - boundary) / BPC(bs); /* create an independent chain of nclsts clusters in all FATs */ - rc = fat_alloc_clusters(bs, devmap_handle, nclsts, &mcl, &lcl); + rc = fat_alloc_clusters(bs, service_id, nclsts, &mcl, &lcl); if (rc != EOK) { /* could not allocate a chain of nclsts clusters */ @@ -1225,13 +1225,13 @@ rc = fat_fill_gap(bs, nodep, mcl, pos); if (rc != EOK) { - (void) fat_free_clusters(bs, devmap_handle, mcl); + (void) fat_free_clusters(bs, service_id, mcl); (void) fat_node_put(fn); async_answer_0(callid, rc); return rc; } - rc = _fat_block_get(&b, bs, devmap_handle, lcl, NULL, + rc = _fat_block_get(&b, bs, service_id, lcl, NULL, (pos / BPS(bs)) % SPC(bs), flags); if (rc != EOK) { - (void) fat_free_clusters(bs, devmap_handle, mcl); + (void) fat_free_clusters(bs, service_id, mcl); (void) fat_node_put(fn); async_answer_0(callid, rc); @@ -1243,5 +1243,5 @@ rc = block_put(b); if (rc != EOK) { - (void) fat_free_clusters(bs, devmap_handle, mcl); + (void) fat_free_clusters(bs, service_id, mcl); (void) fat_node_put(fn); return rc; @@ -1253,5 +1253,5 @@ rc = fat_append_clusters(bs, nodep, mcl, lcl); if (rc != EOK) { - (void) fat_free_clusters(bs, devmap_handle, mcl); + (void) fat_free_clusters(bs, service_id, mcl); (void) fat_node_put(fn); return rc; @@ -1266,5 +1266,5 @@ static int -fat_truncate(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t size) +fat_truncate(service_id_t service_id, fs_index_t index, aoff64_t size) { fs_node_t *fn; @@ -1273,5 +1273,5 @@ int rc; - rc = fat_node_get(&fn, devmap_handle, index); + rc = fat_node_get(&fn, service_id, index); if (rc != EOK) return rc; @@ -1280,5 +1280,5 @@ nodep = FAT_NODE(fn); - bs = block_bb_get(devmap_handle); + bs = block_bb_get(service_id); if (nodep->size == size) { @@ -1307,5 +1307,5 @@ } else { fat_cluster_t lastc; - rc = fat_cluster_walk(bs, devmap_handle, nodep->firstc, + rc = fat_cluster_walk(bs, service_id, nodep->firstc, &lastc, NULL, (size - 1) / BPC(bs)); if (rc != EOK) @@ -1324,10 +1324,10 @@ } -static int fat_close(devmap_handle_t devmap_handle, fs_index_t index) +static int fat_close(service_id_t service_id, fs_index_t index) { return EOK; } -static int fat_destroy(devmap_handle_t devmap_handle, fs_index_t index) +static int fat_destroy(service_id_t service_id, fs_index_t index) { fs_node_t *fn; @@ -1335,5 +1335,5 @@ int rc; - rc = fat_node_get(&fn, devmap_handle, index); + rc = fat_node_get(&fn, service_id, index); if (rc != EOK) return rc; @@ -1352,8 +1352,8 @@ } -static int fat_sync(devmap_handle_t devmap_handle, fs_index_t index) +static int fat_sync(service_id_t service_id, fs_index_t index) { fs_node_t *fn; - int rc = fat_node_get(&fn, devmap_handle, index); + int rc = fat_node_get(&fn, service_id, index); if (rc != EOK) return rc; Index: uspace/srv/fs/locfs/Makefile =================================================================== --- uspace/srv/fs/locfs/Makefile (revision eb660787259c7eab2dd7649bebbe0990cb008eab) +++ uspace/srv/fs/locfs/Makefile (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -0,0 +1,40 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../../.. +LIBS = $(LIBFS_PREFIX)/libfs.a +EXTRA_CFLAGS += -I$(LIBFS_PREFIX) +BINARY = locfs +STATIC_NEEDED = y + +SOURCES = \ + locfs.c \ + locfs_ops.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/fs/locfs/locfs.c =================================================================== --- uspace/srv/fs/locfs/locfs.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) +++ uspace/srv/fs/locfs/locfs.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2009 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup fs + * @{ + */ + +/** + * @file locfs.c + * @brief Location-service file system. + * + * Every service registered with location service is represented as a file in this + * file system. + */ + +#include +#include +#include +#include +#include +#include +#include +#include "locfs.h" +#include "locfs_ops.h" + +#define NAME "locfs" + +static vfs_info_t locfs_vfs_info = { + .name = NAME, + .concurrent_read_write = false, + .write_retains_size = false, +}; + +int main(int argc, char *argv[]) +{ + printf("%s: HelenOS Device Filesystem\n", NAME); + + if (!locfs_init()) { + printf("%s: failed to initialize locfs\n", NAME); + return -1; + } + + async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE, + SERVICE_VFS, 0, 0); + if (!vfs_sess) { + printf("%s: Unable to connect to VFS\n", NAME); + return -1; + } + + int rc = fs_register(vfs_sess, &locfs_vfs_info, &locfs_ops, + &locfs_libfs_ops); + if (rc != EOK) { + printf("%s: Failed to register file system (%d)\n", NAME, rc); + return rc; + } + + printf("%s: Accepting connections\n", NAME); + task_retval(0); + async_manager(); + + /* Not reached */ + return 0; +} + +/** + * @} + */ + Index: uspace/srv/fs/locfs/locfs.h =================================================================== --- uspace/srv/fs/locfs/locfs.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) +++ uspace/srv/fs/locfs/locfs.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2009 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup fs + * @{ + */ + +#ifndef LOCFS_LOCFS_H_ +#define LOCFS_LOCFS_H_ + +#include + +extern vfs_out_ops_t locfs_ops; +extern libfs_ops_t locfs_libfs_ops; + +#endif + +/** + * @} + */ Index: uspace/srv/fs/locfs/locfs_ops.c =================================================================== --- uspace/srv/fs/locfs/locfs_ops.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) +++ uspace/srv/fs/locfs/locfs_ops.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -0,0 +1,779 @@ +/* + * Copyright (c) 2009 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup fs + * @{ + */ + +/** + * @file locfs_ops.c + * @brief Implementation of VFS operations for the locfs file system server. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "locfs.h" +#include "locfs_ops.h" + +typedef struct { + loc_object_type_t type; + service_id_t service_id; +} locfs_node_t; + +/** Opened services structure */ +typedef struct { + service_id_t service_id; + async_sess_t *sess; /**< If NULL, the structure is incomplete. */ + size_t refcount; + link_t link; + fibril_condvar_t cv; /**< Broadcast when completed. */ +} service_t; + +/** Hash table of opened services */ +static hash_table_t services; + +/** Hash table mutex */ +static FIBRIL_MUTEX_INITIALIZE(services_mutex); + +#define SERVICES_KEYS 1 +#define SERVICES_KEY_HANDLE 0 +#define SERVICES_BUCKETS 256 + +/* Implementation of hash table interface for the nodes hash table. */ +static hash_index_t services_hash(unsigned long key[]) +{ + return key[SERVICES_KEY_HANDLE] % SERVICES_BUCKETS; +} + +static int services_compare(unsigned long key[], hash_count_t keys, link_t *item) +{ + service_t *dev = hash_table_get_instance(item, service_t, link); + return (dev->service_id == (service_id_t) key[SERVICES_KEY_HANDLE]); +} + +static void services_remove_callback(link_t *item) +{ + free(hash_table_get_instance(item, service_t, link)); +} + +static hash_table_operations_t services_ops = { + .hash = services_hash, + .compare = services_compare, + .remove_callback = services_remove_callback +}; + +static int locfs_node_get_internal(fs_node_t **rfn, loc_object_type_t type, + service_id_t service_id) +{ + locfs_node_t *node = (locfs_node_t *) malloc(sizeof(locfs_node_t)); + if (node == NULL) { + *rfn = NULL; + return ENOMEM; + } + + *rfn = (fs_node_t *) malloc(sizeof(fs_node_t)); + if (*rfn == NULL) { + free(node); + *rfn = NULL; + return ENOMEM; + } + + fs_node_initialize(*rfn); + node->type = type; + node->service_id = service_id; + + (*rfn)->data = node; + return EOK; +} + +static int locfs_root_get(fs_node_t **rfn, service_id_t service_id) +{ + return locfs_node_get_internal(rfn, LOC_OBJECT_NONE, 0); +} + +static int locfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component) +{ + locfs_node_t *node = (locfs_node_t *) pfn->data; + int 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; + for (pos = 0; pos < count; pos++) { + /* Ignore root namespace */ + 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); + free(nspaces); + return ret; + } + } + + free(nspaces); + } + + /* Search root namespace */ + service_id_t namespace; + loc_sdesc_t *svcs; + if (loc_namespace_get_id("", &namespace, 0) == EOK) { + count = loc_get_services(namespace, &svcs); + + if (count > 0) { + size_t pos; + for (pos = 0; pos < count; pos++) { + if (str_cmp(svcs[pos].name, component) == 0) { + ret = locfs_node_get_internal(rfn, LOC_OBJECT_SERVICE, svcs[pos].id); + free(svcs); + return ret; + } + } + + 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); + if (count > 0) { + size_t pos; + for (pos = 0; pos < count; pos++) { + if (str_cmp(svcs[pos].name, component) == 0) { + ret = locfs_node_get_internal(rfn, LOC_OBJECT_SERVICE, svcs[pos].id); + free(svcs); + return ret; + } + } + + free(svcs); + } + + *rfn = NULL; + return EOK; + } + + *rfn = NULL; + return EOK; +} + +static int locfs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index) +{ + return locfs_node_get_internal(rfn, loc_id_probe(index), index); +} + +static int locfs_node_open(fs_node_t *fn) +{ + 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 */ + + unsigned long key[] = { + [SERVICES_KEY_HANDLE] = (unsigned long) node->service_id + }; + link_t *lnk; + + fibril_mutex_lock(&services_mutex); +restart: + lnk = hash_table_find(&services, key); + if (lnk == NULL) { + service_t *dev = (service_t *) malloc(sizeof(service_t)); + if (dev == NULL) { + fibril_mutex_unlock(&services_mutex); + 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 + * fibrils will not race with us when we drop the mutex + * below. + */ + hash_table_insert(&services, key, &dev->link); + + /* + * Drop the mutex to allow recursive locfs requests. + */ + fibril_mutex_unlock(&services_mutex); + + async_sess_t *sess = loc_service_connect( + EXCHANGE_SERIALIZE, node->service_id, 0); + + fibril_mutex_lock(&services_mutex); + + /* + * Notify possible waiters about this device structure + * being completed (or destroyed). + */ + fibril_condvar_broadcast(&dev->cv); + + if (!sess) { + /* + * Connecting failed, need to remove the + * entry and free the device structure. + */ + hash_table_remove(&services, key, SERVICES_KEYS); + fibril_mutex_unlock(&services_mutex); + + return ENOENT; + } + + /* Set the correct session. */ + dev->sess = sess; + } else { + service_t *dev = hash_table_get_instance(lnk, service_t, link); + + if (!dev->sess) { + /* + * Wait until the device structure is completed + * and start from the beginning as the device + * structure might have entirely disappeared + * while we were not holding the mutex in + * fibril_condvar_wait(). + */ + fibril_condvar_wait(&dev->cv, &services_mutex); + goto restart; + } + + dev->refcount++; + } + + fibril_mutex_unlock(&services_mutex); + + return EOK; + } + + return ENOENT; +} + +static int locfs_node_put(fs_node_t *fn) +{ + free(fn->data); + free(fn); + return EOK; +} + +static int locfs_create_node(fs_node_t **rfn, service_id_t service_id, int lflag) +{ + assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY)); + + *rfn = NULL; + return ENOTSUP; +} + +static int locfs_destroy_node(fs_node_t *fn) +{ + return ENOTSUP; +} + +static int locfs_link_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm) +{ + return ENOTSUP; +} + +static int locfs_unlink_node(fs_node_t *pfn, fs_node_t *cfn, const char *nm) +{ + return ENOTSUP; +} + +static int locfs_has_children(bool *has_children, fs_node_t *fn) +{ + locfs_node_t *node = (locfs_node_t *) fn->data; + + if (node->service_id == 0) { + size_t count = loc_count_namespaces(); + if (count > 0) { + *has_children = true; + return EOK; + } + + /* Root namespace */ + service_id_t namespace; + if (loc_namespace_get_id("", &namespace, 0) == EOK) { + count = loc_count_services(namespace); + if (count > 0) { + *has_children = true; + return EOK; + } + } + + *has_children = false; + return EOK; + } + + if (node->type == LOC_OBJECT_NAMESPACE) { + size_t count = loc_count_services(node->service_id); + if (count > 0) { + *has_children = true; + return EOK; + } + + *has_children = false; + return EOK; + } + + *has_children = false; + return EOK; +} + +static fs_index_t locfs_index_get(fs_node_t *fn) +{ + locfs_node_t *node = (locfs_node_t *) fn->data; + return node->service_id; +} + +static aoff64_t locfs_size_get(fs_node_t *fn) +{ + return 0; +} + +static unsigned int locfs_lnkcnt_get(fs_node_t *fn) +{ + locfs_node_t *node = (locfs_node_t *) fn->data; + + if (node->service_id == 0) + return 0; + + return 1; +} + +static bool locfs_is_directory(fs_node_t *fn) +{ + locfs_node_t *node = (locfs_node_t *) fn->data; + + return ((node->type == LOC_OBJECT_NONE) || (node->type == LOC_OBJECT_NAMESPACE)); +} + +static bool locfs_is_file(fs_node_t *fn) +{ + locfs_node_t *node = (locfs_node_t *) fn->data; + + return (node->type == LOC_OBJECT_SERVICE); +} + +static service_id_t locfs_device_get(fs_node_t *fn) +{ + locfs_node_t *node = (locfs_node_t *) fn->data; + + if (node->type == LOC_OBJECT_SERVICE) + return node->service_id; + + return 0; +} + +/** libfs operations */ +libfs_ops_t locfs_libfs_ops = { + .root_get = locfs_root_get, + .match = locfs_match, + .node_get = locfs_node_get, + .node_open = locfs_node_open, + .node_put = locfs_node_put, + .create = locfs_create_node, + .destroy = locfs_destroy_node, + .link = locfs_link_node, + .unlink = locfs_unlink_node, + .has_children = locfs_has_children, + .index_get = locfs_index_get, + .size_get = locfs_size_get, + .lnkcnt_get = locfs_lnkcnt_get, + .is_directory = locfs_is_directory, + .is_file = locfs_is_file, + .device_get = locfs_device_get +}; + +bool locfs_init(void) +{ + if (!hash_table_create(&services, SERVICES_BUCKETS, + SERVICES_KEYS, &services_ops)) + return false; + + return true; +} + +static int locfs_mounted(service_id_t service_id, const char *opts, + fs_index_t *index, aoff64_t *size, unsigned *lnkcnt) +{ + *index = 0; + *size = 0; + *lnkcnt = 0; + return EOK; +} + +static int locfs_unmounted(service_id_t service_id) +{ + return ENOTSUP; +} + +static int +locfs_read(service_id_t service_id, fs_index_t index, aoff64_t pos, + size_t *rbytes) +{ + if (index == 0) { + ipc_callid_t callid; + size_t size; + if (!async_data_read_receive(&callid, &size)) { + async_answer_0(callid, EINVAL); + return EINVAL; + } + + loc_sdesc_t *desc; + size_t count = loc_get_namespaces(&desc); + + /* Get rid of root namespace */ + size_t i; + for (i = 0; i < count; i++) { + if (str_cmp(desc[i].name, "") == 0) { + if (pos >= i) + pos++; + + break; + } + } + + if (pos < count) { + async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1); + free(desc); + *rbytes = 1; + 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); + free(desc); + *rbytes = 1; + 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 */ + ipc_callid_t callid; + size_t size; + if (!async_data_read_receive(&callid, &size)) { + async_answer_0(callid, EINVAL); + 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); + free(desc); + *rbytes = 1; + return EOK; + } + + free(desc); + async_answer_0(callid, ENOENT); + return ENOENT; + } + + if (type == LOC_OBJECT_SERVICE) { + /* Device node */ + + unsigned long key[] = { + [SERVICES_KEY_HANDLE] = (unsigned long) index + }; + + fibril_mutex_lock(&services_mutex); + link_t *lnk = hash_table_find(&services, key); + if (lnk == NULL) { + fibril_mutex_unlock(&services_mutex); + return ENOENT; + } + + service_t *dev = hash_table_get_instance(lnk, service_t, link); + assert(dev->sess); + + ipc_callid_t callid; + if (!async_data_read_receive(&callid, NULL)) { + fibril_mutex_unlock(&services_mutex); + async_answer_0(callid, EINVAL); + 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. */ + sysarg_t rc; + async_wait_for(msg, &rc); + + *rbytes = IPC_GET_ARG1(answer); + return rc; + } + + return ENOENT; +} + +static int +locfs_write(service_id_t service_id, fs_index_t index, aoff64_t pos, + size_t *wbytes, aoff64_t *nsize) +{ + 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 */ + unsigned long key[] = { + [SERVICES_KEY_HANDLE] = (unsigned long) index + }; + + fibril_mutex_lock(&services_mutex); + link_t *lnk = hash_table_find(&services, key); + if (lnk == NULL) { + fibril_mutex_unlock(&services_mutex); + return ENOENT; + } + + service_t *dev = hash_table_get_instance(lnk, service_t, link); + assert(dev->sess); + + ipc_callid_t callid; + if (!async_data_write_receive(&callid, NULL)) { + fibril_mutex_unlock(&services_mutex); + async_answer_0(callid, EINVAL); + 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. */ + sysarg_t rc; + async_wait_for(msg, &rc); + + *wbytes = IPC_GET_ARG1(answer); + *nsize = 0; + return rc; + } + + return ENOENT; +} + +static int +locfs_truncate(service_id_t service_id, fs_index_t index, aoff64_t size) +{ + return ENOTSUP; +} + +static int locfs_close(service_id_t service_id, fs_index_t index) +{ + 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) { + unsigned long key[] = { + [SERVICES_KEY_HANDLE] = (unsigned long) index + }; + + fibril_mutex_lock(&services_mutex); + link_t *lnk = hash_table_find(&services, key); + if (lnk == NULL) { + fibril_mutex_unlock(&services_mutex); + return ENOENT; + } + + service_t *dev = hash_table_get_instance(lnk, service_t, link); + assert(dev->sess); + dev->refcount--; + + if (dev->refcount == 0) { + async_hangup(dev->sess); + hash_table_remove(&services, key, SERVICES_KEYS); + } + + fibril_mutex_unlock(&services_mutex); + + return EOK; + } + + return ENOENT; +} + +static int locfs_sync(service_id_t service_id, fs_index_t index) +{ + 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) { + unsigned long key[] = { + [SERVICES_KEY_HANDLE] = (unsigned long) index + }; + + fibril_mutex_lock(&services_mutex); + link_t *lnk = hash_table_find(&services, key); + if (lnk == NULL) { + fibril_mutex_unlock(&services_mutex); + return ENOENT; + } + + service_t *dev = hash_table_get_instance(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 */ + sysarg_t rc; + async_wait_for(msg, &rc); + + return rc; + } + + return ENOENT; +} + +static int locfs_destroy(service_id_t service_id, fs_index_t index) +{ + return ENOTSUP; +} + +vfs_out_ops_t locfs_ops = { + .mounted = locfs_mounted, + .unmounted = locfs_unmounted, + .read = locfs_read, + .write = locfs_write, + .truncate = locfs_truncate, + .close = locfs_close, + .destroy = locfs_destroy, + .sync = locfs_sync, +}; + +/** + * @} + */ Index: uspace/srv/fs/locfs/locfs_ops.h =================================================================== --- uspace/srv/fs/locfs/locfs_ops.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) +++ uspace/srv/fs/locfs/locfs_ops.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2009 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup fs + * @{ + */ + +#ifndef LOCFS_LOCFS_OPS_H_ +#define LOCFS_LOCFS_OPS_H_ + +#include + +extern bool locfs_init(void); + +#endif + +/** + * @} + */ Index: uspace/srv/fs/tmpfs/tmpfs.h =================================================================== --- uspace/srv/fs/tmpfs/tmpfs.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/tmpfs/tmpfs.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -61,5 +61,5 @@ fs_node_t *bp; /**< Back pointer to the FS node. */ fs_index_t index; /**< TMPFS node index. */ - devmap_handle_t devmap_handle;/**< Device handle. */ + service_id_t service_id;/**< Service ID of block device. */ link_t nh_link; /**< Nodes hash table link. */ tmpfs_dentry_type_t type; @@ -74,5 +74,5 @@ extern bool tmpfs_init(void); -extern bool tmpfs_restore(devmap_handle_t); +extern bool tmpfs_restore(service_id_t); #endif Index: uspace/srv/fs/tmpfs/tmpfs_dump.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_dump.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/tmpfs/tmpfs_dump.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -55,5 +55,5 @@ static bool -tmpfs_restore_recursion(devmap_handle_t dev, size_t *bufpos, size_t *buflen, +tmpfs_restore_recursion(service_id_t dsid, size_t *bufpos, size_t *buflen, aoff64_t *pos, fs_node_t *pfn) { @@ -68,5 +68,5 @@ uint32_t size; - if (block_seqread(dev, bufpos, buflen, pos, &entry, + if (block_seqread(dsid, bufpos, buflen, pos, &entry, sizeof(entry)) != EOK) return false; @@ -82,5 +82,5 @@ return false; - rc = ops->create(&fn, dev, L_FILE); + rc = ops->create(&fn, dsid, L_FILE); if (rc != EOK || fn == NULL) { free(fname); @@ -88,5 +88,5 @@ } - if (block_seqread(dev, bufpos, buflen, pos, fname, + if (block_seqread(dsid, bufpos, buflen, pos, fname, entry.len) != EOK) { (void) ops->destroy(fn); @@ -104,5 +104,5 @@ free(fname); - if (block_seqread(dev, bufpos, buflen, pos, &size, + if (block_seqread(dsid, bufpos, buflen, pos, &size, sizeof(size)) != EOK) return false; @@ -116,5 +116,5 @@ nodep->size = size; - if (block_seqread(dev, bufpos, buflen, pos, nodep->data, + if (block_seqread(dsid, bufpos, buflen, pos, nodep->data, size) != EOK) return false; @@ -126,5 +126,5 @@ return false; - rc = ops->create(&fn, dev, L_DIRECTORY); + rc = ops->create(&fn, dsid, L_DIRECTORY); if (rc != EOK || fn == NULL) { free(fname); @@ -132,5 +132,5 @@ } - if (block_seqread(dev, bufpos, buflen, pos, fname, + if (block_seqread(dsid, bufpos, buflen, pos, fname, entry.len) != EOK) { (void) ops->destroy(fn); @@ -148,5 +148,5 @@ free(fname); - if (!tmpfs_restore_recursion(dev, bufpos, buflen, pos, + if (!tmpfs_restore_recursion(dsid, bufpos, buflen, pos, fn)) return false; @@ -161,5 +161,5 @@ } -bool tmpfs_restore(devmap_handle_t dev) +bool tmpfs_restore(service_id_t dsid) { libfs_ops_t *ops = &tmpfs_libfs_ops; @@ -167,5 +167,5 @@ int rc; - rc = block_init(EXCHANGE_SERIALIZE, dev, TMPFS_COMM_SIZE); + rc = block_init(EXCHANGE_SERIALIZE, dsid, TMPFS_COMM_SIZE); if (rc != EOK) return false; @@ -176,5 +176,5 @@ char tag[6]; - if (block_seqread(dev, &bufpos, &buflen, &pos, tag, 5) != EOK) + if (block_seqread(dsid, &bufpos, &buflen, &pos, tag, 5) != EOK) goto error; @@ -183,16 +183,16 @@ goto error; - rc = ops->root_get(&fn, dev); + rc = ops->root_get(&fn, dsid); if (rc != EOK) goto error; - if (!tmpfs_restore_recursion(dev, &bufpos, &buflen, &pos, fn)) - goto error; - - block_fini(dev); + if (!tmpfs_restore_recursion(dsid, &bufpos, &buflen, &pos, fn)) + goto error; + + block_fini(dsid); return true; error: - block_fini(dev); + block_fini(dsid); return false; } Index: uspace/srv/fs/tmpfs/tmpfs_ops.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_ops.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/fs/tmpfs/tmpfs_ops.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -69,8 +69,8 @@ /* Forward declarations of static functions. */ static int tmpfs_match(fs_node_t **, fs_node_t *, const char *); -static int tmpfs_node_get(fs_node_t **, devmap_handle_t, fs_index_t); +static int tmpfs_node_get(fs_node_t **, service_id_t, fs_index_t); static int tmpfs_node_open(fs_node_t *); static int tmpfs_node_put(fs_node_t *); -static int tmpfs_create_node(fs_node_t **, devmap_handle_t, int); +static int tmpfs_create_node(fs_node_t **, service_id_t, int); static int tmpfs_destroy_node(fs_node_t *); static int tmpfs_link_node(fs_node_t *, fs_node_t *, const char *); @@ -78,7 +78,7 @@ /* Implementation of helper functions. */ -static int tmpfs_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle) -{ - return tmpfs_node_get(rfn, devmap_handle, TMPFS_SOME_ROOT); +static int tmpfs_root_get(fs_node_t **rfn, service_id_t service_id) +{ + return tmpfs_node_get(rfn, service_id, TMPFS_SOME_ROOT); } @@ -114,5 +114,5 @@ } -static devmap_handle_t tmpfs_device_get(fs_node_t *fn) +static service_id_t tmpfs_device_get(fs_node_t *fn) { return 0; @@ -158,7 +158,7 @@ switch (keys) { case 1: - return (nodep->devmap_handle == key[NODES_KEY_DEV]); + return (nodep->service_id == key[NODES_KEY_DEV]); case 2: - return ((nodep->devmap_handle == key[NODES_KEY_DEV]) && + return ((nodep->service_id == key[NODES_KEY_DEV]) && (nodep->index == key[NODES_KEY_INDEX])); default: @@ -202,5 +202,5 @@ nodep->bp = NULL; nodep->index = 0; - nodep->devmap_handle = 0; + nodep->service_id = 0; nodep->type = TMPFS_NONE; nodep->lnkcnt = 0; @@ -226,10 +226,10 @@ } -static bool tmpfs_instance_init(devmap_handle_t devmap_handle) +static bool tmpfs_instance_init(service_id_t service_id) { fs_node_t *rfn; int rc; - rc = tmpfs_create_node(&rfn, devmap_handle, L_DIRECTORY); + rc = tmpfs_create_node(&rfn, service_id, L_DIRECTORY); if (rc != EOK || !rfn) return false; @@ -238,8 +238,8 @@ } -static void tmpfs_instance_done(devmap_handle_t devmap_handle) -{ - unsigned long key[] = { - [NODES_KEY_DEV] = devmap_handle +static void tmpfs_instance_done(service_id_t service_id) +{ + unsigned long key[] = { + [NODES_KEY_DEV] = service_id }; /* @@ -270,8 +270,8 @@ } -int tmpfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index) -{ - unsigned long key[] = { - [NODES_KEY_DEV] = devmap_handle, +int tmpfs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index) +{ + unsigned long key[] = { + [NODES_KEY_DEV] = service_id, [NODES_KEY_INDEX] = index }; @@ -299,5 +299,5 @@ } -int tmpfs_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int lflag) +int tmpfs_create_node(fs_node_t **rfn, service_id_t service_id, int lflag) { fs_node_t *rootfn; @@ -318,5 +318,5 @@ nodep->bp->data = nodep; /* link the FS and TMPFS nodes */ - rc = tmpfs_root_get(&rootfn, devmap_handle); + rc = tmpfs_root_get(&rootfn, service_id); assert(rc == EOK); if (!rootfn) @@ -324,5 +324,5 @@ else nodep->index = tmpfs_next_index++; - nodep->devmap_handle = devmap_handle; + nodep->service_id = service_id; if (lflag & L_DIRECTORY) nodep->type = TMPFS_DIRECTORY; @@ -332,5 +332,5 @@ /* Insert the new node into the nodes hash table. */ unsigned long key[] = { - [NODES_KEY_DEV] = nodep->devmap_handle, + [NODES_KEY_DEV] = nodep->service_id, [NODES_KEY_INDEX] = nodep->index }; @@ -348,5 +348,5 @@ unsigned long key[] = { - [NODES_KEY_DEV] = nodep->devmap_handle, + [NODES_KEY_DEV] = nodep->service_id, [NODES_KEY_INDEX] = nodep->index }; @@ -432,5 +432,5 @@ static int -tmpfs_mounted(devmap_handle_t devmap_handle, const char *opts, +tmpfs_mounted(service_id_t service_id, const char *opts, fs_index_t *index, aoff64_t *size, unsigned *lnkcnt) { @@ -439,5 +439,5 @@ /* Check if this device is not already mounted. */ - rc = tmpfs_root_get(&rootfn, devmap_handle); + rc = tmpfs_root_get(&rootfn, service_id); if ((rc == EOK) && (rootfn)) { (void) tmpfs_node_put(rootfn); @@ -446,12 +446,12 @@ /* Initialize TMPFS instance. */ - if (!tmpfs_instance_init(devmap_handle)) + if (!tmpfs_instance_init(service_id)) return ENOMEM; - rc = tmpfs_root_get(&rootfn, devmap_handle); + rc = tmpfs_root_get(&rootfn, service_id); assert(rc == EOK); tmpfs_node_t *rootp = TMPFS_NODE(rootfn); if (str_cmp(opts, "restore") == 0) { - if (!tmpfs_restore(devmap_handle)) + if (!tmpfs_restore(service_id)) return ELIMIT; } @@ -464,11 +464,11 @@ } -static int tmpfs_unmounted(devmap_handle_t devmap_handle) -{ - tmpfs_instance_done(devmap_handle); - return EOK; -} - -static int tmpfs_read(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos, +static int tmpfs_unmounted(service_id_t service_id) +{ + tmpfs_instance_done(service_id); + return EOK; +} + +static int tmpfs_read(service_id_t service_id, fs_index_t index, aoff64_t pos, size_t *rbytes) { @@ -478,5 +478,5 @@ link_t *hlp; unsigned long key[] = { - [NODES_KEY_DEV] = devmap_handle, + [NODES_KEY_DEV] = service_id, [NODES_KEY_INDEX] = index }; @@ -532,5 +532,5 @@ static int -tmpfs_write(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos, +tmpfs_write(service_id_t service_id, fs_index_t index, aoff64_t pos, size_t *wbytes, aoff64_t *nsize) { @@ -540,5 +540,5 @@ link_t *hlp; unsigned long key[] = { - [NODES_KEY_DEV] = devmap_handle, + [NODES_KEY_DEV] = service_id, [NODES_KEY_INDEX] = index }; @@ -594,5 +594,5 @@ } -static int tmpfs_truncate(devmap_handle_t devmap_handle, fs_index_t index, +static int tmpfs_truncate(service_id_t service_id, fs_index_t index, aoff64_t size) { @@ -601,5 +601,5 @@ */ unsigned long key[] = { - [NODES_KEY_DEV] = devmap_handle, + [NODES_KEY_DEV] = service_id, [NODES_KEY_INDEX] = index }; @@ -629,14 +629,14 @@ } -static int tmpfs_close(devmap_handle_t devmap_handle, fs_index_t index) -{ - return EOK; -} - -static int tmpfs_destroy(devmap_handle_t devmap_handle, fs_index_t index) +static int tmpfs_close(service_id_t service_id, fs_index_t index) +{ + return EOK; +} + +static int tmpfs_destroy(service_id_t service_id, fs_index_t index) { link_t *hlp; unsigned long key[] = { - [NODES_KEY_DEV] = devmap_handle, + [NODES_KEY_DEV] = service_id, [NODES_KEY_INDEX] = index }; @@ -649,5 +649,5 @@ } -static int tmpfs_sync(devmap_handle_t devmap_handle, fs_index_t index) +static int tmpfs_sync(service_id_t service_id, fs_index_t index) { /* Index: uspace/srv/hid/console/Makefile =================================================================== --- uspace/srv/hid/console/Makefile (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/console/Makefile (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -29,29 +29,31 @@ USPACE_PREFIX = ../../.. +LIBS = $(LIBIMGMAP_PREFIX)/libimgmap.a +EXTRA_CFLAGS += -I$(LIBIMGMAP_PREFIX) BINARY = console -GENERIC_SOURCES = \ +SOURCES = \ console.c \ keybuffer.c \ + images.c \ gcons.c IMAGES = \ - gfx/helenos.ppm \ - gfx/nameic.ppm \ - gfx/cons_selected.ppm \ - gfx/cons_idle.ppm \ - gfx/cons_has_data.ppm \ - gfx/cons_kernel.ppm \ - gfx/anim_1.ppm \ - gfx/anim_2.ppm \ - gfx/anim_3.ppm \ - gfx/anim_4.ppm + gfx/helenos.tga \ + gfx/nameic.tga \ + gfx/cons_selected.tga \ + gfx/cons_idle.tga \ + gfx/cons_has_data.tga \ + gfx/cons_kernel.tga \ + gfx/anim_1.tga \ + gfx/anim_2.tga \ + gfx/anim_3.tga \ + gfx/anim_4.tga -SOURCES = \ - $(GENERIC_SOURCES) \ - $(IMAGES) +PRE_DEPEND = images.c images.h +EXTRA_CLEAN = images.c images.h include $(USPACE_PREFIX)/Makefile.common -%.o: %.ppm - $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) $< $@ +images.c images.h: $(IMAGES) + $(ROOT_PATH)/tools/mkarray.py images CONSOLE_IMAGES $^ Index: uspace/srv/hid/console/console.c =================================================================== --- uspace/srv/hid/console/console.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/console/console.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -53,5 +53,5 @@ #include #include -#include +#include #include #include @@ -81,5 +81,5 @@ size_t index; /**< Console index */ size_t refcount; /**< Connection reference count */ - devmap_handle_t devmap_handle; /**< Device handle */ + service_id_t service_id; /**< Service ID */ keybuffer_t keybuffer; /**< Buffer for incoming keys. */ screenbuffer_t scr; /**< Screenbuffer for saving screen @@ -582,5 +582,5 @@ continue; - if (consoles[i].devmap_handle == (devmap_handle_t) IPC_GET_ARG1(*icall)) { + if (consoles[i].service_id == (service_id_t) IPC_GET_ARG1(*icall)) { cons = &consoles[i]; break; @@ -721,13 +721,13 @@ } -static async_sess_t *connect_input(const char *dev_path) +static async_sess_t *connect_input(const char *svc_path) { async_sess_t *sess; async_exch_t *exch; - devmap_handle_t handle; - - int rc = devmap_device_get_handle(dev_path, &handle, 0); + service_id_t service_id; + + int rc = loc_service_get_id(svc_path, &service_id, 0); if (rc == EOK) { - sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, 0); + sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0); if (sess == NULL) { printf("%s: Failed to connect to input server\n", NAME); @@ -773,8 +773,8 @@ } - /* Register driver */ - int rc = devmap_driver_register(NAME, client_connection); + /* Register server */ + int rc = loc_server_register(NAME, client_connection); if (rc < 0) { - printf("%s: Unable to register driver (%d)\n", NAME, rc); + printf("%s: Unable to register server (%d)\n", NAME, rc); return false; } @@ -820,9 +820,9 @@ consoles[i].refcount = 0; - char vc[DEVMAP_NAME_MAXLEN + 1]; - snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i); + char vc[LOC_NAME_MAXLEN + 1]; + snprintf(vc, LOC_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i); - if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) { - printf("%s: Unable to register device %s\n", NAME, vc); + if (loc_service_register(vc, &consoles[i].service_id) != EOK) { + printf("%s: Unable to register service %s\n", NAME, vc); return false; } Index: uspace/srv/hid/console/gcons.c =================================================================== --- uspace/srv/hid/console/gcons.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/console/gcons.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -41,7 +41,9 @@ #include #include +#include #include "console.h" #include "gcons.h" +#include "images.h" #define CONSOLE_TOP 66 @@ -58,30 +60,20 @@ #define COLOR_BACKGROUND 0xffffff -extern char _binary_gfx_helenos_ppm_start[0]; -extern int _binary_gfx_helenos_ppm_size; -extern char _binary_gfx_nameic_ppm_start[0]; -extern int _binary_gfx_nameic_ppm_size; - -extern char _binary_gfx_anim_1_ppm_start[0]; -extern int _binary_gfx_anim_1_ppm_size; -extern char _binary_gfx_anim_2_ppm_start[0]; -extern int _binary_gfx_anim_2_ppm_size; -extern char _binary_gfx_anim_3_ppm_start[0]; -extern int _binary_gfx_anim_3_ppm_size; -extern char _binary_gfx_anim_4_ppm_start[0]; -extern int _binary_gfx_anim_4_ppm_size; - -extern char _binary_gfx_cons_selected_ppm_start[0]; -extern int _binary_gfx_cons_selected_ppm_size; -extern char _binary_gfx_cons_idle_ppm_start[0]; -extern int _binary_gfx_cons_idle_ppm_size; -extern char _binary_gfx_cons_has_data_ppm_start[0]; -extern int _binary_gfx_cons_has_data_ppm_size; -extern char _binary_gfx_cons_kernel_ppm_start[0]; -extern int _binary_gfx_cons_kernel_ppm_size; - static bool use_gcons = false; static sysarg_t xres; static sysarg_t yres; + +static imgmap_t *helenos_img; +static imgmap_t *nameic_img; + +static imgmap_t *anim_1_img; +static imgmap_t *anim_2_img; +static imgmap_t *anim_3_img; +static imgmap_t *anim_4_img; + +static imgmap_t *cons_has_data_img; +static imgmap_t *cons_idle_img; +static imgmap_t *cons_kernel_img; +static imgmap_t *cons_selected_img; enum butstate { @@ -101,6 +93,6 @@ static int fbphone; -/** List of pixmaps identifying these icons */ -static int ic_pixmaps[CONS_LAST] = {-1, -1, -1, -1, -1, -1}; +/** List of image maps identifying these icons */ +static int ic_imgmaps[CONS_LAST] = {-1, -1, -1, -1, -1, -1}; static int animation = -1; @@ -149,7 +141,7 @@ enum butstate state = console_state[index]; - if (ic_pixmaps[state] != -1) - async_obsolete_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[index], - ic_pixmaps[state]); + if (ic_imgmaps[state] != -1) + async_obsolete_msg_2(fbphone, FB_VP_DRAW_IMGMAP, cstatus_vp[index], + ic_imgmaps[state]); if ((state != CONS_DISCONNECTED) && (state != CONS_KERNEL) @@ -358,21 +350,23 @@ } -/** Draw a PPM pixmap to framebuffer - * - * @param logo Pointer to PPM data - * @param size Size of PPM data - * @param x Coordinate of upper left corner - * @param y Coordinate of upper left corner - * - */ -static void draw_pixmap(char *logo, size_t size, sysarg_t x, sysarg_t y) -{ +/** Draw an image map to framebuffer + * + * @param img Image map + * @param x Coordinate of upper left corner + * @param y Coordinate of upper left corner + * + */ +static void draw_imgmap(imgmap_t *img, sysarg_t x, sysarg_t y) +{ + if (img == NULL) + return; + /* Create area */ - char *shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED | + char *shm = mmap(NULL, img->size, PROTO_READ | PROTO_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0); if (shm == MAP_FAILED) return; - memcpy(shm, logo, size); + memcpy(shm, img, img->size); /* Send area */ @@ -386,5 +380,5 @@ /* Draw logo */ - async_obsolete_msg_2(fbphone, FB_DRAW_PPM, x, y); + async_obsolete_msg_2(fbphone, FB_DRAW_IMGMAP, x, y); drop: @@ -394,5 +388,5 @@ exit: /* Remove area */ - munmap(shm, size); + munmap(shm, img->size); } @@ -406,8 +400,6 @@ set_rgb_color(COLOR_MAIN, COLOR_MAIN); clear(); - draw_pixmap(_binary_gfx_helenos_ppm_start, - (size_t) &_binary_gfx_helenos_ppm_size, xres - 66, 2); - draw_pixmap(_binary_gfx_nameic_ppm_start, - (size_t) &_binary_gfx_nameic_ppm_size, 5, 17); + draw_imgmap(helenos_img, xres - 66, 2); + draw_imgmap(nameic_img, 5, 17); unsigned int i; @@ -418,23 +410,25 @@ } -/** Creates a pixmap on framebuffer - * - * @param data PPM data - * @param size PPM data size - * - * @return Pixmap identification - * - */ -static int make_pixmap(char *data, size_t size) -{ +/** Create an image map on framebuffer + * + * @param img Image map. + * + * @return Image map identification + * + */ +static int make_imgmap(imgmap_t *img) +{ + if (img == NULL) + return -1; + /* Create area */ - char *shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED | - MAP_ANONYMOUS, 0, 0); + char *shm = mmap(NULL, img->size, PROTO_READ | PROTO_WRITE, + MAP_SHARED | MAP_ANONYMOUS, 0, 0); if (shm == MAP_FAILED) return -1; - memcpy(shm, data, size); - - int pxid = -1; + memcpy(shm, img, img->size); + + int id = -1; /* Send area */ @@ -447,10 +441,10 @@ goto drop; - /* Obtain pixmap */ - rc = async_obsolete_req_0_0(fbphone, FB_SHM2PIXMAP); + /* Obtain image map identifier */ + rc = async_obsolete_req_0_0(fbphone, FB_SHM2IMGMAP); if (rc < 0) goto drop; - pxid = rc; + id = rc; drop: @@ -460,7 +454,7 @@ exit: /* Remove area */ - munmap(shm, size); - - return pxid; + munmap(shm, img->size); + + return id; } @@ -472,19 +466,15 @@ return; - int pm = make_pixmap(_binary_gfx_anim_1_ppm_start, - (size_t) &_binary_gfx_anim_1_ppm_size); - async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); - - pm = make_pixmap(_binary_gfx_anim_2_ppm_start, - (size_t) &_binary_gfx_anim_2_ppm_size); - async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); - - pm = make_pixmap(_binary_gfx_anim_3_ppm_start, - (size_t) &_binary_gfx_anim_3_ppm_size); - async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); - - pm = make_pixmap(_binary_gfx_anim_4_ppm_start, - (size_t) &_binary_gfx_anim_4_ppm_size); - async_obsolete_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); + int pm = make_imgmap(anim_1_img); + async_obsolete_msg_2(fbphone, FB_ANIM_ADDIMGMAP, an, pm); + + pm = make_imgmap(anim_2_img); + async_obsolete_msg_2(fbphone, FB_ANIM_ADDIMGMAP, an, pm); + + pm = make_imgmap(anim_3_img); + async_obsolete_msg_2(fbphone, FB_ANIM_ADDIMGMAP, an, pm); + + pm = make_imgmap(anim_4_img); + async_obsolete_msg_2(fbphone, FB_ANIM_ADDIMGMAP, an, pm); async_obsolete_msg_1(fbphone, FB_ANIM_START, an); @@ -504,4 +494,28 @@ if ((xres < 800) || (yres < 600)) return; + + /* Create image maps */ + helenos_img = imgmap_decode_tga((void *) helenos_tga, + helenos_tga_size); + nameic_img = imgmap_decode_tga((void *) nameic_tga, + nameic_tga_size); + + anim_1_img = imgmap_decode_tga((void *) anim_1_tga, + anim_1_tga_size); + anim_2_img = imgmap_decode_tga((void *) anim_2_tga, + anim_2_tga_size); + anim_3_img = imgmap_decode_tga((void *) anim_3_tga, + anim_3_tga_size); + anim_4_img = imgmap_decode_tga((void *) anim_4_tga, + anim_4_tga_size); + + cons_has_data_img = imgmap_decode_tga((void *) cons_has_data_tga, + cons_has_data_tga_size); + cons_idle_img = imgmap_decode_tga((void *) cons_idle_tga, + cons_idle_tga_size); + cons_kernel_img = imgmap_decode_tga((void *) cons_kernel_tga, + cons_kernel_tga_size); + cons_selected_img = imgmap_decode_tga((void *) cons_selected_tga, + cons_selected_tga_size); /* Create console viewport */ @@ -531,20 +545,10 @@ /* Initialize icons */ - ic_pixmaps[CONS_SELECTED] = - make_pixmap(_binary_gfx_cons_selected_ppm_start, - (size_t) &_binary_gfx_cons_selected_ppm_size); - ic_pixmaps[CONS_IDLE] = - make_pixmap(_binary_gfx_cons_idle_ppm_start, - (size_t) &_binary_gfx_cons_idle_ppm_size); - ic_pixmaps[CONS_HAS_DATA] = - make_pixmap(_binary_gfx_cons_has_data_ppm_start, - (size_t) &_binary_gfx_cons_has_data_ppm_size); - ic_pixmaps[CONS_DISCONNECTED] = - make_pixmap(_binary_gfx_cons_idle_ppm_start, - (size_t) &_binary_gfx_cons_idle_ppm_size); - ic_pixmaps[CONS_KERNEL] = - make_pixmap(_binary_gfx_cons_kernel_ppm_start, - (size_t) &_binary_gfx_cons_kernel_ppm_size); - ic_pixmaps[CONS_DISCONNECTED_SEL] = ic_pixmaps[CONS_SELECTED]; + ic_imgmaps[CONS_SELECTED] = make_imgmap(cons_selected_img); + ic_imgmaps[CONS_IDLE] = make_imgmap(cons_idle_img); + ic_imgmaps[CONS_HAS_DATA] = make_imgmap(cons_has_data_img); + ic_imgmaps[CONS_DISCONNECTED] = make_imgmap(cons_idle_img); + ic_imgmaps[CONS_KERNEL] = make_imgmap(cons_kernel_img); + ic_imgmaps[CONS_DISCONNECTED_SEL] = ic_imgmaps[CONS_SELECTED]; make_anim(); Index: uspace/srv/hid/console/gfx/anim_1.ppm =================================================================== --- uspace/srv/hid/console/gfx/anim_1.ppm (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,23 +1,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -48 48 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ääääää÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúúúúúúúúúúûûûûûûûûûûûûûûûûûûüüüþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿööö½½½eeeeee½½½öööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýùùùøøøõõõêêêèèèèèèéééêêêëëëìììíííîîîîîîðððøøøúúúûûûþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿãããeeedddãããÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý÷÷÷ñññáááÞÞÞÞÞÞÜÜÜÞÞÞßßßáááãããäääåååæææçççèèèéééëëëêêêììì÷÷÷úúúþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿãããeeedddãããÿÿÿÿÿÿÿÿÿýýýõõõîîî×××ÒÒÒÏÏÏÑÑÑÒÒÒÕÕÕ×××ÚÚÚÜÜÜÞÞÞàààâââãããääääääååååååääääääåååèèèõõõùùùýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿööö½½½eeeddd½½½öööÿÿÿÿÿÿýýýíííÏÏÏÇÇÇÃÃÃÃÃÃÅÅÅÈÈÈËËËÎÎÎÑÑÑÕÕÕØØØÛÛÛÝÝÝßßßàààáááââââââââââââáááßßßÞÞÞßßßâââôôôýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööããããããöööþþþÿÿÿüüüìììÇÇǸ¸¸···¸¸¸»»»¾¾¾ÂÂÂÆÆÆÊÊÊÎÎÎÒÒÒÖÖÖÙÙÙÜÜÜÞÞÞàààáááââââââââââââàààßßßÜÜÜÙÙÙ×××ÝÝÝòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüêêêÃÃñ±±¯¯¯°°°²²²¶¶¶ººº¾¾¾ÃÃÃÈÈÈÍÍÍÒÒÒÖÖÖÚÚÚÝÝÝßßßáááâââãããääääääãããáááàààÝÝÝÚÚÚÖÖÖÔÔÔÚÚÚòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüëëëÁÁÁ­­­©©©©©©«««¯¯¯³³³¹¹¹¾¾¾ÄÄÄÊÊÊÏÏÏÔÔÔØØØÜÜÜßßßâââäääåååæææççççççæææäääâââàààÜÜÜÙÙÙÔÔÔÑÑÑØØØðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýìììÃÃí­­§§§¦¦¦§§§ªªª®®®´´´ºººÁÁÁÇÇÇÍÍÍÓÓÓØØØÜÜÜàààãããæææèèèéééêêêêêêêêêêêêèèèæææäääàààÝÝÝØØØÓÓÓÏÏÏ×××ðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÇÇDZ±±©©©¦¦¦¦¦¦¨¨¨¬¬¬±±±···¾¾¾ÅÅÅÌÌÌÒÒÒØØØÝÝÝâââåååèèèêêêìììíííîîîîîîîîîîîîìììëëëèèèæææâââÞÞÞØØØÓÓÓÎÎÎÕÕÕðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööÏÏϸ¸¸¯¯¯©©©§§§¨¨¨«««°°°¶¶¶½½½ÄÄÄËËËÒÒÒÙÙÙÞÞÞãããçççêêêíííïïïðððñññòòòòòòòòòòòòñññïïïíííëëëçççãããßßßÙÙÙÓÓÓÎÎÎ×××÷÷÷þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýîîîÇÇÇ···°°°«««ªªª¬¬¬°°°¶¶¶½½½ÄÄÄÌÌÌÓÓÓÙÙÙßßßåååéééìììïïïñññóóóôôôõõõõõõööööööõõõõõõóóóòòòïïïíííéééåååàààÚÚÚÔÔÔÔÔÔðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ØØظ¸¸²²²¯¯¯®®®±±±¶¶¶¼¼¼ÄÄÄËËËÓÓÓÚÚÚàààæææëëëîîîñññóóóõõõööö÷÷÷øøøøøøùùùùùùøøøøøø÷÷÷õõõôôôñññïïïëëëçççáááÛÛÛÕÕÕÜÜÜøøøþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýòòòÒÒÒÃÃû»»µµµ³³³´´´···½½½ÄÄÄËËËÓÓÓÚÚÚáááçççìììðððóóóõõõ÷÷÷øøøùùùúúúúúúûûûûûûûûûûûûúúúúúúùùù÷÷÷öööóóóðððìììèèèâââÜÜÜÛÛÛóóóýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿùùùààà···yyyEEE777¹¹¹ººº¾¾¾ÄÄÄÌÌÌÓÓÓÚÚÚáááèèèíííñññôôôöööøøøùùùúúúûûûüüüüüüüüüýýýýýýüüüüüüûûûûûûúúúøøø÷÷÷ôôôñññíííèèèãããÞÞÞãããùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿøøøÝÝݺººccc - - -¾¾¾ÁÁÁÅÅÅËËËÓÓÓÚÚÚáááèèèíííñññôôô÷÷÷ùùùúúúûûûüüüüüüýýýýýýýýýþþþþþþýýýýýýýýýüüüüüüûûûùùùøøøõõõòòòîîîéééääääääùùùþþþÿÿÿÿÿÿÿÿÿþþþõõõÞÞÞÒÒÒÅÅÅ - - -ÄÄÄÇÇÇÌÌÌÒÒÒÙÙÙàààçççíííñññõõõ÷÷÷ùùùûûûüüüýýýýýýýýýþþþþþþþþþþþþþþþþþþþþþþþþýýýýýýüüüûûûúúúøøøõõõòòòîîîêêêééé÷÷÷þþþþþþÿÿÿÿÿÿûûûéééÜÜÜÕÕÕÍÍÍÊÊÊÍÍÍÒÒÒÙÙÙßßßæææìììñññôôô÷÷÷ùùùûûûüüüýýýýýýþþþþþþþþþþþþþþþÿÿÿÿÿÿþþþþþþþþþþþþþþþýýýýýýûûûúúúøøøöööóóóïïïìììîîîûûûþþþÿÿÿÿÿÿúúúèèèÝÝÝ×××ÑÑÑÏÏÏÆÆÆDDDZZZáááôôô¯¯¯666MMM666VVVäääþþþþþþ···999GGG???KKKÔÔÔÿÿÿ'''ÐÐÐZZZªªªùùùöööôôôððððððûûûþþþÿÿÿÿÿÿúúúéééßßßÙÙÙÔÔÔ ÔÔÔ×××^^^eeeâââîîîóó󸸸“““üüüööö666þþþÿÿÿþþþXXXâââþþþÆÆÆ - - -„„„ùùùííí úúúùùù÷÷÷ôôôôôôüüüþþþÿÿÿÿÿÿûûûêêêáááÜÜÜ×××!!!ÕÕÕSSS^^^çççìììñññõõõ???ñññüüüýýýCCC ÿÿÿEEEñññÿÿÿÿÿÿÊÊÊqqqÿÿÿþþþ$$$ÿÿÿþþþþþþ%%%üüüûûûùùùøøø÷÷÷ýýýþþþÿÿÿÿÿÿûûûëëëãããÞÞÞÚÚÚNNNÙÙÙïïïóóó÷÷÷ üüüýýýþþþûûûúúúÿÿÿ - - -ÿÿÿÿÿÿÿÿÿôôô333ÿÿÿÿÿÿ'''ÿÿÿÿÿÿþþþ'''ýýýüüüûûûúúúúúúýýýþþþÿÿÿÿÿÿûûûëëëäääàààÝÝÝ - - -²²²¨¨¨UUUñññõõõøøø ýýýþþþþþþþþþÿÿÿÿÿÿ ÿÿÿÿÿÿÿÿÿùùù111ÿÿÿÿÿÿ'''ÿÿÿÿÿÿÿÿÿ'''ýýýýýýüüüüüüûûûþþþþþþÿÿÿÿÿÿûûûìììåååâââßßß"""âââæææ___¨¨¨öööùùù>>>èèèþþþþþþÿÿÿöööÿÿÿ>>>ôôôÿÿÿÿÿÿÔÔÔgggÿÿÿÿÿÿ'''ÿÿÿÿÿÿÿÿÿ'''þþþþþþýýýýýýýýýþþþþþþÿÿÿÿÿÿûûûíííæææãããÖÖÖãããèèèßßßÖÖÖúúú½½½___ûûûÿÿÿîîîUUUôôô¾¾¾ŠŠŠÿÿÿþþþhhhÜÜÜÿÿÿôôôÿÿÿÿÿÿÿÿÿ - - -õõõþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûíííççç···BBBUUUÎÎ͝™™™üüü»»»:::///^^^jjjâââÿÿÿÿÿÿ¾¾¾>>>KKKEEEJJJÓÓÓÿÿÿÍÍÍKKKrrrÿÿÿqqqNNNÍÍÍþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûîîîçççäääââââââãããæææêêêîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüðððèèèäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøêêêäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúêêêäääââââââãããæææéééîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûíííäääáááàààáááäääèèèìììñññõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþöööåååßßßÞÞÞßßßâââæææëëëïïïóóó÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúèèèÞÞÞÜÜÜÝÝÝàààäääèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþõõõßßßÙÙÙÚÚÚÜÜÜàààæææëëëðððôôô÷÷÷úúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøâââ×××ÖÖÖÙÙÙÝÝÝâââèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýôôôÝÝÝÓÓÓÔÔÔØØØÞÞÞãããéééïïïóóó÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýòòòÚÚÚÐÐÐÓÓÓØØØßßßåååëëëðððôôôøøøúúúûûûýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññØØØÏÏÏÓÓÓÙÙÙàààçççìììñññõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññ×××ÎÎÎÓÓÓÚÚÚáááèèèíííòòòõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÕÕÕÎÎÎÓÓÓÛÛÛâââèèèîîîòòòöööùùùûûûüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÖÖÖÔÔÔÕÕÕÛÛÛãããéééîîîóóóöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüöööðððÜÜÜÛÛÛÞÞÞãããêêêïïïôôô÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþüüü÷÷÷òòòãããäääéééìììðððôôô÷÷÷úúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýùùùùùù÷÷÷îîîðððôôô÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþýýýûûûûûûüüüüüüýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ Index: uspace/srv/hid/console/gfx/anim_2.ppm =================================================================== --- uspace/srv/hid/console/gfx/anim_2.ppm (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,23 +1,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -48 48 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúúúúúúúúúúûûûûûûûûûûûûûûûûûûüüüþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ääääää÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýùùùøøøõõõêêêèèèèèèéééêêêëëëìììíííîîîîîîðððøøøúúúûûûþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿööö½½½eeeeee½½½öööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý÷÷÷ñññáááÞÞÞÞÞÞÜÜÜÞÞÞßßßáááãããäääåååæææçççèèèéééëëëêêêììì÷÷÷úúúþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿãããeeedddãããÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýõõõîîî×××ÒÒÒÏÏÏÑÑÑÒÒÒÕÕÕ×××ÚÚÚÜÜÜÞÞÞàààâââãããääääääååååååääääääåååèèèõõõùùùýýýþþþÿÿÿÿÿÿãããeeedddãããÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÏÏÏÇÇÇÃÃÃÃÃÃÅÅÅÈÈÈËËËÎÎÎÑÑÑÕÕÕØØØÛÛÛÝÝÝßßßàààáááââââââââââââáááßßßÞÞÞßßßâââôôôýýýþþþÿÿÿööö½½½eeeddd½½½öööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüìììÇÇǸ¸¸···¸¸¸»»»¾¾¾ÂÂÂÆÆÆÊÊÊÎÎÎÒÒÒÖÖÖÙÙÙÜÜÜÞÞÞàààáááââââââââââââàààßßßÜÜÜÙÙÙ×××ÝÝÝòòòýýýþþþÿÿÿöööããããããöööþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüêêêÃÃñ±±¯¯¯°°°²²²¶¶¶ººº¾¾¾ÃÃÃÈÈÈÍÍÍÒÒÒÖÖÖÚÚÚÝÝÝßßßáááâââãããääääääãããáááàààÝÝÝÚÚÚÖÖÖÔÔÔÚÚÚòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüëëëÁÁÁ­­­©©©©©©«««¯¯¯³³³¹¹¹¾¾¾ÄÄÄÊÊÊÏÏÏÔÔÔØØØÜÜÜßßßâââäääåååæææççççççæææäääâââàààÜÜÜÙÙÙÔÔÔÑÑÑØØØðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýìììÃÃí­­§§§¦¦¦§§§ªªª®®®´´´ºººÁÁÁÇÇÇÍÍÍÓÓÓØØØÜÜÜàààãããæææèèèéééêêêêêêêêêêêêèèèæææäääàààÝÝÝØØØÓÓÓÏÏÏ×××ðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÇÇDZ±±©©©¦¦¦¦¦¦¨¨¨¬¬¬±±±···¾¾¾ÅÅÅÌÌÌÒÒÒØØØÝÝÝâââåååèèèêêêìììíííîîîîîîîîîîîîìììëëëèèèæææâââÞÞÞØØØÓÓÓÎÎÎÕÕÕðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööÏÏϸ¸¸¯¯¯©©©§§§¨¨¨«««°°°¶¶¶½½½ÄÄÄËËËÒÒÒÙÙÙÞÞÞãããçççêêêíííïïïðððñññòòòòòòòòòòòòñññïïïíííëëëçççãããßßßÙÙÙÓÓÓÎÎÎ×××÷÷÷þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýîîîÇÇÇ···°°°«««ªªª¬¬¬°°°¶¶¶½½½ÄÄÄÌÌÌÓÓÓÙÙÙßßßåååéééìììïïïñññóóóôôôõõõõõõööööööõõõõõõóóóòòòïïïíííéééåååàààÚÚÚÔÔÔÔÔÔðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ØØظ¸¸²²²¯¯¯®®®±±±¶¶¶¼¼¼ÄÄÄËËËÓÓÓÚÚÚàààæææëëëîîîñññóóóõõõööö÷÷÷øøøøøøùùùùùùøøøøøø÷÷÷õõõôôôñññïïïëëëçççáááÛÛÛÕÕÕÜÜÜøøøþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýòòòÒÒÒÃÃû»»µµµ³³³´´´···½½½ÄÄÄËËËÓÓÓÚÚÚáááçççìììðððóóóõõõ÷÷÷øøøùùùúúúúúúûûûûûûûûûûûûúúúúúúùùù÷÷÷öööóóóðððìììèèèâââÜÜÜÛÛÛóóóýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿùùùààà···yyyEEE777¹¹¹ººº¾¾¾ÄÄÄÌÌÌÓÓÓÚÚÚáááèèèíííñññôôôöööøøøùùùúúúûûûüüüüüüüüüýýýýýýüüüüüüûûûûûûúúúøøø÷÷÷ôôôñññíííèèèãããÞÞÞãããùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿøøøÝÝݺººccc - - -¾¾¾ÁÁÁÅÅÅËËËÓÓÓÚÚÚáááèèèíííñññôôô÷÷÷ùùùúúúûûûüüüüüüýýýýýýýýýþþþþþþýýýýýýýýýüüüüüüûûûùùùøøøõõõòòòîîîéééääääääùùùþþþÿÿÿÿÿÿÿÿÿþþþõõõÞÞÞÒÒÒÅÅÅ - - -ÄÄÄÇÇÇÌÌÌÒÒÒÙÙÙàààçççíííñññõõõ÷÷÷ùùùûûûüüüýýýýýýýýýþþþþþþþþþþþþþþþþþþþþþþþþýýýýýýüüüûûûúúúøøøõõõòòòîîîêêêééé÷÷÷þþþþþþÿÿÿÿÿÿûûûéééÜÜÜÕÕÕÍÍÍÊÊÊÍÍÍÒÒÒÙÙÙßßßæææìììñññôôô÷÷÷ùùùûûûüüüýýýýýýþþþþþþþþþþþþþþþÿÿÿÿÿÿþþþþþþþþþþþþþþþýýýýýýûûûúúúøøøöööóóóïïïìììîîîûûûþþþÿÿÿÿÿÿúúúèèèÝÝÝ×××ÑÑÑÏÏÏÆÆÆDDDZZZáááôôô¯¯¯666MMM666VVVäääþþþþþþ···999GGG???KKKÔÔÔÿÿÿ'''ÐÐÐZZZªªªùùùöööôôôððððððûûûþþþÿÿÿÿÿÿúúúéééßßßÙÙÙÔÔÔ ÔÔÔ×××^^^eeeâââîîîóó󸸸“““üüüööö666þþþÿÿÿþþþXXXâââþþþÆÆÆ - - -„„„ùùùííí úúúùùù÷÷÷ôôôôôôüüüþþþÿÿÿÿÿÿûûûêêêáááÜÜÜ×××!!!ÕÕÕSSS^^^çççìììñññõõõ???ñññüüüýýýCCC ÿÿÿEEEñññÿÿÿÿÿÿÊÊÊqqqÿÿÿþþþ$$$ÿÿÿþþþþþþ%%%üüüûûûùùùøøø÷÷÷ýýýþþþÿÿÿÿÿÿûûûëëëãããÞÞÞÚÚÚNNNÙÙÙïïïóóó÷÷÷ üüüýýýþþþûûûúúúÿÿÿ - - -ÿÿÿÿÿÿÿÿÿôôô333ÿÿÿÿÿÿ'''ÿÿÿÿÿÿþþþ'''ýýýüüüûûûúúúúúúýýýþþþÿÿÿÿÿÿûûûëëëäääàààÝÝÝ - - -²²²¨¨¨UUUñññõõõøøø ýýýþþþþþþþþþÿÿÿÿÿÿ ÿÿÿÿÿÿÿÿÿùùù111ÿÿÿÿÿÿ'''ÿÿÿÿÿÿÿÿÿ'''ýýýýýýüüüüüüûûûþþþþþþÿÿÿÿÿÿûûûìììåååâââßßß"""âââæææ___¨¨¨öööùùù>>>èèèþþþþþþÿÿÿöööÿÿÿ>>>ôôôÿÿÿÿÿÿÔÔÔgggÿÿÿÿÿÿ'''ÿÿÿÿÿÿÿÿÿ'''þþþþþþýýýýýýýýýþþþþþþÿÿÿÿÿÿûûûíííæææãããÖÖÖãããèèèßßßÖÖÖúúú½½½___ûûûÿÿÿîîîUUUôôô¾¾¾ŠŠŠÿÿÿþþþhhhÜÜÜÿÿÿôôôÿÿÿÿÿÿÿÿÿ - - -õõõþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûíííççç···BBBUUUÎÎ͝™™™üüü»»»:::///^^^jjjâââÿÿÿÿÿÿ¾¾¾>>>KKKEEEJJJÓÓÓÿÿÿÍÍÍKKKrrrÿÿÿqqqNNNÍÍÍþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûîîîçççäääââââââãããæææêêêîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüðððèèèäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøêêêäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúêêêäääââââââãããæææéééîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûíííäääáááàààáááäääèèèìììñññõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþöööåååßßßÞÞÞßßßâââæææëëëïïïóóó÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúèèèÞÞÞÜÜÜÝÝÝàààäääèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþõõõßßßÙÙÙÚÚÚÜÜÜàààæææëëëðððôôô÷÷÷úúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøâââ×××ÖÖÖÙÙÙÝÝÝâââèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýôôôÝÝÝÓÓÓÔÔÔØØØÞÞÞãããéééïïïóóó÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýòòòÚÚÚÐÐÐÓÓÓØØØßßßåååëëëðððôôôøøøúúúûûûýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññØØØÏÏÏÓÓÓÙÙÙàààçççìììñññõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññ×××ÎÎÎÓÓÓÚÚÚáááèèèíííòòòõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÕÕÕÎÎÎÓÓÓÛÛÛâââèèèîîîòòòöööùùùûûûüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÖÖÖÔÔÔÕÕÕÛÛÛãããéééîîîóóóöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüöööðððÜÜÜÛÛÛÞÞÞãããêêêïïïôôô÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþüüü÷÷÷òòòãããäääéééìììðððôôô÷÷÷úúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýùùùùùù÷÷÷îîîðððôôô÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþýýýûûûûûûüüüüüüýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ Index: uspace/srv/hid/console/gfx/anim_3.ppm =================================================================== --- uspace/srv/hid/console/gfx/anim_3.ppm (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,23 +1,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -48 48 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúúúúúúúúúúûûûûûûûûûûûûûûûûûûüüüþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýùùùøøøõõõêêêèèèèèèéééêêêëëëìììíííîîîîîîðððøøøúúúûûûþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý÷÷÷ñññáááÞÞÞÞÞÞÜÜÜÞÞÞßßßáááãããäääåååæææçççèèèéééëëëêêêììì÷÷÷úúúþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýõõõîîî×××ÒÒÒÏÏÏÑÑÑÒÒÒÕÕÕ×××ÚÚÚÜÜÜÞÞÞàààâââãããääääääååååååääääääåååèèèõõõùùùýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÏÏÏÇÇÇÃÃÃÃÃÃÅÅÅÈÈÈËËËÎÎÎÑÑÑÕÕÕØØØÛÛÛÝÝÝßßßàààáááââââââââââââáááßßßÞÞÞßßßâââôôôýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüìììÇÇǸ¸¸···¸¸¸»»»¾¾¾ÂÂÂÆÆÆÊÊÊÎÎÎÒÒÒÖÖÖÙÙÙÜÜÜÞÞÞàààáááââââââââââââàààßßßÜÜÜÙÙÙ×××ÝÝÝòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüêêêÃÃñ±±¯¯¯°°°²²²¶¶¶ººº¾¾¾ÃÃÃÈÈÈÍÍÍÒÒÒÖÖÖÚÚÚÝÝÝßßßáááâââãããääääääãããáááàààÝÝÝÚÚÚÖÖÖÔÔÔÚÚÚòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüëëëÁÁÁ­­­©©©©©©«««¯¯¯³³³¹¹¹¾¾¾ÄÄÄÊÊÊÏÏÏÔÔÔØØØÜÜÜßßßâââäääåååæææççççççæææäääâââàààÜÜÜÙÙÙÔÔÔÑÑÑØØØðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýìììÃÃí­­§§§¦¦¦§§§ªªª®®®´´´ºººÁÁÁÇÇÇÍÍÍÓÓÓØØØÜÜÜàààãããæææèèèéééêêêêêêêêêêêêèèèæææäääàààÝÝÝØØØÓÓÓÏÏÏ×××ðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÇÇDZ±±©©©¦¦¦¦¦¦¨¨¨¬¬¬±±±···¾¾¾ÅÅÅÌÌÌÒÒÒØØØÝÝÝâââåååèèèêêêìììíííîîîîîîîîîîîîìììëëëèèèæææâââÞÞÞØØØÓÓÓÎÎÎÕÕÕðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööÏÏϸ¸¸¯¯¯©©©§§§¨¨¨«««°°°¶¶¶½½½ÄÄÄËËËÒÒÒÙÙÙÞÞÞãããçççêêêíííïïïðððñññòòòòòòòòòòòòñññïïïíííëëëçççãããßßßÙÙÙÓÓÓÎÎÎ×××÷÷÷þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýîîîÇÇÇ···°°°«««ªªª¬¬¬°°°¶¶¶½½½ÄÄÄÌÌÌÓÓÓÙÙÙßßßåååéééìììïïïñññóóóôôôõõõõõõööööööõõõõõõóóóòòòïïïíííéééåååàààÚÚÚÔÔÔÔÔÔðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ØØظ¸¸²²²¯¯¯®®®±±±¶¶¶¼¼¼ÄÄÄËËËÓÓÓÚÚÚàààæææëëëîîîñññóóóõõõööö÷÷÷øøøøøøùùùùùùøøøøøø÷÷÷õõõôôôñññïïïëëëçççáááÛÛÛÕÕÕÜÜÜøøøþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýòòòÒÒÒÃÃû»»µµµ³³³´´´···½½½ÄÄÄËËËÓÓÓÚÚÚáááçççìììðððóóóõõõ÷÷÷øøøùùùúúúúúúûûûûûûûûûûûûúúúúúúùùù÷÷÷öööóóóðððìììèèèâââÜÜÜÛÛÛóóóýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿùùùààà···yyyEEE777¹¹¹ººº¾¾¾ÄÄÄÌÌÌÓÓÓÚÚÚáááèèèíííñññôôôöööøøøùùùúúúûûûüüüüüüüüüýýýýýýüüüüüüûûûûûûúúúøøø÷÷÷ôôôñññíííèèèãããÞÞÞãããùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿøøøÝÝݺººccc - - -¾¾¾ÁÁÁÅÅÅËËËÓÓÓÚÚÚáááèèèíííñññôôô÷÷÷ùùùúúúûûûüüüüüüýýýýýýýýýþþþþþþýýýýýýýýýüüüüüüûûûùùùøøøõõõòòòîîîéééääääääùùùþþþÿÿÿÿÿÿÿÿÿþþþõõõÞÞÞÒÒÒÅÅÅ - - -ÄÄÄÇÇÇÌÌÌÒÒÒÙÙÙàààçççíííñññõõõ÷÷÷ùùùûûûüüüýýýýýýýýýþþþþþþþþþþþþþþþþþþþþþþþþýýýýýýüüüûûûúúúøøøõõõòòòîîîêêêééé÷÷÷þþþþþþÿÿÿÿÿÿûûûéééÜÜÜÕÕÕÍÍÍÊÊÊÍÍÍÒÒÒÙÙÙßßßæææìììñññôôô÷÷÷ùùùûûûüüüýýýýýýþþþþþþþþþþþþþþþÿÿÿÿÿÿþþþþþþþþþþþþþþþýýýýýýûûûúúúøøøöööóóóïïïìììîîîûûûþþþÿÿÿÿÿÿúúúèèèÝÝÝ×××ÑÑÑÏÏÏÆÆÆDDDZZZáááôôô¯¯¯666MMM666VVVäääþþþþþþ···999GGG???KKKÔÔÔÿÿÿ'''ÐÐÐZZZªªªùùùöööôôôððððððûûûþþþÿÿÿÿÿÿúúúéééßßßÙÙÙÔÔÔ ÔÔÔ×××^^^eeeâââîîîóó󸸸“““üüüööö666þþþÿÿÿþþþXXXâââþþþÆÆÆ - - -„„„ùùùííí úúúùùù÷÷÷ôôôôôôüüüþþþÿÿÿÿÿÿûûûêêêáááÜÜÜ×××!!!ÕÕÕSSS^^^çççìììñññõõõ???ñññüüüýýýCCC ÿÿÿEEEñññÿÿÿÿÿÿÊÊÊqqqÿÿÿþþþ$$$ÿÿÿþþþþþþ%%%üüüûûûùùùøøø÷÷÷ýýýþþþÿÿÿÿÿÿûûûëëëãããÞÞÞÚÚÚNNNÙÙÙïïïóóó÷÷÷ üüüýýýþþþûûûúúúÿÿÿ - - -ÿÿÿÿÿÿÿÿÿôôô333ÿÿÿÿÿÿ'''ÿÿÿÿÿÿþþþ'''ýýýüüüûûûúúúúúúýýýþþþÿÿÿÿÿÿûûûëëëäääàààÝÝÝ - - -²²²¨¨¨UUUñññõõõøøø ýýýþþþþþþþþþÿÿÿÿÿÿ ÿÿÿÿÿÿÿÿÿùùù111ÿÿÿÿÿÿ'''ÿÿÿÿÿÿÿÿÿ'''ýýýýýýüüüüüüûûûþþþþþþÿÿÿÿÿÿûûûìììåååâââßßß"""âââæææ___¨¨¨öööùùù>>>èèèþþþþþþÿÿÿöööÿÿÿ>>>ôôôÿÿÿÿÿÿÔÔÔgggÿÿÿÿÿÿ'''ÿÿÿÿÿÿÿÿÿ'''þþþþþþýýýýýýýýýþþþþþþÿÿÿÿÿÿûûûíííæææãããÖÖÖãããèèèßßßÖÖÖúúú½½½___ûûûÿÿÿîîîUUUôôô¾¾¾ŠŠŠÿÿÿþþþhhhÜÜÜÿÿÿôôôÿÿÿÿÿÿÿÿÿ - - -õõõþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûíííççç···BBBUUUÎÎ͝™™™üüü»»»:::///^^^jjjâââÿÿÿÿÿÿ¾¾¾>>>KKKEEEJJJÓÓÓÿÿÿÍÍÍKKKrrrÿÿÿqqqNNNÍÍÍþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûîîîçççäääââââââãããæææêêêîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüðððèèèäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøêêêäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúêêêäääââââââãããæææéééîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûíííäääáááàààáááäääèèèìììñññõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþöööåååßßßÞÞÞßßßâââæææëëëïïïóóó÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúèèèÞÞÞÜÜÜÝÝÝàààäääèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþõõõßßßÙÙÙÚÚÚÜÜÜàààæææëëëðððôôô÷÷÷úúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøâââ×××ÖÖÖÙÙÙÝÝÝâââèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýôôôÝÝÝÓÓÓÔÔÔØØØÞÞÞãããéééïïïóóó÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýòòòÚÚÚÐÐÐÓÓÓØØØßßßåååëëëðððôôôøøøúúúûûûýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññØØØÏÏÏÓÓÓÙÙÙàààçççìììñññõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññ×××ÎÎÎÓÓÓÚÚÚáááèèèíííòòòõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÕÕÕÎÎÎÓÓÓÛÛÛâââèèèîîîòòòöööùùùûûûüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÖÖÖÔÔÔÕÕÕÛÛÛãããéééîîîóóóöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿ÷÷÷ääääää÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüöööðððÜÜÜÛÛÛÞÞÞãããêêêïïïôôô÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýýýýýýýþþþþþþþþþÿÿÿÿÿÿööö½½½eeeeee½½½öööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþüüü÷÷÷òòòãããäääéééìììðððôôô÷÷÷úúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿãããeeedddãããÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýùùùùùù÷÷÷îîîðððôôô÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿãããeeedddãããÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþýýýûûûûûûüüüüüüýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿööö½½½eeeddd½½½öööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööããããããöööþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ Index: uspace/srv/hid/console/gfx/anim_4.ppm =================================================================== --- uspace/srv/hid/console/gfx/anim_4.ppm (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,23 +1,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -48 48 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúúúúúúúúúúûûûûûûûûûûûûûûûûûûüüüþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýùùùøøøõõõêêêèèèèèèéééêêêëëëìììíííîîîîîîðððøøøúúúûûûþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý÷÷÷ñññáááÞÞÞÞÞÞÜÜÜÞÞÞßßßáááãããäääåååæææçççèèèéééëëëêêêììì÷÷÷úúúþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýõõõîîî×××ÒÒÒÏÏÏÑÑÑÒÒÒÕÕÕ×××ÚÚÚÜÜÜÞÞÞàààâââãããääääääååååååääääääåååèèèõõõùùùýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÏÏÏÇÇÇÃÃÃÃÃÃÅÅÅÈÈÈËËËÎÎÎÑÑÑÕÕÕØØØÛÛÛÝÝÝßßßàààáááââââââââââââáááßßßÞÞÞßßßâââôôôýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüìììÇÇǸ¸¸···¸¸¸»»»¾¾¾ÂÂÂÆÆÆÊÊÊÎÎÎÒÒÒÖÖÖÙÙÙÜÜÜÞÞÞàààáááââââââââââââàààßßßÜÜÜÙÙÙ×××ÝÝÝòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüêêêÃÃñ±±¯¯¯°°°²²²¶¶¶ººº¾¾¾ÃÃÃÈÈÈÍÍÍÒÒÒÖÖÖÚÚÚÝÝÝßßßáááâââãããääääääãããáááàààÝÝÝÚÚÚÖÖÖÔÔÔÚÚÚòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüëëëÁÁÁ­­­©©©©©©«««¯¯¯³³³¹¹¹¾¾¾ÄÄÄÊÊÊÏÏÏÔÔÔØØØÜÜÜßßßâââäääåååæææççççççæææäääâââàààÜÜÜÙÙÙÔÔÔÑÑÑØØØðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýìììÃÃí­­§§§¦¦¦§§§ªªª®®®´´´ºººÁÁÁÇÇÇÍÍÍÓÓÓØØØÜÜÜàààãããæææèèèéééêêêêêêêêêêêêèèèæææäääàààÝÝÝØØØÓÓÓÏÏÏ×××ðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÇÇDZ±±©©©¦¦¦¦¦¦¨¨¨¬¬¬±±±···¾¾¾ÅÅÅÌÌÌÒÒÒØØØÝÝÝâââåååèèèêêêìììíííîîîîîîîîîîîîìììëëëèèèæææâââÞÞÞØØØÓÓÓÎÎÎÕÕÕðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööÏÏϸ¸¸¯¯¯©©©§§§¨¨¨«««°°°¶¶¶½½½ÄÄÄËËËÒÒÒÙÙÙÞÞÞãããçççêêêíííïïïðððñññòòòòòòòòòòòòñññïïïíííëëëçççãããßßßÙÙÙÓÓÓÎÎÎ×××÷÷÷þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýîîîÇÇÇ···°°°«««ªªª¬¬¬°°°¶¶¶½½½ÄÄÄÌÌÌÓÓÓÙÙÙßßßåååéééìììïïïñññóóóôôôõõõõõõööööööõõõõõõóóóòòòïïïíííéééåååàààÚÚÚÔÔÔÔÔÔðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ØØظ¸¸²²²¯¯¯®®®±±±¶¶¶¼¼¼ÄÄÄËËËÓÓÓÚÚÚàààæææëëëîîîñññóóóõõõööö÷÷÷øøøøøøùùùùùùøøøøøø÷÷÷õõõôôôñññïïïëëëçççáááÛÛÛÕÕÕÜÜÜøøøþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýòòòÒÒÒÃÃû»»µµµ³³³´´´···½½½ÄÄÄËËËÓÓÓÚÚÚáááçççìììðððóóóõõõ÷÷÷øøøùùùúúúúúúûûûûûûûûûûûûúúúúúúùùù÷÷÷öööóóóðððìììèèèâââÜÜÜÛÛÛóóóýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿùùùààà···yyyEEE777¹¹¹ººº¾¾¾ÄÄÄÌÌÌÓÓÓÚÚÚáááèèèíííñññôôôöööøøøùùùúúúûûûüüüüüüüüüýýýýýýüüüüüüûûûûûûúúúøøø÷÷÷ôôôñññíííèèèãããÞÞÞãããùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿøøøÝÝݺººccc - - -¾¾¾ÁÁÁÅÅÅËËËÓÓÓÚÚÚáááèèèíííñññôôô÷÷÷ùùùúúúûûûüüüüüüýýýýýýýýýþþþþþþýýýýýýýýýüüüüüüûûûùùùøøøõõõòòòîîîéééääääääùùùþþþÿÿÿÿÿÿÿÿÿþþþõõõÞÞÞÒÒÒÅÅÅ - - -ÄÄÄÇÇÇÌÌÌÒÒÒÙÙÙàààçççíííñññõõõ÷÷÷ùùùûûûüüüýýýýýýýýýþþþþþþþþþþþþþþþþþþþþþþþþýýýýýýüüüûûûúúúøøøõõõòòòîîîêêêééé÷÷÷þþþþþþÿÿÿÿÿÿûûûéééÜÜÜÕÕÕÍÍÍÊÊÊÍÍÍÒÒÒÙÙÙßßßæææìììñññôôô÷÷÷ùùùûûûüüüýýýýýýþþþþþþþþþþþþþþþÿÿÿÿÿÿþþþþþþþþþþþþþþþýýýýýýûûûúúúøøøöööóóóïïïìììîîîûûûþþþÿÿÿÿÿÿúúúèèèÝÝÝ×××ÑÑÑÏÏÏÆÆÆDDDZZZáááôôô¯¯¯666MMM666VVVäääþþþþþþ···999GGG???KKKÔÔÔÿÿÿ'''ÐÐÐZZZªªªùùùöööôôôððððððûûûþþþÿÿÿÿÿÿúúúéééßßßÙÙÙÔÔÔ ÔÔÔ×××^^^eeeâââîîîóó󸸸“““üüüööö666þþþÿÿÿþþþXXXâââþþþÆÆÆ - - -„„„ùùùííí úúúùùù÷÷÷ôôôôôôüüüþþþÿÿÿÿÿÿûûûêêêáááÜÜÜ×××!!!ÕÕÕSSS^^^çççìììñññõõõ???ñññüüüýýýCCC ÿÿÿEEEñññÿÿÿÿÿÿÊÊÊqqqÿÿÿþþþ$$$ÿÿÿþþþþþþ%%%üüüûûûùùùøøø÷÷÷ýýýþþþÿÿÿÿÿÿûûûëëëãããÞÞÞÚÚÚNNNÙÙÙïïïóóó÷÷÷ üüüýýýþþþûûûúúúÿÿÿ - - -ÿÿÿÿÿÿÿÿÿôôô333ÿÿÿÿÿÿ'''ÿÿÿÿÿÿþþþ'''ýýýüüüûûûúúúúúúýýýþþþÿÿÿÿÿÿûûûëëëäääàààÝÝÝ - - -²²²¨¨¨UUUñññõõõøøø ýýýþþþþþþþþþÿÿÿÿÿÿ ÿÿÿÿÿÿÿÿÿùùù111ÿÿÿÿÿÿ'''ÿÿÿÿÿÿÿÿÿ'''ýýýýýýüüüüüüûûûþþþþþþÿÿÿÿÿÿûûûìììåååâââßßß"""âââæææ___¨¨¨öööùùù>>>èèèþþþþþþÿÿÿöööÿÿÿ>>>ôôôÿÿÿÿÿÿÔÔÔgggÿÿÿÿÿÿ'''ÿÿÿÿÿÿÿÿÿ'''þþþþþþýýýýýýýýýþþþþþþÿÿÿÿÿÿûûûíííæææãããÖÖÖãããèèèßßßÖÖÖúúú½½½___ûûûÿÿÿîîîUUUôôô¾¾¾ŠŠŠÿÿÿþþþhhhÜÜÜÿÿÿôôôÿÿÿÿÿÿÿÿÿ - - -õõõþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûíííççç···BBBUUUÎÎ͝™™™üüü»»»:::///^^^jjjâââÿÿÿÿÿÿ¾¾¾>>>KKKEEEJJJÓÓÓÿÿÿÍÍÍKKKrrrÿÿÿqqqNNNÍÍÍþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûîîîçççäääââââââãããæææêêêîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüðððèèèäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøêêêäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúêêêäääââââââãããæææéééîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûíííäääáááàààáááäääèèèìììñññõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþöööåååßßßÞÞÞßßßâââæææëëëïïïóóó÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúèèèÞÞÞÜÜÜÝÝÝàààäääèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþõõõßßßÙÙÙÚÚÚÜÜÜàààæææëëëðððôôô÷÷÷úúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøâââ×××ÖÖÖÙÙÙÝÝÝâââèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýôôôÝÝÝÓÓÓÔÔÔØØØÞÞÞãããéééïïïóóó÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýòòòÚÚÚÐÐÐÓÓÓØØØßßßåååëëëðððôôôøøøúúúûûûýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññØØØÏÏÏÓÓÓÙÙÙàààçççìììñññõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññ×××ÎÎÎÓÓÓÚÚÚáááèèèíííòòòõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÕÕÕÎÎÎÓÓÓÛÛÛâââèèèîîîòòòöööùùùûûûüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ääääää÷÷÷ÿÿÿÿÿÿþþþüüüðððÖÖÖÔÔÔÕÕÕÛÛÛãããéééîîîóóóöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿööö½½½eeeeee½½½öööÿÿÿÿÿÿþþþüüüöööðððÜÜÜÛÛÛÞÞÞãããêêêïïïôôô÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿãããeeedddãããÿÿÿÿÿÿÿÿÿþþþþþþüüü÷÷÷òòòãããäääéééìììðððôôô÷÷÷úúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿãããeeedddãããÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýùùùùùù÷÷÷îîîðððôôô÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿööö½½½eeeddd½½½öööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþýýýûûûûûûüüüüüüýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööããããããöööþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ Index: uspace/srv/hid/console/gfx/cons_has_data.ppm =================================================================== --- uspace/srv/hid/console/gfx/cons_has_data.ppm (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,5 +1,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -48 48 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþúúþúúþúúþúúþûûþûûþûûþûûþûûþûûþüüþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþýýþùùþøøþõõþêêþèèþèèþééþêêþëëþììþííþîîþîîþððþøøþúúþûûþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþýýþ÷÷þññþááþÞÞþÞÞþÜÜþÞÞþßßþááþããþääþååþææþççþèèþééþëëþêêþììþ÷÷þúúþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþýýþõõþîîþ××þÒÒþÏÏþÑÑþÒÒþÕÕþ××þÚÚþÜÜþÞÞþààþââþããþääþääþååþååþääþääþååþèèþõõþùùþýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþýýþííþÏÏþÇÇþÃÃþÃÃþÅÅþÈÈþËËþÎÎþÑÑþÕÕþØØþÛÛþÝÝþßßþààþááþââþââþââþââþááþßßþÞÞþßßþââþôôþýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþüüþììþÇÇþ¸¸þ··þ¸¸þ»»þ¾¾þÂÂþÆÆþÊÊþÎÎþÒÒþÖÖþÙÙþÜÜþÞÞþààþááþââþââþââþââþààþßßþÜÜþÙÙþ××þÝÝþòòþýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþüüþêêþÃÃþ±±þ¯¯þ°°þ²²þ¶¶þººþ¾¾þÃÃþÈÈþÍÍþÒÒþÖÖþÚÚþÝÝþßßþááþââþããþääþääþããþááþààþÝÝþÚÚþÖÖþÔÔþÚÚþòòþýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþüüþëëþÁÁþ­­þ©©þ©©þ««þ¯¯þ³³þ¹¹þ¾¾þÄÄþÊÊþÏÏþÔÔþØØþÜÜþßßþââþääþååþææþççþççþææþääþââþààþÜÜþÙÙþÔÔþÑÑþØØþððþýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþýýþììþÃÃþ­­þ§§þ¦¦þ§§þªªþ®®þ´´þººþÁÁþÇÇþÍÍþÓÓþØØþÜÜþààþããþææþèèþééþêêþêêþêêþêêþèèþææþääþààþÝÝþØØþÓÓþÏÏþ××þððþýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþýýþííþÇÇþ±±þ©©þ¦¦þ¦¦þ¨¨þ¬¬þ±±þ··þ¾¾þÅÅþÌÌþÒÒþØØþÝÝþââþååþèèþêêþììþííþîîþîîþîîþîîþììþëëþèèþææþââþÞÞþØØþÓÓþÎÎþÕÕþððþýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþööþÏÏþ¸¸þ¯¯þ©©þ§§þ¨¨þ««þ°°þ¶¶þ½½þÄÄþËËþÒÒþÙÙþÞÞþããþççþêêþííþïïþððþññþòòþòòþòòþòòþññþïïþííþëëþççþããþßßþÙÙþÓÓþÎÎþ××þ÷÷þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþýýþîîþÇÇþ··þ°°þ««þªªþ¬¬þ°°þ¶¶þ½½þÄÄþÌÌþÓÓþÙÙþßßþååþééþììþïïþññþóóþôôþõõþõõþööþööþõõþõõþóóþòòþïïþííþééþååþààþÚÚþÔÔþÔÔþððþýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþ÷÷þØØþÂÂþ¸¸þ²²þ¯¯þ®®þ±±þ¶¶þ¼¼þÄÄþËËþÓÓþÚÚþààþææþëëþîîþññþóóþõõþööþ÷÷þøøþøøþùùþùùþøøþøøþ÷÷þõõþôôþññþïïþëëþççþááþÛÛþÕÕþÜÜþøøþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþýýþòòþÒÒþÃÃþ»»þµµþ³³þ´´þ··þ½½þÄÄþËËþÓÓþÚÚþááþççþììþððþóóþõõþ÷÷þøøþùùþúúþúúþûûþûûþûûþûûþúúþúúþùùþ÷÷þööþóóþððþììþèèþââþÜÜþÛÛþóóþýýþþþÿÿÿÿÿÿÿÿÿÿÿÿþùùþààþÏÏþÅÅþ¾¾þººþ¹¹þººþ¾¾þÄÄþÌÌþÓÓþÚÚþááþèèþííþññþôôþööþøøþùùþúúþûûþüüþüüþüüþýýþýýþüüþüüþûûþûûþúúþøøþ÷÷þôôþññþííþèèþããþÞÞþããþùùþþþÿÿÿÿÿÿÿÿÿÿÿÿþøøþÝÝþÐÐþÈÈþÂÂþ¾¾þ¾¾þÁÁþÅÅþËËþÓÓþÚÚþááþèèþííþññþôôþ÷÷þùùþúúþûûþüüþüüþýýÿýýÿýýÿþþÿþþÿýýÿýýþýýþüüþüüþûûþùùþøøþõõþòòþîîþééþääþääþùùþþþÿÿÿÿÿÿÿÿÿþþþþõõþÞÞþÒÒþËËþÆÆþÃÃþÄÄþÇÇþÌÌþÒÒþÙÙþààþççþííþññþõõþ÷÷þùùþûûþüüþýýþýýÿýýÿþþÿþþÿþþÿþþÿþþÿþþÿþþÿþþÿýýþýýþüüþûûþúúþøøþõõþòòþîîþêêþééþ÷÷þþþþþþÿÿÿÿÿÿþûûþééþÜÜþÕÕþÎÎþÊÊþÈÈþÊÊþÍÍþÒÒþÙÙþßßþææþììþññþôôþ÷÷þùùþûûþüüþýýÿýýÿþþÿþþÿþþÿþþÿþþÿÿÿÿÿÿÿþþÿþþÿþþÿþþÿþþÿýýþýýþûûþúúþøøþööþóóþïïþììþîîþûûþþþÿÿÿÿÿÿþúúþèèþÝÝþ××þÑÑþÎÎþÍÍþÏÏþÓÓþØØþÞÞþååþëëþððþôôþ÷÷þùùþûûþüüþýýÿýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿþþÿýýþýýþüüþúúþùùþööþôôþððþððþûûþþþÿÿÿÿÿÿþúúþééþßßþÙÙþÔÔþÒÒþÒÒþÔÔþØØþÝÝþããþééþîîþóóþööþùùþûûþüüþýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýþýýþüüþúúþùùþ÷÷þôôþôôþüüþþþÿÿÿÿÿÿþûûþêêþááþÜÜþ××þÖÖþÖÖþØØþÜÜþââþççþììþññþõõþøøþúúþûûþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýþýýþüüþûûþùùþøøþ÷÷þýýþþþÿÿÿÿÿÿþûûþëëþããþÞÞþÚÚþÙÙþÚÚþÜÜþààþååþêêþïïþóóþ÷÷þùùþûûþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýþýýþüüþûûþúúþúúþýýþþþÿÿÿÿÿÿþûûþëëþääþààþÝÝþÜÜþÝÝþßßþããþèèþííþññþõõþøøþúúþüüþýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýÿýýþüüþüüþûûþþþþþþÿÿÿÿÿÿþûûþììþååþââþßßþÞÞþßßþââþææþêêþïïþóóþööþùùþûûþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿþþÿýýþýýþýýþþþþþþÿÿÿÿÿÿþûûþííþææþããþààþààþááþääþèèþììþððþôôþ÷÷þúúþüüþýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿþþÿþþÿþþÿþþÿþþÿÿÿÿÿÿþûûþííþççþääþááþááþââþååþééþííþññþõõþøøþúúþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿþþÿþþÿþþÿÿÿÿÿÿþûûþîîþççþääþââþââþããþææþêêþîîþòòþõõþøøþúúþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþüüþððþèèþääþââþââþääþææþêêþîîþòòþööþùùþûûþýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþøøþêêþääþââþââþääþææþêêþîîþòòþööþùùþûûþýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþúúþêêþääþââþââþããþææþééþîîþòòþõõþøøþúúþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþûûþííþääþááþààþááþääþèèþììþññþõõþøøþúúþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþööþååþßßþÞÞþßßþââþææþëëþïïþóóþ÷÷þùùþûûþýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþúúþèèþÞÞþÜÜþÝÝþààþääþèèþííþòòþööþùùþûûþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþõõþßßþÙÙþÚÚþÜÜþààþææþëëþððþôôþ÷÷þúúþüüþýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýÿýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþøøþââþ××þÖÖþÙÙþÝÝþââþèèþííþòòþööþùùþûûþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýÿýýÿüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþýýþôôþÝÝþÓÓþÔÔþØØþÞÞþããþééþïïþóóþ÷÷þùùþûûþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýÿýýÿüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþýýþòòþÚÚþÐÐþÓÓþØØþßßþååþëëþððþôôþøøþúúþûûþýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýÿýýÿüüÿýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþüüþññþØØþÏÏþÓÓþÙÙþààþççþììþññþõõþøøþúúþüüþýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýÿýýÿüüÿýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþüüþññþ××þÎÎþÓÓþÚÚþááþèèþííþòòþõõþøøþúúþüüþýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýÿýýÿüüÿýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþüüþððþÕÕþÎÎþÓÓþÛÛþââþèèþîîþòòþööþùùþûûþüüþýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýÿýýÿüüÿýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþüüþððþÖÖþÔÔþÕÕþÛÛþããþééþîîþóóþööþùùþûûþüüþýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿýýÿüüÿýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþüüþööþððþÜÜþÛÛþÞÞþããþêêþïïþôôþ÷÷þùùþûûþüüÿýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿýýÿýýÿýýÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþüüþ÷÷þòòþããþääþééþììþððþôôþ÷÷þúúþüüþýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿþþÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþýýþùùþùùþ÷÷þîîþððþôôþ÷÷þùùþûûþýýÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþÿþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþýýþûûþûûþüüþüüþýýþýýþþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþþþþþþþÿþþÿþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ Index: uspace/srv/hid/console/gfx/cons_idle.ppm =================================================================== --- uspace/srv/hid/console/gfx/cons_idle.ppm (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,5 +1,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -48 48 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúúúúúúúúúúûûûûûûûûûûûûûûûûûûüüüþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýùùùøøøõõõêêêèèèèèèéééêêêëëëìììíííîîîîîîðððøøøúúúûûûþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý÷÷÷ñññáááÞÞÞÞÞÞÜÜÜÞÞÞßßßáááãããäääåååæææçççèèèéééëëëêêêììì÷÷÷úúúþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýõõõîîî×××ÒÒÒÏÏÏÑÑÑÒÒÒÕÕÕ×××ÚÚÚÜÜÜÞÞÞàààâââãããääääääååååååääääääåååèèèõõõùùùýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÏÏÏÇÇÇÃÃÃÃÃÃÅÅÅÈÈÈËËËÎÎÎÑÑÑÕÕÕØØØÛÛÛÝÝÝßßßàààáááââââââââââââáááßßßÞÞÞßßßâââôôôýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüìììÇÇǸ¸¸···¸¸¸»»»¾¾¾ÂÂÂÆÆÆÊÊÊÎÎÎÒÒÒÖÖÖÙÙÙÜÜÜÞÞÞàààáááââââââââââââàààßßßÜÜÜÙÙÙ×××ÝÝÝòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüêêêÃÃñ±±¯¯¯°°°²²²¶¶¶ººº¾¾¾ÃÃÃÈÈÈÍÍÍÒÒÒÖÖÖÚÚÚÝÝÝßßßáááâââãããääääääãããáááàààÝÝÝÚÚÚÖÖÖÔÔÔÚÚÚòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüëëëÁÁÁ­­­©©©©©©«««¯¯¯³³³¹¹¹¾¾¾ÄÄÄÊÊÊÏÏÏÔÔÔØØØÜÜÜßßßâââäääåååæææççççççæææäääâââàààÜÜÜÙÙÙÔÔÔÑÑÑØØØðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýìììÃÃí­­§§§¦¦¦§§§ªªª®®®´´´ºººÁÁÁÇÇÇÍÍÍÓÓÓØØØÜÜÜàààãããæææèèèéééêêêêêêêêêêêêèèèæææäääàààÝÝÝØØØÓÓÓÏÏÏ×××ðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÇÇDZ±±©©©¦¦¦¦¦¦¨¨¨¬¬¬±±±···¾¾¾ÅÅÅÌÌÌÒÒÒØØØÝÝÝâââåååèèèêêêìììíííîîîîîîîîîîîîìììëëëèèèæææâââÞÞÞØØØÓÓÓÎÎÎÕÕÕðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööÏÏϸ¸¸¯¯¯©©©§§§¨¨¨«««°°°¶¶¶½½½ÄÄÄËËËÒÒÒÙÙÙÞÞÞãããçççêêêíííïïïðððñññòòòòòòòòòòòòñññïïïíííëëëçççãããßßßÙÙÙÓÓÓÎÎÎ×××÷÷÷þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýîîîÇÇÇ···°°°«««ªªª¬¬¬°°°¶¶¶½½½ÄÄÄÌÌÌÓÓÓÙÙÙßßßåååéééìììïïïñññóóóôôôõõõõõõööööööõõõõõõóóóòòòïïïíííéééåååàààÚÚÚÔÔÔÔÔÔðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ØØظ¸¸²²²¯¯¯®®®±±±¶¶¶¼¼¼ÄÄÄËËËÓÓÓÚÚÚàààæææëëëîîîñññóóóõõõööö÷÷÷øøøøøøùùùùùùøøøøøø÷÷÷õõõôôôñññïïïëëëçççáááÛÛÛÕÕÕÜÜÜøøøþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýòòòÒÒÒÃÃû»»µµµ³³³´´´···½½½ÄÄÄËËËÓÓÓÚÚÚáááçççìììðððóóóõõõ÷÷÷øøøùùùúúúúúúûûûûûûûûûûûûúúúúúúùùù÷÷÷öööóóóðððìììèèèâââÜÜÜÛÛÛóóóýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿùùùàààÏÏÏÅÅž¾¾ººº¹¹¹ººº¾¾¾ÄÄÄÌÌÌÓÓÓÚÚÚáááèèèíííñññôôôöööøøøùùùúúúûûûüüüüüüüüüýýýýýýüüüüüüûûûûûûúúúøøø÷÷÷ôôôñññíííèèèãããÞÞÞãããùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿøøøÝÝÝÐÐÐÈÈȾ¾¾¾¾¾ÁÁÁÅÅÅËËËÓÓÓÚÚÚáááèèèíííñññôôô÷÷÷ùùùúúúûûûüüüüüüýýýýýýýýýþþþþþþýýýýýýýýýüüüüüüûûûùùùøøøõõõòòòîîîéééääääääùùùþþþÿÿÿÿÿÿÿÿÿþþþõõõÞÞÞÒÒÒËËËÆÆÆÃÃÃÄÄÄÇÇÇÌÌÌÒÒÒÙÙÙàààçççíííñññõõõ÷÷÷ùùùûûûüüüýýýýýýýýýþþþþþþþþþþþþþþþþþþþþþþþþýýýýýýüüüûûûúúúøøøõõõòòòîîîêêêééé÷÷÷þþþþþþÿÿÿÿÿÿûûûéééÜÜÜÕÕÕÎÎÎÊÊÊÈÈÈÊÊÊÍÍÍÒÒÒÙÙÙßßßæææìììñññôôô÷÷÷ùùùûûûüüüýýýýýýþþþþþþþþþþþþþþþÿÿÿÿÿÿþþþþþþþþþþþþþþþýýýýýýûûûúúúøøøöööóóóïïïìììîîîûûûþþþÿÿÿÿÿÿúúúèèèÝÝÝ×××ÑÑÑÎÎÎÍÍÍÏÏÏÓÓÓØØØÞÞÞåååëëëðððôôô÷÷÷ùùùûûûüüüýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþýýýýýýüüüúúúùùùöööôôôððððððûûûþþþÿÿÿÿÿÿúúúéééßßßÙÙÙÔÔÔÒÒÒÒÒÒÔÔÔØØØÝÝÝãããéééîîîóóóöööùùùûûûüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüúúúùùù÷÷÷ôôôôôôüüüþþþÿÿÿÿÿÿûûûêêêáááÜÜÜ×××ÖÖÖÖÖÖØØØÜÜÜâââçççìììñññõõõøøøúúúûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüûûûùùùøøø÷÷÷ýýýþþþÿÿÿÿÿÿûûûëëëãããÞÞÞÚÚÚÙÙÙÚÚÚÜÜÜàààåååêêêïïïóóó÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüûûûúúúúúúýýýþþþÿÿÿÿÿÿûûûëëëäääàààÝÝÝÜÜÜÝÝÝßßßãããèèèíííñññõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüüüüûûûþþþþþþÿÿÿÿÿÿûûûìììåååâââßßßÞÞÞßßßâââæææêêêïïïóóóöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþýýýýýýýýýþþþþþþÿÿÿÿÿÿûûûíííæææãããààààààáááäääèèèìììðððôôô÷÷÷úúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûíííçççäääááááááâââåååéééíííñññõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûîîîçççäääââââââãããæææêêêîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüðððèèèäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøêêêäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúêêêäääââââââãããæææéééîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûíííäääáááàààáááäääèèèìììñññõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþöööåååßßßÞÞÞßßßâââæææëëëïïïóóó÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúèèèÞÞÞÜÜÜÝÝÝàààäääèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþõõõßßßÙÙÙÚÚÚÜÜÜàààæææëëëðððôôô÷÷÷úúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøâââ×××ÖÖÖÙÙÙÝÝÝâââèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýôôôÝÝÝÓÓÓÔÔÔØØØÞÞÞãããéééïïïóóó÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýòòòÚÚÚÐÐÐÓÓÓØØØßßßåååëëëðððôôôøøøúúúûûûýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññØØØÏÏÏÓÓÓÙÙÙàààçççìììñññõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññ×××ÎÎÎÓÓÓÚÚÚáááèèèíííòòòõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÕÕÕÎÎÎÓÓÓÛÛÛâââèèèîîîòòòöööùùùûûûüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÖÖÖÔÔÔÕÕÕÛÛÛãããéééîîîóóóöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüöööðððÜÜÜÛÛÛÞÞÞãããêêêïïïôôô÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþüüü÷÷÷òòòãããäääéééìììðððôôô÷÷÷úúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýùùùùùù÷÷÷îîîðððôôô÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþýýýûûûûûûüüüüüüýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ Index: uspace/srv/hid/console/gfx/cons_kernel.ppm =================================================================== --- uspace/srv/hid/console/gfx/cons_kernel.ppm (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,23 +1,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -48 48 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúúúúúúúúúúûûûûûûûûûûûûûûûûûûüüüþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýùùùøøøõõõêêêèèèèèèéééêêêëëëìììíííîîîîîîðððøøøúúúûûûþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý÷÷÷ñññáááÞÞÞÞÞÞÜÜÜÞÞÞßßßáááãããäääåååæææçççèèèéééëëëêêêììì÷÷÷úúúþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýõõõîîî×××ÒÒÒÏÏÏÑÑÑÒÒÒÕÕÕ×××ÚÚÚÜÜÜÞÞÞàààâââãããääääääååååååääääääåååèèèõõõùùùýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÏÏÏÇÇÇÃÃÃÃÃÃÅÅÅÈÈÈËËËÎÎÎÑÑÑÕÕÕØØØÛÛÛÝÝÝßßßàààáááââââââââââââáááßßßÞÞÞßßßâââôôôýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüìììÇÇǸ¸¸···¸¸¸»»»¾¾¾ÂÂÂÆÆÆÊÊÊÎÎÎÒÒÒÖÖÖÙÙÙÜÜÜÞÞÞàààáááââââââââââââàààßßßÜÜÜÙÙÙ×××ÝÝÝòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüêêêÃÃñ±±¯¯¯°°°²²²¶¶¶ººº¾¾¾ÃÃÃÈÈÈÍÍÍÒÒÒÖÖÖÚÚÚÝÝÝßßßáááâââãããääääääãããáááàààÝÝÝÚÚÚÖÖÖÔÔÔÚÚÚòòòýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüëëëÁÁÁ­­­©©©©©©«««¯¯¯³³³¹¹¹¾¾¾ÄÄÄÊÊÊÏÏÏÔÔÔØØØÜÜÜßßßâââäääåååæææççççççæææäääâââàààÜÜÜÙÙÙÔÔÔÑÑÑØØØðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýìììÃÃí­­§§§¦¦¦§§§ªªª®®®´´´ºººÁÁÁÇÇÇÍÍÍÓÓÓØØØÜÜÜàààãããæææèèèéééêêêêêêêêêêêêèèèæææäääàààÝÝÝØØØÓÓÓÏÏÏ×××ðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýíííÇÇDZ±±©©©¦¦¦¦¦¦¨¨¨¬¬¬±±±···¾¾¾ÅÅÅÌÌÌÒÒÒØØØÝÝÝâââåååèèèêêêìììíííîîîîîîîîîîîîìììëëëèèèæææâââÞÞÞØØØÓÓÓÎÎÎÕÕÕðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööÏÏϸ¸¸¯¯¯©©©§§§¨¨¨«««°°°¶¶¶½½½ÄÄÄËËËÒÒÒÙÙÙÞÞÞãããçççêêêíííïïïðððñññòòòòòòòòòòòòñññïïïíííëëëçççãããßßßÙÙÙÓÓÓÎÎÎ×××÷÷÷þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýîîîÇÇÇ···°°°«««ªªª¬¬¬°°°¶¶¶½½½ÄÄÄÌÌÌÓÓÓÙÙÙßßßåååéééìììïïïñññóóóôôôõõõõõõööööööõõõõõõóóóòòòïïïíííéééåååàààÚÚÚÔÔÔÔÔÔðððýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ØØظ¸¸²²²¯¯¯®®®±±±¶¶¶¼¼¼ÄÄÄËËËÓÓÓÚÚÚàààæææëëëîîîñññóóóõõõööö÷÷÷øøøøøøùùùùùùøøøøøø÷÷÷õõõôôôñññïïïëëëçççáááÛÛÛÕÕÕÜÜÜøøøþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýòòòÒÒÒÃÃû»»µµµ³³³´´´···½½½ÄÄÄËËËÓÓÓÚÚÚáááçççìììðððóóóõõõ÷÷÷øøøùùùúúúúúúûûûûûûûûûûûûúúúúúúùùù÷÷÷öööóóóðððìììèèèâââÜÜÜÛÛÛóóóýýýþþþÿÿÿÿÿÿÿÿÿÿÿÿùùùààà···yyyEEE777¹¹¹ººº¾¾¾ÄÄÄÌÌÌÓÓÓÚÚÚáááèèèíííñññôôôöööøøøùùùúúúûûûüüüüüüüüüýýýýýýüüüüüüûûûûûûúúúøøø÷÷÷ôôôñññíííèèèãããÞÞÞãããùùùþþþÿÿÿÿÿÿÿÿÿÿÿÿøøøÝÝݺººccc - - -¾¾¾ÁÁÁÅÅÅËËËÓÓÓÚÚÚáááèèèíííñññôôô÷÷÷ùùùúúúûûûüüüüüüýýýýýýýýýþþþþþþýýýýýýýýýüüüüüüûûûùùùøøøõõõòòòîîîéééääääääùùùþþþÿÿÿÿÿÿÿÿÿþþþõõõÞÞÞÒÒÒÅÅÅ - - -ÄÄÄÇÇÇÌÌÌÒÒÒÙÙÙàààçççíííñññõõõ÷÷÷ùùùûûûüüüýýýýýýýýýþþþþþþþþþþþþþþþþþþþþþþþþýýýýýýüüüûûûúúúøøøõõõòòòîîîêêêééé÷÷÷þþþþþþÿÿÿÿÿÿûûûéééÜÜÜÕÕÕÍÍÍÊÊÊÍÍÍÒÒÒÙÙÙßßßæææìììñññôôô÷÷÷ùùùûûûüüüýýýýýýþþþþþþþþþþþþþþþÿÿÿÿÿÿþþþþþþþþþþþþþþþýýýýýýûûûúúúøøøöööóóóïïïìììîîîûûûþþþÿÿÿÿÿÿúúúèèèÝÝÝ×××ÑÑÑÏÏÏÆÆÆDDDZZZáááôôô¯¯¯666MMM666VVVäääþþþþþþ···999GGG???KKKÔÔÔÿÿÿ'''ÐÐÐZZZªªªùùùöööôôôððððððûûûþþþÿÿÿÿÿÿúúúéééßßßÙÙÙÔÔÔ ÔÔÔ×××^^^eeeâââîîîóó󸸸“““üüüööö666þþþÿÿÿþþþXXXâââþþþÆÆÆ - - -„„„ùùùííí úúúùùù÷÷÷ôôôôôôüüüþþþÿÿÿÿÿÿûûûêêêáááÜÜÜ×××!!!ÕÕÕSSS^^^çççìììñññõõõ???ñññüüüýýýCCC ÿÿÿEEEñññÿÿÿÿÿÿÊÊÊqqqÿÿÿþþþ$$$ÿÿÿþþþþþþ%%%üüüûûûùùùøøø÷÷÷ýýýþþþÿÿÿÿÿÿûûûëëëãããÞÞÞÚÚÚNNNÙÙÙïïïóóó÷÷÷ üüüýýýþþþûûûúúúÿÿÿ - - -ÿÿÿÿÿÿÿÿÿôôô333ÿÿÿÿÿÿ'''ÿÿÿÿÿÿþþþ'''ýýýüüüûûûúúúúúúýýýþþþÿÿÿÿÿÿûûûëëëäääàààÝÝÝ - - -²²²¨¨¨UUUñññõõõøøø ýýýþþþþþþþþþÿÿÿÿÿÿ ÿÿÿÿÿÿÿÿÿùùù111ÿÿÿÿÿÿ'''ÿÿÿÿÿÿÿÿÿ'''ýýýýýýüüüüüüûûûþþþþþþÿÿÿÿÿÿûûûìììåååâââßßß"""âââæææ___¨¨¨öööùùù>>>èèèþþþþþþÿÿÿöööÿÿÿ>>>ôôôÿÿÿÿÿÿÔÔÔgggÿÿÿÿÿÿ'''ÿÿÿÿÿÿÿÿÿ'''þþþþþþýýýýýýýýýþþþþþþÿÿÿÿÿÿûûûíííæææãããÖÖÖãããèèèßßßÖÖÖúúú½½½___ûûûÿÿÿîîîUUUôôô¾¾¾ŠŠŠÿÿÿþþþhhhÜÜÜÿÿÿôôôÿÿÿÿÿÿÿÿÿ - - -õõõþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûíííççç···BBBUUUÎÎ͝™™™üüü»»»:::///^^^jjjâââÿÿÿÿÿÿ¾¾¾>>>KKKEEEJJJÓÓÓÿÿÿÍÍÍKKKrrrÿÿÿqqqNNNÍÍÍþþþþþþþþþþþþþþþÿÿÿÿÿÿûûûîîîçççäääââââââãããæææêêêîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüðððèèèäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøêêêäääââââââäääæææêêêîîîòòòöööùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúêêêäääââââââãããæææéééîîîòòòõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûíííäääáááàààáááäääèèèìììñññõõõøøøúúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþöööåååßßßÞÞÞßßßâââæææëëëïïïóóó÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúèèèÞÞÞÜÜÜÝÝÝàààäääèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþõõõßßßÙÙÙÚÚÚÜÜÜàààæææëëëðððôôô÷÷÷úúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþøøøâââ×××ÖÖÖÙÙÙÝÝÝâââèèèíííòòòöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýôôôÝÝÝÓÓÓÔÔÔØØØÞÞÞãããéééïïïóóó÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýòòòÚÚÚÐÐÐÓÓÓØØØßßßåååëëëðððôôôøøøúúúûûûýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññØØØÏÏÏÓÓÓÙÙÙàààçççìììñññõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüñññ×××ÎÎÎÓÓÓÚÚÚáááèèèíííòòòõõõøøøúúúüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÕÕÕÎÎÎÓÓÓÛÛÛâââèèèîîîòòòöööùùùûûûüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüðððÖÖÖÔÔÔÕÕÕÛÛÛãããéééîîîóóóöööùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýüüüýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüöööðððÜÜÜÛÛÛÞÞÞãããêêêïïïôôô÷÷÷ùùùûûûüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþýýýýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþüüü÷÷÷òòòãããäääéééìììðððôôô÷÷÷úúúüüüýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþýýýùùùùùù÷÷÷îîîðððôôô÷÷÷ùùùûûûýýýþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþýýýûûûûûûüüüüüüýýýýýýþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþþþþþþþþþþþþþþþþþþþþþþþþþþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ Index: uspace/srv/hid/console/gfx/cons_selected.ppm =================================================================== --- uspace/srv/hid/console/gfx/cons_selected.ppm (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,29 +1,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -48 48 -255 -ýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûû÷÷÷ïïïæææÝÝÝ×××ÓÓÓÓÓÓ×××ÝÝÝæææïïï÷÷÷ûûûüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýûûûôôôåååÓÓÓ©©©ŽŽŽtttaaaVVVVVVaaatttŽŽŽ©©©ÁÁÁÒÒÒåååôôôûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýûûûðððÙÙÙºººŠŠŠ]]]LLL___zzz–––¬¬¬¸¸¸¹¹¹¯¯¯›››€€€eee```]]]ŠŠŠºººÙÙÙðððûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüôôôÛÛÛ¬¬¬oooFFFfff   ³³³½½½ÈÈÈÒÒÒÛÛÛàààáááÞÞÞØØØÑÑÑÈÈÈÀÀÀ­­­tttdddnnn¬¬¬ÚÚÚôôôüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýúúúèè躺ºxxx@@@jjjžžž···ËËËÑÑÑÔÔÔ×××ÚÚÚÜÜÜÞÞÞßßßáááâââââââââáááÝÝÝËË˲²²~~~kkkwww¹¹¹èèèúúúüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüøøøÜÜܛ››555NNN¯¯¯ÀÀÀÅÅÅÉÉÉÌÌÌÏÏÏÓÓÓ×××ÙÙÙÜÜÜÞÞÞßßßàààááááááàààßßßÞÞÞÚÚÚÊÊʪªªgggggg›››ÛÛÛ÷÷÷üüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüöööÐÐÐ - - -333wwwžžž²²²¸¸¸¼¼¼ÀÀÀÅÅÅÉÉÉÍÍÍÑÑÑÔÔÔØØØÛÛÛÝÝÝßßßàààáááááááááàààßßßÜÜÜÚÚÚÓÓÓ½½½•••uuu - - -ÏÏÏõõõüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüöööËËËxxx000{{{¥¥¥¬¬¬°°°³³³¸¸¸½½½ÂÂÂÇÇÇÌÌÌÑÑÑÕÕÕØØØÜÜÜÞÞÞàààáááâââãããâââáááàààÞÞÞÜÜÜ×××ÔÔÔÉÉɛ››{{{xxxËËËõõõüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýøøøÐÐÐxxx///{{{   ¦¦¦¨¨¨¬¬¬²²²···½½½ÃÃÃÈÈÈÎÎÎÓÓÓ×××ÛÛÛÞÞÞáááãããååååååæææååååååãããáááÞÞÞÛÛÛÖÖÖÒÒÒÈÈț››}}}xxxÐÐÐ÷÷÷üüüýýýýýýýýýýýýýýýýýýýýýýýýúúúÛÛÛ - - -000{{{ŸŸŸ£££¤¤¤¨¨¨­­­²²²¹¹¹¿¿¿ÆÆÆÌÌÌÒÒÒ×××ÜÜÜàààãããåååçççéééêêêêêêêêêéééçççåååãããàààÜÜÜ×××ÑÑÑÆÆƙ™™{{{ - - -ÛÛÛúúúüüüýýýýýýýýýýýýýýýýýýüüüèè蜜œ333{{{   ££££££¦¦¦ªªª¯¯¯¶¶¶½½½ÄÄÄËËËÒÒÒ×××ÝÝÝáááåååèèèêêêìììíííîîîîîîîîîíííìììêêêèèèåååáááÝÝÝØØØÑÑÑÅÅœ““uuu›››èèèûûûüüüýýýýýýýýýýýýýýýôôôººº555www¥¥¥¦¦¦¤¤¤¦¦¦©©©®®®´´´¼¼¼ÃÃÃËËËÒÒÒØØØÞÞÞãããçççêêêíííïïïðððñññòòòòòòòòòñññðððïïïíííêêêçççãããÞÞÞØØØÑÑÑÃÃƆ†gggºººôôôüüüýýýýýýýýýýýýûûûÚÚÚwwwNNNžžž­­­¨¨¨¨¨¨ªªª®®®´´´»»»ÃÃÃËËËÒÒÒÙÙÙßßßäääéééìììïïïñññóóóôôôõõõõõõõõõõõõõõõôôôóóóñññïïïìììéééäääßßßÙÙÙÑÑѵµµwwwÚÚÚúúúüüüýýýýýýýýýñññ¬¬¬@@@²²²¯¯¯¬¬¬­­­¯¯¯´´´»»»ÃÃÃËËËÓÓÓÚÚÚàààæææëëëîîîñññóóóõõõööö÷÷÷øøøøøøøøøøøøøøø÷÷÷öööõõõóóóñññîîîëëëæææáááÙÙÙÎÎΛ››jjj¬¬¬ðððüüüýýýýýýûûûÙÙÙooojjj¯¯¯¸¸¸³³³²²²²²²¶¶¶¼¼¼ÃÃÃËËËÓÓÓÚÚÚáááçççìììðððóóóõõõ÷÷÷øøøùùùúúúúúúúúúúúúúúúúúúúúúùùùøøø÷÷÷õõõóóóðððìììçççâââÚÚÚÃÃܜœoooÙÙÙûûûüüüýýýõõõºººFFFžžžÀÀÀ¼¼¼¸¸¸···¹¹¹½½½ÃÃÃËËËÓÓÓÚÚÚáááèèèíííñññôôôöööøøøùùùúúúûûûûûûûûûüüüüüüüüüûûûûûûûûûúúúùùùøøøöööôôôñññíííèèèâââÙÙÙ¦¦¦eeeºººôôôüüüüüüåå劊Šeee¶¶¶ÆÆÆÀÀÀ½½½½½½¿¿¿ÄÄÄËËËÒÒÒÚÚÚáááèèèíííñññôôô÷÷÷ùùùúúúûûûûûûüüüüüüýýýýýýýýýýýýýýýüüüüüüûûûûûûúúúùùù÷÷÷õõõñññîîîéééâââÆÆƋ‹‹ŠŠŠåååüüüüüüÓÓÓ]]]ŸŸŸËËËÉÉÉÅÅÅÂÂÂÃÃÃÆÆÆËËËÒÒÒÙÙÙàààçççíííñññõõõ÷÷÷ùùùúúúûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûúúúùùù÷÷÷õõõòòòîîîéééßßßÃÃÃ]]]ÒÒÒûûû÷÷÷ÂÂÂKKK³³³ÒÒÒÌÌÌÉÉÉÇÇÇÈÈÈÌÌÌÒÒÒØØØßßßæææìììñññôôô÷÷÷ùùùûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûùùùøøøõõõòòòïïïééé¿¿¿___ÂÂÂ÷÷÷ïï着ª^^^½½½ÕÕÕÏÏÏÍÍÍÌÌÌÎÎÎÒÒÒ×××ÞÞÞäääëëëðððôôô÷÷÷ùùùûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûúúúøøøöööóóóïïïÍÍÍvvvªªªïïïææ掎ŽzzzÈÈÈ×××ÓÓÓÑÑÑÐÐÐÓÓÓ×××ÝÝÝãããéééîîîóóóöööùùùúúúûûûýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûúúúøøøöööôôôÜÜܒ’’ŽŽŽæææÞÞÞttt–––ÓÓÓÙÙÙÖÖÖÔÔÔÕÕÕ×××ÜÜÜáááçççìììñññõõõøøøúúúûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûúúúùùù÷÷÷èèè­­­tttÞÞÞ×××aaa«««ÚÚÚÜÜÜÙÙÙØØØØØØÛÛÛßßßåååêêêïïïóóó÷÷÷ùùùûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûúúúùùùòòòÁÁÁaaa×××ÔÔÔWWW¸¸¸àààÞÞÞÜÜÜÚÚÚÜÜÜÞÞÞãããèèèíííñññõõõøøøúúúûûûýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûûûûøøøÍÍÍWWWÔÔÔÔÔÔWWW¹¹¹áááßßßÞÞÞÝÝÝÞÞÞáááåååêêêïïïóóóöööùùùûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüùùùÍÍÍWWWÔÔÔ×××aaa¯¯¯ßßßáááßßßßßßàààãããçççìììðððôôô÷÷÷ùùùûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýý÷÷÷ÂÂÂaaa×××ÞÞÞtttšššÙÙÙáááààààààáááäääèèèíííñññõõõøøøúúúûûûýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýððð­­­tttÞÞÞææ掎ŽÐÐÐâââááááááâââåååéééíííòòòõõõøøøúúúûûûýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýèè蒒’ŽŽŽæææïïï©©©eeeÇÇÇâââááááááãããæææéééîîîòòòõõõøøøúúúûûûýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýßßßvvv©©©ïïï÷÷÷ÁÁÁ___¿¿¿âââàààáááâââåååéééíííòòòõõõøøøúúúûûûýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüÖÖÖ___ÁÁÁöööüüüÒÒÒ]]]­­­ÜÜÜßßßàààáááäääèèèíííñññõõõøøøúúúûûûýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýøøøÄÄÄ]]]ÒÒÒûûûüüüåå剉‰tttËËËÞÞÞßßßàààãããçççìììðððôôô÷÷÷ùùùûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýææ挌Œ‰‰‰åååüüüüüüôôô¹¹¹eee²²²ÚÚÚÜÜÜÞÞÞáááåååêêêïïïóóóöööùùùûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýúúúÐÐÐeee¹¹¹óóóüüüýýýûûûÙÙÙooo~~~ËËËÙÙÙÜÜÜÞÞÞãããèèèíííñññõõõøøøúúúûûûýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüêêꜜœoooÙÙÙûûûüüüýýýüüüððð«««jjjªªªÔÔÔ×××ÛÛÛßßßåååêêêïïïóóó÷÷÷ùùùûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüü÷÷÷ÎÎÎjjj«««ïïïüüüüüüýýýýýýûûûÚÚÚwwwfff¾¾¾ÔÔÔÖÖÖÜÜÜáááçççìììñññõõõøøøúúúûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüúúúää䎎ŽwwwÚÚÚúúúüüüýýýýýýýýýüüüôôôºººggg”””ÈÈÈÒÒÒ×××ÝÝÝãããéééîîîóóóöööùùùúúúûûûýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûóóóÀÀÀgggºººóóóüüüüüüýýýýýýýýýýýýüüüèè蛛›uuu›››ÈÈÈÑÑÑ×××ÞÞÞäääëëëðððôôô÷÷÷ùùùûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûôôôÌÌÌuuu›››çççûûûüüüýýýýýýýýýýýýýýýüüüùùùÛÛÛ - - -{{{›››ÆÆÆÑÑÑØØØßßßæææìììñññõõõ÷÷÷ùùùûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûõõõÐÐÐ{{{ - - -ÛÛÛùùùüüüüüüýýýýýýýýýýýýýýýýýýüüü÷÷÷ÏÏÏxxx}}}˜˜˜ÅÅÅÑÑÑÙÙÙáááçççíííñññõõõøøøúúúûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûôôôÐÐÐ}}}xxxÏÏÏ÷÷÷üüüüüüýýýýýýýýýýýýýýýýýýýýýýýýüüüõõõËËËxxx{{{“““ÄÄÄÑÑÑÙÙÙâââèèèîîîòòòõõõøøøúúúûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüúúúóóóÌÌÌ{{{xxxËËËõõõüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüüüüõõõÐÐÐ - - -uuu†††µµµÏÏÏÚÚÚâââéééîîîòòòöööøøøúúúûûûüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýüüü÷÷÷äääÁÁÁuuu - - -ÏÏÏõõõûûûüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüüüü÷÷÷ÛÛۛ››gggœœœÂÂÂÙÙÙâââéééïïïóóóöööøøøúúúûûûýýýýýýýýýýýýýýýýýýýýýýýýúúúêêêÎÎ΍ggg›››ÚÚÚöööûûûüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüüüüùùùèè躺ºxxxkkkœœœ¥¥¥ÅÅÅßßßéééïïïôôô÷÷÷ùùùûûûüüüýýýýýýýýýýýýüüüøøøæææÏÏϜœœkkkwww¹¹¹çççùùùüüüüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüûûûóóóÚÚÚ¬¬¬ooodddŒŒŒÄÄĽ½½ÍÍÍÛÛÛèèèòòòøøøùùù÷÷÷ðððçççÞÞÞÖÖÖÄÄȌŒdddnnn«««ÙÙÙóóóûûûüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüüüüúúúðððÙÙÙºººŠŠŠ]]]```vvv’’’­­­ÂÂÂÍÍÍÍÍÍ­­­’’’vvv```]]]ŠŠŠºººÙÙÙðððúúúüüüüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüüüüûûûôôôåååÓÓÓ©©©ŽŽŽtttaaaVVVVVVaaatttŽŽŽ©©©ÁÁÁÒÒÒåååôôôúúúüüüüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýüüüüüüüüüûûûöööîîîæææÝÝÝ×××ÓÓÓÓÓÓ×××ÝÝÝåååîîîöööûûûûûûüüüüüüüüüýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýýý Index: uspace/srv/hid/console/gfx/helenos.ppm =================================================================== --- uspace/srv/hid/console/gfx/helenos.ppm (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,13 +1,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -64 60 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýøùùñóõîñóïòóö÷÷ûûûþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýþþøùùíñóäêîßèìÞæëÝåêÝåêÞåêäèêðññûûûþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýþþøùùïòôåëïåìðäêîÛàãØÜßÛàâæëîåëîÝåêÛäèÛáåèééúúúþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýþþùùúïóôæìïåìðåëî×Üß½ÄƵ¼¾ÈÍÏÍÒÓÊÏÑ·¾ÀÃÊÌãçêÝåéÚãçØÛÞçèèûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþúúúðôõèîñäìðçíðÙÞáÁÇÉ´¼¾ÊÏÑèëì÷ùù÷ùúôöøòõ÷ñóôÖÚܹÀÂÞäæÜâåØÝâÔÕ×ñòòþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþûûûòõöéîñåíñæíñÛáäÄËε¼¾ÈÍÏäæçöøøøúúõ÷ùòõ÷ðóõðóõðóõïòôïòôÒ×Ù¿ÅÈàåéØßäÎÒÕáááûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþûûûóö÷êïòæíñçîñÞãåÇÎе½¿ÅËÍàãäö÷÷ùúûöøùóöøòõ÷ñôöðóõðóõïòôïòôïòôîñóëïñ»ÂÅÛßâÚàåÓÙÞÑÒÓôôôÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþûüüôöøëðóçîñèïòßåèËÑÓ¶¾ÀÃÉËÜàáóôõøúû÷ùúô÷øóöøòõ÷òõ÷ñôöðóõðóõïòôïòôîñóîñóìðòìïòÔÙÛÄËÍÞäè×ÞãËÎÐæççüýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþûüüô÷øíñôèîòéïóáçêÍÔÖ¹ÁÃÂÈÊØÜÝñòóøúú÷úûõ÷ùôöøóöøòõ÷òõ÷ñôöñôöðóõðóõïòôîñóîñóíñóìðòëïñëîñåéìºÁÃÞãå×ÞãÐÕÙÕÕÖ÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþüüüõøùîòõèïóéðôãéìÑ×Ù»ÂÄÀÆÈÔØÙïðñøùúøúûõøúô÷ùôöøóöøóöøòõ÷òõ÷ñôöðóõðóõïòôïòôîñóîñóìðòìïòëîñëîñêíðéíðÉÏÒÌÒÓÛàäÓÙÞÊÌÏìííþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý÷ùùðóõèïóéðôåêîÔÚݽÄÇ¿ÆÇÑÖ×ëíîøùùúûüöùúô÷ùô÷ùô÷ùôöøóöøòõ÷òõ÷òõ÷ñôöðóõðóõïòôîñóîñóíñóìðòëïñëîñêîñéíðèìïèìïÝâä»ÂÄÞâåÓÚßËÐÓÛÛÛúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýý÷ùúðôöéðóêðôæìï×ÝßÁÈ˾ÅÇÎÓÔèëëöøøúüü÷úûöùúõ÷ùô÷ùô÷ùô÷ùôöøòõ÷òõ÷òõ÷òõ÷ñôöðóõïòôïòôîñóíñóìðòìïòëîñëîñêíðéíðèìïèìïçëîæêí¿ÆÈÕÚÜÖÜáÐ×ÛÍÏÐððñþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþùúúñõ÷êñôêñõçíñÚàâÃÊ̾ÅÆÊÏÑæèéö÷øûüüøúûöùúöùúõøùô÷ùô÷ùô÷ùôöøóöøòõ÷òõ÷òõ÷ñôöðóõïòôïòôîñóîñóíðòìðòìïòëîñëîñêíðéíðèìïçëîçëîæêíåêíÕÛÞ¿ÆÇÝâåÓÙÞÉÍÏâââûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþùûûíóöéñôëñôßäçÆÍϾÅÇÇÌÎâåæõö÷ûüýùûü÷ùúöùúöùúöùúõøùô÷ùô÷ùô÷ùôöøóöøòõ÷òõ÷òõ÷ñôöðóõïòôïòôîñóÛÞà±²´´µ¶ÛÝàëîñêîñéíðèìïèìïçëîçëîæêíåéìäéìáæèºÁÃÙÝßÓÙÝÍÓÖÑÒÓôõõÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùúúèðôêñõíñóÃÉËÂÈÊßâãóôõûüýúûýøúü÷ùûöùúöùúöùúõøùô÷ùô÷ùô÷ùôöøôöøòõ÷òõ÷òõ÷òõ÷ñôöïòôïòôîñóîñóÜÞá~~ooptsu‹ŒŒÛÞáéíðèìïèìïçëîæêíåêíäéìäéëãèêãèêËÒÔÅËÍØÞáÏÖÚÈËÍèèèýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüëðôçðôóöø½ÄÆ×ÚÜúûûûüýøúüøúü÷úûöùúöùúöùúöùúõ÷ùô÷ùô÷ùôöøôöøóöøòõ÷òõ÷òõ÷ñôöðóõïòôïòôîñóîñóíñ󯱳poq{{|‰‰‰ŽŽº»½çëîçëîçëîæêíåéìäéìãèëãèêâçéáæèÛà⸿ÁÛßâÐ×ÚËÐÒ×××÷øøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿïððäíñðöøÔÙÛÍÒÓûüýùûüøúüøúü÷úûöùúöùúöùúõøùõ÷ùô÷ùô÷ùôöøôöøóöøòõ÷òõ÷ñôöðóõïòôïòôïòôîñóîñóíðòìðò«¬®yyzŽŽ¢¢£«ª«­®¯áåèçëîæêíäéìäèëãèêâçéâçéáæèàåçßäçÁÈÊÌÒÔÓÙÜÎÓÖÊÌÍíîîþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýþþÝàáâëð÷úûºÁÃðòóùûüøúüøúü÷ùûöùúöùúöùúõøùô÷ùô÷ùôöøôöøôöøòõ÷òõ÷òõ÷ñôöðóõïòôïòôîñóîñóîñóìðòìðòëîñÑÓՂ‚ƒœœ³³´½¼½µµ¶ÑÔ×æêíåéìãèêãèêâçéâçéàåçßäçÞãæÝâåÓØÛºÀÃÙÞáÎÔØÆÊÍÝÝÞúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüÍÑÒáêïøúüºÁÃ÷øùøúüøúü÷ùûöùúöùúöùúõ÷ùô÷ùô÷ùôöøôöøóöøòõ÷òõ÷ëîðæéëîñóïòôïòôîñóîñóíñóìðòìïòëîñêîñéìœ  ¡¸·¹ÁÀ¾½¿ÀÁÂâæéãèêâçéâçéáæèàåçßäçÞãæÝâåÜáäÚßãºÁÄÔÙÛÎÕØËÐÔÍÎÏòòòþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûû¶¸¹Ýåêóöù»ÂÄðòò÷úûöùúöùúöùúõøùõ÷ùô÷ùôöøôöøôöøóöøòõ÷ñôöÎÐҎ††ˆ°±³èëíîñóîñóíñóìðòìïòëîñêíðéíðèìïÂÄƛ›œ³³´À¿ÁÀÀÁ¹¹ºÙÝÞâçéâçéàåçßäçßäçÝâåÜáäÛàäÛàäÚßãËÑÔ½ÄÆ×ÜßÌÓ×ÆÉËäääüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûº»»½ÄÈëñôÏÔÖÕÙÛöùúöùúöùúõøùô÷ùô÷ùôöøôöøôöøóõ÷òõ÷ñôößâä~~qpqxxz€¹º»îñóìðòìðòëîñëîñêíðéíðèìïèìïàä痘™««¬½¼¾ÂÁý¼¾ÇÈÉàåçàåçßäçÞãæÝâåÜáäÛàäÚßãÚßãÙÞâÕÚÞ¶¾ÀÕÚÞËÒÖÈÎÑÒÒÒöööÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüýýÙÙٓ˜šàéíèíï»ÁÃóö÷öùúõøùô÷ùôöøôöøôöøóöøòõ÷òõ÷ñôöðóõÇÉÊqpq~~~˜™š£¤¥æêëìïòëîñêíðéíðèìïèìïçëîçëîæêí±³µ¡¡¢··¸ÁÀÂÀ¿Áºº¼ÚßáßäçÞãæÜáåÛàäÛàäÚßãÚÞâØÝáØÝáÖÛàÁÈËÇÌÎÑ×ÚÊÐÔÇÉËéêêýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþéé锖˜ÌÔØíóõ¿ÆÈâæèõ÷ùô÷ùôöøôöøôöøóõ÷òõ÷ñôöñôöðóõïòôÔÖØ|}}ŽŽ¦¥¦³²³°°±ÒÕ×ëîñêíðéíðèìïèìïçëîæêíæêíåéìÍÐӗ˜™°¯±¿¾ÀÂÁûº»ÌÐÒÝâåÜáäÛàäÚßãÚßãÙÞâØÝá×ÜàÖÛàÕÚßÏÕÙ¶½¿ØÜÞÊÐÔÆÊÌØØÙùùùÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôõõº»¼¢§ª¶¼¾œŸ¡¡¤¥ðòôôöøôöøóöøòõ÷òõ÷ñôöñôöðóõïòôïòôèë횛œ˜˜™²±³¿¾À½¼¾ÀÀÂéìïèìïèìïçëîçëîæêíæêíÞáäÂÅǙš›ŒŒ¨¨©»»½ÂÁþ¾À¾¿ÁÙÞáÛàäÚßãÚÞâÙÝáØÝáÖÛàÖÛàÕÚÞÕÚÝÓØÜ»ÁÄÎÓÕÌÒÖÉÎÒÉÊËïïïþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüüààà‰ŒŽehi444444ÇÇÈôöøóõ÷òõ÷ñôöñôöñôöðóõïòôïòôîñóíñóÁÂė—˜²±³À¿ÁÁÀ»º¼ÜßáçëîçëîæêíäèëØÛÞ¬®°‚onowxyŒŒŒ¦¦§º¹ºÂÁÃÁÀ¸¸¹ÐÔ×ÚßãÚÞâØÝá×ÜàÖÛàÕÚßÕÚÞÔÙÝÓØÛÒ×ÚÊÏÒ·¾ÀÖÚÝÊÐÔÅÈËßßßûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþïï着¬|€ƒ??@222||}ðòôòõ÷ñôöñôöðóõðóõïòôîñóîñóíðòìðòàâ坝ž««¬½¼¾ÁÁ¼¼½ÈÊÌæêíâåèÉË͘š›uuvppqvvw}~~ŠŠ‹››œ®®¯¼¼½ÂÁÃÂÁý½¾ÂÄÆÙÝá×ÜáÖÛàÖÛàÕÚßÔÙÝÔÙÝÓØÛÒ×ÚÑÖÙÏÕض½ÀÔÙÛÊÐÔÈÍÑÌÍÎóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿùùùÐÐÐ -ŠŒXYY333AAAÜßàñôöñôöðóõðóõïòôîñóíñóìðòìïòëîñêíð´µ·¡¡¢¸¸¹ÁÀÂÀÀÁº¹»ÅÈʗ—™sstrrsyyz‚ƒ„ŽŽ™™š¥¥¦±°±º¹»À¿ÁÃÂÄÃÂÄÀ¿Á¹¹»ÒÖÚÖÛàÖÛßÕÚÞÔÙÝÓØÜÒ×ÚÒ×ÚÑÖÙÐÖÙÐÖÙÃÉ̾ÄÆÓØÛÊÐÔÅÈÊæææüýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýéé隝Ÿrvx999222 ¡¢ñôöðóõïòôîñóîñóíðòìðòìïñëîñêíðéíðÓÖؘ˜™°°±¾¾¿ÁÀ»º»¨¨©‘‘’ - -†ˆˆŠ’’“ŸŸ ªª«³²´º¹»ÂÁÃÊÌÎÂÁÃÂÁÃÂÁÃÂÁû»¼ÆÈËÕÚßÔÙÝÔÙÝÓØÛÒ×ÚÒ×ÚÐÖÙÐÖÙÏÕØÏÕØËÑÕ³»½ÖÙÜÊÐÔÇÍÐÓÓÓ÷÷÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿôôô»¼½‚‡‰JJK222]]]çéëïòôîñóíðòìðòìïñëîñêîðêíðéíðèìïãæ饦§¦¦§»º¼ÂÁÿ¾Àµ´¶§§¨  ¢¥¥¥®®¯¶¶¸¼¼½ÆÇÉÒÕ×ÚÞâÚßãÃÄƼ»½À¿ÁÂÁÿ¾À¼¼¾Ò×ÚÔÙÜÓØÛÒ×ÚÑ×ÚÐÖÙÐÖÙÏÕØÏÔØÍÓ×ÍÓ׺ÂÄÈÎÐÍÓ×ÉÏÓÆÈÉìììýþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûüüààà‹’fij555444ÆÆÇîñóíðòìðòìïñëîñêíðêíðéìïèìïçëîçëîÄÇț›œ´´µÀ¿ÁÂÁþ½¿¹¸º·¶¸º¹ºÀÀÁÌÎÐØÜßÛàäÚßãÚßãÚÞâÉÌÏ®®¯¹¸ºÀÀÁÁÀ¹¹ºÉÍÏÒ×ÚÒ×ÚÑÖÙÐÖÙÐÖÙÏÕØÏÔØÍÓ×ÍÓ×ÌÒÖÈÎÒ³»½×ÛÞÊÐÔÅÉËÚÛÛúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþïïï©«¬|€ƒAAB222{||ìïðìðòìîñëîñêíðêíðèìïèìïçëîæêíæêíÜà❝Ÿ««¬½¼¾ÂÁÃÂÁÃÂÁÃÆÇÉÓÖØÜàãÝâåÛàäÚßãÚÞâÚÞâØÝáÔØÜ¡¡£¬¬­¼¼½ÁÀ½¼¾¾¿ÁÑÖÙÐÖÙÐÖÙÏÕØÏÕØÎÔØÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕµ½ÀÐÔÖËÐÔÉÏÒÉÊËðññþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷øøÍÍΆ‹Y[\333CCCÙÛÜëîñêîðêíðéìïèìïçëîçëîæêíåéìåéìãèê²´µ  ¡·¶·ÁÁÂÃÂÄÅÄÆÛßâÝâåÜáäÚßãÚßãÚÞâÙÝá×ÜàÖÛàÖÛà°²´ŸŸ ·¶·ÁÀÂÀÀÁ¹¹»ÌÑÓÐÖÙÏÕØÏÔØÎÓ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÃÊÍ·¾ÀÕÚÝÊÐÔÄÇÉáááüüüÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýçç薚œsxy:::222 ¡¢ìïòêíðéìïèìïçëîçëîæêíåéìåéìäèëâçéÑÕ֘˜™¯¯°¾¾¿ÃÂÄÂÁÃÐÓÖÛàäÚßãÚÞâÚÞâØÝá×ÜàÖÛàÖÛßÔÙÝÇËΙ™™®­®¾½¾ÂÁû»¼ÃÇÉÏÕØÏÔØÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕËÑÕÊÐÔÉÏÓ³º½ÔØÛÊÐÔÈÎÑÍÎÎôôõÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóôô¹ºº‚‡‰LMN222^^^ãåçèìïèìïçëîæêíæêíåéìäèëãèêâçéâçéÞã䥧¨¥¥¦º¹»ÂÁÃÂÁÃÁÁÄÙÞáÚÞâÙÝáØÝáÖÛàÖÛàÕÚÞÔÙÝÓØÛÒ×Ú¢£¤¤¤¥¹¹ºÁÀ¿¾ÀÆÈËÎÔØÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔ¾ÅÇÀÆÉÐÕÙÊÐÔÅÈÉçèèýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûûÝÝ݊hjl666666ÃÄÅèìïçëîæêíåéìåéìäèëãçêâçéáæèáæèàåçÂÅǚšš³³´À¿ÁÂÁü»½ÎÒÕÙÝá×ÜàÖÛàÕÚßÕÚÞÓØÜÓØÛÒ×ÚÒ×ÚÀÃƝŸ²±²À¿ÁÃÃÅÌÐÔÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÇÎѱ¸»ÖÚÝÊÐÔÆËÏÔÔÔøøøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþîî裡ª{‚BBC222|}}éìîæêíåéìäèëãèêâçéâçéáæèàåèßäçÞãæÖÚݛœªª«¼¼½ÂÁþ½¿ÀÁÃ×ÜàÖÛàÕÚÞÔÙÝÓØÛÓØÛÒ×ÚÒ×ÚÑÖÙÐÕØÃÈʼ¾ÀÅÇÉÌÐÔÍÓ×ÌÒÖÌÒÖËÑÕËÑÕËÑÕÊÐÔÊÐÔÈÏÒ¸¾Á¾ÄÇËÑÕÊÐÔ¹ÀÃÌÑÓÌÒÖÊÏÓÆÇÈíîîþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷øøËˈŠ[]^344EEEÖØÙåéìäèëâçéâçéáæèáæèàåçßäæÝâåÝâåÛàä³µ· Ÿ ¶¶·ÁÀÂÀÀÁ¸¸ºÑÕÙÕÚÞÔÙÜÓØÛÓØÛÒ×ÚÒ×ÚÐÖÙÐÖÙÏÕØÏÕØÎÔ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔ£ª¬{Ž‘“ÐÔ×ÊÐÔÄÊκÁÃÚÞáÊÐÔÄÈÊÜÜÜúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýçç疘šswy;;;222 ¡¢æêíâçéáæèáæèàåèßäçÞãæÝâåÜáäÛàäÚßãÍÐӘ˜™®®¯¾¾¿ÂÁû»¼ÄÆÉÓØÜÓØÛÒ×ÚÒ×ÚÑ×ÚÐÖÙÐÖÙÏÕØÏÔØÎÓ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔ®³µ¤«­ÊÐÒâäæÊÐÔÇÍѹÀÂäæéÊÐÔÉÏÒÉÉÊóóóÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóôô¸¹¹‡‰MNO222___áãåáæèáæèàåçßäçÞãæÝâåÜáäÛàäÚßãÚÞâ×ÚÞ¥¦¨¤¤¥º¹»ÁÀ¿¾À¾¿ÁÓØÛÒ×ÚÒ×ÚÑÖÙÐÖÙÏÕØÏÕØÏÔØÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÌÒÖàãåèëìÑÖÚÊÐÔÂÈË¿ÅÇæèêÊÐÔÉÏÓ¼¾¿êêêÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúûûÛÛۋŽ‘hlm666666½¾¿âçéàåçßäæÝâåÜáäÜáäÚßãÚÞâÙÝáÙÝá×Üà¿Âř™š³²³À¿ÁÂÁÃÆÈÊÒ×ÚÒ×ÚÑÖÙÐÖÙÏÕØÏÕØÎÔ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔËÐÔËÑÕÊÐÔÉÏÓ³»½ÙÝÞÜàãÊÐÔÉÏÓ³´µäääÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþîî©{€‚DEE222wxxäèêÞãæÝâåÜáäÛàäÚßãÚÞâÙÝáØÜáÖÛàÕÚßÒ×Û±³µ¬«­¼¼½ÆÆÈÐÔ×Ò×ÚÐÖÙÐÖÙÏÕØÏÔØÎÔ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÈÎÒ¶¾Á½ÄÅñóôÍÓ×ÊÐÔÃÉ̬¬­äääÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ÊÊʄ‰‹\^_444EEEÒÔÕÝâåÜáäÛàãÚßãÙÝáÙÝá×ÜàÖÛàÕÚßÔÙÝÔÙÝÒ×ÚÌÐÒÎÒÔÑÖØÑÖÙÐÖÙÏÕØÏÕØÏÔØÍÓ×ÍÓ×ÌÒÖÌÒÖÌÒÖËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÉÏÓÃÊθÀñ¹»ÇÍÏïñòØÜßÊÐÔÉÏӖšœ³³´éêêÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýææ畗˜sxy<<<222›œœáåèÚßãÚÞâÙÝáØÝá×ÜàÖÛßÕÚÞÔÙÝÓØÜÓØÛÓØÛÒ×ÚÒ×ÚÑÖÙÐÖÙÏÕØÏÕØÎÔ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÅËλÃŲº½ºÀÂÑÖ×éëìêíîÔÙÜÊÐÔÉÏӗ›nooÂÂÃñòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóô¸¸¹€ -‡OQQ222\\\ÝàâÚÞâÙÝá×ÜáÖÛàÕÚßÔÙÞÔÙÝÓØÜÓØÛÒ×ÚÒ×ÚÒ×ÚÐÖÙÐÖÙÏÕØÏÔØÎÔ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÆÌоÄDzº¼¸¿ÀËÐÑæèéëíîáåçÓØÛËÑÕÇÍÑ®²µxyzKKK••–ÖÖÖøøøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúÚÚڊiln667777¼½¾Ûàä×ÜàÖÛßÕÚÞÔÙÝÔÙÜÓØÛÓØÛÒ×ÚÒ×ÚÑÖÙÐÖÙÏÕØÏÕØÏÔØÍÓ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÊÐÔÇÍÑÀÆʵ¼¿µ¼¾ÇÌÎáäåìîïäèêÕÚÝÌÒÖÈÎÒ´º½’”`abAABCCD€¼»¼êêêýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþîî¨zDEF333¥¥¦àãæÖÛßÔÙÞÔÙÝÓØÜÓØÛÓØÛÒ×ÚÒ×ÚÑÖÙÐÖÙÏÕØÏÕØÎÔ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕËÑÕÊÐÔÊÐÔÊÐÔÊÐÔÈÎÒÁÈ˵½Àµ¼¾ÁÇÉÞáâëíîèêìØÜßÍÓ×ÉÏÓ¹¾Â˜ŸgjkHIJ;;;FGGaabŠŠ‹¶¶·ßààøøøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ÈÈɄˆ‹]__\\]ÐÒÓÛßâÔÙÝÔÙÝÓØÜÓØÛÈÍÐÀÄÇÍÒÔÐÖÙÐÖÙÏÕØÏÔØÎÔ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÊÐÔÊÐÔÊÐÔÉÏÓÃÉ͸¿Â³»½½ÃÅØÜÝêìíëíîÚÞáÏÔØÊÐÓ½ÂÆ¡¥¨qstOOO===DDDZ[[www’““«««ÇÇÈäää÷÷÷þþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýææ攗˜}ƒÂÃÄÂÉËÎÓÕÖÛßÓØÛÓØÛÍÒՍ’”~ƒ -¤¨ªÚÞáÏÕØÏÔØÎÓ×ÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÊÐÔÉÏÓÅËϺÂų»¾¹ÀÂÓ×ØèêëìîïÝáäÐÖÙÊÐÔÀÆʨ¬¯|€UVV>>>CCDTTUppqŒ‹¥¥¦»»¼ÐÐÐâââñññúúúþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóô·¸¸–›ÑÕØÊÐÓºÀÂÚÞáÓØÛÒ×ÚÎÓÕ¢¥§¹ÀÂÕ×ØÝáãÏÔØÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕËÑÕÊÐÔÅÌϾÄdz»½·¾ÀÍÒÓåèèïðñàäæÓØÛËÑÔÃÈÌ°µ¸ -‡‰\^_CCDCDDQQQjkk -††ŸŸ µµ¶ËËÌÞÞÞìììöööüüüþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúÙÙهŠŒ·¼¿ÎÔØ·¾ÀÔÙÜÓØÛÒ×ÚÐÖÙÙÝàçêëæéêÐÕÙÍÓ×ÍÓ×ÌÒÖÌÒÖËÑÕÈÎÒÀÇÉ´»¾´»½ÇÌÎâåæîðñäçéÔÙÜËÑÕÆÌдº½“•cdeGGGCDDNOOddd~€šš›°°±ÆÆÇÚÚÚéééôôôûûûþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþíîœ’ÌÒÕÆÌλÂÄÔÙÜÐÖÙÐÖÙÏÕØÏÔØÎÓ×ÍÓ×ÍÓ×ÌÒÖÉÏÓÃÉͶ¾À³»½ÁÈÉÞáâïññæéë×ÜßËÑÕÇÍѺ¿Â–šknoKLMDEFKLL_``yzz•••«««ÁÁÁÕÕÖæççòòóùúúýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷÷÷ÆÇÇuwx¾ÄÈÏÔ×¹ÁúÂÄËÑÔÏÕØÏÔØÍÓ×ÍÓ×ËÑÕÅËϸÀô»½»ÁÃÛÞßíîïëíïÚÞàÍÓ×ÈÎÒ½ÃǞ£¦qsuPQRDEEIJKZ[\uuv¦¦§½½½ÑÑÑáââïïðøøøýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüýýåæ悃„ž£¥ÌÒÖÎÔ×¾ÅȲº¼ºÁÄÁÈËÂÉ̺Áij»½¸¿ÁÓ×ØëííîðñÝáãÏÔØÊÏÓÁÆʧ¬¯x{}RTUCDEGHIUUWoop‰‰Š¡¡¢¸·¸ÍÍÎßààíîî÷÷÷üüüþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿóóô²²²uxyÃÉÍÍÓÖÐÖÙÕÙÜÒ×ØÇÍÏÉÎÐ×ÚÜæéêñòóàãæÐÖÚÊÐÔÃÉÍ­²µ -‡Z\]DEFEFGPPQhiiƒ„„œœ²²³ÈÈÈÜÜÜëëëõööûûûþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿúúúØØØopqŒ’ÈÎÑÌÒÖÍÓ×ÎÔØÖÛßÛßâÚÞáÒ×ÛÊÐÔÅË϶¼¿‰ŒŽ`bdGHIGHINOPbcd}}~––—¬¬­ÃÃÄ××ØèèèóóóúúúþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿþþþíîŸXYZƒ†‡½ÂÆÉÏÓËÑÕËÑÕÊÐÔÇÍÑ»ÀĔ˜šhklKLMGHIKLM]^_vww’’’§§¨¾½¾ÒÓÔåååñññùùùýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷øøÔÔÕ{||RTU\^_|€‚’–˜”˜šŒ’qstQRRHIJLMNYZZqqqŒ‹Œ¢¢£¹¹¹ÏÏÐáááîîî÷÷÷üüüþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýïïïÅÅÅ~€UWXPQROPQNOOMNNNOOWXYklm‡‡‡ž´³´ÊÊÊÝÝÝìííö÷÷üüüþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûüüêëëÊÊʟŸ z{{jkkhhhnoo‚ƒ™™š®®¯ÅÅÅÙÚÚéééóôôûûûþþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûüüðððÛÜÜÇÇÇ··¸²²²¶¶¶ÃÃÄÕÕÕæææòóóúúúýþþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ Index: uspace/srv/hid/console/gfx/nameic.ppm =================================================================== --- uspace/srv/hid/console/gfx/nameic.ppm (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,14 +1,0 @@ -P6 -# CREATOR: The GIMP's PNM Filter Version 1.0 -100 26 -255 -ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿããã»»»˜˜˜¤¤¤¿¿¿êêêÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññÄÄĦ¦¦˜˜˜¢¢¢ÅÅÅððñÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿËËË___444222222222222222666rrsÞÞÞÿÿÿÿÿÿÿÿÿññòŽŽŽ;;;222222222222222999ŠŠŠòòòÿÿÿÿÿÿ~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿVVV222IIIòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¯¯°888222222222222222222222222222AAAÈÈÈÿÿÿïïïbbb222222222222222222222222222VVWïïïÿÿÿ~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿVVV222IIIòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÖÖÖ;;;222222222222222222222222222222222UUUìì쑑‘222222222222222222222222222222222~~~ÿÿÿ~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿVVV222IIIòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿzzz222222222222222IIIeef???222222222222222’““NNN222222222222???hhhLLL222222222222444ççè~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿVVV222IIIòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööBBB222222222222VVVëëëÿÿÿÔÔÔAAA222222222222AAA444222222222CCCàááÿÿÿñññWWW222222222333®®®~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿVVV222IIIòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÞÞÞ;;;222222222222‘’’ÿÿÿÿÿÿýýýaaa222222222222222222222222222\\\ÿÿÿÿÿÿþþþ„„„222222222222 - - -~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýýýààà¿¿¿´´´ÀÀÀßßßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿVVV222IIIòòòÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿëëëÈÈÈ´´´ºººÔÔÕúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿñññÇÇÇ´´´¿¿¿ÝÝÝÿÿÿÿÿÿÿÿÿÿÿÿÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222222222222222222GGGëëëÿÿÿÿÿÿ£££222222222222ttt~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿÿÿÿÿÿÿúúú°°±PPP222222222222333\\\ÑÑÑÿÿÿÿÿÿÿÿÿÿÿÿVVV222IIIòòòÿÿÿÿÿÿÿÿÿÏÏÏggg666222222222222GHH¬¬¬ûûûÿÿÿÿÿÿâââMMMNNN¤¤¤ùùú———;;;222222222222WXXËËËÿÿÿÿÿÿÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222222222222222222222uuuôôôÿÿÿòòòãããããããããäääëëë~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿÿÿÿôôôzz{222222222222222222222222777¼¼¼ÿÿÿÿÿÿÿÿÿVVV222IIIòòòÿÿÿÿÿÿ§§§999222222222222222222222444ˆˆˆùùùÿÿÿÞÞÞ222222222222222222222222222555ÄÄÄÿÿÿÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222BBBHHH222222222222222YYYÇÇÇÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿúúúƒƒƒ222222BBBŸŸŸÛÛÛãããÏÏÏ - - -5552229::ãããÿÿÿÿÿÿVVV222IIIòòòÿÿÿ¶¶¶888222666ÏÏÏäääÙÙÙ  ¡EEE222555ªªªÿÿÿÞÞÞ222222CCD222KKK¨¨©ÞÞÞãããÂÃÃ]]]222222RRRúúúÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222OOOooo222222222222222222555wwwçççÿÿÿÿÿÿÿÿÿÿÿÿ~~~222222QQQhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhEEE222222«««ÿÿÿÆÆÆ666222NNNÝÝÝÿÿÿÿÿÿÿÿÿÿÿÿþþþ­¬­222222€€€þþþÿÿÿVVV222IIIòòòïïïLLL222999µµµþþþÿÿÿÿÿÿÿÿÿÿÿÿÖÖÖFFF222RRRîîîÞÞÞ222222222WWWìììÿÿÿÿÿÿÿÿÿÿÿÿóóóFFF222222ÕÕÕÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222RRRÓÓÓKKK222222222222222222222===ŸŸŸüüüÿÿÿÿÿÿ~~~222222222222222222222222222222222222222222222222222«««ûûûuuu222<<<ÆÆÆÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿûûû__`222899óóóÿÿÿVVV222IIIòòò¬¬¬444222“““ýýýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿššš222555¸¸¸ÞÞÞ222222:::ÆÆÆÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿŠŠŠ222222²²²ÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222RRRïïïÔÔÔPPP222222222222222222222333nnnùùùÿÿÿ~~~222222222222222222222222222222222222222222222222222«««æææKKK222[[[úúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ§¨¨222222¾¾¾ÿÿÿVVV222IIIòòòppp222999ÝÝÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÚÚÚ>>>222€€€ÞÞÞ222222SSSúúúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ°°°222222¬¬¬ÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222RRRïïïÿÿÿìììzzz222222222222222222222333‹‹‹ÿÿÿ~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ËËË222222††‡ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÊÊÊ222222›œœÿÿÿVVV222IIIêêêEEE222WWWðððÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿêêêQQQ222]]]ÞÞÞ222222wwwÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ´´´222222¬¬¬ÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222RRRïïïÿÿÿÿÿÿýýýÁÁÁRRR222222222222222222444ááá~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««³³³222222222222222222222222222222222222222222~~~þþþVVV222IIIÖÖÖ@@@222222222222222222222222222222222222222NNNÎÎÎ222222ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ´´´222222¬¬¬ÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222RRRïïïÿÿÿÿÿÿÿÿÿÿÿÿõõõ”””777222222222222222~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««¥¥¥222222222222222222222222222222222222222222zzzþþþVVV222IIIËËË===222222222222222222222222222222222222222MMMÌÌÌ222222ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ´´´222222¬¬¬ÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222BBB¤¤¤´´´´´´´´´ÚÚÚÿÿÿþþþÆÆÆ===222222222222{{{~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««¨¨¨222222tttÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏàààÿÿÿVVV222IIIÎÎÎ>>>222PPPÄÄÄÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÕÕÕÙÙÙ222222ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ´´´222222¬¬¬ÕÕÕ999222222222222±±±ÿÿÿÿÿÿÿÿÿxxx222222222222222222222222222šššÿÿÿÿÿÿþþþˆ‰‰222222222222iii~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÁÁÁ222222|||ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿVVV222IIIáááCCC222PPPíííÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÞÞÞ222222ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ´´´222222¬¬¬ÞÞÞ;;;222222222222£££ÿÿÿÿÿÿÿÿÿmmm222222222222222222222222222šššÿÿÿÿÿÿÿÿÿ£££222222222222iii~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ßßßAAA222SSSøøøÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÏÏÏ}}}}}}ÊÊÊÿÿÿVVV222IIIòòò___222555×××ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿëë뉉‰}}}¢¢¢ÞÞÞ222222ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ´´´222222¬¬¬ööö>>>222222222222tttûûûÿÿÿîîïQQQ222222222222222222222222222pqqÿÿÿÿÿÿüüü222222222222‚‚‚~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««øøøjij222888¸¸¸ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿüüülll222222áááÿÿÿVVV222IIIòòò  ¡333222„„„ûûûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ§¨¨222222£££ÞÞÞ222222ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ´´´222222¬¬¬ÿÿÿiii222222222222777š››ÌÌ̆†‡555222222222222\\\222222222222999••–ÎÎΤ¤¤;;;222222222333®®®~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿÃÃÃ666222IIIÔÔÔÿÿÿÿÿÿÿÿÿÿÿÿøøø222222vvvþþþÿÿÿVVV222IIIòòòìììKKK222677¬¬¬ûûûÿÿÿÿÿÿÿÿÿýýýºººAAA222OOOçççÞÞÞ222222ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ´´´222222¬¬¬ÿÿÿ¬¬¬444222222222222222222222222222222222===£££:::222222222222222222222222222222222;;;îîï~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿûûûŒŒŒ222222777www©©©³³³›››TTT222222HHHçççÿÿÿÿÿÿVVV222IIIòòòÿÿÿ¿¿¿:::222222aaa´´´§§§kkl555222;;;¶¶¶ÿÿÿÞÞÞ222222ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ´´´222222¬¬¬ÿÿÿóóó\\\222222222222222222222222222222222† -†úúúŠŠŠ222222222222222222222222222222333ŸŸ ÿÿÿ~~~222222©©©ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}}}222222«««ÿÿÿÿÿÿøøø‘‘‘777222222222222222222222TTTáááÿÿÿÿÿÿÿÿÿVVV222IIIòòòÿÿÿÿÿÿ»»¼DDD222222222222222222222BBBµµµÿÿÿÿÿÿÞÞÞ222222ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ´´´222222¬¬¬ÿÿÿÿÿÿæææbbb333222222222222222222222444~~ôôôÿÿÿ÷÷÷‰‰‰444222222222222222222222444šššÿÿÿÿÿÿ¿¿¿˜˜˜˜˜˜ÔÔÔÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ¾¾¾˜˜˜˜˜˜ÕÕÕÿÿÿÿÿÿÿÿÿþþþ×ØØ - -†SSS555333EEEeef­­­ùùùÿÿÿÿÿÿÿÿÿÿÿÿ«««˜˜˜¤¤¤ùùùÿÿÿÿÿÿÿÿÿëë띝__`;;;222===YYZ”””èèèÿÿÿÿÿÿÿÿÿîî˜˜˜˜ÀÀÀÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÙÙٙ™™˜˜˜ÕÕÕÿÿÿÿÿÿÿÿÿüüüÁÁÁzzzTUU666222:::XYY‡‡‡ÐÐÐýýýÿÿÿÿÿÿÿÿÿþþþÕÕՋ‹‹ZZ[<<<222888[[[‰‰‰ÝÝÝÿÿÿÿÿÿÿÿÿ Index: uspace/srv/hid/fb/Makefile =================================================================== --- uspace/srv/hid/fb/Makefile (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/fb/Makefile (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -40,6 +40,5 @@ SOURCES = \ - main.c \ - ppm.c + main.c ifneq ($(UARCH),ia64) @@ -86,5 +85,6 @@ endif -EXTRA_CFLAGS += -D$(UARCH) +LIBS = $(LIBIMGMAP_PREFIX)/libimgmap.a +EXTRA_CFLAGS += -I$(LIBIMGMAP_PREFIX) -D$(UARCH) include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hid/fb/ega.c =================================================================== --- uspace/srv/hid/fb/ega.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/fb/ega.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -56,5 +56,5 @@ // FIXME: remove this header -#include +#include #define MAX_SAVED_SCREENS 256 @@ -414,12 +414,12 @@ retval = 0; break; - case FB_VP_DRAW_PIXMAP: + case FB_VP_DRAW_IMGMAP: scr = IPC_GET_ARG2(call); retval = print_screen(scr); break; - case FB_VP2PIXMAP: + case FB_VP2IMGMAP: retval = save_screen(); break; - case FB_DROP_PIXMAP: + case FB_DROP_IMGMAP: scr = IPC_GET_ARG1(call); Index: uspace/srv/hid/fb/fb.c =================================================================== --- uspace/srv/hid/fb/fb.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/fb/fb.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -49,6 +49,6 @@ #include #include -#include -#include +#include +#include #include #include @@ -59,13 +59,13 @@ #include #include +#include #include "font-8x16.h" #include "fb.h" #include "main.h" -#include "ppm.h" #include "pointer.xbm" #include "pointer_mask.xbm" // FIXME: remove this header -#include +#include #define DEFAULT_BGCOLOR 0xf0f0f0 @@ -76,5 +76,5 @@ #define MAX_ANIM_LEN 8 #define MAX_ANIMATIONS 4 -#define MAX_PIXMAPS 256 /**< Maximum number of saved pixmaps */ +#define MAX_IMGMAPS 256 /**< Maximum number of saved image maps */ #define MAX_VIEWPORTS 128 /**< Viewport is a rectangular area on the screen */ @@ -160,5 +160,5 @@ unsigned int pos; unsigned int animlen; - unsigned int pixmaps[MAX_ANIM_LEN]; + unsigned int imgmaps[MAX_ANIM_LEN]; } animation_t; @@ -166,11 +166,5 @@ static bool anims_enabled; -typedef struct { - unsigned int width; - unsigned int height; - uint8_t *data; -} pixmap_t; - -static pixmap_t pixmaps[MAX_PIXMAPS]; +static imgmap_t *imgmaps[MAX_IMGMAPS]; static viewport_t viewports[128]; @@ -212,5 +206,4 @@ static void draw_vp_glyph(viewport_t *vport, bool cursor, unsigned int col, unsigned int row); - #define RED(x, bits) (((x) >> (8 + 8 + 8 - (bits))) & ((1 << (bits)) - 1)) @@ -875,5 +868,4 @@ } - /** Show cursor if cursor showing is enabled * @@ -888,5 +880,4 @@ } - /** Invert cursor, if it is enabled * @@ -899,5 +890,4 @@ cursor_show(vport); } - /** Draw character at given position relative to viewport @@ -981,18 +971,7 @@ } - -static void putpixel_pixmap(void *data, unsigned int x, unsigned int y, uint32_t color) -{ - int pm = *((int *) data); - pixmap_t *pmap = &pixmaps[pm]; - unsigned int pos = (y * pmap->width + x) * screen.pixelbytes; - - screen.rgb_conv(&pmap->data[pos], color); -} - - -static void putpixel(void *data, unsigned int x, unsigned int y, uint32_t color) -{ - viewport_t *vport = (viewport_t *) data; +static void putpixel(viewport_t *vport, unsigned int x, unsigned int y, + uint32_t color) +{ unsigned int dx = vport->x + x; unsigned int dy = vport->y + y; @@ -1001,14 +980,50 @@ } - -/** Return first free pixmap - * - */ -static int find_free_pixmap(void) +/** Draw image map + * + * @param[in] img Image map. + * @param[in] sx Coordinate of upper left corner. + * @param[in] sy Coordinate of upper left corner. + * @param[in] maxwidth Maximum allowed width for picture. + * @param[in] maxheight Maximum allowed height for picture. + * @param[in] vport Viewport. + * + * @return EOK on success. + * + */ +static int imgmap_draw(imgmap_t *img, unsigned int sx, unsigned int sy, + unsigned int maxwidth, unsigned int maxheight, void *vport) +{ + if (img->visual != VISUAL_BGR_8_8_8) + return EINVAL; + + uint8_t *data = (uint8_t *) img->data; + + for (sysarg_t y = 0; y < img->height; y++) { + for (sysarg_t x = 0; x < img->width; x++) { + if ((x > maxwidth) || (y > maxheight)) { + data += 3; + continue; + } + + uint32_t color = (data[2] << 16) + (data[1] << 8) + data[0]; + + putpixel(vport, sx + x, sy + y, color); + data += 3; + } + } + + return EOK; +} + +/** Return first free image map + * + */ +static int find_free_imgmap(void) { unsigned int i; - for (i = 0; i < MAX_PIXMAPS; i++) - if (!pixmaps[i].data) + for (i = 0; i < MAX_IMGMAPS; i++) + if (!imgmaps[i]) return i; @@ -1016,38 +1031,28 @@ } - -/** Create a new pixmap and return appropriate ID - * - */ -static int shm2pixmap(unsigned char *shm, size_t size) -{ - int pm; - pixmap_t *pmap; - - pm = find_free_pixmap(); - if (pm == -1) +/** Create a new image map and return appropriate ID + * + */ +static int shm2imgmap(imgmap_t *shm, size_t size) +{ + int im = find_free_imgmap(); + if (im == -1) return ELIMIT; - pmap = &pixmaps[pm]; - - if (ppm_get_data(shm, size, &pmap->width, &pmap->height)) - return EINVAL; - - pmap->data = malloc(pmap->width * pmap->height * screen.pixelbytes); - if (!pmap->data) + imgmap_t *imap = malloc(size); + if (!imap) return ENOMEM; - ppm_draw(shm, size, 0, 0, pmap->width, pmap->height, putpixel_pixmap, (void *) &pm); - - return pm; -} - + memcpy(imap, shm, size); + imgmaps[im] = imap; + return im; +} /** Handle shared memory communication calls * - * Protocol for drawing pixmaps: + * Protocol for drawing image maps: * - FB_PREPARE_SHM(client shm identification) * - IPC_M_AS_AREA_SEND - * - FB_DRAW_PPM(startx, starty) + * - FB_DRAW_IMGMAP(startx, starty) * - FB_DROP_SHM * @@ -1071,5 +1076,5 @@ static size_t intersize = 0; - static unsigned char *shm = NULL; + static imgmap_t *shm = NULL; static sysarg_t shm_id = 0; static size_t shm_size; @@ -1093,9 +1098,6 @@ return false; } + shm = dest; - - if (shm[0] != 'P') - return false; - return true; } else { @@ -1107,8 +1109,7 @@ if (shm_id) retval = EBUSY; - else + else shm_id = IPC_GET_ARG1(*call); break; - case FB_DROP_SHM: if (shm) { @@ -1118,17 +1119,17 @@ shm_id = 0; break; - - case FB_SHM2PIXMAP: + case FB_SHM2IMGMAP: if (!shm) { retval = EINVAL; break; } - retval = shm2pixmap(shm, shm_size); - break; - case FB_DRAW_PPM: + retval = shm2imgmap(shm, shm_size); + break; + case FB_DRAW_IMGMAP: if (!shm) { retval = EINVAL; break; } + x = IPC_GET_ARG1(*call); y = IPC_GET_ARG2(*call); @@ -1139,6 +1140,6 @@ } - ppm_draw(shm, shm_size, IPC_GET_ARG1(*call), - IPC_GET_ARG2(*call), vport->width - x, vport->height - y, putpixel, (void *) vport); + imgmap_draw(shm, IPC_GET_ARG1(*call), IPC_GET_ARG2(*call), + vport->width - x, vport->height - y, vport); break; case FB_DRAW_TEXT_DATA: @@ -1167,9 +1168,9 @@ if (handled) async_answer_0(callid, retval); + return handled; } - -static void copy_vp_to_pixmap(viewport_t *vport, pixmap_t *pmap) +static void copy_vp_to_imgmap(viewport_t *vport, imgmap_t *imap) { unsigned int width = vport->width; @@ -1178,9 +1179,10 @@ if (width + vport->x > screen.xres) width = screen.xres - vport->x; + if (height + vport->y > screen.yres) height = screen.yres - vport->y; - unsigned int realwidth = pmap->width <= width ? pmap->width : width; - unsigned int realheight = pmap->height <= height ? pmap->height : height; + unsigned int realwidth = imap->width <= width ? imap->width : width; + unsigned int realheight = imap->height <= height ? imap->height : height; unsigned int srcrowsize = vport->width * screen.pixelbytes; @@ -1190,44 +1192,44 @@ for (y = 0; y < realheight; y++) { unsigned int tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes; - memcpy(pmap->data + srcrowsize * y, screen.fb_addr + tmp, realrowsize); - } -} - - -/** Save viewport to pixmap - * - */ -static int save_vp_to_pixmap(viewport_t *vport) -{ - int pm; - pixmap_t *pmap; - - pm = find_free_pixmap(); - if (pm == -1) + memcpy(imap->data + srcrowsize * y, screen.fb_addr + tmp, realrowsize); + } +} + +/** Save viewport to image map + * + */ +static int save_vp_to_imgmap(viewport_t *vport) +{ + int im = find_free_imgmap(); + if (im == -1) return ELIMIT; - pmap = &pixmaps[pm]; - pmap->data = malloc(screen.pixelbytes * vport->width * vport->height); - if (!pmap->data) + size_t size = screen.pixelbytes * vport->width * vport->height; + imgmap_t *imap = malloc(sizeof(imgmap_t) + size); + if (!imap) return ENOMEM; - pmap->width = vport->width; - pmap->height = vport->height; - - copy_vp_to_pixmap(vport, pmap); - - return pm; -} - - -/** Draw pixmap on screen - * - * @param vp Viewport to draw on - * @param pm Pixmap identifier - * - */ -static int draw_pixmap(int vp, int pm) -{ - pixmap_t *pmap = &pixmaps[pm]; + imap->size = sizeof(imgmap_t) + size; + imap->width = vport->width; + imap->height = vport->height; + imap->visual = (visual_t) -1; + + copy_vp_to_imgmap(vport, imap); + imgmaps[im] = imap; + return im; +} + +/** Draw image map to screen + * + * @param vp Viewport to draw to + * @param im Image map identifier + * + */ +static int draw_imgmap(int vp, int im) +{ + imgmap_t *imap = imgmaps[im]; + if (!imap) + return EINVAL; + viewport_t *vport = &viewports[vp]; @@ -1237,25 +1239,25 @@ if (width + vport->x > screen.xres) width = screen.xres - vport->x; + if (height + vport->y > screen.yres) height = screen.yres - vport->y; - if (!pmap->data) - return EINVAL; - - unsigned int realwidth = pmap->width <= width ? pmap->width : width; - unsigned int realheight = pmap->height <= height ? pmap->height : height; - - unsigned int srcrowsize = vport->width * screen.pixelbytes; - unsigned int realrowsize = realwidth * screen.pixelbytes; - - unsigned int y; - for (y = 0; y < realheight; y++) { - unsigned int tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes; - memcpy(screen.fb_addr + tmp, pmap->data + y * srcrowsize, realrowsize); - } + unsigned int realwidth = imap->width <= width ? imap->width : width; + unsigned int realheight = imap->height <= height ? imap->height : height; + + if (imap->visual == (visual_t) -1) { + unsigned int srcrowsize = vport->width * screen.pixelbytes; + unsigned int realrowsize = realwidth * screen.pixelbytes; + + unsigned int y; + for (y = 0; y < realheight; y++) { + unsigned int tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes; + memcpy(screen.fb_addr + tmp, imap->data + y * srcrowsize, realrowsize); + } + } else + imgmap_draw(imap, 0, 0, realwidth, realheight, vport); return EOK; } - /** Tick animation one step forward @@ -1277,5 +1279,5 @@ continue; - draw_pixmap(animations[i].vp, animations[i].pixmaps[animations[i].pos]); + draw_imgmap(animations[i].vp, animations[i].imgmaps[animations[i].pos]); animations[i].pos = (animations[i].pos + 1) % animations[i].animlen; } @@ -1287,5 +1289,5 @@ static bool pointer_shown, pointer_enabled; static int pointer_vport = -1; -static int pointer_pixmap = -1; +static int pointer_imgmap = -1; @@ -1310,8 +1312,8 @@ } - if (pointer_pixmap == -1) - pointer_pixmap = save_vp_to_pixmap(&viewports[pointer_vport]); + if (pointer_imgmap == -1) + pointer_imgmap = save_vp_to_imgmap(&viewports[pointer_vport]); else - copy_vp_to_pixmap(&viewports[pointer_vport], &pixmaps[pointer_pixmap]); + copy_vp_to_imgmap(&viewports[pointer_vport], imgmaps[pointer_imgmap]); /* Draw mouse pointer. */ @@ -1338,5 +1340,5 @@ /* Restore image under the pointer. */ if (pointer_shown) { - draw_pixmap(pointer_vport, pointer_pixmap); + draw_imgmap(pointer_vport, pointer_imgmap); pointer_shown = 0; } @@ -1393,5 +1395,5 @@ animations[i].initialized = 0; break; - case FB_ANIM_ADDPIXMAP: + case FB_ANIM_ADDIMGMAP: i = IPC_GET_ARG1(*call); if (i >= MAX_ANIMATIONS || i < 0 || @@ -1405,10 +1407,10 @@ } newval = IPC_GET_ARG2(*call); - if (newval < 0 || newval > MAX_PIXMAPS || - !pixmaps[newval].data) { + if (newval < 0 || newval > MAX_IMGMAPS || + !imgmaps[newval]) { retval = EINVAL; break; } - animations[i].pixmaps[animations[i].animlen++] = newval; + animations[i].imgmaps[animations[i].animlen++] = newval; break; case FB_ANIM_CHGVP: @@ -1449,9 +1451,8 @@ } - -/** Handler for messages concerning pixmap handling - * - */ -static int pixmap_handle(ipc_callid_t callid, ipc_call_t *call, int vp) +/** Handler for messages concerning image map handling + * + */ +static int imgmap_handle(ipc_callid_t callid, ipc_call_t *call, int vp) { bool handled = true; @@ -1460,36 +1461,43 @@ switch (IPC_GET_IMETHOD(*call)) { - case FB_VP_DRAW_PIXMAP: + case FB_VP_DRAW_IMGMAP: nvp = IPC_GET_ARG1(*call); if (nvp == -1) nvp = vp; + if (nvp < 0 || nvp >= MAX_VIEWPORTS || - !viewports[nvp].initialized) { + !viewports[nvp].initialized) { retval = EINVAL; break; } + i = IPC_GET_ARG2(*call); - retval = draw_pixmap(nvp, i); - break; - case FB_VP2PIXMAP: + retval = draw_imgmap(nvp, i); + break; + case FB_VP2IMGMAP: nvp = IPC_GET_ARG1(*call); if (nvp == -1) nvp = vp; + if (nvp < 0 || nvp >= MAX_VIEWPORTS || - !viewports[nvp].initialized) + !viewports[nvp].initialized) { retval = EINVAL; - else - retval = save_vp_to_pixmap(&viewports[nvp]); - break; - case FB_DROP_PIXMAP: + break; + } + + retval = save_vp_to_imgmap(&viewports[nvp]); + break; + case FB_DROP_IMGMAP: i = IPC_GET_ARG1(*call); - if (i >= MAX_PIXMAPS) { + if (i >= MAX_IMGMAPS) { retval = EINVAL; break; } - if (pixmaps[i].data) { - free(pixmaps[i].data); - pixmaps[i].data = NULL; - } + + if (imgmaps[i]) { + free(imgmaps[i]); + imgmaps[i] = NULL; + } + break; default: @@ -1616,5 +1624,5 @@ continue; - if (pixmap_handle(callid, &call, vp)) + if (imgmap_handle(callid, &call, vp)) continue; Index: uspace/srv/hid/fb/fb.h =================================================================== --- uspace/srv/hid/fb/fb.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/fb/fb.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -39,6 +39,4 @@ #include -typedef void (* putpixel_cb_t)(void *, unsigned int, unsigned int, uint32_t); - extern int fb_init(void); Index: uspace/srv/hid/fb/ppm.c =================================================================== --- uspace/srv/hid/fb/ppm.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,130 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include - -#include "ppm.h" - -static void skip_whitespace(unsigned char **data) -{ -retry: - while (**data == ' ' || **data == '\t' || **data == '\n' || - **data == '\r') - (*data)++; - if (**data == '#') { - while (1) { - if (**data == '\n' || **data == '\r') - break; - (*data)++; - } - goto retry; - } -} - -static void read_num(unsigned char **data, unsigned int *num) -{ - *num = 0; - while (**data >= '0' && **data <= '9') { - *num *= 10; - *num += **data - '0'; - (*data)++; - } -} - -int ppm_get_data(unsigned char *data, size_t dtsz, unsigned int *width, - unsigned int *height) -{ - /* Read magic */ - if (data[0] != 'P' || data[1] != '6') - return EINVAL; - - data+=2; - skip_whitespace(&data); - read_num(&data, width); - skip_whitespace(&data); - read_num(&data,height); - - return 0; -} - -/** Draw PPM pixmap - * - * @param data Pointer to PPM data - * @param datasz Maximum data size - * @param sx Coordinate of upper left corner - * @param sy Coordinate of upper left corner - * @param maxwidth Maximum allowed width for picture - * @param maxheight Maximum allowed height for picture - * @param putpixel Putpixel function used to print bitmap - */ -int ppm_draw(unsigned char *data, size_t datasz, unsigned int sx, - unsigned int sy, unsigned int maxwidth, unsigned int maxheight, - putpixel_cb_t putpixel, void *vport) -{ - unsigned int width, height; - unsigned int maxcolor; - unsigned int i; - unsigned int color; - unsigned int coef; - - /* Read magic */ - if ((data[0] != 'P') || (data[1] != '6')) - return EINVAL; - - data += 2; - skip_whitespace(&data); - read_num(&data, &width); - skip_whitespace(&data); - read_num(&data, &height); - skip_whitespace(&data); - read_num(&data, &maxcolor); - data++; - - if ((maxcolor == 0) || (maxcolor > 255) || (width * height > datasz)) - return EINVAL; - - coef = 255 / maxcolor; - if (coef * maxcolor > 255) - coef -= 1; - - for (i = 0; i < width * height; i++) { - /* Crop picture if we don't fit into region */ - if (i % width > maxwidth || i / width > maxheight) { - data += 3; - continue; - } - color = ((data[0] * coef) << 16) + ((data[1] * coef) << 8) + - data[2] * coef; - - (*putpixel)(vport, sx + (i % width), sy + (i / width), color); - data += 3; - } - - return 0; -} Index: uspace/srv/hid/fb/ppm.h =================================================================== --- uspace/srv/hid/fb/ppm.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,39 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef FB_PPM_H_ -#define FB_PPM_H_ - -#include "fb.h" -#include - -extern int ppm_draw(unsigned char *, size_t, unsigned int, unsigned int, - unsigned int, unsigned int, putpixel_cb_t, void *); -extern int ppm_get_data(unsigned char *, size_t, unsigned int *, unsigned int *); - -#endif Index: uspace/srv/hid/fb/serial_console.c =================================================================== --- uspace/srv/hid/fb/serial_console.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/fb/serial_console.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -53,5 +53,5 @@ // FIXME: remove this header -#include +#include #define MAX_CONTROL 20 Index: uspace/srv/hid/input/ctl/kbdev.c =================================================================== --- uspace/srv/hid/input/ctl/kbdev.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/input/ctl/kbdev.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -48,7 +48,8 @@ #include #include +#include #include #include - +#include static int kbdev_ctl_init(kbd_dev_t *); @@ -70,7 +71,4 @@ /** Session with kbdev device */ async_sess_t *sess; - - /** File descriptor of open kbdev device */ - int fd; } kbdev_t; @@ -84,5 +82,4 @@ kbdev->kbd_dev = kdev; - kbdev->fd = -1; return kbdev; @@ -93,6 +90,4 @@ if (kbdev->sess != NULL) async_hangup(kbdev->sess); - if (kbdev->fd >= 0) - close(kbdev->fd); free(kbdev); } @@ -100,22 +95,13 @@ static int kbdev_ctl_init(kbd_dev_t *kdev) { - const char *pathname; async_sess_t *sess; async_exch_t *exch; kbdev_t *kbdev; - int fd; int rc; - pathname = kdev->dev_path; - - fd = open(pathname, O_RDWR); - if (fd < 0) { - return -1; - } - - sess = fd_session(EXCHANGE_SERIALIZE, fd); + sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->svc_id, 0); if (sess == NULL) { - printf("%s: Failed starting session with '%s'\n", NAME, pathname); - close(fd); + printf("%s: Failed starting session with '%s.'\n", NAME, + kdev->svc_name); return -1; } @@ -124,14 +110,14 @@ if (kbdev == NULL) { printf("%s: Failed allocating device structure for '%s'.\n", - NAME, pathname); + NAME, kdev->svc_name); return -1; } - kbdev->fd = fd; kbdev->sess = sess; exch = async_exchange_begin(sess); if (exch == NULL) { - printf("%s: Failed starting exchange with '%s'.\n", NAME, pathname); + printf("%s: Failed starting exchange with '%s'.\n", NAME, + kdev->svc_name); kbdev_destroy(kbdev); return -1; @@ -141,5 +127,5 @@ if (rc != EOK) { printf("%s: Failed creating callback connection from '%s'.\n", - NAME, pathname); + NAME, kdev->svc_name); async_exchange_end(exch); kbdev_destroy(kbdev); Index: uspace/srv/hid/input/generic/input.c =================================================================== --- uspace/srv/hid/input/generic/input.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/input/generic/input.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -38,4 +38,5 @@ #include +#include #include #include @@ -53,5 +54,5 @@ #include #include -#include +#include #include #include @@ -63,8 +64,5 @@ // FIXME: remove this header -#include - -/* In microseconds */ -#define DISCOVERY_POLL_INTERVAL (10 * 1000 * 1000) +#include #define NUM_LAYOUTS 3 @@ -275,5 +273,5 @@ kdev->port_ops = port; kdev->ctl_ops = ctl; - kdev->dev_path = NULL; + kdev->svc_id = 0; /* Initialize port driver. */ @@ -303,5 +301,5 @@ mdev->port_ops = port; mdev->proto_ops = proto; - mdev->dev_path = NULL; + mdev->svc_id = 0; /* Initialize port driver. */ @@ -324,8 +322,8 @@ /** Add new kbdev device. * - * @param dev_path Filesystem path to the device (/dev/class/...) + * @param service_id Service ID of the keyboard device * */ -static int kbd_add_kbdev(const char *dev_path) +static int kbd_add_kbdev(service_id_t service_id, kbd_dev_t **kdevp) { kbd_dev_t *kdev = kbd_dev_new(); @@ -333,8 +331,14 @@ return -1; - kdev->dev_path = dev_path; + kdev->svc_id = service_id; kdev->port_ops = NULL; kdev->ctl_ops = &kbdev_ctl; + int rc = loc_service_get_name(service_id, &kdev->svc_name); + if (rc != EOK) { + kdev->svc_name = NULL; + goto fail; + } + /* Initialize controller driver. */ if ((*kdev->ctl_ops->init)(kdev) != 0) { @@ -343,7 +347,10 @@ list_append(&kdev->kbd_devs, &kbd_devs); + *kdevp = kdev; return EOK; fail: + if (kdev->svc_name != NULL) + free(kdev->svc_name); free(kdev); return -1; @@ -352,8 +359,8 @@ /** Add new mousedev device. * - * @param dev_path Filesystem path to the device (/dev/class/...) + * @param service_id Service ID of the mouse device * */ -static int mouse_add_mousedev(const char *dev_path) +static int mouse_add_mousedev(service_id_t service_id, mouse_dev_t **mdevp) { mouse_dev_t *mdev = mouse_dev_new(); @@ -361,8 +368,14 @@ return -1; - mdev->dev_path = dev_path; + mdev->svc_id = service_id; mdev->port_ops = NULL; mdev->proto_ops = &mousedev_proto; + int rc = loc_service_get_name(service_id, &mdev->svc_name); + if (rc != EOK) { + mdev->svc_name = NULL; + goto fail; + } + /* Initialize controller driver. */ if ((*mdev->proto_ops->init)(mdev) != 0) { @@ -371,4 +384,5 @@ list_append(&mdev->mouse_devs, &mouse_devs); + *mdevp = mdev; return EOK; @@ -480,70 +494,143 @@ } -/** Periodically check for new input devices. - * - * Looks under /dev/class/keyboard and /dev/class/mouse. - * - * @param arg Ignored - * - */ -static int dev_discovery_fibril(void *arg) -{ - char *dev_path; - size_t kbd_id = 1; - size_t mouse_id = 1; +static int dev_check_new_kbdevs(void) +{ + category_id_t keyboard_cat; + service_id_t *svcs; + size_t count, i; + bool already_known; int rc; - while (true) { - async_usleep(DISCOVERY_POLL_INTERVAL); - - /* - * Check for new keyboard device - */ - rc = asprintf(&dev_path, "/dev/class/keyboard\\%zu", kbd_id); - if (rc < 0) - continue; - - if (kbd_add_kbdev(dev_path) == EOK) { - printf("%s: Connected keyboard device '%s'\n", - NAME, dev_path); - - /* XXX Handle device removal */ - ++kbd_id; + rc = loc_category_get_id("keyboard", &keyboard_cat, IPC_FLAG_BLOCKING); + if (rc != EOK) { + printf("%s: Failed resolving category 'keyboard'.\n", NAME); + return ENOENT; + } + + /* + * Check for new keyboard devices + */ + rc = loc_category_get_svcs(keyboard_cat, &svcs, &count); + if (rc != EOK) { + printf("%s: Failed getting list of keyboard devices.\n", + NAME); + return EIO; + } + + for (i = 0; i < count; i++) { + already_known = false; + + /* Determine whether we already know this device. */ + list_foreach(kbd_devs, kdev_link) { + kbd_dev_t *kdev = list_get_instance(kdev_link, + kbd_dev_t, kbd_devs); + if (kdev->svc_id == svcs[i]) { + already_known = true; + break; + } } - free(dev_path); - - /* - * Check for new mouse device - */ - rc = asprintf(&dev_path, "/dev/class/mouse\\%zu", mouse_id); - if (rc < 0) - continue; - - if (mouse_add_mousedev(dev_path) == EOK) { - printf("%s: Connected mouse device '%s'\n", - NAME, dev_path); - - /* XXX Handle device removal */ - ++mouse_id; + if (!already_known) { + kbd_dev_t *kdev; + if (kbd_add_kbdev(svcs[i], &kdev) == EOK) { + printf("%s: Connected keyboard device '%s'\n", + NAME, kdev->svc_name); + } } - - free(dev_path); - } + } + + free(svcs); + + /* XXX Handle device removal */ return EOK; } -/** Start a fibril for discovering new devices. */ -static void input_start_dev_discovery(void) -{ - fid_t fid = fibril_create(dev_discovery_fibril, NULL); - if (!fid) { - printf("%s: Failed to create device discovery fibril.\n", +static int dev_check_new_mousedevs(void) +{ + category_id_t mouse_cat; + service_id_t *svcs; + size_t count, i; + bool already_known; + int rc; + + rc = loc_category_get_id("mouse", &mouse_cat, IPC_FLAG_BLOCKING); + if (rc != EOK) { + printf("%s: Failed resolving category 'mouse'.\n", NAME); + return ENOENT; + } + + /* + * Check for new mouse devices + */ + rc = loc_category_get_svcs(mouse_cat, &svcs, &count); + if (rc != EOK) { + printf("%s: Failed getting list of mouse devices.\n", NAME); - return; - } - - fibril_add_ready(fid); + return EIO; + } + + for (i = 0; i < count; i++) { + already_known = false; + + /* Determine whether we already know this device. */ + list_foreach(mouse_devs, mdev_link) { + mouse_dev_t *mdev = list_get_instance(mdev_link, + mouse_dev_t, mouse_devs); + if (mdev->svc_id == svcs[i]) { + already_known = true; + break; + } + } + + if (!already_known) { + mouse_dev_t *mdev; + if (mouse_add_mousedev(svcs[i], &mdev) == EOK) { + printf("%s: Connected mouse device '%s'\n", + NAME, mdev->svc_name); + } + } + } + + free(svcs); + + /* XXX Handle device removal */ + + return EOK; +} + +static int dev_check_new(void) +{ + int rc; + + rc = dev_check_new_kbdevs(); + if (rc != EOK) + return rc; + + rc = dev_check_new_mousedevs(); + if (rc != EOK) + return rc; + + return EOK; +} + +static void cat_change_cb(void) +{ + dev_check_new(); +} + +/** Start listening for new devices. */ +static int input_start_dev_discovery(void) +{ + int rc; + + rc = loc_register_cat_change_cb(cat_change_cb); + if (rc != EOK) { + printf("%s: Failed registering callback for device discovery. " + "(%d)\n", NAME, rc); + return rc; + } + + return dev_check_new(); } @@ -572,16 +659,16 @@ /* Register driver */ - int rc = devmap_driver_register(NAME, client_connection); + int rc = loc_server_register(NAME, client_connection); if (rc < 0) { - printf("%s: Unable to register driver (%d)\n", NAME, rc); + printf("%s: Unable to register server (%d)\n", NAME, rc); return -1; } - char kbd[DEVMAP_NAME_MAXLEN + 1]; - snprintf(kbd, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME); - - devmap_handle_t devmap_handle; - if (devmap_device_register(kbd, &devmap_handle) != EOK) { - printf("%s: Unable to register device %s\n", NAME, kbd); + char kbd[LOC_NAME_MAXLEN + 1]; + snprintf(kbd, LOC_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME); + + service_id_t service_id; + if (loc_service_register(kbd, &service_id) != EOK) { + printf("%s: Unable to register service %s\n", NAME, kbd); return -1; } Index: uspace/srv/hid/input/include/kbd.h =================================================================== --- uspace/srv/hid/input/include/kbd.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/input/include/kbd.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -40,4 +40,5 @@ #include +#include struct kbd_port_ops; @@ -49,6 +50,9 @@ link_t kbd_devs; - /** Path to the device (only for kbdev devices) */ - const char *dev_path; + /** Service ID (only for kbdev devices) */ + service_id_t svc_id; + + /** Device service name (only for kbdev devices) */ + char *svc_name; /** Port ops */ Index: uspace/srv/hid/input/include/mouse.h =================================================================== --- uspace/srv/hid/input/include/mouse.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/input/include/mouse.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -39,4 +39,5 @@ #include +#include struct mouse_port_ops; @@ -47,6 +48,9 @@ link_t mouse_devs; - /** Path to the device (only for mouseev devices) */ - const char *dev_path; + /** Service ID (only for mousedev devices) */ + service_id_t svc_id; + + /** Device service name (only for mousedev devices) */ + char *svc_name; /** Port ops */ Index: uspace/srv/hid/input/include/sun.h =================================================================== --- uspace/srv/hid/input/include/sun.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * Copyright (c) 2009 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup kbdgen generic - * @brief Sun keyboard virtual port driver. - * @ingroup kbd - * @{ - */ -/** @file - */ - -#ifndef KBD_SUN_H_ -#define KBD_SUN_H_ - -extern int ns16550_port_init(void); -extern int z8530_port_init(void); - -#endif - -/** - * @} - */ Index: uspace/srv/hid/input/port/adb.c =================================================================== --- uspace/srv/hid/input/port/adb.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/input/port/adb.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -43,5 +43,5 @@ #include #include -#include +#include static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg); @@ -66,5 +66,5 @@ { const char *dev = "adb/kbd"; - devmap_handle_t handle; + service_id_t service_id; async_exch_t *exch; int rc; @@ -72,9 +72,9 @@ kbd_dev = kdev; - rc = devmap_device_get_handle(dev, &handle, 0); + rc = loc_service_get_id(dev, &service_id, 0); if (rc != EOK) return rc; - dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, 0); + dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0); if (dev_sess == NULL) { printf("%s: Failed to connect to device\n", NAME); Index: uspace/srv/hid/input/port/adb_mouse.c =================================================================== --- uspace/srv/hid/input/port/adb_mouse.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/input/port/adb_mouse.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -41,5 +41,6 @@ #include #include -#include +#include +#include static mouse_dev_t *mouse_dev; @@ -78,10 +79,10 @@ mouse_dev = mdev; - devmap_handle_t handle; - int rc = devmap_device_get_handle(dev, &handle, 0); + service_id_t service_id; + int rc = loc_service_get_id(dev, &service_id, 0); if (rc != EOK) return rc; - dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, 0); + dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0); if (dev_sess == NULL) { printf("%s: Failed to connect to device\n", NAME); Index: uspace/srv/hid/input/port/chardev.c =================================================================== --- uspace/srv/hid/input/port/chardev.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/input/port/chardev.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -40,5 +40,5 @@ #include #include -#include +#include #include #include @@ -71,5 +71,5 @@ static int chardev_port_init(kbd_dev_t *kdev) { - devmap_handle_t handle; + service_id_t service_id; async_exch_t *exch; unsigned int i; @@ -79,5 +79,5 @@ for (i = 0; i < num_devs; i++) { - rc = devmap_device_get_handle(in_devs[i], &handle, 0); + rc = loc_service_get_id(in_devs[i], &service_id, 0); if (rc == EOK) break; @@ -89,5 +89,5 @@ } - dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, + dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, IPC_FLAG_BLOCKING); if (dev_sess == NULL) { Index: uspace/srv/hid/input/port/chardev_mouse.c =================================================================== --- uspace/srv/hid/input/port/chardev_mouse.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/input/port/chardev_mouse.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -39,5 +39,5 @@ #include #include -#include +#include #include #include @@ -82,5 +82,5 @@ static int chardev_port_init(mouse_dev_t *mdev) { - devmap_handle_t handle; + service_id_t service_id; unsigned int i; int rc; @@ -89,5 +89,5 @@ for (i = 0; i < num_devs; i++) { - rc = devmap_device_get_handle(in_devs[i], &handle, 0); + rc = loc_service_get_id(in_devs[i], &service_id, 0); if (rc == EOK) break; @@ -99,5 +99,5 @@ } - dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, + dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, IPC_FLAG_BLOCKING); if (dev_sess == NULL) { Index: uspace/srv/hid/input/port/dummy.c =================================================================== --- uspace/srv/hid/input/port/dummy.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,59 +1,0 @@ -/* - * Copyright (c) 2009 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup kbd_port - * @brief Dummy keyboard port driver. - * @ingroup kbd - * @{ - */ -/** @file - */ - -#include -#include - -int kbd_port_init(void) -{ - return 0; -} - -void kbd_port_yield(void) -{ -} - -void kbd_port_reclaim(void) -{ -} - -void kbd_port_write(uint8_t data) -{ - (void) data; -} - -/** @} -*/ Index: uspace/srv/hid/input/port/sgcn.c =================================================================== --- uspace/srv/hid/input/port/sgcn.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,188 +1,0 @@ -/* - * Copyright (c) 2008 Pavel Rimsky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup kbd_port - * @ingroup kbd - * @{ - */ -/** @file - * @brief SGCN (Serengeti Console) keyboard port driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define POLL_INTERVAL 10000 - -/** - * SGCN buffer header. It is placed at the very beginning of the SGCN - * buffer. - */ -typedef struct { - /** hard-wired to "CON" */ - char magic[4]; - - /** we don't need this */ - char unused[8]; - - /** offset within the SGCN buffer of the input buffer start */ - uint32_t in_begin; - - /** offset within the SGCN buffer of the input buffer end */ - uint32_t in_end; - - /** offset within the SGCN buffer of the input buffer read pointer */ - uint32_t in_rdptr; - - /** offset within the SGCN buffer of the input buffer write pointer */ - uint32_t in_wrptr; -} __attribute__ ((packed)) sgcn_buffer_header_t; - -/* - * Returns a pointer to the object of a given type which is placed at the given - * offset from the console buffer beginning. - */ -#define SGCN_BUFFER(type, offset) \ - ((type *) (sram_virt_addr + sram_buffer_offset + (offset))) - -/** Returns a pointer to the console buffer header. */ -#define SGCN_BUFFER_HEADER (SGCN_BUFFER(sgcn_buffer_header_t, 0)) - -/** - * Virtual address mapped to SRAM. - */ -static uintptr_t sram_virt_addr; - -/** - * SGCN buffer offset within SGCN. - */ -static uintptr_t sram_buffer_offset; - -/* polling thread */ -static void sgcn_thread_impl(void *arg); - -static volatile bool polling_disabled = false; - -/** - * Initializes the SGCN driver. - * Maps the physical memory (SRAM) and creates the polling thread. - */ -int kbd_port_init(void) -{ - sysarg_t sram_paddr; - if (sysinfo_get_value("sram.address.physical", &sram_paddr) != EOK) - return -1; - - sysarg_t sram_size; - if (sysinfo_get_value("sram.area.size", &sram_size) != EOK) - return -1; - - if (sysinfo_get_value("sram.buffer.offset", &sram_buffer_offset) != EOK) - sram_buffer_offset = 0; - - sram_virt_addr = (uintptr_t) as_get_mappable_page(sram_size); - - if (physmem_map((void *) sram_paddr, (void *) sram_virt_addr, - sram_size / PAGE_SIZE, AS_AREA_READ | AS_AREA_WRITE) != 0) { - printf("SGCN: uspace driver could not map physical memory."); - return -1; - } - - thread_id_t tid; - int rc = thread_create(sgcn_thread_impl, NULL, "kbd_poll", &tid); - if (rc != 0) - return rc; - - return 0; -} - -void kbd_port_yield(void) -{ - polling_disabled = true; -} - -void kbd_port_reclaim(void) -{ - polling_disabled = false; -} - -void kbd_port_write(uint8_t data) -{ - (void) data; -} - -/** - * Handler of the "key pressed" event. Reads codes of all the pressed keys from - * the buffer. - */ -static void sgcn_key_pressed(void) -{ - char c; - - uint32_t begin = SGCN_BUFFER_HEADER->in_begin; - uint32_t end = SGCN_BUFFER_HEADER->in_end; - uint32_t size = end - begin; - - volatile char *buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - volatile uint32_t *in_wrptr_ptr = &(SGCN_BUFFER_HEADER->in_wrptr); - volatile uint32_t *in_rdptr_ptr = &(SGCN_BUFFER_HEADER->in_rdptr); - - while (*in_rdptr_ptr != *in_wrptr_ptr) { - c = *buf_ptr; - *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin; - buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - kbd_push_scancode(c); - } -} - -/** - * Thread to poll SGCN for keypresses. - */ -static void sgcn_thread_impl(void *arg) -{ - (void) arg; - - while (1) { - if (polling_disabled == false) - sgcn_key_pressed(); - usleep(POLL_INTERVAL); - } -} - -/** @} - */ Index: uspace/srv/hid/input/port/sun.c =================================================================== --- uspace/srv/hid/input/port/sun.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,89 +1,0 @@ -/* - * Copyright (c) 2009 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup kbd_port - * @ingroup kbd - * @{ - */ -/** @file - * @brief Sun keyboard virtual port driver. - */ - -#include -#include -#include -#include -#include -#include - -/** Sun keyboard virtual port driver. - * - * This is a virtual port driver which can use - * both ns16550_port_init and z8530_port_init - * according to the information passed from the - * kernel. This is just a temporal hack. - * - */ -int kbd_port_init(void) -{ - sysarg_t z8530; - if (sysinfo_get_value("kbd.type.z8530", &z8530) != EOK) - z8530 = false; - - sysarg_t ns16550; - if (sysinfo_get_value("kbd.type.ns16550", &ns16550) != EOK) - ns16550 = false; - - if (z8530) { - if (z8530_port_init() == 0) - return 0; - } - - if (ns16550) { - if (ns16550_port_init() == 0) - return 0; - } - - return -1; -} - -void kbd_port_yield(void) -{ -} - -void kbd_port_reclaim(void) -{ -} - -void kbd_port_write(uint8_t data) -{ - (void) data; -} - -/** @} -*/ Index: uspace/srv/hid/input/port/z8530.c =================================================================== --- uspace/srv/hid/input/port/z8530.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ (revision ) @@ -1,116 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup kbd_port - * @ingroup kbd - * @{ - */ -/** @file - * @brief Z8530 keyboard port driver. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define CHAN_A_STATUS 4 -#define CHAN_A_DATA 6 - -#define RR0_RCA 1 - -static irq_cmd_t z8530_cmds[] = { - { - .cmd = CMD_PIO_READ_8, - .addr = (void *) 0, /* Will be patched in run-time */ - .dstarg = 1 - }, - { - .cmd = CMD_BTEST, - .value = RR0_RCA, - .srcarg = 1, - .dstarg = 3 - }, - { - .cmd = CMD_PREDICATE, - .value = 2, - .srcarg = 3 - }, - { - .cmd = CMD_PIO_READ_8, - .addr = (void *) 0, /* Will be patched in run-time */ - .dstarg = 2 - }, - { - .cmd = CMD_ACCEPT - } -}; - -irq_code_t z8530_kbd = { - sizeof(z8530_cmds) / sizeof(irq_cmd_t), - z8530_cmds -}; - -static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call); - -int z8530_port_init(void) -{ - sysarg_t kaddr; - if (sysinfo_get_value("kbd.address.kernel", &kaddr) != EOK) - return -1; - - sysarg_t inr; - if (sysinfo_get_value("kbd.inr", &inr) != EOK) - return -1; - - z8530_cmds[0].addr = (void *) kaddr + CHAN_A_STATUS; - z8530_cmds[3].addr = (void *) kaddr + CHAN_A_DATA; - - async_set_interrupt_received(z8530_irq_handler); - register_irq(inr, device_assign_devno(), inr, &z8530_kbd); - - return 0; -} - -static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call) -{ - int scan_code = IPC_GET_ARG2(*call); - kbd_push_scancode(scan_code); - - if (irc_service) - async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, - IPC_GET_IMETHOD(*call)); -} - -/** @} - */ Index: uspace/srv/hid/input/proto/mousedev.c =================================================================== --- uspace/srv/hid/input/proto/mousedev.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/input/proto/mousedev.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -44,7 +44,9 @@ #include #include +#include #include #include #include +#include /** Mousedev softstate */ @@ -55,7 +57,4 @@ /** Session to mouse device */ async_sess_t *sess; - - /** File descriptor of open mousedev device */ - int fd; } mousedev_t; @@ -67,5 +66,4 @@ mousedev->mouse_dev = mdev; - mousedev->fd = -1; return mousedev; @@ -76,7 +74,4 @@ if (mousedev->sess != NULL) async_hangup(mousedev->sess); - - if (mousedev->fd >= 0) - close(mousedev->fd); free(mousedev); @@ -122,14 +117,9 @@ static int mousedev_proto_init(mouse_dev_t *mdev) { - const char *pathname = mdev->dev_path; - - int fd = open(pathname, O_RDWR); - if (fd < 0) - return -1; - - async_sess_t *sess = fd_session(EXCHANGE_SERIALIZE, fd); + async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, + mdev->svc_id, 0); if (sess == NULL) { - printf("%s: Failed starting session with '%s'\n", NAME, pathname); - close(fd); + printf("%s: Failed starting session with '%s'\n", NAME, + mdev->svc_name); return -1; } @@ -138,14 +128,14 @@ if (mousedev == NULL) { printf("%s: Failed allocating device structure for '%s'.\n", - NAME, pathname); + NAME, mdev->svc_name); return -1; } - mousedev->fd = fd; mousedev->sess = sess; async_exch_t *exch = async_exchange_begin(sess); if (exch == NULL) { - printf("%s: Failed starting exchange with '%s'.\n", NAME, pathname); + printf("%s: Failed starting exchange with '%s'.\n", NAME, + mdev->svc_name); mousedev_destroy(mousedev); return -1; @@ -157,5 +147,5 @@ if (rc != EOK) { printf("%s: Failed creating callback connection from '%s'.\n", - NAME, pathname); + NAME, mdev->svc_name); mousedev_destroy(mousedev); return -1; Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c =================================================================== --- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -39,5 +39,5 @@ #include #include -#include +#include #include #include @@ -54,5 +54,5 @@ // FIXME: remove this header -#include +#include #define NAME "s3c24ser" @@ -90,5 +90,5 @@ printf(NAME ": S3C24xx touchscreen driver\n"); - rc = devmap_driver_register(NAME, s3c24xx_ts_connection); + rc = loc_server_register(NAME, s3c24xx_ts_connection); if (rc < 0) { printf(NAME ": Unable to register driver.\n"); @@ -103,5 +103,5 @@ return -1; - rc = devmap_device_register(NAMESPACE "/mouse", &ts->devmap_handle); + rc = loc_service_register(NAMESPACE "/mouse", &ts->service_id); if (rc != EOK) { printf(NAME ": Unable to register device %s.\n", Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h =================================================================== --- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -124,6 +124,6 @@ int client_phone; - /** Device handle */ - devmap_handle_t devmap_handle; + /** Service ID */ + service_id_t service_id; /** Device/driver state */ Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -43,5 +43,5 @@ #include #include -#include +#include #include #include @@ -53,5 +53,5 @@ // FIXME: remove this header -#include +#include #define NAME "cuda_adb" @@ -147,5 +147,5 @@ int main(int argc, char *argv[]) { - devmap_handle_t devmap_handle; + service_id_t service_id; int rc; int i; @@ -155,29 +155,29 @@ for (i = 0; i < ADB_MAX_ADDR; ++i) { adb_dev[i].client_phone = -1; - adb_dev[i].devmap_handle = 0; - } - - rc = devmap_driver_register(NAME, cuda_connection); + adb_dev[i].service_id = 0; + } + + rc = loc_server_register(NAME, cuda_connection); if (rc < 0) { - printf(NAME ": Unable to register driver.\n"); + printf(NAME ": Unable to register server.\n"); return rc; } - rc = devmap_device_register("adb/kbd", &devmap_handle); + rc = loc_service_register("adb/kbd", &service_id); if (rc != EOK) { - printf(NAME ": Unable to register device %s.\n", "adb/kdb"); + printf(NAME ": Unable to register service %s.\n", "adb/kdb"); return rc; } - adb_dev[2].devmap_handle = devmap_handle; - adb_dev[8].devmap_handle = devmap_handle; - - rc = devmap_device_register("adb/mouse", &devmap_handle); + adb_dev[2].service_id = service_id; + adb_dev[8].service_id = service_id; + + rc = loc_service_register("adb/mouse", &service_id); if (rc != EOK) { - printf(NAME ": Unable to register device %s.\n", "adb/mouse"); + printf(NAME ": Unable to register servise %s.\n", "adb/mouse"); return rc; } - adb_dev[9].devmap_handle = devmap_handle; + adb_dev[9].service_id = service_id; if (cuda_init() < 0) { @@ -198,15 +198,15 @@ ipc_call_t call; sysarg_t method; - devmap_handle_t dh; + service_id_t dsid; int retval; int dev_addr, i; /* Get the device handle. */ - dh = IPC_GET_ARG1(*icall); + dsid = IPC_GET_ARG1(*icall); /* Determine which disk device is the client connecting to. */ dev_addr = -1; for (i = 0; i < ADB_MAX_ADDR; i++) { - if (adb_dev[i].devmap_handle == dh) + if (adb_dev[i].service_id == dsid) dev_addr = i; } @@ -242,5 +242,5 @@ */ for (i = 0; i < ADB_MAX_ADDR; ++i) { - if (adb_dev[i].devmap_handle == dh) { + if (adb_dev[i].service_id == dsid) { adb_dev[i].client_phone = IPC_GET_ARG5(call); } Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.h =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_adb.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hw/bus/cuda_adb/cuda_adb.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -38,5 +38,5 @@ #include -#include +#include #include @@ -104,5 +104,5 @@ typedef struct { - devmap_handle_t devmap_handle; + service_id_t service_id; int client_phone; } adb_dev_t; Index: uspace/srv/hw/char/i8042/i8042.c =================================================================== --- uspace/srv/hw/char/i8042/i8042.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hw/char/i8042/i8042.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -39,5 +39,5 @@ #include #include -#include +#include #include #include @@ -50,5 +50,5 @@ // FIXME: remove this header -#include +#include #define NAME "i8042" @@ -135,7 +135,7 @@ printf(NAME ": i8042 PS/2 port driver\n"); - rc = devmap_driver_register(NAME, i8042_connection); + rc = loc_server_register(NAME, i8042_connection); if (rc < 0) { - printf(NAME ": Unable to register driver.\n"); + printf(NAME ": Unable to register server.\n"); return rc; } @@ -148,5 +148,5 @@ snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]); - rc = devmap_device_register(name, &i8042_port[i].devmap_handle); + rc = loc_service_register(name, &i8042_port[i].service_id); if (rc != EOK) { printf(NAME ": Unable to register device %s.\n", name); @@ -221,5 +221,5 @@ ipc_call_t call; sysarg_t method; - devmap_handle_t dh; + service_id_t dsid; int retval; int dev_id, i; @@ -228,10 +228,10 @@ /* Get the device handle. */ - dh = IPC_GET_ARG1(*icall); + dsid = IPC_GET_ARG1(*icall); /* Determine which disk device is the client connecting to. */ dev_id = -1; for (i = 0; i < MAX_DEVS; i++) { - if (i8042_port[i].devmap_handle == dh) + if (i8042_port[i].service_id == dsid) dev_id = i; } Index: uspace/srv/hw/char/i8042/i8042.h =================================================================== --- uspace/srv/hw/char/i8042/i8042.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hw/char/i8042/i8042.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -52,5 +52,5 @@ /** Softstate structure, one for each serial port (primary and aux). */ typedef struct { - devmap_handle_t devmap_handle; + service_id_t service_id; int client_phone; } i8042_port_t; Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c =================================================================== --- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -39,5 +39,5 @@ #include #include -#include +#include #include #include @@ -52,5 +52,5 @@ // FIXME: remove this header -#include +#include #define NAME "s3c24ser" @@ -83,7 +83,7 @@ printf(NAME ": S3C24xx on-chip UART driver\n"); - rc = devmap_driver_register(NAME, s3c24xx_uart_connection); + rc = loc_server_register(NAME, s3c24xx_uart_connection); if (rc < 0) { - printf(NAME ": Unable to register driver.\n"); + printf(NAME ": Unable to register server.\n"); return -1; } @@ -96,5 +96,5 @@ return -1; - rc = devmap_device_register(NAMESPACE "/" NAME, &uart->devmap_handle); + rc = loc_service_register(NAMESPACE "/" NAME, &uart->service_id); if (rc != EOK) { printf(NAME ": Unable to register device %s.\n", Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h =================================================================== --- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -87,6 +87,6 @@ int client_phone; - /** Device handle */ - devmap_handle_t devmap_handle; + /** Service ID */ + service_id_t service_id; } s3c24xx_uart_t; Index: uspace/srv/hw/irc/apic/apic.c =================================================================== --- uspace/srv/hw/irc/apic/apic.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hw/irc/apic/apic.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -45,4 +45,5 @@ #include #include +#include #define NAME "apic" Index: uspace/srv/hw/irc/i8259/i8259.c =================================================================== --- uspace/srv/hw/irc/i8259/i8259.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hw/irc/i8259/i8259.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -50,5 +50,5 @@ #include #include -#include +#include #define NAME "i8259" Index: uspace/srv/hw/irc/obio/obio.c =================================================================== --- uspace/srv/hw/irc/obio/obio.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/hw/irc/obio/obio.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -55,5 +55,5 @@ #include #include -#include +#include #define NAME "obio" Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/loader/main.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -61,4 +61,5 @@ #include #include +#include #ifdef CONFIG_RTLD @@ -89,9 +90,5 @@ /** Number of preset files */ -static int filc = 0; -/** Preset files vector */ -static fdi_node_t **filv = NULL; -/** Buffer holding all preset files */ -static fdi_node_t *fil_buf = NULL; +static unsigned int filc = 0; static elf_info_t prog_info; @@ -239,45 +236,23 @@ static void ldr_set_files(ipc_callid_t rid, ipc_call_t *request) { - fdi_node_t *buf; - size_t buf_size; - int rc = async_data_write_accept((void **) &buf, false, 0, 0, - sizeof(fdi_node_t), &buf_size); - - if (rc == EOK) { - int count = buf_size / sizeof(fdi_node_t); - - /* - * Allocate new filv - */ - fdi_node_t **_filv = (fdi_node_t **) calloc(count + 1, sizeof(fdi_node_t *)); - if (_filv == NULL) { - free(buf); - async_answer_0(rid, ENOMEM); - return; + size_t count = IPC_GET_ARG1(*request); + + async_exch_t *vfs_exch = vfs_exchange_begin(); + + for (filc = 0; filc < count; filc++) { + ipc_callid_t callid; + int fd; + + if (!async_state_change_receive(&callid, NULL, NULL, NULL)) { + async_answer_0(callid, EINVAL); + break; } - - /* - * Fill the new filv with argument pointers - */ - int i; - for (i = 0; i < count; i++) - _filv[i] = &buf[i]; - - _filv[count] = NULL; - - /* - * Copy temporary data to global variables - */ - if (fil_buf != NULL) - free(fil_buf); - - if (filv != NULL) - free(filv); - - filc = count; - fil_buf = buf; - filv = _filv; - } - + async_state_change_finalize(callid, vfs_exch); + fd = fd_wait(); + assert(fd == (int) filc); + } + + vfs_exchange_end(vfs_exch); + async_answer_0(rid, EOK); } @@ -308,5 +283,4 @@ pcb.filc = filc; - pcb.filv = filv; if (prog_info.interp == NULL) { Index: uspace/srv/loc/Makefile =================================================================== --- uspace/srv/loc/Makefile (revision eb660787259c7eab2dd7649bebbe0990cb008eab) +++ uspace/srv/loc/Makefile (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -0,0 +1,38 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +BINARY = loc +STATIC_NEEDED = y + +SOURCES = \ + category.c \ + loc.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/loc/category.c =================================================================== --- uspace/srv/loc/category.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) +++ uspace/srv/loc/category.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -0,0 +1,213 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup loc + * @{ + */ +/** @file Categories for location service. + */ + +#include +#include +#include +#include +#include + +#include "category.h" +#include "loc.h" + +/** Initialize category directory. */ +void categ_dir_init(categ_dir_t *cdir) +{ + fibril_mutex_initialize(&cdir->mutex); + list_initialize(&cdir->categories); +} + +/** Add new category to directory. */ +void categ_dir_add_cat(categ_dir_t *cdir, category_t *cat) +{ + list_append(&cat->cat_list, &cdir->categories); +} + +/** Get list of categories. */ +int categ_dir_get_categories(categ_dir_t *cdir, category_id_t *id_buf, + size_t buf_size, size_t *act_size) +{ + size_t act_cnt; + size_t buf_cnt; + + assert(fibril_mutex_is_locked(&cdir->mutex)); + + buf_cnt = buf_size / sizeof(category_id_t); + + act_cnt = list_count(&cdir->categories); + *act_size = act_cnt * sizeof(category_id_t); + + if (buf_size % sizeof(category_id_t) != 0) + return EINVAL; + + size_t pos = 0; + list_foreach(cdir->categories, item) { + category_t *cat = + list_get_instance(item, category_t, cat_list); + + if (pos < buf_cnt) + id_buf[pos] = cat->id; + pos++; + } + + return EOK; +} + + +/** Initialize category structure. */ +static void category_init(category_t *cat, const char *name) +{ + fibril_mutex_initialize(&cat->mutex); + cat->name = str_dup(name); + cat->id = loc_create_id(); + link_initialize(&cat->cat_list); + list_initialize(&cat->svc_memb); +} + +/** Allocate new category. */ +category_t *category_new(const char *name) +{ + category_t *cat; + + cat = malloc(sizeof(category_t)); + if (cat == NULL) + return NULL; + + category_init(cat, name); + return cat; +} + +/** Add service to category. */ +int category_add_service(category_t *cat, loc_service_t *svc) +{ + assert(fibril_mutex_is_locked(&cat->mutex)); + assert(fibril_mutex_is_locked(&services_list_mutex)); + + /* Verify that category does not contain this service yet. */ + list_foreach(cat->svc_memb, item) { + svc_categ_t *memb = list_get_instance(item, svc_categ_t, + cat_link); + if (memb->svc == svc) { + return EEXIST; + } + } + + svc_categ_t *nmemb = malloc(sizeof(svc_categ_t)); + if (nmemb == NULL) + return ENOMEM; + + nmemb->svc = svc; + nmemb->cat = cat; + + list_append(&nmemb->cat_link, &cat->svc_memb); + list_append(&nmemb->svc_link, &svc->cat_memb); + + return EOK; +} + +/** Remove service from category. */ +void category_remove_service(svc_categ_t *memb) +{ + assert(fibril_mutex_is_locked(&memb->cat->mutex)); + assert(fibril_mutex_is_locked(&services_list_mutex)); + + list_remove(&memb->cat_link); + list_remove(&memb->svc_link); + + free(memb); +} + +/** Get category by ID. */ +category_t *category_get(categ_dir_t *cdir, catid_t catid) +{ + assert(fibril_mutex_is_locked(&cdir->mutex)); + + list_foreach(cdir->categories, item) { + category_t *cat = list_get_instance(item, category_t, + cat_list); + if (cat->id == catid) + return cat; + } + + return NULL; +} + +/** Find category by name. */ +category_t *category_find_by_name(categ_dir_t *cdir, const char *name) +{ + assert(fibril_mutex_is_locked(&cdir->mutex)); + + list_foreach(cdir->categories, item) { + category_t *cat = list_get_instance(item, category_t, + cat_list); + if (str_cmp(cat->name, name) == 0) + return cat; + } + + return NULL; +} + +/** Get list of services in category. */ +int category_get_services(category_t *cat, service_id_t *id_buf, + size_t buf_size, size_t *act_size) +{ + size_t act_cnt; + size_t buf_cnt; + + assert(fibril_mutex_is_locked(&cat->mutex)); + + buf_cnt = buf_size / sizeof(service_id_t); + + act_cnt = list_count(&cat->svc_memb); + *act_size = act_cnt * sizeof(service_id_t); + + if (buf_size % sizeof(service_id_t) != 0) + return EINVAL; + + size_t pos = 0; + list_foreach(cat->svc_memb, item) { + svc_categ_t *memb = + list_get_instance(item, svc_categ_t, cat_link); + + if (pos < buf_cnt) + id_buf[pos] = memb->svc->id; + pos++; + } + + return EOK; +} + +/** + * @} + */ Index: uspace/srv/loc/category.h =================================================================== --- uspace/srv/loc/category.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) +++ uspace/srv/loc/category.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup loc + * @{ + */ +/** @file Categories for location service. + */ + +#ifndef CATEGORY_H_ +#define CATEGORY_H_ + +#include +#include "loc.h" + +typedef sysarg_t catid_t; + +/** Service category */ +typedef struct { + /** Protects this structure, list of services */ + fibril_mutex_t mutex; + + /** Identifier */ + catid_t id; + + /** Category name */ + const char *name; + + /** Link to list of categories (categ_dir_t.categories) */ + link_t cat_list; + + /** List of service memberships in this category (svc_categ_t) */ + list_t svc_memb; +} category_t; + +/** Service directory ogranized by categories (yellow pages) */ +typedef struct { + /** Protects this structure, list of categories */ + fibril_mutex_t mutex; + /** List of all categories (category_t) */ + list_t categories; +} categ_dir_t; + +/** Service in category membership. */ +typedef struct { + /** Link to category_t.svc_memb list */ + link_t cat_link; + /** Link to loc_service_t.cat_memb list */ + link_t svc_link; + + /** Category */ + category_t *cat; + /** Service */ + loc_service_t *svc; +} svc_categ_t; + +extern void categ_dir_init(categ_dir_t *); +extern void categ_dir_add_cat(categ_dir_t *, category_t *); +extern int categ_dir_get_categories(categ_dir_t *, service_id_t *, size_t, + size_t *); +extern category_t *category_new(const char *); +extern int category_add_service(category_t *, loc_service_t *); +extern void category_remove_service(svc_categ_t *); +extern category_t *category_get(categ_dir_t *, catid_t); +extern category_t *category_find_by_name(categ_dir_t *, const char *); +extern int category_get_services(category_t *, service_id_t *, size_t, + size_t *); + + +#endif + +/** @} + */ Index: uspace/srv/loc/loc.c =================================================================== --- uspace/srv/loc/loc.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) +++ uspace/srv/loc/loc.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -0,0 +1,1457 @@ +/* + * Copyright (c) 2007 Josef Cejka + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @defgroup loc Location Service. + * @brief HelenOS location service. + * @{ + */ + +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "category.h" +#include "loc.h" + +#define NAME "loc" +#define NULL_SERVICES 256 + +LIST_INITIALIZE(services_list); +LIST_INITIALIZE(namespaces_list); +LIST_INITIALIZE(servers_list); + +/* Locking order: + * servers_list_mutex + * services_list_mutex + * (loc_server_t *)->services_mutex + * create_id_mutex + **/ + +FIBRIL_MUTEX_INITIALIZE(services_list_mutex); +static FIBRIL_CONDVAR_INITIALIZE(services_list_cv); +static FIBRIL_MUTEX_INITIALIZE(servers_list_mutex); +static FIBRIL_MUTEX_INITIALIZE(create_id_mutex); +static FIBRIL_MUTEX_INITIALIZE(null_services_mutex); + +static service_id_t last_id = 0; +static loc_service_t *null_services[NULL_SERVICES]; + +/* + * Dummy list for null services. This is necessary so that null services can + * be used just as any other services, e.g. in loc_service_unregister_core(). + */ +static LIST_INITIALIZE(dummy_null_services); + +/** Service directory ogranized by categories (yellow pages) */ +static categ_dir_t cdir; + +static FIBRIL_MUTEX_INITIALIZE(callback_sess_mutex); +static async_sess_t *callback_sess = NULL; + +service_id_t loc_create_id(void) +{ + /* TODO: allow reusing old ids after their unregistration + * 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; +} + +/** Convert fully qualified service name to namespace and service name. + * + * A fully qualified service name can be either a plain service name + * (then the namespace is considered to be an empty string) or consist + * of two components separated by a slash. No more than one slash + * is allowed. + * + */ +static bool loc_fqsn_split(const char *fqsn, char **ns_name, char **name) +{ + size_t cnt = 0; + 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 == '/') { + cnt++; + slash_offset = offset_prev; + slash_after = offset; + } + offset_prev = offset; + } + + /* More than one slash */ + if (cnt > 1) + return false; + + /* No slash -> namespace is empty */ + if (cnt == 0) { + *ns_name = str_dup(""); + if (*ns_name == NULL) + return false; + + *name = str_dup(fqsn); + if (*name == NULL) { + free(*ns_name); + return false; + } + + if (str_cmp(*name, "") == 0) { + free(*name); + free(*ns_name); + 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) { + free(*ns_name); + return false; + } + + if (str_cmp(*name, "") == 0) { + free(*name); + free(*ns_name); + return false; + } + + return true; +} + +/** Find namespace with given name. */ +static loc_namespace_t *loc_namespace_find_name(const char *name) +{ + assert(fibril_mutex_is_locked(&services_list_mutex)); + + list_foreach(namespaces_list, item) { + loc_namespace_t *namespace = + list_get_instance(item, loc_namespace_t, namespaces); + if (str_cmp(namespace->name, name) == 0) + return namespace; + } + + return NULL; +} + +/** Find namespace with given ID. + * + * @todo: use hash table + * + */ +static loc_namespace_t *loc_namespace_find_id(service_id_t id) +{ + assert(fibril_mutex_is_locked(&services_list_mutex)); + + list_foreach(namespaces_list, item) { + loc_namespace_t *namespace = + list_get_instance(item, loc_namespace_t, namespaces); + if (namespace->id == id) + return namespace; + } + + return NULL; +} + +/** Find service with given name. */ +static loc_service_t *loc_service_find_name(const char *ns_name, + const char *name) +{ + assert(fibril_mutex_is_locked(&services_list_mutex)); + + list_foreach(services_list, item) { + loc_service_t *service = + list_get_instance(item, loc_service_t, services); + if ((str_cmp(service->namespace->name, ns_name) == 0) + && (str_cmp(service->name, name) == 0)) + return service; + } + + return NULL; +} + +/** Find service with given ID. + * + * @todo: use hash table + * + */ +static loc_service_t *loc_service_find_id(service_id_t id) +{ + assert(fibril_mutex_is_locked(&services_list_mutex)); + + list_foreach(services_list, item) { + loc_service_t *service = + list_get_instance(item, loc_service_t, services); + if (service->id == id) + return service; + } + + return NULL; +} + +/** Create a namespace (if not already present). */ +static loc_namespace_t *loc_namespace_create(const char *ns_name) +{ + 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) { + free(namespace); + 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; +} + +/** Destroy a namespace (if it is no longer needed). */ +static void loc_namespace_destroy(loc_namespace_t *namespace) +{ + assert(fibril_mutex_is_locked(&services_list_mutex)); + + if (namespace->refcnt == 0) { + list_remove(&(namespace->namespaces)); + + free(namespace->name); + free(namespace); + } +} + +/** Increase namespace reference count by including service. */ +static void loc_namespace_addref(loc_namespace_t *namespace, + loc_service_t *service) +{ + assert(fibril_mutex_is_locked(&services_list_mutex)); + + service->namespace = namespace; + namespace->refcnt++; +} + +/** Decrease namespace reference count. */ +static void loc_namespace_delref(loc_namespace_t *namespace) +{ + assert(fibril_mutex_is_locked(&services_list_mutex)); + + namespace->refcnt--; + loc_namespace_destroy(namespace); +} + +/** Unregister service and free it. */ +static void loc_service_unregister_core(loc_service_t *service) +{ + 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)) { + link_t *link = list_first(&service->cat_memb); + svc_categ_t *memb = list_get_instance(link, svc_categ_t, + svc_link); + fibril_mutex_lock(&memb->cat->mutex); + category_remove_service(memb); + fibril_mutex_unlock(&memb->cat->mutex); + } + + free(service->name); + free(service); +} + +/** + * Read info about new server and add it into linked list of registered + * servers. + */ +static loc_server_t *loc_server_register(void) +{ + 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)); + if (server == NULL) { + async_answer_0(iid, ENOMEM); + return NULL; + } + + /* + * Get server name + */ + int rc = async_data_write_accept((void **) &server->name, true, 0, + LOC_NAME_MAXLEN, 0, NULL); + if (rc != EOK) { + free(server); + async_answer_0(iid, rc); + return NULL; + } + + /* + * Create connection to the server + */ + server->sess = async_callback_receive(EXCHANGE_SERIALIZE); + if (!server->sess) { + free(server->name); + free(server); + async_answer_0(iid, ENOTSUP); + return NULL; + } + + /* + * Initialize mutex for list of services + * supplied by this server + */ + fibril_mutex_initialize(&server->services_mutex); + + /* + * Initialize list of supplied services + */ + 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 + */ + list_append(&(server->servers), &servers_list); + fibril_mutex_unlock(&servers_list_mutex); + + async_answer_0(iid, EOK); + + return server; +} + +/** + * Unregister server, unregister all its services and free server + * structure. + * + */ +static int loc_server_unregister(loc_server_t *server) +{ + if (server == NULL) + return EEXISTS; + + 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( + list_first(&server->services), loc_service_t, + server_services); + 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); + + return EOK; +} + +/** Register service + * + */ +static void loc_service_register(ipc_callid_t iid, ipc_call_t *icall, + loc_server_t *server) +{ + if (server == NULL) { + async_answer_0(iid, EREFUSED); + return; + } + + /* Create new service entry */ + loc_service_t *service = + (loc_service_t *) malloc(sizeof(loc_service_t)); + if (service == NULL) { + async_answer_0(iid, ENOMEM); + return; + } + + /* Set the interface, if any. */ + service->forward_interface = IPC_GET_ARG1(*icall); + + /* Get fqsn */ + char *fqsn; + int rc = async_data_write_accept((void **) &fqsn, true, 0, + LOC_NAME_MAXLEN, 0, NULL); + if (rc != EOK) { + free(service); + async_answer_0(iid, rc); + return; + } + + char *ns_name; + if (!loc_fqsn_split(fqsn, &ns_name, &service->name)) { + free(fqsn); + free(service); + async_answer_0(iid, EINVAL); + return; + } + + free(fqsn); + + fibril_mutex_lock(&services_list_mutex); + + loc_namespace_t *namespace = loc_namespace_create(ns_name); + free(ns_name); + if (namespace == NULL) { + fibril_mutex_unlock(&services_list_mutex); + free(service->name); + free(service); + async_answer_0(iid, ENOMEM); + 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) { + printf("%s: Service '%s/%s' already registered\n", NAME, + namespace->name, service->name); + loc_namespace_destroy(namespace); + fibril_mutex_unlock(&services_list_mutex); + free(service->name); + free(service); + async_answer_0(iid, EEXISTS); + return; + } + + /* Get unique service ID */ + service->id = loc_create_id(); + + 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); +} + +/** + * + */ +static void loc_service_unregister(ipc_callid_t iid, ipc_call_t *icall, + loc_server_t *server) +{ + loc_service_t *svc; + + fibril_mutex_lock(&services_list_mutex); + svc = loc_service_find_id(IPC_GET_ARG1(*icall)); + if (svc == NULL) { + fibril_mutex_unlock(&services_list_mutex); + async_answer_0(iid, ENOENT); + return; + } + + fibril_mutex_lock(&cdir.mutex); + loc_service_unregister_core(svc); + fibril_mutex_unlock(&cdir.mutex); + fibril_mutex_unlock(&services_list_mutex); + async_answer_0(iid, EOK); +} + +static void loc_category_get_name(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + size_t size; + size_t act_size; + category_t *cat; + + if (!async_data_read_receive(&callid, &size)) { + async_answer_0(callid, EREFUSED); + async_answer_0(iid, EREFUSED); + return; + } + + fibril_mutex_lock(&cdir.mutex); + + cat = category_get(&cdir, IPC_GET_ARG1(*icall)); + if (cat == NULL) { + fibril_mutex_unlock(&cdir.mutex); + async_answer_0(callid, ENOENT); + async_answer_0(iid, ENOENT); + return; + } + + act_size = str_size(cat->name); + if (act_size > size) { + fibril_mutex_unlock(&cdir.mutex); + async_answer_0(callid, EOVERFLOW); + async_answer_0(iid, EOVERFLOW); + return; + } + + sysarg_t retval = async_data_read_finalize(callid, cat->name, + min(size, act_size)); + + fibril_mutex_unlock(&cdir.mutex); + + async_answer_0(iid, retval); +} + +static void loc_service_get_name(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + size_t size; + size_t act_size; + loc_service_t *svc; + + if (!async_data_read_receive(&callid, &size)) { + async_answer_0(callid, EREFUSED); + async_answer_0(iid, EREFUSED); + return; + } + + fibril_mutex_lock(&services_list_mutex); + + svc = loc_service_find_id(IPC_GET_ARG1(*icall)); + if (svc == NULL) { + fibril_mutex_unlock(&services_list_mutex); + async_answer_0(callid, ENOENT); + async_answer_0(iid, ENOENT); + return; + } + + act_size = str_size(svc->name); + if (act_size > size) { + fibril_mutex_unlock(&services_list_mutex); + async_answer_0(callid, EOVERFLOW); + async_answer_0(iid, EOVERFLOW); + return; + } + + sysarg_t retval = async_data_read_finalize(callid, svc->name, + min(size, act_size)); + + fibril_mutex_unlock(&services_list_mutex); + + async_answer_0(iid, retval); +} + +/** Connect client to the service. + * + * Find server supplying requested service and forward + * the message to it. + * + */ +static void loc_forward(ipc_callid_t callid, ipc_call_t *call) +{ + fibril_mutex_lock(&services_list_mutex); + + /* + * Get ID from request + */ + 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); + async_answer_0(callid, ENOENT); + return; + } + + async_exch_t *exch = async_exchange_begin(svc->server->sess); + + if (svc->forward_interface == 0) + async_forward_fast(callid, exch, svc->id, 0, 0, IPC_FF_NONE); + else + async_forward_fast(callid, exch, svc->forward_interface, + svc->id, 0, IPC_FF_NONE); + + async_exchange_end(exch); + + fibril_mutex_unlock(&services_list_mutex); +} + +/** Find ID for service identified by name. + * + * In answer will be send EOK and service ID in arg1 or a error + * code from errno.h. + * + */ +static void loc_service_get_id(ipc_callid_t iid, ipc_call_t *icall) +{ + char *fqsn; + + /* Get fqsn */ + int rc = async_data_write_accept((void **) &fqsn, true, 0, + LOC_NAME_MAXLEN, 0, NULL); + if (rc != EOK) { + async_answer_0(iid, rc); + return; + } + + char *ns_name; + char *name; + if (!loc_fqsn_split(fqsn, &ns_name, &name)) { + free(fqsn); + async_answer_0(iid, EINVAL); + 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. + */ + if (svc == NULL) { + if (IPC_GET_ARG1(*icall) & IPC_FLAG_BLOCKING) { + /* Blocking lookup */ + fibril_condvar_wait(&services_list_cv, + &services_list_mutex); + goto recheck; + } + + async_answer_0(iid, ENOENT); + free(ns_name); + free(name); + fibril_mutex_unlock(&services_list_mutex); + return; + } + + async_answer_1(iid, EOK, svc->id); + + fibril_mutex_unlock(&services_list_mutex); + free(ns_name); + free(name); +} + +/** Find ID for namespace identified by name. + * + * In answer will be send EOK and service ID in arg1 or a error + * code from errno.h. + * + */ +static void loc_namespace_get_id(ipc_callid_t iid, ipc_call_t *icall) +{ + char *name; + + /* Get service name */ + int rc = async_data_write_accept((void **) &name, true, 0, + LOC_NAME_MAXLEN, 0, NULL); + if (rc != EOK) { + async_answer_0(iid, rc); + 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. + */ + if (namespace == NULL) { + if (IPC_GET_ARG1(*icall) & IPC_FLAG_BLOCKING) { + /* Blocking lookup */ + fibril_condvar_wait(&services_list_cv, + &services_list_mutex); + goto recheck; + } + + async_answer_0(iid, ENOENT); + free(name); + fibril_mutex_unlock(&services_list_mutex); + return; + } + + async_answer_1(iid, EOK, namespace->id); + + fibril_mutex_unlock(&services_list_mutex); + free(name); +} + +/** Find ID for category specified by name. + * + * On success, answer will contain EOK int retval and service ID in arg1. + * On failure, error code will be sent in retval. + * + */ +static void loc_callback_create(ipc_callid_t iid, ipc_call_t *icall) +{ + async_sess_t *cb_sess = async_callback_receive(EXCHANGE_SERIALIZE); + if (cb_sess == NULL) { + async_answer_0(iid, ENOMEM); + return; + } + + fibril_mutex_lock(&callback_sess_mutex); + if (callback_sess != NULL) { + fibril_mutex_unlock(&callback_sess_mutex); + async_answer_0(iid, EEXIST); + return; + } + + callback_sess = cb_sess; + fibril_mutex_unlock(&callback_sess_mutex); + + async_answer_0(iid, EOK); +} + +void loc_category_change_event(void) +{ + fibril_mutex_lock(&callback_sess_mutex); + + if (callback_sess != NULL) { + async_exch_t *exch = async_exchange_begin(callback_sess); + async_msg_0(exch, LOC_EVENT_CAT_CHANGE); + async_exchange_end(exch); + } + + fibril_mutex_unlock(&callback_sess_mutex); +} + +/** Find ID for category specified by name. + * + * On success, answer will contain EOK int retval and service ID in arg1. + * On failure, error code will be sent in retval. + * + */ +static void loc_category_get_id(ipc_callid_t iid, ipc_call_t *icall) +{ + char *name; + category_t *cat; + + /* Get service name */ + int rc = async_data_write_accept((void **) &name, true, 0, + LOC_NAME_MAXLEN, 0, NULL); + if (rc != EOK) { + async_answer_0(iid, rc); + return; + } + + fibril_mutex_lock(&cdir.mutex); + + cat = category_find_by_name(&cdir, name); + if (cat == NULL) { + /* Category not found */ + async_answer_0(iid, ENOENT); + goto cleanup; + } + + async_answer_1(iid, EOK, cat->id); +cleanup: + fibril_mutex_unlock(&cdir.mutex); + free(name); +} + +static void loc_id_probe(ipc_callid_t iid, ipc_call_t *icall) +{ + fibril_mutex_lock(&services_list_mutex); + + loc_namespace_t *namespace = + loc_namespace_find_id(IPC_GET_ARG1(*icall)); + if (namespace == NULL) { + loc_service_t *svc = + loc_service_find_id(IPC_GET_ARG1(*icall)); + if (svc == NULL) + async_answer_1(iid, EOK, LOC_OBJECT_NONE); + else + async_answer_1(iid, EOK, LOC_OBJECT_SERVICE); + } else + async_answer_1(iid, EOK, LOC_OBJECT_NAMESPACE); + + fibril_mutex_unlock(&services_list_mutex); +} + +static void loc_get_namespace_count(ipc_callid_t iid, ipc_call_t *icall) +{ + fibril_mutex_lock(&services_list_mutex); + async_answer_1(iid, EOK, list_count(&namespaces_list)); + fibril_mutex_unlock(&services_list_mutex); +} + +static void loc_get_service_count(ipc_callid_t iid, ipc_call_t *icall) +{ + fibril_mutex_lock(&services_list_mutex); + + loc_namespace_t *namespace = + loc_namespace_find_id(IPC_GET_ARG1(*icall)); + if (namespace == NULL) + async_answer_0(iid, EEXISTS); + else + async_answer_1(iid, EOK, namespace->refcnt); + + fibril_mutex_unlock(&services_list_mutex); +} + +static void loc_get_categories(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + size_t size; + size_t act_size; + int rc; + + if (!async_data_read_receive(&callid, &size)) { + async_answer_0(callid, EREFUSED); + async_answer_0(iid, EREFUSED); + return; + } + + category_id_t *id_buf = (category_id_t *) malloc(size); + if (id_buf == NULL) { + fibril_mutex_unlock(&cdir.mutex); + async_answer_0(callid, ENOMEM); + async_answer_0(iid, ENOMEM); + return; + } + + fibril_mutex_lock(&cdir.mutex); + + rc = categ_dir_get_categories(&cdir, id_buf, size, &act_size); + if (rc != EOK) { + fibril_mutex_unlock(&cdir.mutex); + async_answer_0(callid, rc); + async_answer_0(iid, rc); + return; + } + + fibril_mutex_unlock(&cdir.mutex); + + sysarg_t retval = async_data_read_finalize(callid, id_buf, size); + free(id_buf); + + async_answer_1(iid, retval, act_size); +} + +static void loc_get_namespaces(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + size_t size; + if (!async_data_read_receive(&callid, &size)) { + async_answer_0(callid, EREFUSED); + async_answer_0(iid, EREFUSED); + return; + } + + if ((size % sizeof(loc_sdesc_t)) != 0) { + async_answer_0(callid, EINVAL); + async_answer_0(iid, EINVAL); + return; + } + + fibril_mutex_lock(&services_list_mutex); + + size_t count = size / sizeof(loc_sdesc_t); + if (count != list_count(&namespaces_list)) { + fibril_mutex_unlock(&services_list_mutex); + async_answer_0(callid, EOVERFLOW); + async_answer_0(iid, EOVERFLOW); + return; + } + + loc_sdesc_t *desc = (loc_sdesc_t *) malloc(size); + if (desc == NULL) { + fibril_mutex_unlock(&services_list_mutex); + async_answer_0(callid, ENOMEM); + async_answer_0(iid, ENOMEM); + return; + } + + size_t pos = 0; + list_foreach(namespaces_list, item) { + loc_namespace_t *namespace = + list_get_instance(item, loc_namespace_t, namespaces); + + desc[pos].id = namespace->id; + str_cpy(desc[pos].name, LOC_NAME_MAXLEN, namespace->name); + pos++; + } + + sysarg_t retval = async_data_read_finalize(callid, desc, size); + + free(desc); + fibril_mutex_unlock(&services_list_mutex); + + async_answer_0(iid, retval); +} + +static void loc_get_services(ipc_callid_t iid, ipc_call_t *icall) +{ + /* FIXME: Use faster algorithm which can make better use + of namespaces */ + + ipc_callid_t callid; + size_t size; + if (!async_data_read_receive(&callid, &size)) { + async_answer_0(callid, EREFUSED); + async_answer_0(iid, EREFUSED); + return; + } + + if ((size % sizeof(loc_sdesc_t)) != 0) { + async_answer_0(callid, EINVAL); + async_answer_0(iid, EINVAL); + return; + } + + fibril_mutex_lock(&services_list_mutex); + + loc_namespace_t *namespace = + loc_namespace_find_id(IPC_GET_ARG1(*icall)); + if (namespace == NULL) { + fibril_mutex_unlock(&services_list_mutex); + async_answer_0(callid, ENOENT); + async_answer_0(iid, ENOENT); + return; + } + + size_t count = size / sizeof(loc_sdesc_t); + if (count != namespace->refcnt) { + fibril_mutex_unlock(&services_list_mutex); + async_answer_0(callid, EOVERFLOW); + async_answer_0(iid, EOVERFLOW); + return; + } + + loc_sdesc_t *desc = (loc_sdesc_t *) malloc(size); + if (desc == NULL) { + fibril_mutex_unlock(&services_list_mutex); + async_answer_0(callid, ENOMEM); + async_answer_0(iid, EREFUSED); + return; + } + + size_t pos = 0; + list_foreach(services_list, item) { + loc_service_t *service = + list_get_instance(item, loc_service_t, services); + + if (service->namespace == namespace) { + desc[pos].id = service->id; + str_cpy(desc[pos].name, LOC_NAME_MAXLEN, service->name); + pos++; + } + } + + sysarg_t retval = async_data_read_finalize(callid, desc, size); + + free(desc); + fibril_mutex_unlock(&services_list_mutex); + + async_answer_0(iid, retval); +} + +static void loc_category_get_svcs(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + size_t size; + size_t act_size; + int rc; + + if (!async_data_read_receive(&callid, &size)) { + async_answer_0(callid, EREFUSED); + async_answer_0(iid, EREFUSED); + return; + } + + fibril_mutex_lock(&cdir.mutex); + + category_t *cat = category_get(&cdir, IPC_GET_ARG1(*icall)); + if (cat == NULL) { + fibril_mutex_unlock(&cdir.mutex); + async_answer_0(callid, ENOENT); + async_answer_0(iid, ENOENT); + return; + } + + category_id_t *id_buf = (category_id_t *) malloc(size); + if (id_buf == NULL) { + fibril_mutex_unlock(&cdir.mutex); + async_answer_0(callid, ENOMEM); + async_answer_0(iid, ENOMEM); + return; + } + + fibril_mutex_lock(&cat->mutex); + + rc = category_get_services(cat, id_buf, size, &act_size); + if (rc != EOK) { + fibril_mutex_unlock(&cat->mutex); + fibril_mutex_unlock(&cdir.mutex); + async_answer_0(callid, rc); + async_answer_0(iid, rc); + return; + } + + fibril_mutex_unlock(&cat->mutex); + fibril_mutex_unlock(&cdir.mutex); + + sysarg_t retval = async_data_read_finalize(callid, id_buf, size); + free(id_buf); + + async_answer_1(iid, retval, act_size); +} + + +static void loc_null_create(ipc_callid_t iid, ipc_call_t *icall) +{ + fibril_mutex_lock(&null_services_mutex); + + unsigned int i; + bool fnd = false; + + for (i = 0; i < NULL_SERVICES; i++) { + if (null_services[i] == NULL) { + fnd = true; + break; + } + } + + if (!fnd) { + fibril_mutex_unlock(&null_services_mutex); + async_answer_0(iid, ENOMEM); + return; + } + + char null[LOC_NAME_MAXLEN]; + snprintf(null, LOC_NAME_MAXLEN, "%u", i); + + char *dev_name = str_dup(null); + if (dev_name == NULL) { + fibril_mutex_unlock(&null_services_mutex); + async_answer_0(iid, ENOMEM); + return; + } + + loc_service_t *service = + (loc_service_t *) malloc(sizeof(loc_service_t)); + if (service == NULL) { + fibril_mutex_unlock(&null_services_mutex); + async_answer_0(iid, ENOMEM); + return; + } + + fibril_mutex_lock(&services_list_mutex); + + loc_namespace_t *namespace = loc_namespace_create("null"); + if (namespace == NULL) { + fibril_mutex_lock(&services_list_mutex); + fibril_mutex_unlock(&null_services_mutex); + async_answer_0(iid, ENOMEM); + return; + } + + link_initialize(&service->services); + link_initialize(&service->server_services); + + /* 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. + * Insert service into a dummy list of null server's services so that it + * can be safely removed later. + */ + list_append(&service->services, &services_list); + 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); +} + +static void loc_null_destroy(ipc_callid_t iid, ipc_call_t *icall) +{ + sysarg_t i = IPC_GET_ARG1(*icall); + if (i >= NULL_SERVICES) { + async_answer_0(iid, ELIMIT); + return; + } + + fibril_mutex_lock(&null_services_mutex); + + if (null_services[i] == NULL) { + fibril_mutex_unlock(&null_services_mutex); + async_answer_0(iid, ENOENT); + return; + } + + fibril_mutex_lock(&services_list_mutex); + fibril_mutex_lock(&cdir.mutex); + loc_service_unregister_core(null_services[i]); + 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); +} + +static void loc_service_add_to_cat(ipc_callid_t iid, ipc_call_t *icall) +{ + category_t *cat; + loc_service_t *svc; + catid_t cat_id; + service_id_t svc_id; + sysarg_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); + + fibril_mutex_lock(&cat->mutex); + retval = category_add_service(cat, svc); + + fibril_mutex_unlock(&cat->mutex); + fibril_mutex_unlock(&cdir.mutex); + fibril_mutex_unlock(&services_list_mutex); + + async_answer_0(iid, retval); + + loc_category_change_event(); +} + + +/** Initialize location service. + * + * + */ +static bool loc_init(void) +{ + unsigned int i; + category_t *cat; + + for (i = 0; i < NULL_SERVICES; i++) + null_services[i] = NULL; + + categ_dir_init(&cdir); + + cat = category_new("bd"); + categ_dir_add_cat(&cdir, cat); + + cat = category_new("keyboard"); + categ_dir_add_cat(&cdir, cat); + + cat = category_new("mouse"); + categ_dir_add_cat(&cdir, cat); + + cat = category_new("serial"); + categ_dir_add_cat(&cdir, cat); + + cat = category_new("usbhc"); + categ_dir_add_cat(&cdir, cat); + + cat = category_new("virtual"); + categ_dir_add_cat(&cdir, cat); + + return true; +} + +/** Handle connection on supplier port. + * + */ +static void loc_connection_supplier(ipc_callid_t iid, ipc_call_t *icall) +{ + /* 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: + if (server == NULL) + async_answer_0(callid, ENOENT); + else + async_answer_0(callid, EOK); + break; + case LOC_SERVICE_ADD_TO_CAT: + /* Add service to category */ + loc_service_add_to_cat(callid, &call); + break; + case LOC_SERVICE_REGISTER: + /* Register one service */ + loc_service_register(callid, &call, server); + break; + case LOC_SERVICE_UNREGISTER: + /* Remove one service */ + loc_service_unregister(callid, &call, server); + break; + case LOC_SERVICE_GET_ID: + loc_service_get_id(callid, &call); + break; + case LOC_NAMESPACE_GET_ID: + loc_namespace_get_id(callid, &call); + break; + default: + async_answer_0(callid, ENOENT); + } + } + + if (server != NULL) { + /* + * Unregister the server and all its services. + */ + loc_server_unregister(server); + server = NULL; + } +} + +/** Handle connection on consumer port. + * + */ +static void loc_connection_consumer(ipc_callid_t iid, ipc_call_t *icall) +{ + /* 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: + loc_service_get_id(callid, &call); + break; + case LOC_SERVICE_GET_NAME: + loc_service_get_name(callid, &call); + break; + case LOC_NAMESPACE_GET_ID: + loc_namespace_get_id(callid, &call); + break; + case LOC_CALLBACK_CREATE: + loc_callback_create(callid, &call); + break; + case LOC_CATEGORY_GET_ID: + loc_category_get_id(callid, &call); + break; + case LOC_CATEGORY_GET_NAME: + loc_category_get_name(callid, &call); + break; + case LOC_CATEGORY_GET_SVCS: + loc_category_get_svcs(callid, &call); + break; + case LOC_ID_PROBE: + loc_id_probe(callid, &call); + break; + case LOC_NULL_CREATE: + loc_null_create(callid, &call); + break; + case LOC_NULL_DESTROY: + loc_null_destroy(callid, &call); + break; + case LOC_GET_NAMESPACE_COUNT: + loc_get_namespace_count(callid, &call); + break; + case LOC_GET_SERVICE_COUNT: + loc_get_service_count(callid, &call); + break; + case LOC_GET_CATEGORIES: + loc_get_categories(callid, &call); + break; + case LOC_GET_NAMESPACES: + loc_get_namespaces(callid, &call); + break; + case LOC_GET_SERVICES: + loc_get_services(callid, &call); + break; + default: + async_answer_0(callid, ENOENT); + } + } +} + +/** Function for handling connections to location service + * + */ +static void loc_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + /* Select interface */ + switch ((sysarg_t) (IPC_GET_ARG1(*icall))) { + case LOC_PORT_SUPPLIER: + loc_connection_supplier(iid, icall); + break; + case LOC_PORT_CONSUMER: + loc_connection_consumer(iid, icall); + break; + case LOC_CONNECT_TO_SERVICE: + /* Connect client to selected service */ + loc_forward(iid, icall); + break; + default: + /* No such interface */ + async_answer_0(iid, ENOENT); + } +} + +/** + * + */ +int main(int argc, char *argv[]) +{ + printf("%s: HelenOS Location Service\n", NAME); + + if (!loc_init()) { + printf("%s: Error while initializing service\n", NAME); + return -1; + } + + /* Set a handler of incomming connections */ + async_set_client_connection(loc_connection); + + /* Register location service at naming service */ + if (service_register(SERVICE_LOC) != EOK) + return -1; + + printf("%s: Accepting connections\n", NAME); + async_manager(); + + /* Never reached */ + return 0; +} + +/** + * @} + */ Index: uspace/srv/loc/loc.h =================================================================== --- uspace/srv/loc/loc.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) +++ uspace/srv/loc/loc.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2011 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup loc + * @{ + */ +/** @file HelenOS location service. + */ + +#ifndef LOC_H_ +#define LOC_H_ + +#include +#include +#include +#include + +/** Representation of server (supplier). + * + * Each server supplies a set of services. + * + */ +typedef struct { + /** 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; +} loc_server_t; + +/** Info about registered namespaces + * + */ +typedef struct { + /** Link to namespaces_list */ + link_t namespaces; + + /** Unique namespace identifier */ + service_id_t id; + + /** Namespace name */ + char *name; + + /** Reference count */ + size_t refcnt; +} loc_namespace_t; + +/** Info about registered service + * + */ +typedef struct { + /** 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; + /** Use this interface when forwarding to server. */ + sysarg_t forward_interface; +} loc_service_t; + +extern fibril_mutex_t services_list_mutex; + +extern service_id_t loc_create_id(void); +extern void loc_category_change_event(void); + +#endif + +/** @} + */ Index: uspace/srv/vfs/vfs.c =================================================================== --- uspace/srv/vfs/vfs.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/vfs/vfs.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -36,5 +36,8 @@ */ +#include #include +#include +#include #include #include @@ -45,7 +48,12 @@ #include #include +#include #include "vfs.h" #define NAME "vfs" + +enum { + VFS_TASK_STATE_CHANGE +}; static void vfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg) @@ -80,7 +88,4 @@ vfs_open(callid, &call); break; - case VFS_IN_OPEN_NODE: - vfs_open_node(callid, &call); - break; case VFS_IN_CLOSE: vfs_close(callid, &call); @@ -118,4 +123,8 @@ case VFS_IN_DUP: vfs_dup(callid, &call); + break; + case VFS_IN_WAIT_HANDLE: + vfs_wait_handle(callid, &call); + break; default: async_answer_0(callid, ENOTSUP); @@ -128,4 +137,19 @@ * connection fibril terminates. */ +} + +static void notification_received(ipc_callid_t callid, ipc_call_t *call) +{ + switch (IPC_GET_IMETHOD(*call)) { + case VFS_TASK_STATE_CHANGE: + if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE) + vfs_pass_handle( + (task_id_t) MERGE_LOUP32(IPC_GET_ARG4(*call), + IPC_GET_ARG5(*call)), call->in_task_id, + (int) IPC_GET_ARG2(*call)); + break; + default: + break; + } } @@ -170,4 +194,10 @@ /* + * Set notification handler and subscribe to notifications. + */ + async_set_interrupt_received(notification_received); + event_task_subscribe(EVENT_TASK_STATE_CHANGE, VFS_TASK_STATE_CHANGE); + + /* * Register at the naming service. */ Index: uspace/srv/vfs/vfs.h =================================================================== --- uspace/srv/vfs/vfs.h (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/vfs/vfs.h (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -38,7 +38,8 @@ #include #include -#include +#include #include #include +#include #ifndef dprintf @@ -61,5 +62,5 @@ #define VFS_PAIR \ fs_handle_t fs_handle; \ - devmap_handle_t devmap_handle; + service_id_t service_id; /** @@ -67,5 +68,5 @@ * doesn't contain any state. For a stateful structure, see vfs_node_t. * - * @note fs_handle, devmap_handle and index are meant to be returned in one + * @note fs_handle, service_id and index are meant to be returned in one * IPC reply. */ @@ -175,5 +176,4 @@ extern int vfs_lookup_internal(char *, int, vfs_lookup_res_t *, vfs_pair_t *, ...); -extern int vfs_open_node_internal(vfs_lookup_res_t *); extern bool vfs_nodes_init(void); @@ -181,5 +181,5 @@ extern void vfs_node_put(vfs_node_t *); extern void vfs_node_forget(vfs_node_t *); -extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, devmap_handle_t); +extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, service_id_t); @@ -188,4 +188,7 @@ extern void *vfs_client_data_create(void); extern void vfs_client_data_destroy(void *); + +extern void vfs_pass_handle(task_id_t, task_id_t, int); +extern int vfs_wait_handle_internal(void); extern vfs_file_t *vfs_file_get(int); @@ -197,4 +200,5 @@ extern void vfs_node_addref(vfs_node_t *); extern void vfs_node_delref(vfs_node_t *); +extern int vfs_open_node_remote(vfs_node_t *); extern void vfs_register(ipc_callid_t, ipc_call_t *); @@ -202,5 +206,4 @@ extern void vfs_unmount(ipc_callid_t, ipc_call_t *); extern void vfs_open(ipc_callid_t, ipc_call_t *); -extern void vfs_open_node(ipc_callid_t, ipc_call_t *); extern void vfs_sync(ipc_callid_t, ipc_call_t *); extern void vfs_dup(ipc_callid_t, ipc_call_t *); @@ -215,4 +218,5 @@ extern void vfs_unlink(ipc_callid_t, ipc_call_t *); extern void vfs_rename(ipc_callid_t, ipc_call_t *); +extern void vfs_wait_handle(ipc_callid_t, ipc_call_t *); #endif Index: uspace/srv/vfs/vfs_file.c =================================================================== --- uspace/srv/vfs/vfs_file.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/vfs/vfs_file.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -43,4 +43,6 @@ #include #include +#include +#include #include "vfs.h" @@ -50,38 +52,57 @@ typedef struct { fibril_mutex_t lock; + fibril_condvar_t cv; + list_t passed_handles; vfs_file_t **files; } vfs_client_data_t; +typedef struct { + link_t link; + int handle; +} vfs_boxed_handle_t; + +static int _vfs_fd_free(vfs_client_data_t *, int); + /** Initialize the table of open files. */ -static bool vfs_files_init(void) -{ - fibril_mutex_lock(&VFS_DATA->lock); - if (!FILES) { - FILES = malloc(MAX_OPEN_FILES * sizeof(vfs_file_t *)); - if (!FILES) { - fibril_mutex_unlock(&VFS_DATA->lock); +static bool vfs_files_init(vfs_client_data_t *vfs_data) +{ + fibril_mutex_lock(&vfs_data->lock); + if (!vfs_data->files) { + vfs_data->files = malloc(MAX_OPEN_FILES * sizeof(vfs_file_t *)); + if (!vfs_data->files) { + fibril_mutex_unlock(&vfs_data->lock); return false; } - memset(FILES, 0, MAX_OPEN_FILES * sizeof(vfs_file_t *)); - } - fibril_mutex_unlock(&VFS_DATA->lock); + memset(vfs_data->files, 0, MAX_OPEN_FILES * sizeof(vfs_file_t *)); + } + fibril_mutex_unlock(&vfs_data->lock); return true; } /** Cleanup the table of open files. */ -static void vfs_files_done(void) +static void vfs_files_done(vfs_client_data_t *vfs_data) { int i; - if (!FILES) + if (!vfs_data->files) return; for (i = 0; i < MAX_OPEN_FILES; i++) { - if (FILES[i]) { - (void) vfs_fd_free(i); - } - } - - free(FILES); + if (vfs_data->files[i]) + (void) _vfs_fd_free(vfs_data, i); + } + + free(vfs_data->files); + + while (!list_empty(&vfs_data->passed_handles)) { + link_t *lnk; + vfs_boxed_handle_t *bh; + + lnk = list_first(&vfs_data->passed_handles); + list_remove(lnk); + + bh = list_get_instance(lnk, vfs_boxed_handle_t, link); + free(bh); + } } @@ -93,4 +114,6 @@ if (vfs_data) { fibril_mutex_initialize(&vfs_data->lock); + fibril_condvar_initialize(&vfs_data->cv); + list_initialize(&vfs_data->passed_handles); vfs_data->files = NULL; } @@ -103,5 +126,5 @@ vfs_client_data_t *vfs_data = (vfs_client_data_t *) data; - vfs_files_done(); + vfs_files_done(vfs_data); free(vfs_data); } @@ -115,5 +138,5 @@ ipc_call_t answer; - aid_t msg = async_send_2(exch, VFS_OUT_CLOSE, file->node->devmap_handle, + aid_t msg = async_send_2(exch, VFS_OUT_CLOSE, file->node->service_id, file->node->index, &answer); @@ -131,7 +154,7 @@ * incremented. */ -static void vfs_file_addref(vfs_file_t *file) -{ - assert(fibril_mutex_is_locked(&VFS_DATA->lock)); +static void vfs_file_addref(vfs_client_data_t *vfs_data, vfs_file_t *file) +{ + assert(fibril_mutex_is_locked(&vfs_data->lock)); file->refcnt++; @@ -143,9 +166,9 @@ * decremented. */ -static int vfs_file_delref(vfs_file_t *file) +static int vfs_file_delref(vfs_client_data_t *vfs_data, vfs_file_t *file) { int rc = EOK; - assert(fibril_mutex_is_locked(&VFS_DATA->lock)); + assert(fibril_mutex_is_locked(&vfs_data->lock)); if (file->refcnt-- == 1) { @@ -162,16 +185,7 @@ } - -/** Allocate a file descriptor. - * - * @param desc If true, look for an available file descriptor - * in a descending order. - * - * @return First available file descriptor or a negative error - * code. - */ -int vfs_fd_alloc(bool desc) -{ - if (!vfs_files_init()) +static int _vfs_fd_alloc(vfs_client_data_t *vfs_data, bool desc) +{ + if (!vfs_files_init(vfs_data)) return ENOMEM; @@ -182,17 +196,17 @@ i = 0; - fibril_mutex_lock(&VFS_DATA->lock); + fibril_mutex_lock(&vfs_data->lock); while (true) { - if (!FILES[i]) { - FILES[i] = (vfs_file_t *) malloc(sizeof(vfs_file_t)); - if (!FILES[i]) { - fibril_mutex_unlock(&VFS_DATA->lock); + if (!vfs_data->files[i]) { + vfs_data->files[i] = (vfs_file_t *) malloc(sizeof(vfs_file_t)); + if (!vfs_data->files[i]) { + fibril_mutex_unlock(&vfs_data->lock); return ENOMEM; } - memset(FILES[i], 0, sizeof(vfs_file_t)); - fibril_mutex_initialize(&FILES[i]->lock); - vfs_file_addref(FILES[i]); - fibril_mutex_unlock(&VFS_DATA->lock); + memset(vfs_data->files[i], 0, sizeof(vfs_file_t)); + fibril_mutex_initialize(&vfs_data->files[i]->lock); + vfs_file_addref(vfs_data, vfs_data->files[i]); + fibril_mutex_unlock(&vfs_data->lock); return (int) i; } @@ -210,7 +224,40 @@ } } - fibril_mutex_unlock(&VFS_DATA->lock); + fibril_mutex_unlock(&vfs_data->lock); return EMFILE; +} + +/** Allocate a file descriptor. + * + * @param desc If true, look for an available file descriptor + * in a descending order. + * + * @return First available file descriptor or a negative error + * code. + */ +int vfs_fd_alloc(bool desc) +{ + return _vfs_fd_alloc(VFS_DATA, desc); +} + +static int _vfs_fd_free(vfs_client_data_t *vfs_data, int fd) +{ + int rc; + + if (!vfs_files_init(vfs_data)) + return ENOMEM; + + fibril_mutex_lock(&vfs_data->lock); + if ((fd < 0) || (fd >= MAX_OPEN_FILES) || !vfs_data->files[fd]) { + fibril_mutex_unlock(&vfs_data->lock); + return EBADF; + } + + rc = vfs_file_delref(vfs_data, vfs_data->files[fd]); + vfs_data->files[fd] = NULL; + fibril_mutex_unlock(&vfs_data->lock); + + return rc; } @@ -224,20 +271,5 @@ int vfs_fd_free(int fd) { - int rc; - - if (!vfs_files_init()) - return ENOMEM; - - fibril_mutex_lock(&VFS_DATA->lock); - if ((fd < 0) || (fd >= MAX_OPEN_FILES) || (FILES[fd] == NULL)) { - fibril_mutex_unlock(&VFS_DATA->lock); - return EBADF; - } - - rc = vfs_file_delref(FILES[fd]); - FILES[fd] = NULL; - fibril_mutex_unlock(&VFS_DATA->lock); - - return rc; + return _vfs_fd_free(VFS_DATA, fd); } @@ -253,5 +285,5 @@ int vfs_fd_assign(vfs_file_t *file, int fd) { - if (!vfs_files_init()) + if (!vfs_files_init(VFS_DATA)) return ENOMEM; @@ -263,5 +295,5 @@ FILES[fd] = file; - vfs_file_addref(FILES[fd]); + vfs_file_addref(VFS_DATA, FILES[fd]); fibril_mutex_unlock(&VFS_DATA->lock); @@ -269,29 +301,41 @@ } -/** Find VFS file structure for a given file descriptor. - * - * @param fd File descriptor. - * - * @return VFS file structure corresponding to fd. - */ -vfs_file_t *vfs_file_get(int fd) -{ - if (!vfs_files_init()) +static vfs_file_t *_vfs_file_get(vfs_client_data_t *vfs_data, int fd) +{ + if (!vfs_files_init(vfs_data)) return NULL; - fibril_mutex_lock(&VFS_DATA->lock); + fibril_mutex_lock(&vfs_data->lock); if ((fd >= 0) && (fd < MAX_OPEN_FILES)) { - vfs_file_t *file = FILES[fd]; + vfs_file_t *file = vfs_data->files[fd]; if (file != NULL) { - vfs_file_addref(file); - fibril_mutex_unlock(&VFS_DATA->lock); + vfs_file_addref(vfs_data, file); + fibril_mutex_unlock(&vfs_data->lock); return file; } } - fibril_mutex_unlock(&VFS_DATA->lock); + fibril_mutex_unlock(&vfs_data->lock); return NULL; } +/** Find VFS file structure for a given file descriptor. + * + * @param fd File descriptor. + * + * @return VFS file structure corresponding to fd. + */ +vfs_file_t *vfs_file_get(int fd) +{ + return _vfs_file_get(VFS_DATA, fd); +} + +static void _vfs_file_put(vfs_client_data_t *vfs_data, vfs_file_t *file) +{ + fibril_mutex_lock(&vfs_data->lock); + vfs_file_delref(vfs_data, file); + fibril_mutex_unlock(&vfs_data->lock); +} + /** Stop using a file structure. * @@ -300,7 +344,90 @@ void vfs_file_put(vfs_file_t *file) { - fibril_mutex_lock(&VFS_DATA->lock); - vfs_file_delref(file); - fibril_mutex_unlock(&VFS_DATA->lock); + _vfs_file_put(VFS_DATA, file); +} + +void vfs_pass_handle(task_id_t donor_id, task_id_t acceptor_id, int donor_fd) +{ + vfs_client_data_t *donor_data = NULL; + vfs_client_data_t *acceptor_data = NULL; + vfs_file_t *donor_file = NULL; + vfs_file_t *acceptor_file = NULL; + vfs_boxed_handle_t *bh; + int acceptor_fd; + + acceptor_data = async_get_client_data_by_id(acceptor_id); + if (!acceptor_data) + return; + + bh = malloc(sizeof(vfs_boxed_handle_t)); + assert(bh); + + link_initialize(&bh->link); + bh->handle = -1; + + donor_data = async_get_client_data_by_id(donor_id); + if (!donor_data) + goto out; + + donor_file = _vfs_file_get(donor_data, donor_fd); + if (!donor_file) + goto out; + + acceptor_fd = _vfs_fd_alloc(acceptor_data, false); + if (acceptor_fd < 0) + goto out; + + bh->handle = acceptor_fd; + + /* + * Add a new reference to the underlying VFS node. + */ + vfs_node_addref(donor_file->node); + (void) vfs_open_node_remote(donor_file->node); + + acceptor_file = _vfs_file_get(acceptor_data, acceptor_fd); + assert(acceptor_file); + + /* + * Inherit attributes from the donor. + */ + acceptor_file->node = donor_file->node; + acceptor_file->append = donor_file->append; + acceptor_file->pos = donor_file->pos; + +out: + fibril_mutex_lock(&acceptor_data->lock); + list_append(&bh->link, &acceptor_data->passed_handles); + fibril_condvar_broadcast(&acceptor_data->cv); + fibril_mutex_unlock(&acceptor_data->lock); + + if (donor_data) + async_put_client_data_by_id(donor_id); + if (acceptor_data) + async_put_client_data_by_id(acceptor_id); + if (donor_file) + _vfs_file_put(donor_data, donor_file); + if (acceptor_file) + _vfs_file_put(acceptor_data, acceptor_file); + +} + +int vfs_wait_handle_internal(void) +{ + vfs_client_data_t *vfs_data = VFS_DATA; + int fd; + + fibril_mutex_lock(&vfs_data->lock); + while (list_empty(&vfs_data->passed_handles)) + fibril_condvar_wait(&vfs_data->cv, &vfs_data->lock); + link_t *lnk = list_first(&vfs_data->passed_handles); + list_remove(lnk); + fibril_mutex_unlock(&vfs_data->lock); + + vfs_boxed_handle_t *bh = list_get_instance(lnk, vfs_boxed_handle_t, link); + fd = bh->handle; + free(bh); + + return fd; } Index: uspace/srv/vfs/vfs_lookup.c =================================================================== --- uspace/srv/vfs/vfs_lookup.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/vfs/vfs_lookup.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -162,5 +162,5 @@ aid_t req = async_send_5(exch, VFS_OUT_LOOKUP, (sysarg_t) first, (sysarg_t) (first + len - 1) % PLB_SIZE, - (sysarg_t) root->devmap_handle, (sysarg_t) lflag, (sysarg_t) index, + (sysarg_t) root->service_id, (sysarg_t) lflag, (sysarg_t) index, &answer); @@ -185,5 +185,5 @@ result->triplet.fs_handle = (fs_handle_t) rc; - result->triplet.devmap_handle = (devmap_handle_t) IPC_GET_ARG1(answer); + result->triplet.service_id = (service_id_t) IPC_GET_ARG1(answer); result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer); result->size = @@ -201,37 +201,4 @@ } -/** Perform a node open operation. - * - * @return EOK on success or an error code from errno.h. - * - */ -int vfs_open_node_internal(vfs_lookup_res_t *result) -{ - async_exch_t *exch = vfs_exchange_grab(result->triplet.fs_handle); - - ipc_call_t answer; - aid_t req = async_send_2(exch, VFS_OUT_OPEN_NODE, - (sysarg_t) result->triplet.devmap_handle, - (sysarg_t) result->triplet.index, &answer); - - sysarg_t rc; - async_wait_for(req, &rc); - vfs_exchange_release(exch); - - if (rc == EOK) { - result->size = - MERGE_LOUP32(IPC_GET_ARG1(answer), IPC_GET_ARG2(answer)); - result->lnkcnt = (unsigned int) IPC_GET_ARG3(answer); - if (IPC_GET_ARG4(answer) & L_FILE) - result->type = VFS_NODE_FILE; - else if (IPC_GET_ARG4(answer) & L_DIRECTORY) - result->type = VFS_NODE_DIRECTORY; - else - result->type = VFS_NODE_UNKNOWN; - } - - return rc; -} - /** * @} Index: uspace/srv/vfs/vfs_node.c =================================================================== --- uspace/srv/vfs/vfs_node.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/vfs/vfs_node.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -116,5 +116,5 @@ unsigned long key[] = { [KEY_FS_HANDLE] = node->fs_handle, - [KEY_DEV_HANDLE] = node->devmap_handle, + [KEY_DEV_HANDLE] = node->service_id, [KEY_INDEX] = node->index }; @@ -138,5 +138,5 @@ async_exch_t *exch = vfs_exchange_grab(node->fs_handle); sysarg_t rc = async_req_2_0(exch, VFS_OUT_DESTROY, - (sysarg_t) node->devmap_handle, (sysarg_t)node->index); + (sysarg_t) node->service_id, (sysarg_t)node->index); assert(rc == EOK); @@ -160,5 +160,5 @@ unsigned long key[] = { [KEY_FS_HANDLE] = node->fs_handle, - [KEY_DEV_HANDLE] = node->devmap_handle, + [KEY_DEV_HANDLE] = node->service_id, [KEY_INDEX] = node->index }; @@ -184,5 +184,5 @@ unsigned long key[] = { [KEY_FS_HANDLE] = result->triplet.fs_handle, - [KEY_DEV_HANDLE] = result->triplet.devmap_handle, + [KEY_DEV_HANDLE] = result->triplet.service_id, [KEY_INDEX] = result->triplet.index }; @@ -200,5 +200,5 @@ memset(node, 0, sizeof(vfs_node_t)); node->fs_handle = result->triplet.fs_handle; - node->devmap_handle = result->triplet.devmap_handle; + node->service_id = result->triplet.service_id; node->index = result->triplet.index; node->size = result->size; @@ -252,5 +252,5 @@ vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link); return (node->fs_handle == (fs_handle_t) key[KEY_FS_HANDLE]) && - (node->devmap_handle == key[KEY_DEV_HANDLE]) && + (node->service_id == key[KEY_DEV_HANDLE]) && (node->index == key[KEY_INDEX]); } @@ -264,5 +264,5 @@ unsigned refcnt; fs_handle_t fs_handle; - devmap_handle_t devmap_handle; + service_id_t service_id; }; @@ -273,15 +273,15 @@ if ((node->fs_handle == rd->fs_handle) && - (node->devmap_handle == rd->devmap_handle)) + (node->service_id == rd->service_id)) rd->refcnt += node->refcnt; } unsigned -vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, devmap_handle_t devmap_handle) +vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, service_id_t service_id) { struct refcnt_data rd = { .refcnt = 0, .fs_handle = fs_handle, - .devmap_handle = devmap_handle + .service_id = service_id }; @@ -291,4 +291,26 @@ return rd.refcnt; +} + + +/** Perform a remote node open operation. + * + * @return EOK on success or an error code from errno.h. + * + */ +int vfs_open_node_remote(vfs_node_t *node) +{ + 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); + + sysarg_t rc; + async_wait_for(req, &rc); + + return rc; } Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/vfs/vfs_ops.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -54,5 +54,5 @@ /* Forward declarations of static functions. */ -static int vfs_truncate_internal(fs_handle_t, devmap_handle_t, fs_index_t, +static int vfs_truncate_internal(fs_handle_t, service_id_t, fs_index_t, aoff64_t); @@ -65,8 +65,8 @@ vfs_pair_t rootfs = { .fs_handle = 0, - .devmap_handle = 0 + .service_id = 0 }; -static void vfs_mount_internal(ipc_callid_t rid, devmap_handle_t devmap_handle, +static void vfs_mount_internal(ipc_callid_t rid, service_id_t service_id, fs_handle_t fs_handle, char *mp, char *opts) { @@ -125,5 +125,5 @@ exch = vfs_exchange_grab(fs_handle); msg = async_send_1(exch, VFS_OUT_MOUNTED, - (sysarg_t) devmap_handle, &answer); + (sysarg_t) service_id, &answer); /* Send the mount options */ rc = async_data_write_start(exch, (void *)opts, @@ -150,5 +150,5 @@ mr_res.triplet.fs_handle = fs_handle; - mr_res.triplet.devmap_handle = devmap_handle; + mr_res.triplet.service_id = service_id; mr_res.triplet.index = rindex; mr_res.size = rsize; @@ -157,5 +157,5 @@ rootfs.fs_handle = fs_handle; - rootfs.devmap_handle = devmap_handle; + rootfs.service_id = service_id; /* Add reference to the mounted root. */ @@ -178,6 +178,6 @@ /* - * At this point, we have all necessary pieces: file system and device - * handles, and we know the mount point VFS node. + * At this point, we have all necessary pieces: file system handle + * and service ID, and we know the mount point VFS node. */ @@ -187,8 +187,8 @@ exch = vfs_exchange_grab(mp_res.triplet.fs_handle); msg = async_send_4(exch, VFS_OUT_MOUNT, - (sysarg_t) mp_res.triplet.devmap_handle, + (sysarg_t) mp_res.triplet.service_id, (sysarg_t) mp_res.triplet.index, (sysarg_t) fs_handle, - (sysarg_t) devmap_handle, &answer); + (sysarg_t) service_id, &answer); /* Send connection */ @@ -234,5 +234,5 @@ mr_res.triplet.fs_handle = fs_handle; - mr_res.triplet.devmap_handle = devmap_handle; + mr_res.triplet.service_id = service_id; mr_res.triplet.index = rindex; mr_res.size = rsize; @@ -255,5 +255,5 @@ void vfs_mount(ipc_callid_t rid, ipc_call_t *request) { - devmap_handle_t devmap_handle; + service_id_t service_id; /* @@ -262,5 +262,5 @@ * in the request. */ - devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request); + service_id = (service_id_t) IPC_GET_ARG1(*request); /* @@ -350,5 +350,5 @@ /* Do the mount */ - vfs_mount_internal(rid, devmap_handle, fs_handle, mp, opts); + vfs_mount_internal(rid, service_id, fs_handle, mp, opts); free(mp); free(fs_name); @@ -409,5 +409,5 @@ */ if (vfs_nodes_refcount_sum_get(mr_node->fs_handle, - mr_node->devmap_handle) != 2) { + mr_node->service_id) != 2) { fibril_rwlock_write_unlock(&namespace_rwlock); vfs_node_put(mr_node); @@ -430,5 +430,5 @@ exch = vfs_exchange_grab(mr_node->fs_handle); rc = async_req_1_0(exch, VFS_OUT_UNMOUNTED, - mr_node->devmap_handle); + mr_node->service_id); vfs_exchange_release(exch); @@ -441,5 +441,5 @@ rootfs.fs_handle = 0; - rootfs.devmap_handle = 0; + rootfs.service_id = 0; } else { @@ -470,5 +470,5 @@ exch = vfs_exchange_grab(mp_node->fs_handle); rc = async_req_2_0(exch, VFS_OUT_UNMOUNT, - mp_node->devmap_handle, mp_node->index); + mp_node->service_id, mp_node->index); vfs_exchange_release(exch); @@ -575,5 +575,5 @@ if (node->size) { rc = vfs_truncate_internal(node->fs_handle, - node->devmap_handle, node->index, 0); + node->service_id, node->index, 0); if (rc) { fibril_rwlock_write_unlock(&node->contents_rwlock); @@ -618,77 +618,4 @@ } -void vfs_open_node(ipc_callid_t rid, ipc_call_t *request) -{ - // FIXME: check for sanity of the supplied fs, dev and index - - /* - * The interface is open_node(fs, dev, index, oflag). - */ - vfs_lookup_res_t lr; - - lr.triplet.fs_handle = IPC_GET_ARG1(*request); - lr.triplet.devmap_handle = IPC_GET_ARG2(*request); - lr.triplet.index = IPC_GET_ARG3(*request); - int oflag = IPC_GET_ARG4(*request); - - fibril_rwlock_read_lock(&namespace_rwlock); - - int rc = vfs_open_node_internal(&lr); - if (rc != EOK) { - fibril_rwlock_read_unlock(&namespace_rwlock); - async_answer_0(rid, rc); - return; - } - - vfs_node_t *node = vfs_node_get(&lr); - fibril_rwlock_read_unlock(&namespace_rwlock); - - /* Truncate the file if requested and if necessary. */ - if (oflag & O_TRUNC) { - fibril_rwlock_write_lock(&node->contents_rwlock); - if (node->size) { - rc = vfs_truncate_internal(node->fs_handle, - node->devmap_handle, node->index, 0); - if (rc) { - fibril_rwlock_write_unlock(&node->contents_rwlock); - vfs_node_put(node); - async_answer_0(rid, rc); - return; - } - node->size = 0; - } - fibril_rwlock_write_unlock(&node->contents_rwlock); - } - - /* - * Get ourselves a file descriptor and the corresponding vfs_file_t - * structure. - */ - int fd = vfs_fd_alloc((oflag & O_DESC) != 0); - if (fd < 0) { - vfs_node_put(node); - async_answer_0(rid, fd); - return; - } - vfs_file_t *file = vfs_file_get(fd); - file->node = node; - if (oflag & O_APPEND) - file->append = true; - - /* - * The following increase in reference count is for the fact that the - * file is being opened and that a file structure is pointing to it. - * It is necessary so that the file will not disappear when - * vfs_node_put() is called. The reference will be dropped by the - * respective VFS_IN_CLOSE. - */ - vfs_node_addref(node); - vfs_node_put(node); - vfs_file_put(file); - - /* Success! Return the new file descriptor to the client. */ - async_answer_1(rid, EOK, fd); -} - void vfs_sync(ipc_callid_t rid, ipc_call_t *request) { @@ -712,5 +639,5 @@ aid_t msg; ipc_call_t answer; - msg = async_send_2(fs_exch, VFS_OUT_SYNC, file->node->devmap_handle, + msg = async_send_2(fs_exch, VFS_OUT_SYNC, file->node->service_id, file->node->index, &answer); @@ -797,5 +724,5 @@ if (read) { rc = async_data_read_forward_4_1(fs_exch, VFS_OUT_READ, - file->node->devmap_handle, file->node->index, + file->node->service_id, file->node->index, LOWER32(file->pos), UPPER32(file->pos), &answer); } else { @@ -804,5 +731,5 @@ rc = async_data_write_forward_4_1(fs_exch, VFS_OUT_WRITE, - file->node->devmap_handle, file->node->index, + file->node->service_id, file->node->index, LOWER32(file->pos), UPPER32(file->pos), &answer); } @@ -935,10 +862,10 @@ } -int vfs_truncate_internal(fs_handle_t fs_handle, devmap_handle_t devmap_handle, +int vfs_truncate_internal(fs_handle_t fs_handle, service_id_t service_id, fs_index_t index, aoff64_t size) { async_exch_t *exch = vfs_exchange_grab(fs_handle); sysarg_t rc = async_req_4_0(exch, VFS_OUT_TRUNCATE, - (sysarg_t) devmap_handle, (sysarg_t) index, LOWER32(size), + (sysarg_t) service_id, (sysarg_t) index, LOWER32(size), UPPER32(size)); vfs_exchange_release(exch); @@ -963,5 +890,5 @@ fibril_rwlock_write_lock(&file->node->contents_rwlock); rc = vfs_truncate_internal(file->node->fs_handle, - file->node->devmap_handle, file->node->index, size); + file->node->service_id, file->node->index, size); if (rc == EOK) file->node->size = size; @@ -997,5 +924,5 @@ aid_t msg; - msg = async_send_3(exch, VFS_OUT_STAT, file->node->devmap_handle, + msg = async_send_3(exch, VFS_OUT_STAT, file->node->service_id, file->node->index, true, NULL); async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); @@ -1050,5 +977,5 @@ aid_t msg; - msg = async_send_3(exch, VFS_OUT_STAT, node->devmap_handle, + msg = async_send_3(exch, VFS_OUT_STAT, node->service_id, node->index, false, NULL); async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME); @@ -1227,5 +1154,5 @@ /* Check whether linking to the same file system instance. */ if ((old_node->fs_handle != new_par_lr.triplet.fs_handle) || - (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) { + (old_node->service_id != new_par_lr.triplet.service_id)) { fibril_rwlock_write_unlock(&namespace_rwlock); vfs_node_put(old_node); @@ -1349,4 +1276,10 @@ } +void vfs_wait_handle(ipc_callid_t rid, ipc_call_t *request) +{ + int fd = vfs_wait_handle_internal(); + async_answer_1(rid, EOK, fd); +} + /** * @} Index: uspace/srv/vfs/vfs_register.c =================================================================== --- uspace/srv/vfs/vfs_register.c (revision 842a2d27f4f0102a5ee40d6b3a27c77c9de90501) +++ uspace/srv/vfs/vfs_register.c (revision eb660787259c7eab2dd7649bebbe0990cb008eab) @@ -306,5 +306,5 @@ list_foreach(fs_list, cur) { fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link); - if (str_cmp(fs->vfs_info.name, name) == 0) { + if (str_cmp(fs->vfs_info.name, name) == 0) { handle = fs->fs_handle; break;