Changes in / [c3f95d8:c1a5d8d] in mainline


Ignore:
Files:
34 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    rc3f95d8 rc1a5d8d  
    9797        $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
    9898        $(USPACE_PATH)/srv/fs/fat/fat \
    99         $(USPACE_PATH)/srv/fs/pipefs/pipefs \
    100         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
    10199        $(USPACE_PATH)/srv/taskmon/taskmon \
    102100        $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
    … …  
    126124
    127125RD_APPS_NON_ESSENTIAL = \
    128         $(USPACE_PATH)/app/blkdump/blkdump \
    129126        $(USPACE_PATH)/app/edit/edit \
    130         $(USPACE_PATH)/app/ext2info/ext2info \
    131127        $(USPACE_PATH)/app/kill/kill \
    132128        $(USPACE_PATH)/app/killall/killall \

  • uspace/Makefile

    rc3f95d8 rc1a5d8d  
    3535DIRS = \
    3636        app/bdsh \
    37         app/blkdump \
    3837        app/edit \
    39         app/ext2info \
    4038        app/getterm \
    4139        app/init \
    … …  
    7472        srv/fs/tmpfs \
    7573        srv/fs/devfs \
    76         srv/fs/pipefs \
    77         srv/fs/ext2fs \
    7874        srv/hid/adb_mouse \
    7975        srv/hid/char_mouse \
    … …  
    152148        lib/drv \
    153149        lib/packet \
    154         lib/net \
    155         lib/ext2
     150        lib/net
    156151
    157152LIBC_BUILD = $(addsuffix .build,$(LIBC))

  • uspace/Makefile.common

    rc3f95d8 rc1a5d8d  
    8686LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
    8787
    88 LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2
    89 
    9088LIBDRV_PREFIX = $(LIB_PREFIX)/drv
    9189LIBPACKET_PREFIX = $(LIB_PREFIX)/packet

  • uspace/app/bdsh/cmds/modules/mount/mount.c

    rc3f95d8 rc1a5d8d  
    5151{
    5252        static char helpfmt[] =
    53             "Usage:  %s <fstype> <mp> [dev] [<moptions>]\n";
     53            "Usage:  %s <fstype> <mp> <dev> [<moptions>]\n";
    5454        if (level == HELP_SHORT) {
    5555                printf("'%s' mounts a file system.\n", cmdname);
    … …  
    6666        unsigned int argc;
    6767        const char *mopts = "";
    68         const char *dev = "";
    6968        int rc, c, opt_ind;
    7069
    … …  
    8079        }
    8180
    82         if ((argc < 3) || (argc > 5)) {
     81        if ((argc < 4) || (argc > 5)) {
    8382                printf("%s: invalid number of arguments. Try `mount --help'\n",
    8483                    cmdname);
    8584                return CMD_FAILURE;
    8685        }
    87         if (argc > 3)
    88                 dev = argv[3];
    8986        if (argc == 5)
    9087                mopts = argv[4];
    9188
    92         rc = mount(argv[1], argv[2], dev, mopts, 0);
     89        rc = mount(argv[1], argv[2], argv[3], mopts, 0);
    9390        if (rc != EOK) {
    9491                printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",

  • uspace/app/redir/redir.c

    rc3f95d8 rc1a5d8d  
    4949static void usage(void)
    5050{
    51         fprintf(stderr, "Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n",
     51        printf("Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n",
    5252            NAME);
    5353}
    … …  
    8383        args = (const char **) calloc(argc + 1, sizeof(char *));
    8484        if (!args) {
    85                 fprintf(stderr, "No memory available\n");
     85                printf("No memory available\n");
    8686                return 0;
    8787        }
    … …  
    9898       
    9999        if (rc != EOK) {
    100                 fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, argv[0],
     100                printf("%s: Error spawning %s (%s)\n", NAME, argv[0],
    101101                    str_error(rc));
    102                 return 0;
    103102        }
    104103       

  • uspace/app/tester/Makefile

    rc3f95d8 rc1a5d8d  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBEXT2_PREFIX)/libext2.a
    32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX)
    3331BINARY = tester
    3432
    3533SOURCES = \
    3634        tester.c \
    37         util.c \
    3835        thread/thread1.c \
    3936        print/print1.c \
    … …  
    5350        mm/malloc1.c \
    5451        hw/misc/virtchar1.c \
    55         hw/serial/serial1.c \
    56         libext2/libext2_1.c
     52        hw/serial/serial1.c
    5753
    5854include $(USPACE_PREFIX)/Makefile.common

  • uspace/app/tester/tester.c

    rc3f95d8 rc1a5d8d  
    6464#include "hw/serial/serial1.def"
    6565#include "hw/misc/virtchar1.def"
    66 #include "libext2/libext2_1.def"
    6766        {NULL, NULL, NULL, false}
    6867};

  • uspace/app/tester/tester.h

    rc3f95d8 rc1a5d8d  
    8080extern const char *test_serial1(void);
    8181extern const char *test_virtchar1(void);
    82 extern const char *test_libext2_1(void);
    8382
    8483extern test_t tests[];

  • uspace/lib/block/libblock.c

    rc3f95d8 rc1a5d8d  
    22 * Copyright (c) 2008 Jakub Jermar
    33 * Copyright (c) 2008 Martin Decky
    4  * Copyright (c) 2011 Martin Sucha
    54 * All rights reserved.
    65 *
    … …  
    826825}
    827826
    828 /** Read bytes directly from the device (bypass cache)
    829  *
    830  * @param devmap_handle Device handle of the block device.
    831  * @param abs_offset    Absolute offset in bytes where to start reading
    832  * @param bytes                 Number of bytes to read
    833  * @param data                  Buffer that receives the data
    834  *
    835  * @return              EOK on success or negative error code on failure.
    836  */
    837 int block_read_bytes_direct(devmap_handle_t devmap_handle, aoff64_t abs_offset,
    838     size_t bytes, void *data)
    839 {
    840         int rc;
    841         size_t phys_block_size;
    842         size_t buf_size;
    843         void *buffer;
    844         aoff64_t first_block;
    845         aoff64_t last_block;
    846         size_t blocks;
    847         size_t offset;
    848        
    849         rc = block_get_bsize(devmap_handle, &phys_block_size);
    850         if (rc != EOK) {
    851                 return rc;
    852         }
    853        
    854         // calculate data position and required space
    855         first_block = abs_offset / phys_block_size;
    856         offset = abs_offset % phys_block_size;
    857         last_block = (abs_offset + bytes - 1) / phys_block_size;
    858         blocks = last_block - first_block + 1;
    859         buf_size = blocks * phys_block_size;
    860        
    861         // read the data into memory
    862         buffer = malloc(buf_size);
    863         if (buffer == NULL) {
    864                 return ENOMEM;
    865         }
    866        
    867         rc = block_read_direct(devmap_handle, first_block, blocks, buffer);
    868         if (rc != EOK) {
    869                 free(buffer);
    870                 return rc;
    871         }
    872        
    873         // copy the data from the buffer
    874         memcpy(data, buffer + offset, bytes);
    875         free(buffer);
    876        
    877         return EOK;
    878 }
    879 
    880827/** Read blocks from block device.
    881828 *

  • uspace/lib/block/libblock.h

    rc3f95d8 rc1a5d8d  
    22 * Copyright (c) 2008 Jakub Jermar
    33 * Copyright (c) 2008 Martin Decky
    4  * Copyright (c) 2011 Martin Sucha
    54 * All rights reserved.
    65 *
    … …  
    114113extern int block_get_nblocks(devmap_handle_t, aoff64_t *);
    115114extern int block_read_direct(devmap_handle_t, aoff64_t, size_t, void *);
    116 extern int block_read_bytes_direct(devmap_handle_t, aoff64_t, size_t, void *);
    117115extern int block_write_direct(devmap_handle_t, aoff64_t, size_t, const void *);
    118116
Note: See TracChangeset for help on using the changeset viewer.