Changes in / [c1a5d8d:c3f95d8] in mainline

Files:

• .bzrignore (added)
• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (3 diffs)
• uspace/Makefile.common (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/mount/mount.c (modified) (3 diffs)
• uspace/app/blkdump/Makefile (added)
• uspace/app/blkdump/blkdump.c (added)
• uspace/app/ext2info/Makefile (added)
• uspace/app/ext2info/ext2info.c (added)
• uspace/app/redir/redir.c (modified) (3 diffs)
• uspace/app/tester/Makefile (modified) (2 diffs)
• uspace/app/tester/libext2/libext2_1.c (added)
• uspace/app/tester/libext2/libext2_1.def (added)
• uspace/app/tester/tester.c (modified) (1 diff)
• uspace/app/tester/tester.h (modified) (1 diff)
• uspace/app/tester/util.c (added)
• uspace/app/tester/util.h (added)
• uspace/app/tester/util_functions.def (added)
• uspace/lib/block/libblock.c (modified) (2 diffs)
• uspace/lib/block/libblock.h (modified) (2 diffs)
• uspace/lib/ext2/Makefile (added)
• uspace/lib/ext2/libext2.h (added)
• uspace/lib/ext2/libext2_block_group.c (added)
• uspace/lib/ext2/libext2_block_group.h (added)
• uspace/lib/ext2/libext2_directory.c (added)
• uspace/lib/ext2/libext2_directory.h (added)
• uspace/lib/ext2/libext2_filesystem.c (added)
• uspace/lib/ext2/libext2_filesystem.h (added)
• uspace/lib/ext2/libext2_inode.c (added)
• uspace/lib/ext2/libext2_inode.h (added)
• uspace/lib/ext2/libext2_superblock.c (added)
• uspace/lib/ext2/libext2_superblock.h (added)
• uspace/srv/fs/ext2fs/Makefile (added)
• uspace/srv/fs/ext2fs/ext2fs.c (added)
• uspace/srv/fs/ext2fs/ext2fs.h (added)
• uspace/srv/fs/ext2fs/ext2fs_ops.c (added)
• uspace/srv/fs/pipefs/Makefile (added)
• uspace/srv/fs/pipefs/pipefs.c (added)
• uspace/srv/fs/pipefs/pipefs.h (added)
• uspace/srv/fs/pipefs/pipefs_ops.c (added)
• uspace/srv/hw/netif/ne2000/dp8390_drv.h (added)
• uspace/srv/hw/netif/ne2000/dp8390_port.h (added)
• uspace/srv/hw/netif/ne2000/local.h (added)
• uspace/srv/hw/netif/ne2000/ne2000.h (added)

boot/Makefile.common ¶

@@ -97 +97 @@
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
+        $(USPACE_PATH)/srv/fs/pipefs/pipefs \
+        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/taskmon/taskmon \
         $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
@@ -124 +126 @@
 
 RD_APPS_NON_ESSENTIAL = \
+        $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/edit/edit \
+        $(USPACE_PATH)/app/ext2info/ext2info \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \

uspace/Makefile ¶

@@ -35 +35 @@
 DIRS = \
         app/bdsh \
+        app/blkdump \
         app/edit \
+        app/ext2info \
         app/getterm \
         app/init \
@@ -72 +74 @@
         srv/fs/tmpfs \
         srv/fs/devfs \
+        srv/fs/pipefs \
+        srv/fs/ext2fs \
         srv/hid/adb_mouse \
         srv/hid/char_mouse \
@@ -148 +152 @@
         lib/drv \
         lib/packet \
-        lib/net
+        lib/net \
+        lib/ext2
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))

uspace/Makefile.common ¶

@@ -86 +86 @@
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
 
+LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2
+
 LIBDRV_PREFIX = $(LIB_PREFIX)/drv
 LIBPACKET_PREFIX = $(LIB_PREFIX)/packet

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

@@ -51 +51 @@
 {
         static char helpfmt[] =
-            "Usage:  %s <fstype> <mp> <dev> [<moptions>]\n";
+            "Usage:  %s <fstype> <mp> [dev] [<moptions>]\n";
         if (level == HELP_SHORT) {
                 printf("'%s' mounts a file system.\n", cmdname);
@@ -66 +66 @@
         unsigned int argc;
         const char *mopts = "";
+        const char *dev = "";
         int rc, c, opt_ind;
 
@@ -79 +80 @@
         }
 
-        if ((argc < 4) || (argc > 5)) {
+        if ((argc < 3) || (argc > 5)) {
                 printf("%s: invalid number of arguments. Try `mount --help'\n",
                     cmdname);
                 return CMD_FAILURE;
         }
+        if (argc > 3)
+                dev = argv[3];
         if (argc == 5)
                 mopts = argv[4];
 
-        rc = mount(argv[1], argv[2], argv[3], mopts, 0);
+        rc = mount(argv[1], argv[2], dev, mopts, 0);
         if (rc != EOK) {
                 printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",

uspace/app/redir/redir.c ¶

@@ -49 +49 @@
 static void usage(void)
 {
-        printf("Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n",
+        fprintf(stderr, "Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n",
             NAME);
 }
@@ -83 +83 @@
         args = (const char **) calloc(argc + 1, sizeof(char *));
         if (!args) {
-                printf("No memory available\n");
+                fprintf(stderr, "No memory available\n");
                 return 0;
         }
@@ -98 +98 @@
         
         if (rc != EOK) {
-                printf("%s: Error spawning %s (%s)\n", NAME, argv[0],
+                fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, argv[0],
                     str_error(rc));
+                return 0;
         }
         

uspace/app/tester/Makefile ¶

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBEXT2_PREFIX)/libext2.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX)
 BINARY = tester
 
 SOURCES = \
         tester.c \
+        util.c \
         thread/thread1.c \
         print/print1.c \
@@ -50 +53 @@
         mm/malloc1.c \
         hw/misc/virtchar1.c \
-        hw/serial/serial1.c
+        hw/serial/serial1.c \
+        libext2/libext2_1.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/tester/tester.c ¶

@@ -64 +64 @@
 #include "hw/serial/serial1.def"
 #include "hw/misc/virtchar1.def"
+#include "libext2/libext2_1.def"
         {NULL, NULL, NULL, false}
 };

uspace/app/tester/tester.h ¶

@@ -80 +80 @@
 extern const char *test_serial1(void);
 extern const char *test_virtchar1(void);
+extern const char *test_libext2_1(void);
 
 extern test_t tests[];

uspace/lib/block/libblock.c ¶

@@ -2 +2 @@
  * Copyright (c) 2008 Jakub Jermar
  * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
  *
@@ -825 +826 @@
 }
 
+/** Read bytes directly from the device (bypass cache)
+ * 
+ * @param devmap_handle Device handle of the block device.
+ * @param abs_offset    Absolute offset in bytes where to start reading
+ * @param bytes                 Number of bytes to read
+ * @param data                  Buffer that receives the data
+ * 
+ * @return              EOK on success or negative error code on failure.
+ */
+int block_read_bytes_direct(devmap_handle_t devmap_handle, aoff64_t abs_offset,
+    size_t bytes, void *data)
+{
+        int rc;
+        size_t phys_block_size;
+        size_t buf_size;
+        void *buffer;
+        aoff64_t first_block;
+        aoff64_t last_block;
+        size_t blocks;
+        size_t offset;
+        
+        rc = block_get_bsize(devmap_handle, &phys_block_size);
+        if (rc != EOK) {
+                return rc;
+        }
+        
+        // calculate data position and required space
+        first_block = abs_offset / phys_block_size;
+        offset = abs_offset % phys_block_size;
+        last_block = (abs_offset + bytes - 1) / phys_block_size;
+        blocks = last_block - first_block + 1;
+        buf_size = blocks * phys_block_size;
+        
+        // read the data into memory
+        buffer = malloc(buf_size);
+        if (buffer == NULL) {
+                return ENOMEM;
+        }
+        
+        rc = block_read_direct(devmap_handle, first_block, blocks, buffer);
+        if (rc != EOK) {
+                free(buffer);
+                return rc;
+        }
+        
+        // copy the data from the buffer
+        memcpy(data, buffer + offset, bytes);
+        free(buffer);
+        
+        return EOK;
+}
+
 /** Read blocks from block device.
  *

uspace/lib/block/libblock.h ¶

@@ -2 +2 @@
  * Copyright (c) 2008 Jakub Jermar
  * Copyright (c) 2008 Martin Decky 
+ * Copyright (c) 2011 Martin Sucha 
  * All rights reserved.
  *
@@ -113 +114 @@
 extern int block_get_nblocks(devmap_handle_t, aoff64_t *);
 extern int block_read_direct(devmap_handle_t, aoff64_t, size_t, void *);
+extern int block_read_bytes_direct(devmap_handle_t, aoff64_t, size_t, void *);
 extern int block_write_direct(devmap_handle_t, aoff64_t, size_t, const void *);