- Timestamp:
- 2013-04-10T19:11:45Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- dd0c8a0
- Parents:
- 44186b01 (diff), b4f43a1 (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. - Location:
- uspace
- Files:
-
- 2 added
- 1 deleted
- 33 edited
- 1 moved
-
app/bdsh/cmds/modules/ls/ls.c (modified) (1 diff)
-
app/bdsh/cmds/modules/sleep/sleep.c (modified) (1 diff)
-
app/bnchmark/bnchmark.c (modified) (1 diff)
-
app/trace/ipc_desc.c (modified) (1 diff)
-
app/trace/ipc_desc.h (modified) (1 diff)
-
app/trace/ipcp.c (modified) (2 diffs)
-
app/trace/syscalls.c (modified) (2 diffs)
-
app/trace/syscalls.h (modified) (2 diffs)
-
app/trace/trace.c (modified) (4 diffs)
-
app/vlaunch/Makefile (modified) (1 diff)
-
app/vlaunch/gfx/helenos.tga (added)
-
app/vlaunch/vlaunch.c (modified) (5 diffs)
-
drv/bus/usb/usbhub/port.c (modified) (1 diff)
-
lib/c/arch/ia32/src/setjmp.S (modified) (1 diff)
-
lib/c/generic/adt/hash_table.c (modified) (1 diff)
-
lib/c/generic/async.c (modified) (2 diffs)
-
lib/c/include/mem.h (modified) (1 diff)
-
lib/c/include/setjmp.h (modified) (2 diffs)
-
lib/c/include/sys/types.h (modified) (1 diff)
-
lib/gui/Makefile (modified) (1 diff)
-
lib/gui/canvas.c (added)
-
lib/gui/canvas.h (moved) (moved from kernel/genarch/include/genarch/fb/logo-196x66.h ) (2 diffs)
-
lib/posix/include/posix/fcntl.h (modified) (1 diff)
-
lib/posix/include/posix/float.h (modified) (1 diff)
-
lib/posix/include/posix/limits.h (modified) (1 diff)
-
lib/posix/include/posix/math.h (modified) (1 diff)
-
lib/posix/include/posix/stdio.h (modified) (1 diff)
-
lib/posix/source/math.c (modified) (1 diff)
-
srv/devman/main.c (modified) (1 diff)
-
srv/fs/exfat/exfat_fat.c (modified) (1 diff)
-
srv/fs/fat/fat_dentry.c (modified) (3 diffs)
-
srv/fs/fat/fat_dentry.h (modified) (3 diffs)
-
srv/fs/fat/fat_fat.c (modified) (5 diffs)
-
srv/fs/mfs/mfs_ops.c (modified) (2 diffs)
-
srv/hid/compositor/Makefile (modified) (1 diff)
-
srv/hid/compositor/compositor.c (modified) (1 diff)
-
srv/hid/compositor/gfx/helenos.tga (deleted)
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/bdsh/cmds/modules/ls/ls.c
r44186b01 r3deb0155 315 315 { 316 316 if (stat(path, &de->s)) { 317 cli_error(CL_ENOENT, path);317 cli_error(CL_ENOENT, "%s", path); 318 318 return LS_BOGUS; 319 319 } -
uspace/app/bdsh/cmds/modules/sleep/sleep.c
r44186b01 r3deb0155 114 114 int ret; 115 115 unsigned int argc; 116 useconds_t duration ;116 useconds_t duration = 0; 117 117 118 118 /* Count the arguments */ -
uspace/app/bnchmark/bnchmark.c
r44186b01 r3deb0155 142 142 { 143 143 int rc; 144 umseconds_t milliseconds_taken ;144 umseconds_t milliseconds_taken = 0; 145 145 char *path = NULL; 146 146 measure_func_t fn = NULL; -
uspace/app/trace/ipc_desc.c
r44186b01 r3deb0155 49 49 { IPC_M_DATA_READ, "DATA_READ" }, 50 50 { IPC_M_DEBUG, "DEBUG" }, 51 52 /* Terminating entry */53 { 0, NULL }54 51 }; 52 53 size_t ipc_methods_len = sizeof(ipc_methods) / sizeof(ipc_m_desc_t); 55 54 56 55 /** @} -
uspace/app/trace/ipc_desc.h
r44186b01 r3deb0155 42 42 43 43 extern ipc_m_desc_t ipc_methods[]; 44 extern size_t ipc_methods_len; 44 45 45 46 #endif -
uspace/app/trace/ipcp.c
r44186b01 r3deb0155 140 140 void ipcp_init(void) 141 141 { 142 ipc_m_desc_t *desc;143 oper_t *oper;144 145 142 val_type_t arg_def[OPER_MAX_ARGS] = { 146 143 V_INTEGER, … … 162 159 proto_system = proto_new("system"); 163 160 164 desc = ipc_methods; 165 while (desc->number != 0) { 166 oper = oper_new(desc->name, OPER_MAX_ARGS, arg_def, V_INTEGER, 167 OPER_MAX_ARGS, arg_def); 168 proto_add_oper(proto_system, desc->number, oper); 169 170 ++desc; 161 for (size_t i = 0; i < ipc_methods_len; i++) { 162 oper_t *oper = oper_new(ipc_methods[i].name, OPER_MAX_ARGS, 163 arg_def, V_INTEGER, OPER_MAX_ARGS, arg_def); 164 proto_add_oper(proto_system, ipc_methods[i].number, oper); 171 165 } 172 166 -
uspace/app/trace/syscalls.c
r44186b01 r3deb0155 46 46 47 47 [SYS_TASK_GET_ID] = { "task_get_id", 1, V_ERRNO }, 48 [SYS_TASK_SET_NAME] = { "task_set_name", 2, V_ERRNO }, 48 49 [SYS_FUTEX_SLEEP] = { "futex_sleep_timeout", 3, V_ERRNO }, 49 50 [SYS_FUTEX_WAKEUP] = { "futex_wakeup", 1, V_ERRNO }, … … 82 83 }; 83 84 85 const size_t syscall_desc_len = (sizeof(syscall_desc) / sizeof(sc_desc_t)); 86 84 87 /** @} 85 88 */ -
uspace/app/trace/syscalls.h
r44186b01 r3deb0155 36 36 #define SYSCALLS_H_ 37 37 38 #include <stdbool.h> 39 #include <unistd.h> 40 38 41 #include "trace.h" 39 42 … … 45 48 46 49 extern const sc_desc_t syscall_desc[]; 50 extern const size_t syscall_desc_len; 51 52 static inline bool syscall_desc_defined(unsigned sc_id) 53 { 54 return (sc_id < syscall_desc_len && syscall_desc[sc_id].name != NULL); 55 } 47 56 48 57 #endif -
uspace/app/trace/trace.c
r44186b01 r3deb0155 136 136 } 137 137 138 free(task_ldr);139 138 task_ldr = NULL; 140 139 … … 348 347 if ((display_mask & DM_SYSCALL) != 0) { 349 348 /* Print syscall name and arguments */ 350 printf("%s", syscall_desc[sc_id].name); 351 print_sc_args(sc_args, syscall_desc[sc_id].n_args); 349 if (syscall_desc_defined(sc_id)) { 350 printf("%s", syscall_desc[sc_id].name); 351 print_sc_args(sc_args, syscall_desc[sc_id].n_args); 352 } 353 else { 354 printf("unknown_syscall<%d>", sc_id); 355 print_sc_args(sc_args, 6); 356 } 352 357 } 353 358 } … … 372 377 if ((display_mask & DM_SYSCALL) != 0) { 373 378 /* Print syscall return value */ 374 rv_type = syscall_desc[sc_id].rv_type; 379 if (syscall_desc_defined(sc_id)) 380 rv_type = syscall_desc[sc_id].rv_type; 381 else 382 rv_type = V_PTR; 375 383 print_sc_retval(sc_rc, rv_type); 376 384 } … … 497 505 ldr = loader_connect(); 498 506 if (ldr == NULL) 499 return 0;507 return NULL; 500 508 501 509 /* Get task ID. */ -
uspace/app/vlaunch/Makefile
r44186b01 r3deb0155 35 35 36 36 SOURCES = \ 37 vlaunch.c 37 vlaunch.c \ 38 images.c 39 40 IMAGES = \ 41 gfx/helenos.tga 42 43 PRE_DEPEND = images.c images.h 44 EXTRA_CLEAN = images.c images.h 38 45 39 46 include $(USPACE_PREFIX)/Makefile.common 47 48 images.c images.h: $(IMAGES) 49 $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^ -
uspace/app/vlaunch/vlaunch.c
r44186b01 r3deb0155 46 46 #include <button.h> 47 47 #include <label.h> 48 #include <canvas.h> 48 49 49 #define NAME "vlaunch" 50 #include <surface.h> 51 #include <source.h> 52 #include <drawctx.h> 53 #include <codec/tga.h> 54 55 #include "images.h" 56 57 #define NAME "vlaunch" 58 59 #define LOGO_WIDTH 196 60 #define LOGO_HEIGHT 66 50 61 51 62 static char *winreg = NULL; … … 97 108 } 98 109 110 surface_t *logo = decode_tga((void *) helenos_tga, helenos_tga_size, 0); 111 if (!logo) { 112 printf("Unable to decode logo.\n"); 113 return 1; 114 } 115 99 116 winreg = argv[1]; 100 117 window_t *main_window = window_open(argv[1], true, true, "vlaunch", 0, 0); … … 110 127 pixel_t lbl_fg = PIXEL(255, 0, 0, 0); 111 128 129 canvas_t *logo_canvas = create_canvas(NULL, LOGO_WIDTH, LOGO_HEIGHT, 130 logo); 112 131 label_t *lbl_caption = create_label(NULL, "Launch application:", 16, 113 132 lbl_bg, lbl_fg); … … 118 137 button_t *btn_vlaunch = create_button(NULL, "vlaunch", 16, btn_bg, 119 138 btn_fg); 120 grid_t *grid = create_grid(window_root(main_window), 4, 1, grd_bg);139 grid_t *grid = create_grid(window_root(main_window), 5, 1, grd_bg); 121 140 122 if ((!l bl_caption) || (!btn_vterm) || (!btn_vdemo) ||123 (!btn_v launch) || (!grid)) {141 if ((!logo_canvas) || (!lbl_caption) || (!btn_vterm) || 142 (!btn_vdemo) || (!btn_vlaunch) || (!grid)) { 124 143 window_close(main_window); 125 144 printf("Cannot create widgets.\n"); … … 131 150 sig_connect(&btn_vlaunch->clicked, NULL, on_vlaunch); 132 151 133 grid->add(grid, &lbl_caption->widget, 0, 0, 1, 1); 134 grid->add(grid, &btn_vterm->widget, 1, 0, 1, 1); 135 grid->add(grid, &btn_vdemo->widget, 2, 0, 1, 1); 136 grid->add(grid, &btn_vlaunch->widget, 3, 0, 1, 1); 152 grid->add(grid, &logo_canvas->widget, 0, 0, 1, 1); 153 grid->add(grid, &lbl_caption->widget, 1, 0, 1, 1); 154 grid->add(grid, &btn_vterm->widget, 2, 0, 1, 1); 155 grid->add(grid, &btn_vdemo->widget, 3, 0, 1, 1); 156 grid->add(grid, &btn_vlaunch->widget, 4, 0, 1, 1); 137 157 138 window_resize(main_window, 180, 130);158 window_resize(main_window, 210, 280 + LOGO_HEIGHT); 139 159 window_exec(main_window); 160 140 161 task_retval(0); 141 162 async_manager(); -
uspace/drv/bus/usb/usbhub/port.c
r44186b01 r3deb0155 143 143 usb_log_debug("Interrupt at port %zu\n", port->port_number); 144 144 145 usb_port_status_t status ;145 usb_port_status_t status = 0; 146 146 const int opResult = get_port_status(port, &status); 147 147 if (opResult != EOK) { -
uspace/lib/c/arch/ia32/src/setjmp.S
r44186b01 r3deb0155 35 35 .type setjmp,@function 36 36 setjmp: 37 movl 0(%esp),%eax # save pc value into eax38 movl 4(%esp),%edx # address of the jmp_buf structure to save context to39 40 # save registers to the jmp_buf structure37 movl 0(%esp),%eax # save pc value into eax 38 movl 4(%esp),%edx # address of the jmp_buf structure to save context to 39 40 # save registers to the jmp_buf structure 41 41 CONTEXT_SAVE_ARCH_CORE %edx %eax 42 43 xorl %eax,%eax # set_jmp returns 042 43 xorl %eax,%eax # set_jmp returns 0 44 44 ret 45 45 46 46 .type longjmp,@function 47 47 longjmp: 48 49 movl 4(%esp), %ecx # put address of jmp_buf into ecx 50 movl 8(%esp), %eax # put return value into eax 51 52 # restore registers from the jmp_buf structure 48 movl 4(%esp), %ecx # put address of jmp_buf into ecx 49 movl 8(%esp), %eax # put return value into eax 50 51 # restore registers from the jmp_buf structure 53 52 CONTEXT_RESTORE_ARCH_CORE %ecx %edx 54 55 movl %edx,0(%esp) # put saved pc on stack53 54 movl %edx,0(%esp) # put saved pc on stack 56 55 ret 57 -
uspace/lib/c/generic/adt/hash_table.c
r44186b01 r3deb0155 81 81 * @param init_size Initial desired number of hash table buckets. Pass zero 82 82 * if you want the default initial size. 83 * @param max_keys Maximal number of keys needed to identify an item. 83 * @param max_load The table is resized when the average load per bucket 84 * exceeds this number. Pass zero if you want the default. 84 85 * @param op Hash table operations structure. remove_callback() 85 86 * is optional and can be NULL if no action is to be taken -
uspace/lib/c/generic/async.c
r44186b01 r3deb0155 2090 2090 * @param arg User defined argument. 2091 2091 * @param flags Storage for the received flags. Can be NULL. 2092 * @param dst Destination address space area base. Cannot be NULL. 2092 * @param dst Address of the storage for the destination address space area 2093 * base address. Cannot be NULL. 2093 2094 * 2094 2095 * @return Zero on success or a negative error code from errno.h. … … 2218 2219 * 2219 2220 * @param callid Hash of the IPC_M_DATA_WRITE call to answer. 2220 * @param dst Destination address space area base address. 2221 * @param dst Address of the storage for the destination address space area 2222 * base address. 2221 2223 * 2222 2224 * @return Zero on success or a value from @ref errno.h on failure. -
uspace/lib/c/include/mem.h
r44186b01 r3deb0155 40 40 #define bzero(ptr, len) memset((ptr), 0, (len)) 41 41 42 extern void *memset(void *, int, size_t); 43 extern void *memcpy(void *, const void *, size_t); 42 extern void *memset(void *, int, size_t) 43 __attribute__ ((optimize("-fno-tree-loop-distribute-patterns"))); 44 extern void *memcpy(void *, const void *, size_t) 45 __attribute__ ((optimize("-fno-tree-loop-distribute-patterns"))); 44 46 extern void *memmove(void *, const void *, size_t); 45 47 -
uspace/lib/c/include/setjmp.h
r44186b01 r3deb0155 38 38 #include <libarch/fibril.h> 39 39 40 typedef context_t jmp_buf ;40 typedef context_t jmp_buf[1]; 41 41 42 42 extern int setjmp(jmp_buf env); … … 47 47 /** @} 48 48 */ 49 -
uspace/lib/c/include/sys/types.h
r44186b01 r3deb0155 50 50 typedef volatile uint32_t ioport32_t; 51 51 52 typedef int16_t unaligned_int16_t __attribute__ ((aligned(1))); 53 typedef int32_t unaligned_int32_t __attribute__ ((aligned(1))); 54 typedef int64_t unaligned_int64_t __attribute__ ((aligned(1))); 55 56 typedef uint16_t unaligned_uint16_t __attribute__ ((aligned(1))); 57 typedef uint32_t unaligned_uint32_t __attribute__ ((aligned(1))); 58 typedef uint64_t unaligned_uint64_t __attribute__ ((aligned(1))); 59 52 60 #endif 53 61 -
uspace/lib/gui/Makefile
r44186b01 r3deb0155 35 35 SOURCES = \ 36 36 button.c \ 37 canvas.c \ 37 38 connection.c \ 38 39 grid.c \ -
uspace/lib/gui/canvas.h
r44186b01 r3deb0155 1 1 /* 2 * Copyright (c) 20 08Martin Decky2 * Copyright (c) 2013 Martin Decky 3 3 * All rights reserved. 4 4 * … … 27 27 */ 28 28 29 /** @addtogroup g enarch29 /** @addtogroup gui 30 30 * @{ 31 31 */ 32 /** @file 32 /** 33 * @file 33 34 */ 34 35 35 #ifndef KERN_LOGO_196X66_H_36 #define KERN_LOGO_196X66_H_36 #ifndef GUI_CANVAS_H_ 37 #define GUI_CANVAS_H_ 37 38 38 #define LOGO_WIDTH 196 39 #define LOGO_HEIGHT 66 40 #define LOGO_COLOR 0xffffff 39 #include <stdbool.h> 40 #include <sys/types.h> 41 #include <io/pixel.h> 42 #include <surface.h> 43 #include "widget.h" 41 44 42 #include <typedefs.h> 45 typedef struct { 46 widget_t widget; 47 sysarg_t width; 48 sysarg_t height; 49 surface_t *surface; 50 } canvas_t; 43 51 44 extern uint32_t fb_logo[LOGO_WIDTH * LOGO_HEIGHT]; 52 extern bool init_canvas(canvas_t *, widget_t *, sysarg_t, sysarg_t, 53 surface_t *); 54 extern canvas_t *create_canvas(widget_t *, sysarg_t, sysarg_t, surface_t *); 55 extern void deinit_canvas(canvas_t *); 45 56 46 57 #endif -
uspace/lib/posix/include/posix/fcntl.h
r44186b01 r3deb0155 44 44 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) 45 45 46 /* Dummy compatibility flag */ 47 #undef O_NOCTTY 48 #define O_NOCTTY 0 49 46 50 /* fcntl commands */ 47 51 #undef F_DUPFD -
uspace/lib/posix/include/posix/float.h
r44186b01 r3deb0155 36 36 #define POSIX_FLOAT_H_ 37 37 38 /* Empty. Just to satisfy preprocessor. */ 38 /* Rouding direction -1 - unknown */ 39 #define FLT_ROUNDS (-1) 40 41 /* define some standard C constants in terms of GCC built-ins */ 42 #ifdef __GNUC__ 43 #undef DBL_MANT_DIG 44 #define DBL_MANT_DIG __DBL_MANT_DIG__ 45 #undef DBL_MIN_EXP 46 #define DBL_MIN_EXP __DBL_MIN_EXP__ 47 #undef DBL_MAX_EXP 48 #define DBL_MAX_EXP __DBL_MAX_EXP__ 49 #undef DBL_MAX 50 #define DBL_MAX __DBL_MAX__ 51 #undef DBL_MAX_10_EXP 52 #define DBL_MAX_10_EXP __DBL_MAX_10_EXP__ 53 #undef DBL_MIN_10_EXP 54 #define DBL_MIN_10_EXP __DBL_MIN_10_EXP__ 55 #undef DBL_MIN 56 #define DBL_MIN __DBL_MIN__ 57 #undef DBL_DIG 58 #define DBL_DIG __DBL_DIG__ 59 #undef DBL_EPSILON 60 #define DBL_EPSILON __DBL_EPSILON__ 61 #undef FLT_RADIX 62 #define FLT_RADIX __FLT_RADIX__ 63 #endif 39 64 40 65 #endif /* POSIX_FLOAT_H_ */ -
uspace/lib/posix/include/posix/limits.h
r44186b01 r3deb0155 49 49 #define PATH_MAX 256 50 50 51 /* it's probably a safe assumption */ 52 #undef CHAR_BIT 53 #define CHAR_BIT 8 54 51 55 #endif /* POSIX_LIMITS_H_ */ 52 56 -
uspace/lib/posix/include/posix/math.h
r44186b01 r3deb0155 36 36 #define POSIX_MATH_H_ 37 37 38 #ifdef __GNUC__ 39 #define HUGE_VAL (__builtin_huge_val()) 40 #endif 41 38 42 /* Normalization Functions */ 39 43 extern double posix_ldexp(double x, int exp); 40 44 extern double posix_frexp(double num, int *exp); 41 45 46 double posix_fabs(double x); 47 double posix_floor(double x); 48 double posix_modf(double x, double *iptr); 49 double posix_fmod(double x, double y); 50 double posix_pow(double x, double y); 51 double posix_exp(double x); 52 double posix_sqrt(double x); 53 double posix_log(double x); 54 double posix_sin(double x); 55 double posix_cos(double x); 56 double posix_atan2(double y, double x); 57 42 58 #ifndef LIBPOSIX_INTERNAL 43 59 #define ldexp posix_ldexp 44 60 #define frexp posix_frexp 61 62 #define fabs posix_fabs 63 #define floor posix_floor 64 #define modf posix_modf 65 #define fmod posix_fmod 66 #define pow posix_pow 67 #define exp posix_exp 68 #define sqrt posix_sqrt 69 #define log posix_log 70 #define sin posix_sin 71 #define cos posix_cos 72 #define atan2 posix_atan2 45 73 #endif 46 74 -
uspace/lib/posix/include/posix/stdio.h
r44186b01 r3deb0155 61 61 62 62 typedef struct _IO_FILE FILE; 63 64 #ifndef LIBPOSIX_INTERNAL 65 enum _buffer_type { 66 /** No buffering */ 67 _IONBF, 68 /** Line buffering */ 69 _IOLBF, 70 /** Full buffering */ 71 _IOFBF 72 }; 73 #endif 63 74 64 75 extern FILE *stdin; -
uspace/lib/posix/source/math.c
r44186b01 r3deb0155 62 62 } 63 63 64 /** 65 * 66 * @param x 67 * @return 68 */ 69 double posix_cos(double x) 70 { 71 // TODO: Python dependency 72 not_implemented(); 73 } 74 75 /** 76 * 77 * @param x 78 * @param y 79 * @return 80 */ 81 double posix_pow(double x, double y) 82 { 83 // TODO: Python dependency 84 not_implemented(); 85 } 86 87 /** 88 * 89 * @param x 90 * @return 91 */ 92 double posix_floor(double x) 93 { 94 // TODO: Python dependency 95 not_implemented(); 96 } 97 98 /** 99 * 100 * @param x 101 * @return 102 */ 103 double posix_fabs(double x) 104 { 105 // TODO: Python dependency 106 not_implemented(); 107 } 108 109 /** 110 * 111 * @param x 112 * @param iptr 113 * @return 114 */ 115 double posix_modf(double x, double *iptr) 116 { 117 // TODO: Python dependency 118 not_implemented(); 119 } 120 121 /** 122 * 123 * @param x 124 * @param y 125 * @return 126 */ 127 double posix_fmod(double x, double y) 128 { 129 // TODO: Python dependency 130 not_implemented(); 131 } 132 133 /** 134 * 135 * @param x 136 * @return 137 */ 138 double posix_log(double x) 139 { 140 // TODO: Python dependency 141 not_implemented(); 142 } 143 144 /** 145 * 146 * @param x 147 * @param y 148 * @return 149 */ 150 double posix_atan2(double y, double x) 151 { 152 // TODO: Python dependency 153 not_implemented(); 154 } 155 156 /** 157 * 158 * @param x 159 * @return 160 */ 161 double posix_sin(double x) 162 { 163 // TODO: Python dependency 164 not_implemented(); 165 } 166 167 /** 168 * 169 * @param x 170 * @return 171 */ 172 double posix_exp(double x) 173 { 174 // TODO: Python dependency 175 not_implemented(); 176 } 177 178 /** 179 * 180 * @param x 181 * @return 182 */ 183 double posix_sqrt(double x) 184 { 185 // TODO: Python dependency 186 not_implemented(); 187 } 188 64 189 /** @} 65 190 */ -
uspace/srv/devman/main.c
r44186b01 r3deb0155 735 735 { 736 736 client_t *client; 737 driver_t *driver ;737 driver_t *driver = NULL; 738 738 739 739 /* Accept the connection. */ -
uspace/srv/fs/exfat/exfat_fat.c
r44186b01 r3deb0155 401 401 { 402 402 service_id_t service_id = nodep->idx->service_id; 403 exfat_cluster_t lastc ;403 exfat_cluster_t lastc = 0; 404 404 int rc; 405 405 -
uspace/srv/fs/fat/fat_dentry.c
r44186b01 r3deb0155 44 44 #include <assert.h> 45 45 #include <unistd.h> 46 #include <sys/types.h> 46 47 47 48 /** Compare path component with the name read from the dentry. … … 232 233 /** Get number of bytes in a string with size limit. 233 234 * 234 * @param str NULL-terminated (or not) string. 235 * @param str NULL-terminated (or not) string. The pointer comes from a packed 236 * structure and as such is expected to be unaligned. 235 237 * @param size Maximum number of bytes to consider. 236 238 * … … 238 240 * 239 241 */ 240 size_t fat_lfn_str_nlength(const u int16_t *str, size_t size)242 size_t fat_lfn_str_nlength(const unaligned_uint16_t *str, size_t size) 241 243 { 242 244 size_t offset = 0; -
uspace/srv/fs/fat/fat_dentry.h
r44186b01 r3deb0155 37 37 #include <stdint.h> 38 38 #include <stdbool.h> 39 #include <sys/types.h> 39 40 40 41 #define IS_D_CHAR(ch) (isalnum(ch) || ch == '_') … … 132 133 } __attribute__ ((packed)) fat_dentry_t; 133 134 134 135 135 extern int fat_dentry_namecmp(char *, const char *); 136 136 extern void fat_dentry_name_get(const fat_dentry_t *, char *); … … 139 139 extern uint8_t fat_dentry_chksum(uint8_t *); 140 140 141 extern size_t fat_lfn_str_nlength(const u int16_t *, size_t);141 extern size_t fat_lfn_str_nlength(const unaligned_uint16_t *, size_t); 142 142 extern size_t fat_lfn_size(const fat_dentry_t *); 143 143 extern size_t fat_lfn_get_entry(const fat_dentry_t *, uint16_t *, size_t *); -
uspace/srv/fs/fat/fat_fat.c
r44186b01 r3deb0155 128 128 { 129 129 fat_cluster_t firstc = nodep->firstc; 130 fat_cluster_t currc ;130 fat_cluster_t currc = 0; 131 131 aoff64_t relbn = bn; 132 132 int rc; … … 194 194 uint32_t clusters; 195 195 uint32_t max_clusters; 196 fat_cluster_t c ;196 fat_cluster_t c = 0; 197 197 int rc; 198 198 … … 679 679 fat_cluster_t *lifo; /* stack for storing free cluster numbers */ 680 680 unsigned found = 0; /* top of the free cluster number stack */ 681 fat_cluster_t clst, value, clst_last1 = FAT_CLST_LAST1(bs); 681 fat_cluster_t clst; 682 fat_cluster_t value = 0; 683 fat_cluster_t clst_last1 = FAT_CLST_LAST1(bs); 682 684 int rc = EOK; 683 685 … … 783 785 { 784 786 service_id_t service_id = nodep->idx->service_id; 785 fat_cluster_t lastc ;787 fat_cluster_t lastc = 0; 786 788 uint8_t fatno; 787 789 int rc; … … 907 909 int fat_sanity_check(fat_bs_t *bs, service_id_t service_id) 908 910 { 909 fat_cluster_t e0, e1; 911 fat_cluster_t e0 = 0; 912 fat_cluster_t e1 = 0; 910 913 unsigned fat_no; 911 914 int rc; -
uspace/srv/fs/mfs/mfs_ops.c
r44186b01 r3deb0155 773 773 { 774 774 int rc; 775 fs_node_t *fn ;775 fs_node_t *fn = NULL; 776 776 777 777 rc = mfs_node_get(&fn, service_id, index); … … 1108 1108 mfs_sync(service_id_t service_id, fs_index_t index) 1109 1109 { 1110 fs_node_t *fn ;1110 fs_node_t *fn = NULL; 1111 1111 int rc = mfs_node_get(&fn, service_id, index); 1112 1112 if (rc != EOK) -
uspace/srv/hid/compositor/Makefile
r44186b01 r3deb0155 38 38 39 39 IMAGES = \ 40 gfx/helenos.tga \41 40 gfx/nameic.tga 42 41 -
uspace/srv/hid/compositor/compositor.c
r44186b01 r3deb0155 1962 1962 } 1963 1963 list_prepend(&blue_win->link, &window_list); 1964 1965 window_t *helenos_win = window_create(0, 0); 1966 helenos_win->surface = decode_tga((void *) helenos_tga, helenos_tga_size, 0); 1967 list_prepend(&helenos_win->link, &window_list); 1968 1964 1969 1965 window_t *nameic_win = window_create(0, 0); 1970 1966 nameic_win->surface = decode_tga((void *) nameic_tga, nameic_tga_size, 0);
Note:
See TracChangeset
for help on using the changeset viewer.
