Changeset 5c96b2a in mainline
- Timestamp:
- 2011-06-02T21:26:44Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- ff4f073
- Parents:
- 4a06045 (diff), 21300a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Files:
-
- 31 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.common
r4a06045 r5c96b2a 97 97 $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \ 98 98 $(USPACE_PATH)/srv/fs/fat/fat \ 99 $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \ 99 100 $(USPACE_PATH)/srv/taskmon/taskmon \ 100 101 $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \ … … 135 136 136 137 RD_APPS_NON_ESSENTIAL = \ 138 $(USPACE_PATH)/app/blkdump/blkdump \ 139 $(USPACE_PATH)/app/bnchmark/bnchmark \ 137 140 $(USPACE_PATH)/app/dltest/dltest \ 138 141 $(USPACE_PATH)/app/dltest2/dltest2 \ 139 142 $(USPACE_PATH)/app/dload/dload \ 140 143 $(USPACE_PATH)/app/edit/edit \ 144 $(USPACE_PATH)/app/ext2info/ext2info \ 141 145 $(USPACE_PATH)/app/kill/kill \ 142 146 $(USPACE_PATH)/app/killall/killall \ … … 146 150 $(USPACE_PATH)/app/taskdump/taskdump \ 147 151 $(USPACE_PATH)/app/tester/tester \ 152 $(USPACE_PATH)/app/testread/testread \ 148 153 $(USPACE_PATH)/app/tetris/tetris \ 149 154 $(USPACE_PATH)/app/trace/trace \ -
uspace/Makefile
r4a06045 r5c96b2a 35 35 DIRS = \ 36 36 app/bdsh \ 37 app/blkdump \ 38 app/bnchmark \ 37 39 app/edit \ 40 app/ext2info \ 38 41 app/getterm \ 39 42 app/init \ … … 47 50 app/taskdump \ 48 51 app/tester \ 52 app/testread \ 49 53 app/tetris \ 50 54 app/trace \ … … 72 76 srv/fs/tmpfs \ 73 77 srv/fs/devfs \ 78 srv/fs/ext2fs \ 74 79 srv/hid/adb_mouse \ 75 80 srv/hid/char_mouse \ … … 149 154 lib/drv \ 150 155 lib/packet \ 151 lib/net 156 lib/net \ 157 lib/ext2 152 158 153 159 LIBC_BUILD = $(addsuffix .build,$(LIBC)) -
uspace/Makefile.common
r4a06045 r5c96b2a 108 108 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui 109 109 110 LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2 111 110 112 LIBDRV_PREFIX = $(LIB_PREFIX)/drv 111 113 LIBPACKET_PREFIX = $(LIB_PREFIX)/packet -
uspace/app/bdsh/cmds/modules/mount/mount.c
r4a06045 r5c96b2a 51 51 { 52 52 static char helpfmt[] = 53 "Usage: %s <fstype> <mp> <dev>[<moptions>]\n";53 "Usage: %s <fstype> <mp> [dev] [<moptions>]\n"; 54 54 if (level == HELP_SHORT) { 55 55 printf("'%s' mounts a file system.\n", cmdname); … … 66 66 unsigned int argc; 67 67 const char *mopts = ""; 68 const char *dev = ""; 68 69 int rc, c, opt_ind; 69 70 … … 79 80 } 80 81 81 if ((argc < 4) || (argc > 5)) {82 if ((argc < 3) || (argc > 5)) { 82 83 printf("%s: invalid number of arguments. Try `mount --help'\n", 83 84 cmdname); 84 85 return CMD_FAILURE; 85 86 } 87 if (argc > 3) 88 dev = argv[3]; 86 89 if (argc == 5) 87 90 mopts = argv[4]; 88 91 89 rc = mount(argv[1], argv[2], argv[3], mopts, 0);92 rc = mount(argv[1], argv[2], dev, mopts, 0); 90 93 if (rc != EOK) { 91 94 printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n", -
uspace/app/redir/redir.c
r4a06045 r5c96b2a 49 49 static void usage(void) 50 50 { 51 printf("Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n",51 fprintf(stderr, "Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n", 52 52 NAME); 53 53 } … … 83 83 args = (const char **) calloc(argc + 1, sizeof(char *)); 84 84 if (!args) { 85 printf("No memory available\n");85 fprintf(stderr, "No memory available\n"); 86 86 return 0; 87 87 } … … 98 98 99 99 if (rc != EOK) { 100 printf("%s: Error spawning %s (%s)\n", NAME, argv[0],100 fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, argv[0], 101 101 str_error(rc)); 102 return 0; 102 103 } 103 104 -
uspace/app/tester/Makefile
r4a06045 r5c96b2a 29 29 30 30 USPACE_PREFIX = ../.. 31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBEXT2_PREFIX)/libext2.a 32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBEXT2_PREFIX) 31 33 BINARY = tester 32 34 33 35 SOURCES = \ 34 36 tester.c \ 37 util.c \ 35 38 thread/thread1.c \ 36 39 print/print1.c \ … … 55 58 devs/devman2.c \ 56 59 hw/misc/virtchar1.c \ 57 hw/serial/serial1.c 60 hw/serial/serial1.c \ 61 libext2/libext2_1.c 58 62 59 63 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/tester/tester.c
r4a06045 r5c96b2a 66 66 #include "hw/serial/serial1.def" 67 67 #include "hw/misc/virtchar1.def" 68 #include "libext2/libext2_1.def" 68 69 #include "devs/devman1.def" 69 70 #include "devs/devman2.def" -
uspace/app/tester/tester.h
r4a06045 r5c96b2a 99 99 extern const char *test_serial1(void); 100 100 extern const char *test_virtchar1(void); 101 extern const char *test_libext2_1(void); 101 102 extern const char *test_devman1(void); 102 103 extern const char *test_devman2(void); -
uspace/lib/block/libblock.c
r4a06045 r5c96b2a 2 2 * Copyright (c) 2008 Jakub Jermar 3 3 * Copyright (c) 2008 Martin Decky 4 * Copyright (c) 2011 Martin Sucha 4 5 * All rights reserved. 5 6 * … … 827 828 } 828 829 830 /** Read bytes directly from the device (bypass cache) 831 * 832 * @param devmap_handle Device handle of the block device. 833 * @param abs_offset Absolute offset in bytes where to start reading 834 * @param bytes Number of bytes to read 835 * @param data Buffer that receives the data 836 * 837 * @return EOK on success or negative error code on failure. 838 */ 839 int block_read_bytes_direct(devmap_handle_t devmap_handle, aoff64_t abs_offset, 840 size_t bytes, void *data) 841 { 842 int rc; 843 size_t phys_block_size; 844 size_t buf_size; 845 void *buffer; 846 aoff64_t first_block; 847 aoff64_t last_block; 848 size_t blocks; 849 size_t offset; 850 851 rc = block_get_bsize(devmap_handle, &phys_block_size); 852 if (rc != EOK) { 853 return rc; 854 } 855 856 /* calculate data position and required space */ 857 first_block = abs_offset / phys_block_size; 858 offset = abs_offset % phys_block_size; 859 last_block = (abs_offset + bytes - 1) / phys_block_size; 860 blocks = last_block - first_block + 1; 861 buf_size = blocks * phys_block_size; 862 863 /* read the data into memory */ 864 buffer = malloc(buf_size); 865 if (buffer == NULL) { 866 return ENOMEM; 867 } 868 869 rc = block_read_direct(devmap_handle, first_block, blocks, buffer); 870 if (rc != EOK) { 871 free(buffer); 872 return rc; 873 } 874 875 /* copy the data from the buffer */ 876 memcpy(data, buffer + offset, bytes); 877 free(buffer); 878 879 return EOK; 880 } 881 829 882 /** Read blocks from block device. 830 883 * -
uspace/lib/block/libblock.h
r4a06045 r5c96b2a 2 2 * Copyright (c) 2008 Jakub Jermar 3 3 * Copyright (c) 2008 Martin Decky 4 * Copyright (c) 2011 Martin Sucha 4 5 * All rights reserved. 5 6 * … … 113 114 extern int block_get_nblocks(devmap_handle_t, aoff64_t *); 114 115 extern 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 *); 115 117 extern int block_write_direct(devmap_handle_t, aoff64_t, size_t, const void *); 116 118
Note:
See TracChangeset
for help on using the changeset viewer.