Changeset 8565a42 in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• kernel/generic/src/console/cmd.c (modified) (46 diffs)

kernel/generic/src/console/cmd.c

@@ -686 +686 @@
 {
         spinlock_lock(&cmd_lock);
-        
+
         size_t len = 0;
         list_foreach(cmd_list, link, cmd_info_t, hlp) {
@@ -694 +694 @@
                 spinlock_unlock(&hlp->lock);
         }
-        
+
         unsigned int _len = (unsigned int) len;
         if ((_len != len) || (((int) _len) < 0)) {
@@ -700 +700 @@
                 return 1;
         }
-        
+
         list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
@@ -706 +706 @@
                 spinlock_unlock(&hlp->lock);
         }
-        
+
         spinlock_unlock(&cmd_lock);
-        
+
         return 1;
 }
@@ -721 +721 @@
 {
         uint8_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -729 +729 @@
                 ptr = (uint8_t *) km_map(argv[0].intval, sizeof(uint8_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         const uint8_t val = pio_read_8(ptr);
         printf("read %" PRIxn ": %" PRIx8 "\n", argv[0].intval, val);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint8_t));
         return 1;
@@ -751 +751 @@
 {
         uint16_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -759 +759 @@
                 ptr = (uint16_t *) km_map(argv[0].intval, sizeof(uint16_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         const uint16_t val = pio_read_16(ptr);
         printf("read %" PRIxn ": %" PRIx16 "\n", argv[0].intval, val);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint16_t));
         return 1;
@@ -781 +781 @@
 {
         uint32_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -789 +789 @@
                 ptr = (uint32_t *) km_map(argv[0].intval, sizeof(uint32_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         const uint32_t val = pio_read_32(ptr);
         printf("read %" PRIxn ": %" PRIx32 "\n", argv[0].intval, val);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint32_t));
         return 1;
@@ -811 +811 @@
 {
         uint8_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -819 +819 @@
                 ptr = (uint8_t *) km_map(argv[0].intval, sizeof(uint8_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         printf("write %" PRIxn ": %" PRIx8 "\n", argv[0].intval,
             (uint8_t) argv[1].intval);
         pio_write_8(ptr, (uint8_t) argv[1].intval);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint8_t));
         return 1;
@@ -842 +842 @@
 {
         uint16_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -850 +850 @@
                 ptr = (uint16_t *) km_map(argv[0].intval, sizeof(uint16_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         printf("write %" PRIxn ": %" PRIx16 "\n", argv[0].intval,
             (uint16_t) argv[1].intval);
         pio_write_16(ptr, (uint16_t) argv[1].intval);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint16_t));
         return 1;
@@ -873 +873 @@
 {
         uint32_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -881 +881 @@
                 ptr = (uint32_t *) km_map(argv[0].intval, sizeof(uint32_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         printf("write %" PRIxn ": %" PRIx32 "\n", argv[0].intval,
             (uint32_t) argv[1].intval);
         pio_write_32(ptr, (uint32_t) argv[1].intval);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint32_t));
         return 1;
@@ -904 +904 @@
 {
         reboot();
-        
+
         /* Not reached */
         return 1;
@@ -918 +918 @@
 {
         assert(uptime);
-        
+
         /* This doesn't have to be very accurate */
         sysarg_t sec = uptime->seconds1;
-        
+
         printf("Up %" PRIun " days, %" PRIun " hours, %" PRIun " minutes, %" PRIun " seconds\n",
                 sec / 86400, (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60);
-        
+
         return 1;
 }
@@ -937 +937 @@
 {
         spinlock_lock(&cmd_lock);
-        
+
         list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
-                
+
                 if (str_lcmp(hlp->name, (const char *) argv->buffer, str_length(hlp->name)) == 0) {
                         printf("%s - %s\n", hlp->name, hlp->description);
@@ -948 +948 @@
                         break;
                 }
-                
+
                 spinlock_unlock(&hlp->lock);
         }
-        
+
         spinlock_unlock(&cmd_lock);
-        
+
         return 1;
 }
@@ -961 +961 @@
 {
         symtab_print_search((char *) argv->buffer);
-        
+
         return 1;
 }
@@ -1004 +1004 @@
          * call the function.
          */
-        
+
         unsigned int i;
         for (i = 0; i < config.cpu_count; i++) {
                 if (!cpus[i].active)
                         continue;
-                
+
                 thread_t *thread;
                 if ((thread = thread_create((void (*)(void *)) cmd_call0,
@@ -1021 +1021 @@
                         printf("Unable to create thread for cpu%u\n", i);
         }
-        
+
         return 1;
 }
@@ -1108 +1108 @@
         fncptr_t fptr;
         errno_t rc;
-        
+
         symbol = (char *) argv->buffer;
         rc = symtab_addr_lookup(symbol, &symaddr);
@@ -1183 +1183 @@
         bool pointer = false;
         errno_t rc;
-        
+
         if (((char *) argv->buffer)[0] == '*') {
                 rc = symtab_addr_lookup((char *) argv->buffer + 1, &addr);
@@ -1195 +1195 @@
         } else
                 rc = symtab_addr_lookup((char *) argv->buffer, &addr);
-        
+
         if (rc == ENOENT)
                 printf("Symbol %s not found.\n", (char *) argv->buffer);
@@ -1210 +1210 @@
         } else
                 printf("No symbol information available.\n");
-        
+
         return 1;
 }
@@ -1252 +1252 @@
         else
                 printf("Unknown argument \"%s\".\n", flag_buf);
-        
+
         return 1;
 }
@@ -1270 +1270 @@
         else
                 printf("Unknown argument \"%s\".\n", flag_buf);
-        
+
         return 1;
 }
@@ -1412 +1412 @@
         release_console();
         indev_pop_character(stdin);
-        
+
         return 1;
 }
@@ -1420 +1420 @@
 {
         printf("%s (%s)\n", test->name, test->desc);
-        
+
         /* Update and read thread accounting
            for benchmarking */
@@ -1427 +1427 @@
         task_get_accounting(TASK, &ucycles0, &kcycles0);
         irq_spinlock_unlock(&TASK->lock, true);
-        
+
         /* Execute the test */
         test_quiet = false;
         const char *ret = test->entry();
-        
+
         /* Update and read thread accounting */
         uint64_t ucycles1, kcycles1;
@@ -1437 +1437 @@
         task_get_accounting(TASK, &ucycles1, &kcycles1);
         irq_spinlock_unlock(&TASK->lock, true);
-        
+
         uint64_t ucycles, kcycles;
         char usuffix, ksuffix;
         order_suffix(ucycles1 - ucycles0, &ucycles, &usuffix);
         order_suffix(kcycles1 - kcycles0, &kcycles, &ksuffix);
-        
+
         printf("Time: %" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles\n",
             ucycles, usuffix, kcycles, ksuffix);
-        
+
         if (ret == NULL) {
                 printf("Test passed\n");
                 return true;
         }
-        
+
         printf("%s\n", ret);
         return false;
@@ -1461 +1461 @@
         uint64_t ucycles, kcycles;
         char usuffix, ksuffix;
-        
+
         if (cnt < 1)
                 return true;
-        
+
         uint64_t *data = (uint64_t *) malloc(sizeof(uint64_t) * cnt, 0);
         if (data == NULL) {
@@ -1470 +1470 @@
                 return false;
         }
-        
+
         for (i = 0; i < cnt; i++) {
                 printf("%s (%u/%u) ... ", test->name, i + 1, cnt);
-                
+
                 /* Update and read thread accounting
                    for benchmarking */
@@ -1480 +1480 @@
                 task_get_accounting(TASK, &ucycles0, &kcycles0);
                 irq_spinlock_unlock(&TASK->lock, true);
-                
+
                 /* Execute the test */
                 test_quiet = true;
                 const char *test_ret = test->entry();
-                
+
                 /* Update and read thread accounting */
                 irq_spinlock_lock(&TASK->lock, true);
@@ -1490 +1490 @@
                 task_get_accounting(TASK, &ucycles1, &kcycles1);
                 irq_spinlock_unlock(&TASK->lock, true);
-                
+
                 if (test_ret != NULL) {
                         printf("%s\n", test_ret);
@@ -1496 +1496 @@
                         break;
                 }
-                
+
                 data[i] = ucycles1 - ucycles0 + kcycles1 - kcycles0;
                 order_suffix(ucycles1 - ucycles0, &ucycles, &usuffix);
@@ -1503 +1503 @@
                     ucycles, usuffix, kcycles, ksuffix);
         }
-        
+
         if (ret) {
                 printf("\n");
-                
+
                 uint64_t sum = 0;
-                
+
                 for (i = 0; i < cnt; i++) {
                         sum += data[i];
                 }
-                
+
                 order_suffix(sum / (uint64_t) cnt, &ucycles, &usuffix);
                 printf("Average\t\t%" PRIu64 "%c\n", ucycles, usuffix);
         }
-        
+
         free(data);
-        
+
         return ret;
 }
@@ -1526 +1526 @@
         size_t len = 0;
         test_t *test;
-        
+
         for (test = tests; test->name != NULL; test++) {
                 if (str_length(test->name) > len)
                         len = str_length(test->name);
         }
-        
+
         unsigned int _len = (unsigned int) len;
         if ((_len != len) || (((int) _len) < 0)) {
@@ -1537 +1537 @@
                 return;
         }
-        
+
         for (test = tests; test->name != NULL; test++)
                 printf("%-*s %s%s\n", _len, test->name, test->desc,
                     (test->safe ? "" : " (unsafe)"));
-        
+
         printf("%-*s Run all safe tests\n", _len, "*");
 }
@@ -1555 +1555 @@
 {
         test_t *test;
-        
+
         if (str_cmp((char *) argv->buffer, "*") == 0) {
                 for (test = tests; test->name != NULL; test++) {
@@ -1566 +1566 @@
         } else if (str_cmp((char *) argv->buffer, "") != 0) {
                 bool fnd = false;
-                
+
                 for (test = tests; test->name != NULL; test++) {
                         if (str_cmp(test->name, (char *) argv->buffer) == 0) {
@@ -1574 +1574 @@
                         }
                 }
-                
+
                 if (!fnd)
                         printf("Unknown test\n");
         } else
                 list_tests();
-        
+
         return 1;
 }
@@ -1593 +1593 @@
         test_t *test;
         uint32_t cnt = argv[1].intval;
-        
+
         if (str_cmp((char *) argv->buffer, "*") == 0) {
                 for (test = tests; test->name != NULL; test++) {
@@ -1603 +1603 @@
         } else {
                 bool fnd = false;
-                
+
                 for (test = tests; test->name != NULL; test++) {
                         if (str_cmp(test->name, (char *) argv->buffer) == 0) {
                                 fnd = true;
-                                
+
                                 if (test->safe)
                                         run_bench(test, cnt);
                                 else
                                         printf("Unsafe test\n");
-                                
+
                                 break;
                         }
                 }
-                
+
                 if (!fnd)
                         printf("Unknown test\n");
         }
-        
+
         return 1;
 }