Changeset 666773c in mainline for kernel/arch/ia64/src/ddi/ddi.c

Timestamp:

2008-12-31T15:33:29Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9805cde

Parents:

d8c0dc5

Message:

Humanitarian facelift for ia64.

File:

• kernel/arch/ia64/src/ddi/ddi.c (modified) (4 diffs)

kernel/arch/ia64/src/ddi/ddi.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar, Jakub vana
+ * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2008 Jakub vana
  * All rights reserved.
  *
@@ -39 +40 @@
 #include <errno.h>
 
-#define IO_MEMMAP_PAGES 16384
-#define PORTS_PER_PAGE 4
+#define IO_MEMMAP_PAGES 16384
+#define PORTS_PER_PAGE  4
 
 /** Enable I/O space range for task.
@@ -46 +47 @@
  * Interrupts are disabled and task is locked.
  *
- * @param task Task.
- * @param ioaddr Startign I/O space address.
- * @param size Size of the enabled I/O range.
+ * @param task          Task.
+ * @param ioaddr        Starting I/O space address.
+ * @param size          Size of the enabled I/O range.
  *
  * @return 0 on success or an error code from errno.h.
@@ -54 +55 @@
 int ddi_iospace_enable_arch(task_t *task, uintptr_t ioaddr, size_t size)
 {
+        if (!task->arch.iomap) {
+                uint8_t *map;
 
-        if(!task->arch.iomap)
-        {
-                uint8_t *map;
-                task->arch.iomap=malloc(sizeof(bitmap_t),0);
-                map=malloc(BITS2BYTES(IO_MEMMAP_PAGES),0);
+                task->arch.iomap = malloc(sizeof(bitmap_t), 0);
+                map = malloc(BITS2BYTES(IO_MEMMAP_PAGES), 0);
                 if(!map)
                         return ENOMEM;
-                bitmap_initialize(task->arch.iomap,map,IO_MEMMAP_PAGES);        
-                bitmap_clear_range(task->arch.iomap,0,IO_MEMMAP_PAGES);
+                bitmap_initialize(task->arch.iomap, map, IO_MEMMAP_PAGES);
+                bitmap_clear_range(task->arch.iomap, 0, IO_MEMMAP_PAGES);
         }
         
         uintptr_t iopage = ioaddr / PORTS_PER_PAGE;
-        size = ALIGN_UP (size+ioaddr-4*iopage,PORTS_PER_PAGE);
-        bitmap_set_range(task->arch.iomap,iopage,size/4);
-
+        size = ALIGN_UP(size + ioaddr - 4 * iopage, PORTS_PER_PAGE);
+        bitmap_set_range(task->arch.iomap, iopage, size / 4);
 
         return 0;