Changeset 3fafe5e0 in mainline for uspace/lib

Timestamp:

2018-04-27T14:15:03Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7148abf

Parents:

a2eb85d

git-author:

Jiri Svoboda <jiri@…> (2018-04-26 17:14:26)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-27 14:15:03)

Message:

Fix incorrectly indented double-slash comments.

Location:

uspace/lib

Files:

• c/arch/ia32/src/rtld/reloc.c (modified) (2 diffs)
• c/generic/elf/elf_mod.c (modified) (2 diffs)
• drv/generic/remote_usbhid.c (modified) (4 diffs)
• label/src/gpt.c (modified) (1 diff)
• posix/src/sys/mman.c (modified) (1 diff)
• posix/src/time.c (modified) (4 diffs)
• usbhid/src/hidreport.c (modified) (1 diff)

uspace/lib/c/arch/ia32/src/rtld/reloc.c

@@ -84 +84 @@
 
         for (i = 0; i < rt_entries; ++i) {
-//              DPRINTF("symbol %d: ", i);
+#if 0
+                DPRINTF("symbol %d: ", i);
+#endif
                 r_offset = rt[i].r_offset;
                 r_info = rt[i].r_info;
@@ -100 +102 @@
 
                 if (sym->st_name != 0) {
-//                      DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
+#if 0
+                        DPRINTF("rel_type: %x, rel_offset: 0x%x\n", rel_type, r_offset);
+#endif
                         sym_def = symbol_def_find(str_tab + sym->st_name,
                             m, ssf_none, &dest);
                         DPRINTF("dest name: '%s'\n", dest->dyn.soname);
-//                      DPRINTF("dest bias: 0x%x\n", dest->bias);
+                        DPRINTF("dest bias: 0x%x\n", dest->bias);
                         if (sym_def) {
                                 sym_addr = (uint32_t)
                                     symbol_get_addr(sym_def, dest, NULL);
-//                              DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
+#if 0
+                                DPRINTF("symbol definition found, addr=0x%x\n", sym_addr);
+#endif
                         } else {
                                 printf("Definition of '%s' not found.\n",

uspace/lib/c/generic/elf/elf_mod.c

@@ -298 +298 @@
                 break;
         case PT_SHLIB:
-//      case PT_LOPROC:
-//      case PT_HIPROC:
         default:
                 DPRINTF("Segment p_type %d unknown.\n", entry->p_type);
@@ -397 +395 @@
                 return EE_OK;
 
-//      printf("set area flags to %d\n", flags);
         rc = as_area_change_flags(seg_ptr, flags);
         if (rc != EOK) {

uspace/lib/drv/generic/remote_usbhid.c

@@ -287 +287 @@
 static void remote_usbhid_get_report_descriptor_length(ddf_fun_t *, void *, cap_call_handle_t, ipc_call_t *);
 static void remote_usbhid_get_report_descriptor(ddf_fun_t *, void *, cap_call_handle_t, ipc_call_t *);
-// static void remote_usbhid_(ddf_fun_t *, void *, cap_call_handle_t, ipc_call_t *);
 
 /** Remote USB HID interface operations. */
@@ -305 +304 @@
 };
 
-//usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-
 
 void remote_usbhid_get_event_length(ddf_fun_t *fun, void *iface,
@@ -322 +319 @@
 
         size_t len = hid_iface->get_event_length(fun);
-//      if (len == 0) {
-//              len = EEMPTY;
-//      }
         async_answer_1(chandle, EOK, len);
-
-//      if (len < 0) {
-//              async_answer_0(chandle, len);
-//      } else {
-//              async_answer_1(chandle, EOK, len);
-//      }
 }
 
@@ -352 +340 @@
                 return;
         }
-//      /* Check that length is even number. Truncate otherwise. */
-//      if ((len % 2) == 1) {
-//              len--;
-//      }
+
         if (len == 0) {
                 async_answer_0(data_chandle, EINVAL);

uspace/lib/label/src/gpt.c

@@ -809 +809 @@
         pte->start_lba = host2uint64_t_le(part->block0);
         pte->end_lba = host2uint64_t_le(eblock);
-//      pte->attributes
-//      pte->part_name
+        //pte->attributes
+        //pte->part_name
         return EOK;
 }

uspace/lib/posix/src/sys/mman.c

@@ -45 +45 @@
                 start = AS_AREA_ANY;
 
-//      if (!((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE)))
-//              return MAP_FAILED;
+#if 0
+        if (!((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE)))
+                return MAP_FAILED;
+#endif
 
         if (!(flags & MAP_ANONYMOUS))

uspace/lib/posix/src/time.c

@@ -216 +216 @@
 
         switch (clock_id) {
-                case CLOCK_REALTIME:
-                        res->tv_sec = 0;
-                        res->tv_nsec = 1000; /* Microsecond resolution. */
-                        return 0;
-                default:
-                        errno = EINVAL;
-                        return -1;
+        case CLOCK_REALTIME:
+                res->tv_sec = 0;
+                res->tv_nsec = 1000; /* Microsecond resolution. */
+                return 0;
+        default:
+                errno = EINVAL;
+                return -1;
         }
 }
@@ -240 +240 @@
 
         switch (clock_id) {
-                case CLOCK_REALTIME:
-                        gettimeofday(&tv, NULL);
-                        tp->tv_sec = tv.tv_sec;
-                        tp->tv_nsec = tv.tv_usec * 1000;
-                        return 0;
-                default:
-                        errno = EINVAL;
-                        return -1;
+        case CLOCK_REALTIME:
+                gettimeofday(&tv, NULL);
+                tp->tv_sec = tv.tv_sec;
+                tp->tv_nsec = tv.tv_usec * 1000;
+                return 0;
+        default:
+                errno = EINVAL;
+                return -1;
         }
 }
@@ -265 +265 @@
 
         switch (clock_id) {
-                case CLOCK_REALTIME:
-                        // TODO: setting clock
-                        // FIXME: HelenOS doesn't actually support hardware
-                        //        clock yet
-                        errno = EPERM;
-                        return -1;
-                default:
-                        errno = EINVAL;
-                        return -1;
+        case CLOCK_REALTIME:
+                // TODO: setting clock
+                // FIXME: HelenOS doesn't actually support hardware
+                //        clock yet
+                errno = EPERM;
+                return -1;
+        default:
+                errno = EINVAL;
+                return -1;
         }
 }
@@ -293 +293 @@
 
         switch (clock_id) {
-                case CLOCK_REALTIME:
-                        // TODO: interruptible sleep
-                        if (rqtp->tv_sec != 0) {
-                                async_sleep(rqtp->tv_sec);
-                        }
-                        if (rqtp->tv_nsec != 0) {
-                                async_usleep(rqtp->tv_nsec / 1000);
-                        }
-                        return 0;
-                default:
-                        errno = EINVAL;
-                        return -1;
+        case CLOCK_REALTIME:
+                // TODO: interruptible sleep
+                if (rqtp->tv_sec != 0) {
+                        async_sleep(rqtp->tv_sec);
+                }
+                if (rqtp->tv_nsec != 0) {
+                        async_usleep(rqtp->tv_nsec / 1000);
+                }
+                return 0;
+        default:
+                errno = EINVAL;
+                return -1;
         }
 }

uspace/lib/usbhid/src/hidreport.c

@@ -172 +172 @@
         }
 
-//      uint8_t *report_desc = NULL;
-//      size_t report_size;
-
         errno_t rc = usb_hid_get_report_descriptor(dev, report_desc, report_size);