Index: uspace/app/bdsh/cmds/modules/bdd/bdd.c =================================================================== --- uspace/app/bdsh/cmds/modules/bdd/bdd.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/bdsh/cmds/modules/bdd/bdd.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -39,5 +39,5 @@ #include -#include +#include #include #include @@ -69,5 +69,5 @@ unsigned int argc; unsigned int i, j; - devmap_handle_t handle; + service_id_t service_id; aoff64_t offset; uint8_t *blk; @@ -96,5 +96,5 @@ size = 256; - rc = devmap_device_get_handle(argv[1], &handle, 0); + rc = loc_service_get_id(argv[1], &service_id, 0); if (rc != EOK) { printf("%s: Error resolving device `%s'.\n", cmdname, argv[1]); @@ -102,5 +102,5 @@ } - rc = block_init(EXCHANGE_SERIALIZE, handle, 2048); + rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048); if (rc != EOK) { printf("%s: Error initializing libblock.\n", cmdname); @@ -108,5 +108,5 @@ } - rc = block_get_bsize(handle, &block_size); + rc = block_get_bsize(service_id, &block_size); if (rc != EOK) { printf("%s: Error determining device block size.\n", cmdname); @@ -117,5 +117,5 @@ if (blk == NULL) { printf("%s: Error allocating memory.\n", cmdname); - block_fini(handle); + block_fini(service_id); return CMD_FAILURE; } @@ -124,9 +124,9 @@ while (size > 0) { - rc = block_read_direct(handle, ba, 1, blk); + rc = block_read_direct(service_id, ba, 1, blk); if (rc != EOK) { printf("%s: Error reading block %" PRIuOFF64 "\n", cmdname, ba); free(blk); - block_fini(handle); + block_fini(service_id); return CMD_FAILURE; } @@ -170,5 +170,5 @@ free(blk); - block_fini(handle); + block_fini(service_id); return CMD_SUCCESS; Index: uspace/app/blkdump/blkdump.c =================================================================== --- uspace/app/blkdump/blkdump.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/blkdump/blkdump.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -42,5 +42,5 @@ #include #include -#include +#include #include #include @@ -59,5 +59,5 @@ int rc; char *dev_path; - devmap_handle_t handle; + service_id_t service_id; size_t block_size; char *endptr; @@ -128,5 +128,5 @@ dev_path = *argv; - rc = devmap_device_get_handle(dev_path, &handle, 0); + rc = loc_service_get_id(dev_path, &service_id, 0); if (rc != EOK) { printf(NAME ": Error resolving device `%s'.\n", dev_path); @@ -134,5 +134,5 @@ } - rc = block_init(EXCHANGE_SERIALIZE, handle, 2048); + rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048); if (rc != EOK) { printf(NAME ": Error initializing libblock.\n"); @@ -140,5 +140,5 @@ } - rc = block_get_bsize(handle, &block_size); + rc = block_get_bsize(service_id, &block_size); if (rc != EOK) { printf(NAME ": Error determining device block size.\n"); @@ -146,5 +146,5 @@ } - rc = block_get_nblocks(handle, &dev_nblocks); + rc = block_get_nblocks(service_id, &dev_nblocks); if (rc != EOK) { printf(NAME ": Warning, failed to obtain block device size.\n"); @@ -156,5 +156,5 @@ if (data == NULL) { printf(NAME ": Error allocating data buffer of %" PRIuOFF64 " bytes", (aoff64_t) block_size); - block_fini(handle); + block_fini(service_id); return 3; } @@ -162,5 +162,5 @@ limit = block_offset + block_count; for (current = block_offset; current < limit; current++) { - rc = block_read_direct(handle, current, 1, data); + rc = block_read_direct(service_id, current, 1, data); if (rc != EOK) { printf(NAME ": Error reading block at %" PRIuOFF64 " \n", current); @@ -186,5 +186,5 @@ free(data); - block_fini(handle); + block_fini(service_id); return 0; Index: uspace/app/bnchmark/bnchmark.c =================================================================== --- uspace/app/bnchmark/bnchmark.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/bnchmark/bnchmark.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -41,5 +41,5 @@ #include #include -#include +#include #include #include Index: uspace/app/ext2info/ext2info.c =================================================================== --- uspace/app/ext2info/ext2info.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/ext2info/ext2info.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -42,5 +42,5 @@ #include #include -#include +#include #include #include @@ -81,5 +81,5 @@ char *endptr; char *dev_path; - devmap_handle_t handle; + service_id_t service_id; ext2_filesystem_t filesystem; int arg_flags; @@ -178,5 +178,5 @@ dev_path = *argv; - rc = devmap_device_get_handle(dev_path, &handle, 0); + rc = loc_service_get_id(dev_path, &service_id, 0); if (rc != EOK) { printf(NAME ": Error resolving device `%s'.\n", dev_path); @@ -184,5 +184,5 @@ } - rc = ext2_filesystem_init(&filesystem, handle); + rc = ext2_filesystem_init(&filesystem, service_id); if (rc != EOK) { printf(NAME ": Error initializing libext2.\n"); Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/init/init.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -46,5 +46,5 @@ #include #include -#include +#include #include #include "init.h" @@ -53,6 +53,6 @@ #define ROOT_MOUNT_POINT "/" -#define DEVFS_FS_TYPE "devfs" -#define DEVFS_MOUNT_POINT "/dev" +#define LOCFS_FS_TYPE "locfs" +#define LOCFS_MOUNT_POINT "/loc" #define TMPFS_FS_TYPE "tmpfs" @@ -113,10 +113,10 @@ } -static bool mount_devfs(void) -{ - int rc = mount(DEVFS_FS_TYPE, DEVFS_MOUNT_POINT, "", "", +static bool mount_locfs(void) +{ + int rc = mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "", IPC_FLAG_BLOCKING); - return mount_report("Device filesystem", DEVFS_MOUNT_POINT, DEVFS_FS_TYPE, - NULL, rc); + return mount_report("Location service filesystem", LOCFS_MOUNT_POINT, + LOCFS_FS_TYPE, NULL, rc); } @@ -174,36 +174,36 @@ } -static void console(const char *dev) -{ - printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, dev); - - /* Wait for the input device to be ready */ - devmap_handle_t handle; - int rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING); - if (rc != EOK) { - printf("%s: Error waiting on %s (%s)\n", NAME, dev, - str_error(rc)); - return; - } - - rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, dev, NULL); +static void console(const char *svc) +{ + printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, svc); + + /* Wait for the input service to be ready */ + service_id_t service_id; + int rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING); + if (rc != EOK) { + printf("%s: Error waiting on %s (%s)\n", NAME, svc, + str_error(rc)); + return; + } + + rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, svc, NULL); if (rc != EOK) { printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE, - dev, str_error(rc)); - } -} - -static void getterm(const char *dev, const char *app, bool wmsg) -{ - char term[DEVMAP_NAME_MAXLEN]; + svc, str_error(rc)); + } +} + +static void getterm(const char *svc, const char *app, bool wmsg) +{ + char term[LOC_NAME_MAXLEN]; int rc; - snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev); + snprintf(term, LOC_NAME_MAXLEN, "%s/%s", LOCFS_MOUNT_POINT, svc); printf("%s: Spawning %s %s %s\n", NAME, APP_GETTERM, term, app); - /* Wait for the terminal device to be ready */ - devmap_handle_t handle; - rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING); + /* Wait for the terminal service to be ready */ + service_id_t service_id; + rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING); if (rc != EOK) { printf("%s: Error waiting on %s (%s)\n", NAME, term, @@ -257,8 +257,8 @@ } - spawn("/srv/devfs"); + spawn("/srv/locfs"); spawn("/srv/taskmon"); - if (!mount_devfs()) { + if (!mount_locfs()) { printf("%s: Exiting\n", NAME); return -2; Index: uspace/app/lsusb/main.c =================================================================== --- uspace/app/lsusb/main.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/lsusb/main.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -43,5 +43,5 @@ #include #include -#include +#include #include #include Index: uspace/app/mkbd/main.c =================================================================== --- uspace/app/mkbd/main.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/mkbd/main.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -43,5 +43,5 @@ #include #include -#include +#include #include #include Index: uspace/app/mkfat/mkfat.c =================================================================== --- uspace/app/mkfat/mkfat.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/mkfat/mkfat.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -42,5 +42,5 @@ #include #include -#include +#include #include #include @@ -85,5 +85,5 @@ struct fat_params *par); static int fat_blocks_write(struct fat_params const *par, - devmap_handle_t handle); + service_id_t service_id); static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs); @@ -95,5 +95,5 @@ int rc; char *dev_path; - devmap_handle_t handle; + service_id_t service_id; size_t block_size; char *endptr; @@ -138,5 +138,5 @@ dev_path = *argv; - rc = devmap_device_get_handle(dev_path, &handle, 0); + rc = loc_service_get_id(dev_path, &service_id, 0); if (rc != EOK) { printf(NAME ": Error resolving device `%s'.\n", dev_path); @@ -144,5 +144,5 @@ } - rc = block_init(EXCHANGE_SERIALIZE, handle, 2048); + rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048); if (rc != EOK) { printf(NAME ": Error initializing libblock.\n"); @@ -150,5 +150,5 @@ } - rc = block_get_bsize(handle, &block_size); + rc = block_get_bsize(service_id, &block_size); if (rc != EOK) { printf(NAME ": Error determining device block size.\n"); @@ -156,5 +156,5 @@ } - rc = block_get_nblocks(handle, &dev_nblocks); + rc = block_get_nblocks(service_id, &dev_nblocks); if (rc != EOK) { printf(NAME ": Warning, failed to obtain block device size.\n"); @@ -183,5 +183,5 @@ } - rc = fat_blocks_write(&par, handle); + rc = fat_blocks_write(&par, service_id); if (rc != EOK) { printf(NAME ": Error writing device.\n"); @@ -189,5 +189,5 @@ } - block_fini(handle); + block_fini(service_id); printf("Success.\n"); @@ -234,5 +234,5 @@ /** Create file system with the given parameters. */ -static int fat_blocks_write(struct fat_params const *par, devmap_handle_t handle) +static int fat_blocks_write(struct fat_params const *par, service_id_t service_id) { aoff64_t addr; @@ -245,5 +245,5 @@ fat_bootsec_create(par, &bs); - rc = block_write_direct(handle, BS_BLOCK, 1, &bs); + rc = block_write_direct(service_id, BS_BLOCK, 1, &bs); if (rc != EOK) return EIO; @@ -257,5 +257,5 @@ /* Reserved sectors */ for (i = 0; i < par->reserved_sectors - 1; ++i) { - rc = block_write_direct(handle, addr, 1, buffer); + rc = block_write_direct(service_id, addr, 1, buffer); if (rc != EOK) return EIO; @@ -277,5 +277,5 @@ } - rc = block_write_direct(handle, addr, 1, buffer); + rc = block_write_direct(service_id, addr, 1, buffer); if (rc != EOK) return EIO; @@ -291,5 +291,5 @@ /* Root directory */ for (i = 0; i < par->rootdir_sectors; ++i) { - rc = block_write_direct(handle, addr, 1, buffer); + rc = block_write_direct(service_id, addr, 1, buffer); if (rc != EOK) return EIO; Index: uspace/app/tester/devs/devman2.c =================================================================== --- uspace/app/tester/devs/devman2.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/tester/devs/devman2.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -58,5 +58,5 @@ char *path = NULL; while (rc == EOK) { - rc = asprintf(&path, "/dev/class/%s\\%zu", DEVICE_CLASS, idx); + rc = asprintf(&path, "/loc/class/%s\\%zu", DEVICE_CLASS, idx); if (rc < 0) { continue; Index: uspace/app/tester/hw/misc/virtchar1.c =================================================================== --- uspace/app/tester/hw/misc/virtchar1.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/tester/hw/misc/virtchar1.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -48,6 +48,6 @@ #include "../../tester.h" -#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null\\a" -#define DEVICE_PATH_CLASSES "/dev/class/virt-null\\1" +#define DEVICE_PATH_NORMAL "/loc/devices/\\virt\\null\\a" +#define DEVICE_PATH_CLASSES "/loc/class/virt-null\\1" #define BUFFER_SIZE 64 Index: uspace/app/tester/vfs/vfs1.c =================================================================== --- uspace/app/tester/vfs/vfs1.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/tester/vfs/vfs1.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -35,5 +35,5 @@ #include #include -#include +#include #include #include Index: uspace/app/testread/testread.c =================================================================== --- uspace/app/testread/testread.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/testread/testread.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -50,5 +50,5 @@ #include #include -#include +#include #include #include Index: uspace/app/usbinfo/main.c =================================================================== --- uspace/app/usbinfo/main.c (revision c06994673347954891a57710998cf1e087a59e8b) +++ uspace/app/usbinfo/main.c (revision f4fa6d97622246b092c84b7d84bfeffa10cbe6a4) @@ -42,5 +42,5 @@ #include #include -#include +#include #include #include