Changeset a35b458 in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

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

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• kernel/generic/src/ddi/ddi.c (modified) (24 diffs)

kernel/generic/src/ddi/ddi.c

@@ -79 +79 @@
 {
         mutex_lock(&parea_lock);
-        
+
         /*
          * We don't check for overlaps here as the kernel is pretty sane.
          */
         btree_insert(&parea_btree, (btree_key_t) parea->pbase, parea, NULL);
-        
+
         mutex_unlock(&parea_lock);
 }
@@ -108 +108 @@
 {
         assert(TASK);
-        
+
         if ((phys % FRAME_SIZE) != 0)
                 return EBADMEM;
-        
+
         /*
          * Unprivileged tasks are only allowed to map pareas
@@ -118 +118 @@
         bool priv =
             ((perm_get(TASK) & PERM_MEM_MANAGER) == PERM_MEM_MANAGER);
-        
+
         mem_backend_data_t backend_data;
         backend_data.base = phys;
         backend_data.frames = pages;
         backend_data.anonymous = false;
-        
+
         /*
          * Check if the memory region is explicitly enabled
          * for mapping by any parea structure.
          */
-        
+
         mutex_lock(&parea_lock);
         btree_node_t *nodep;
         parea_t *parea = (parea_t *) btree_search(&parea_btree,
             (btree_key_t) phys, &nodep);
-        
+
         if ((parea != NULL) && (parea->frames >= pages)) {
                 if ((!priv) && (!parea->unpriv)) {
@@ -139 +139 @@
                         return EPERM;
                 }
-                
+
                 goto map;
         }
-        
+
         parea = NULL;
         mutex_unlock(&parea_lock);
-        
+
         /*
          * Check if the memory region is part of physical
          * memory generally enabled for mapping.
          */
-        
+
         irq_spinlock_lock(&zones.lock, true);
         size_t znum = find_zone(ADDR2PFN(phys), pages, 0);
-        
+
         if (znum == (size_t) -1) {
                 /*
@@ -161 +161 @@
                  */
                 irq_spinlock_unlock(&zones.lock, true);
-                
+
                 if (!priv)
                         return EPERM;
-                
+
                 goto map;
         }
-        
+
         if (zones.info[znum].flags & (ZONE_FIRMWARE | ZONE_RESERVED)) {
                 /*
@@ -174 +174 @@
                  */
                 irq_spinlock_unlock(&zones.lock, true);
-                
+
                 if (!priv)
                         return EPERM;
-                
+
                 goto map;
         }
-        
+
         irq_spinlock_unlock(&zones.lock, true);
         return ENOENT;
-        
+
 map:
         if (!as_area_create(TASK->as, flags, FRAMES2SIZE(pages),
@@ -191 +191 @@
                  * We report it using ENOMEM.
                  */
-                
+
                 if (parea != NULL)
                         mutex_unlock(&parea_lock);
-                
+
                 return ENOMEM;
         }
-        
+
         /*
          * Mapping is created on-demand during page fault.
          */
-        
+
         if (parea != NULL) {
                 parea->mapped = true;
                 mutex_unlock(&parea_lock);
         }
-        
+
         return EOK;
 }
@@ -235 +235 @@
         if (rc != EOK)
                 return rc;
-        
+
         rc = physmem_map(ALIGN_DOWN(phys, FRAME_SIZE), pages, flags, &virt,
             bound);
         if (rc != EOK)
                 return rc;
-        
+
         rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt));
         if (rc != EOK) {
@@ -246 +246 @@
                 return rc;
         }
-        
+
         return EOK;
 }
@@ -273 +273 @@
         if (!(perms & PERM_IO_MANAGER))
                 return EPERM;
-        
+
         irq_spinlock_lock(&tasks_lock, true);
-        
+
         task_t *task = task_find_by_id(id);
-        
+
         if ((!task) || (!container_check(CONTAINER, task->container))) {
                 /*
@@ -287 +287 @@
                 return ENOENT;
         }
-        
+
         /* Lock the task and release the lock protecting tasks_btree. */
         irq_spinlock_exchange(&tasks_lock, &task->lock);
@@ -314 +314 @@
         if (!(perms & PERM_IO_MANAGER))
                 return EPERM;
-        
+
         irq_spinlock_lock(&tasks_lock, true);
-        
+
         task_t *task = task_find_by_id(id);
-        
+
         if ((!task) || (!container_check(CONTAINER, task->container))) {
                 /*
@@ -328 +328 @@
                 return ENOENT;
         }
-        
+
         /* Lock the task and release the lock protecting tasks_btree. */
         irq_spinlock_exchange(&tasks_lock, &task->lock);
         errno_t rc = ddi_iospace_disable_arch(task, ioaddr, size);
         irq_spinlock_unlock(&task->lock, true);
-        
+
         return rc;
 }
@@ -350 +350 @@
         if (rc != EOK)
                 return (sys_errno_t) rc;
-        
+
         return (sys_errno_t) iospace_enable((task_id_t) arg.task_id,
             (uintptr_t) arg.ioaddr, (size_t) arg.size);
@@ -370 +370 @@
 {
         assert(TASK);
-        
+
         // TODO: implement locking of non-anonymous mapping
         return page_find_mapping(virt, phys);
@@ -380 +380 @@
 {
         assert(TASK);
-        
+
         size_t frames = SIZE2FRAMES(size);
         if (frames == 0)
@@ -388 +388 @@
         if (*phys == 0)
                 return ENOMEM;
-        
+
         mem_backend_data_t backend_data;
         backend_data.base = *phys;
         backend_data.frames = frames;
         backend_data.anonymous = true;
-        
+
         if (!as_area_create(TASK->as, map_flags, size,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data, virt, bound)) {
@@ -399 +399 @@
                 return ENOMEM;
         }
-        
+
         return EOK;
 }
@@ -421 +421 @@
                  * Non-anonymous DMA mapping
                  */
-                
+
                 uintptr_t phys;
                 errno_t rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags,
                     flags, &phys);
-                
+
                 if (rc != EOK)
                         return rc;
-                
+
                 rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
                 if (rc != EOK) {
@@ -438 +438 @@
                  * Anonymous DMA mapping
                  */
-                
+
                 uintptr_t constraint;
                 errno_t rc = copy_from_uspace(&constraint, phys_ptr,
@@ -444 +444 @@
                 if (rc != EOK)
                         return rc;
-                
+
                 uintptr_t virt;
                 rc = copy_from_uspace(&virt, virt_ptr, sizeof(virt));
                 if (rc != EOK)
                         return rc;
-                
+
                 uintptr_t phys;
                 rc = dmamem_map_anonymous(size, constraint, map_flags, flags,
@@ -455 +455 @@
                 if (rc != EOK)
                         return rc;
-                
+
                 rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys));
                 if (rc != EOK) {
@@ -461 +461 @@
                         return rc;
                 }
-                
+
                 rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt));
                 if (rc != EOK) {
@@ -468 +468 @@
                 }
         }
-        
+
         return EOK;
 }