Index: uspace/app/mkfat/fat.h =================================================================== --- uspace/app/mkfat/fat.h (revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc) +++ uspace/app/mkfat/fat.h (revision a05ec6671002c451fceb01aa0ab3f71f004efb6d) @@ -51,20 +51,34 @@ typedef struct fat_bs { - uint8_t ji[3]; /**< Jump instruction. */ + /** Jump instruction */ + uint8_t ji[3]; uint8_t oem_name[8]; + /* BIOS Parameter Block */ - uint16_t bps; /**< Bytes per sector. */ - uint8_t spc; /**< Sectors per cluster. */ - uint16_t rscnt; /**< Reserved sector count. */ - uint8_t fatcnt; /**< Number of FATs. */ - uint16_t root_ent_max; /**< Maximum number of root directory - entries. */ - uint16_t totsec16; /**< Total sectors. 16-bit version. */ - uint8_t mdesc; /**< Media descriptor. */ - uint16_t sec_per_fat; /**< Sectors per FAT12/FAT16. */ - uint16_t sec_per_track; /**< Sectors per track. */ - uint16_t headcnt; /**< Number of heads. */ - uint32_t hidden_sec; /**< Hidden sectors. */ - uint32_t totsec32; /**< Total sectors. 32-bit version. */ + + /** Bytes per sector */ + uint16_t bps; + /** Sectors per cluster */ + uint8_t spc; + /** Reserved sector count */ + uint16_t rscnt; + /** Number of FATs */ + uint8_t fatcnt; + /** Maximum number of root directory entries */ + uint16_t root_ent_max; + /** Total sectors. 16-bit version */ + uint16_t totsec16; + /** Media descriptor */ + uint8_t mdesc; + /** Sectors per FAT12/FAT16 */ + uint16_t sec_per_fat; + /** Sectors per track */ + uint16_t sec_per_track; + /** Number of heads */ + uint16_t headcnt; + /** Hidden sectors */ + uint32_t hidden_sec; + /** Total sectors. 32-bit version */ + uint32_t totsec32; union { Index: uspace/app/mkmfs/mkmfs.c =================================================================== --- uspace/app/mkmfs/mkmfs.c (revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc) +++ uspace/app/mkmfs/mkmfs.c (revision a05ec6671002c451fceb01aa0ab3f71f004efb6d) @@ -98,11 +98,11 @@ static struct option const long_options[] = { - { "help", no_argument, 0, 'h' }, - { "long-names", no_argument, 0, 'l' }, - { "block-size", required_argument, 0, 'b' }, - { "inodes", required_argument, 0, 'i' }, - { NULL, no_argument, 0, '1' }, - { NULL, no_argument, 0, '2' }, - { 0, 0, 0, 0 } + { "help", no_argument, 0, 'h' }, + { "long-names", no_argument, 0, 'l' }, + { "block-size", required_argument, 0, 'b' }, + { "inodes", required_argument, 0, 'i' }, + { NULL, no_argument, 0, '1' }, + { NULL, no_argument, 0, '2' }, + { 0, 0, 0, 0 } }; @@ -495,5 +495,5 @@ if (sb->fs_version == 3) { - if(INT32_MAX / sb->block_size < zones) + if (INT32_MAX / sb->block_size < zones) sb->max_file_size = INT32_MAX; sb->ino_per_block = V3_INODES_PER_BLOCK(sb->block_size); @@ -730,5 +730,5 @@ { if (level == HELP_SHORT) { - printf(NAME": tool to create new Minix file systems\n"); + printf(NAME ": tool to create new Minix file systems\n"); } else { printf("Usage: [options] device\n" @@ -737,7 +737,7 @@ "-b ## Specify the block size in bytes (V3 only),\n" " valid block size values are 1024, 2048 and" - " 4096 bytes per block\n" + /* ... */ " 4096 bytes per block\n" "-i ## Specify the number of inodes" - " for the filesystem\n" + /* ... */ " for the filesystem\n" "-l Use 30-char long filenames (V1/V2 only)\n"); } Index: uspace/app/sbi/src/builtin/bi_error.c =================================================================== --- uspace/app/sbi/src/builtin/bi_error.c (revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc) +++ uspace/app/sbi/src/builtin/bi_error.c (revision a05ec6671002c451fceb01aa0ab3f71f004efb6d) @@ -48,15 +48,16 @@ builtin_code_snippet(bi, - "class Error is\n" - /* Common ancestor of all error classes */ - "class Base is\n" - "end\n" - /* Accessing nil reference */ - "class NilReference : Base is\n" - "end\n" - /* Array index out of bounds */ - "class OutOfBounds : Base is\n" - "end\n" - "end\n");} + "class Error is\n" + " -- Common ancestor of all error classes\n" + " class Base is\n" + " end\n" + " -- Accessing nil reference\n" + " class NilReference : Base is\n" + " end\n" + " -- Array index out of bounds\n" + " class OutOfBounds : Base is\n" + " end\n" + "end\n"); +} /** Bind error class hierarchy. Index: uspace/app/sbi/src/builtin/bi_textfile.c =================================================================== --- uspace/app/sbi/src/builtin/bi_textfile.c (revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc) +++ uspace/app/sbi/src/builtin/bi_textfile.c (revision a05ec6671002c451fceb01aa0ab3f71f004efb6d) @@ -62,21 +62,21 @@ builtin_code_snippet(bi, - "class TextFile is\n" - "var f : resource;\n" - "\n" - "fun OpenRead(fname : string), builtin;\n" - "fun OpenWrite(fname : string), builtin;\n" - "fun Close(), builtin;\n" - "fun ReadLine() : string, builtin;\n" - "fun WriteLine(line : string), builtin;\n" - "\n" - "prop EOF : bool is\n" - "get is\n" - "return is_eof();\n" - "end\n" - "end\n" - "\n" - "fun is_eof() : bool, builtin;\n" - "end\n"); + "class TextFile is\n" + " var f : resource;\n" + "\n" + " fun OpenRead(fname : string), builtin;\n" + " fun OpenWrite(fname : string), builtin;\n" + " fun Close(), builtin;\n" + " fun ReadLine() : string, builtin;\n" + " fun WriteLine(line : string), builtin;\n" + "\n" + " prop EOF : bool is\n" + " get is\n" + " return is_eof();\n" + " end\n" + " end\n" + "\n" + " fun is_eof() : bool, builtin;\n" + "end\n"); } @@ -189,5 +189,5 @@ { FILE *file; - rdata_var_t *self_f_var; + rdata_var_t *self_f_var; run_proc_ar_t *proc_ar; @@ -227,5 +227,5 @@ { FILE *file; - rdata_var_t *self_f_var; + rdata_var_t *self_f_var; rdata_string_t *str; @@ -297,5 +297,5 @@ { FILE *file; - rdata_var_t *self_f_var; + rdata_var_t *self_f_var; rdata_var_t *line_var; const char *line; @@ -340,5 +340,5 @@ { FILE *file; - rdata_var_t *self_f_var; + rdata_var_t *self_f_var; bool_t eof_flag; Index: uspace/app/trace/syscalls.c =================================================================== --- uspace/app/trace/syscalls.c (revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc) +++ uspace/app/trace/syscalls.c (revision a05ec6671002c451fceb01aa0ab3f71f004efb6d) @@ -38,49 +38,49 @@ const sc_desc_t syscall_desc[] = { - [SYS_KIO] ={ "kio", 3, V_INT_ERRNO }, + [SYS_KIO] = { "kio", 3, V_INT_ERRNO }, - [SYS_THREAD_CREATE] = { "thread_create", 3, V_ERRNO }, - [SYS_THREAD_EXIT] = { "thread_exit", 1, V_ERRNO }, - [SYS_THREAD_GET_ID] = { "thread_get_id", 1, V_ERRNO }, + [SYS_THREAD_CREATE] = { "thread_create", 3, V_ERRNO }, + [SYS_THREAD_EXIT] = { "thread_exit", 1, V_ERRNO }, + [SYS_THREAD_GET_ID] = { "thread_get_id", 1, V_ERRNO }, - [SYS_TASK_GET_ID] = { "task_get_id", 1, V_ERRNO }, - [SYS_TASK_SET_NAME] = { "task_set_name", 2, V_ERRNO }, - [SYS_FUTEX_SLEEP] = { "futex_sleep_timeout", 3, V_ERRNO }, - [SYS_FUTEX_WAKEUP] = { "futex_wakeup", 1, V_ERRNO }, + [SYS_TASK_GET_ID] = { "task_get_id", 1, V_ERRNO }, + [SYS_TASK_SET_NAME] = { "task_set_name", 2, V_ERRNO }, + [SYS_FUTEX_SLEEP] = { "futex_sleep_timeout", 3, V_ERRNO }, + [SYS_FUTEX_WAKEUP] = { "futex_wakeup", 1, V_ERRNO }, - [SYS_AS_AREA_CREATE] = { "as_area_create", 5, V_ERRNO }, - [SYS_AS_AREA_RESIZE] = { "as_area_resize", 3, V_ERRNO }, - [SYS_AS_AREA_DESTROY] = { "as_area_destroy", 1, V_ERRNO }, + [SYS_AS_AREA_CREATE] = { "as_area_create", 5, V_ERRNO }, + [SYS_AS_AREA_RESIZE] = { "as_area_resize", 3, V_ERRNO }, + [SYS_AS_AREA_DESTROY] = { "as_area_destroy", 1, V_ERRNO }, - [SYS_IPC_CALL_ASYNC_FAST] = { "ipc_call_async_fast", 6, V_HASH }, - [SYS_IPC_CALL_ASYNC_SLOW] = { "ipc_call_async_slow", 3, V_HASH }, + [SYS_IPC_CALL_ASYNC_FAST] = { "ipc_call_async_fast", 6, V_HASH }, + [SYS_IPC_CALL_ASYNC_SLOW] = { "ipc_call_async_slow", 3, V_HASH }, - [SYS_IPC_ANSWER_FAST] = { "ipc_answer_fast", 6, V_ERRNO }, - [SYS_IPC_ANSWER_SLOW] = { "ipc_answer_slow", 2, V_ERRNO }, - [SYS_IPC_FORWARD_FAST] = { "ipc_forward_fast", 6, V_ERRNO }, - [SYS_IPC_FORWARD_SLOW] = { "ipc_forward_slow", 3, V_ERRNO }, - [SYS_IPC_WAIT] = { "ipc_wait_for_call", 3, V_HASH }, - [SYS_IPC_POKE] = { "ipc_poke", 0, V_ERRNO }, - [SYS_IPC_HANGUP] = { "ipc_hangup", 1, V_ERRNO }, + [SYS_IPC_ANSWER_FAST] = { "ipc_answer_fast", 6, V_ERRNO }, + [SYS_IPC_ANSWER_SLOW] = { "ipc_answer_slow", 2, V_ERRNO }, + [SYS_IPC_FORWARD_FAST] = { "ipc_forward_fast", 6, V_ERRNO }, + [SYS_IPC_FORWARD_SLOW] = { "ipc_forward_slow", 3, V_ERRNO }, + [SYS_IPC_WAIT] = { "ipc_wait_for_call", 3, V_HASH }, + [SYS_IPC_POKE] = { "ipc_poke", 0, V_ERRNO }, + [SYS_IPC_HANGUP] = { "ipc_hangup", 1, V_ERRNO }, - [SYS_IPC_EVENT_SUBSCRIBE] = { "ipc_event_subscribe", 2, V_ERRNO }, - [SYS_IPC_EVENT_UNSUBSCRIBE] = { "ipc_event_unsubscribe", 1, V_ERRNO }, - [SYS_IPC_EVENT_UNMASK] = { "ipc_event_unmask", 1, V_ERRNO }, + [SYS_IPC_EVENT_SUBSCRIBE] = { "ipc_event_subscribe", 2, V_ERRNO }, + [SYS_IPC_EVENT_UNSUBSCRIBE] = { "ipc_event_unsubscribe", 1, V_ERRNO }, + [SYS_IPC_EVENT_UNMASK] = { "ipc_event_unmask", 1, V_ERRNO }, - [SYS_PERM_GRANT] = { "perm_grant", 2, V_ERRNO }, - [SYS_PERM_REVOKE] = { "perm_revoke", 2, V_ERRNO }, - [SYS_PHYSMEM_MAP] = { "physmem_map", 4, V_ERRNO }, - [SYS_IOSPACE_ENABLE] = { "iospace_enable", 1, V_ERRNO }, + [SYS_PERM_GRANT] = { "perm_grant", 2, V_ERRNO }, + [SYS_PERM_REVOKE] = { "perm_revoke", 2, V_ERRNO }, + [SYS_PHYSMEM_MAP] = { "physmem_map", 4, V_ERRNO }, + [SYS_IOSPACE_ENABLE] = { "iospace_enable", 1, V_ERRNO }, - [SYS_IPC_IRQ_SUBSCRIBE] = { "ipc_irq_subscribe", 4, V_ERRNO }, - [SYS_IPC_IRQ_UNSUBSCRIBE] = { "ipc_irq_unsubscribe", 2, V_ERRNO }, + [SYS_IPC_IRQ_SUBSCRIBE] = { "ipc_irq_subscribe", 4, V_ERRNO }, + [SYS_IPC_IRQ_UNSUBSCRIBE] = { "ipc_irq_unsubscribe", 2, V_ERRNO }, - [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type", 2, V_INTEGER }, - [SYS_SYSINFO_GET_VALUE] = { "sysinfo_get_value", 3, V_ERRNO }, - [SYS_SYSINFO_GET_DATA_SIZE] = { "sysinfo_get_data_size", 3, V_ERRNO }, - [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data", 5, V_ERRNO }, + [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type", 2, V_INTEGER }, + [SYS_SYSINFO_GET_VALUE] = { "sysinfo_get_value", 3, V_ERRNO }, + [SYS_SYSINFO_GET_DATA_SIZE] = { "sysinfo_get_data_size", 3, V_ERRNO }, + [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data", 5, V_ERRNO }, - [SYS_DEBUG_CONSOLE] = { "debug_console", 0, V_ERRNO }, - [SYS_IPC_CONNECT_KBOX] = { "ipc_connect_kbox", 1, V_ERRNO } + [SYS_DEBUG_CONSOLE] = { "debug_console", 0, V_ERRNO }, + [SYS_IPC_CONNECT_KBOX] = { "ipc_connect_kbox", 1, V_ERRNO } }; Index: uspace/app/vuhid/hids/bootkbd.c =================================================================== --- uspace/app/vuhid/hids/bootkbd.c (revision 6ff23ff32c8aa9d6ad8d06f1743ca1b0d68c14bc) +++ uspace/app/vuhid/hids/bootkbd.c (revision a05ec6671002c451fceb01aa0ab3f71f004efb6d) @@ -45,37 +45,39 @@ USAGE1(USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD), START_COLLECTION(COLLECTION_APPLICATION), - STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), - USAGE_MINIMUM1(224), - USAGE_MAXIMUM1(231), - LOGICAL_MINIMUM1(0), - LOGICAL_MAXIMUM1(1), - REPORT_SIZE1(1), - REPORT_COUNT1(8), - /* Modifiers */ - INPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), - REPORT_COUNT1(1), - REPORT_SIZE1(8), - /* Reserved */ - INPUT(IOF_CONSTANT), - REPORT_COUNT1(5), - REPORT_SIZE1(1), - STD_USAGE_PAGE(USB_HIDUT_PAGE_LED), - USAGE_MINIMUM1(1), - USAGE_MAXIMUM1(5), - /* LED states */ - OUTPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), - REPORT_COUNT1(1), - REPORT_SIZE1(3), - /* LED states padding */ - OUTPUT(IOF_CONSTANT), - REPORT_COUNT1(6), - REPORT_SIZE1(8), - LOGICAL_MINIMUM1(0), - LOGICAL_MAXIMUM1(101), - STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), - USAGE_MINIMUM1(0), - USAGE_MAXIMUM1(101), - /* Key array */ - INPUT(IOF_DATA | IOF_ARRAY), + + STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), + USAGE_MINIMUM1(224), + USAGE_MAXIMUM1(231), + LOGICAL_MINIMUM1(0), + LOGICAL_MAXIMUM1(1), + REPORT_SIZE1(1), + REPORT_COUNT1(8), + /* Modifiers */ + INPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), + REPORT_COUNT1(1), + REPORT_SIZE1(8), + /* Reserved */ + INPUT(IOF_CONSTANT), + REPORT_COUNT1(5), + REPORT_SIZE1(1), + STD_USAGE_PAGE(USB_HIDUT_PAGE_LED), + USAGE_MINIMUM1(1), + USAGE_MAXIMUM1(5), + /* LED states */ + OUTPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), + REPORT_COUNT1(1), + REPORT_SIZE1(3), + /* LED states padding */ + OUTPUT(IOF_CONSTANT), + REPORT_COUNT1(6), + REPORT_SIZE1(8), + LOGICAL_MINIMUM1(0), + LOGICAL_MAXIMUM1(101), + STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), + USAGE_MINIMUM1(0), + USAGE_MAXIMUM1(101), + /* Key array */ + INPUT(IOF_DATA | IOF_ARRAY), + END_COLLECTION() }; @@ -84,16 +86,16 @@ static uint8_t in_data[] = { - 0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0, 0, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, // Caps Lock - 0, 0, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, // Num Lock - 0, 0, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, // Caps Lock + 0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0, 0, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, // Caps Lock + 0, 0, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, // Num Lock + 0, 0, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, // Caps Lock 1 << 2, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1 << 2, 0, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 1 << 2, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0, 0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static vuhid_interface_life_t boot_life = { .data_in = in_data, - .data_in_count = sizeof(in_data)/INPUT_SIZE, + .data_in_count = sizeof(in_data) / INPUT_SIZE, .data_in_pos_change_delay = 500, .msg_born = "Boot keyboard comes to life...",