[src/trunk]: src/sys/dev/cardbus KNFfied those files.

[haya <haya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a19521a14139
branches:  trunk
changeset: 486593:a19521a14139
user:      haya <haya%NetBSD.org@localhost>
date:      Fri May 26 06:32:56 2000 +0000

description:
KNFfied those files.

diffstat:

 sys/dev/cardbus/rbus.c |  439 +++++++++++++++++++++++++-----------------------
 sys/dev/cardbus/rbus.h |    4 +-
 2 files changed, 227 insertions(+), 216 deletions(-)

diffs (truncated from 558 to 300 lines):

diff -r 0fcf14af365c -r a19521a14139 sys/dev/cardbus/rbus.c
--- a/sys/dev/cardbus/rbus.c    Fri May 26 05:27:29 2000 +0000
+++ b/sys/dev/cardbus/rbus.c    Fri May 26 06:32:56 2000 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: rbus.c,v 1.6 2000/05/08 19:27:00 augustss Exp $        */
+/*     $NetBSD: rbus.c,v 1.7 2000/05/26 06:32:56 haya Exp $    */
 /*
- * Copyright (c) 1999
+ * Copyright (c) 1999 and 2000
  *     HAYAKAWA Koichi.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,6 @@
 #if defined RBUS_DEBUG
 #define STATIC
 #define DPRINTF(a) printf a
-#define DDELAY(x) delay((x)*1000*1000)
 #else
 #define STATIC static
 #define DPRINTF(a)
@@ -63,16 +62,16 @@
 
 int
 rbus_space_alloc(rbt, addr, size, mask, align, flags, addrp, bshp)
-     rbus_tag_t rbt;
-     bus_addr_t addr;
-     bus_size_t size;
-     bus_addr_t mask, align;
-     int flags;
-     bus_addr_t *addrp;
-     bus_space_handle_t *bshp;
+       rbus_tag_t rbt;
+       bus_addr_t addr;
+       bus_size_t size;
+       bus_addr_t mask, align;
+       int flags;
+       bus_addr_t *addrp;
+       bus_space_handle_t *bshp;
 {
-  return rbus_space_alloc_subregion(rbt, rbt->rb_start, rbt->rb_end, addr,
-                                   size, mask, align, flags, addrp, bshp);
+       return rbus_space_alloc_subregion(rbt, rbt->rb_start, rbt->rb_end,
+           addr, size, mask, align, flags, addrp, bshp);
 }
 
 
@@ -80,96 +79,102 @@
 
 int
 rbus_space_alloc_subregion(rbt, substart, subend, addr, size, mask, align, flags, addrp, bshp)
-     rbus_tag_t rbt;
-     bus_addr_t addr;
-     bus_addr_t substart;
-     bus_addr_t subend;
-     bus_size_t size;
-     bus_addr_t mask, align;
-     int flags;
-     bus_addr_t *addrp;
-     bus_space_handle_t *bshp;
+       rbus_tag_t rbt;
+       bus_addr_t addr;
+       bus_addr_t substart;
+       bus_addr_t subend;
+       bus_size_t size;
+       bus_addr_t mask, align;
+       int flags;
+       bus_addr_t *addrp;
+       bus_space_handle_t *bshp;
 {
-  bus_addr_t decodesize = mask + 1;
-  bus_addr_t boundary, search_addr;
-  int val;
-  bus_addr_t result;
-  int exflags = EX_FAST | EX_NOWAIT;
+       bus_addr_t decodesize = mask + 1;
+       bus_addr_t boundary, search_addr;
+       int val;
+       bus_addr_t result;
+       int exflags = EX_FAST | EX_NOWAIT;
+
+       DPRINTF(("rbus_space_alloc: addr %lx, size %lx, mask %lx, align %lx\n",
+           addr, size, mask, align));
+
+       addr += rbt->rb_offset;
+
+       if (mask == 0) {
+               /* FULL Decode */
+               decodesize = 0;
+       }
 
-  DPRINTF(("rbus_space_alloc: addr %lx, size %lx, mask %lx, align %lx\n",
-          addr, size, mask, align));
+       if (rbt->rb_flags == RBUS_SPACE_ASK_PARENT) {
+               return rbus_space_alloc(rbt->rb_parent, addr, size, mask,
+                   align, flags, addrp, bshp);
+       } else if (rbt->rb_flags == RBUS_SPACE_SHARE ||
+           rbt->rb_flags == RBUS_SPACE_DEDICATE) {
+               /* rbt has its own sh_extent */
 
-  addr += rbt->rb_offset;
+               /*
+                * sanity check: the subregion [substart, subend] should be
+                * smaller than the region included in sh_extent.
+                */
+               if (substart < rbt->rb_ext->ex_start
+                   || subend > rbt->rb_ext->ex_end) {
+                       return 1;
+               }
 
-  if (mask == 0) {
-    /* FULL Decode */
-    decodesize = 0;
-  }
+               if (decodesize == align) {
+                       if(extent_alloc_subregion(rbt->rb_ext, substart,
+                           subend, size, align, 0, exflags, (u_long *)&result)) {
+                               return 1;
+                       }
+               } else if (decodesize == 0) {
+                       /* maybe, the resister is overflowed. */
+      
+                       if (extent_alloc_subregion(rbt->rb_ext, addr,
+                           addr + size, size, 0, 0, exflags, (u_long *)&result)) {
+                               return 1;
+                       }
+               } else {
+
+                       boundary = decodesize > align ? decodesize : align;
+
+                       search_addr = (substart & ~(boundary - 1)) + addr;
+
+                       if (search_addr < substart) {
+                               search_addr += boundary;
+                       }
 
-  if (rbt->rb_flags == RBUS_SPACE_ASK_PARENT) {
-    return rbus_space_alloc(rbt->rb_parent, addr, size, mask, align, flags,
-                           addrp, bshp);
-  } else if (rbt->rb_flags == RBUS_SPACE_SHARE ||
-            rbt->rb_flags == RBUS_SPACE_DEDICATE) {
-    /* rbt has its own sh_extent */
+                       val = 1;
+                       for (; search_addr + size <= subend;
+                            search_addr += boundary) {
+                               val = extent_alloc_subregion(rbt->rb_ext,
+                                   search_addr, search_addr + size, size,
+                                   align, 0, exflags, (u_long *)&result);
+                               if (val == 0) {
+                                       break;
+                               }
+                       }
+                       if (val != 0) {
+                               /* no space found */
+                               return 1;
+                       }
+               }
 
-    /* sanity check: the subregion [substart, subend] should be
-       smaller than the region included in sh_extent */
-    if (substart < rbt->rb_ext->ex_start || subend > rbt->rb_ext->ex_end) {
-      return 1;
-    }
+               if(md_space_map(rbt->rb_bt, result, size, flags, bshp)) {
+                       /* map failed */
+                       extent_free(rbt->rb_ext, result, size, exflags);
+                       return 1;
+               }
 
-    if (decodesize == align) {
-      if(extent_alloc_subregion(rbt->rb_ext, substart, subend, size, align, 0,
-                               exflags, (u_long *)&result)) {
+               if (addrp != NULL) {
+                       *addrp = result + rbt->rb_offset;
+               }
+               return 0;
+
+       } else {
+               /* error!! */
+               return 1;
+       }
        return 1;
-      }
-    } else if (decodesize == 0) {
-      /* maybe, the resister is overflowed. */
-      
-      if (extent_alloc_subregion(rbt->rb_ext, addr, addr + size, size,
-                                0, 0, exflags, (u_long *)&result)) {
-       return 1;
-      }
-    } else {
-
-      boundary = decodesize > align ? decodesize : align;
-
-      search_addr = (substart & ~(boundary - 1)) + addr;
-
-      if (search_addr < substart) {
-       search_addr += boundary;
-      }
-
-      val = 1;
-      for (; search_addr + size <= subend; search_addr += boundary) {
-       val = extent_alloc_subregion(rbt->rb_ext,search_addr, search_addr+size,
-                               size, align, 0, exflags, (u_long *)&result);
-       if (val == 0) {
-         break;
-       }
-      }
-      if (val) {
-       return 1;
-      }
-    }
-
-    if(md_space_map(rbt->rb_bt, result, size, flags, bshp)) {
-      /* map failed */
-      extent_free(rbt->rb_ext, result, size, exflags);
-      return 1;
-    }
-
-    if (addrp != NULL) {
-      *addrp = result + rbt->rb_offset;
-    }
-    return 0;
-
-  } else {
-    /* error!! */
-    return 1;
-  }
-  return 1;
 }
 
 
@@ -178,32 +183,32 @@
 
 int
 rbus_space_free(rbt, bsh, size, addrp)
-     rbus_tag_t rbt;
-     bus_space_handle_t bsh;
-     bus_size_t size;
-     bus_addr_t *addrp;
+       rbus_tag_t rbt;
+       bus_space_handle_t bsh;
+       bus_size_t size;
+       bus_addr_t *addrp;
 {
-  int exflags = EX_FAST | EX_NOWAIT;
-  bus_addr_t addr;
-  int status = 1;
+       int exflags = EX_FAST | EX_NOWAIT;
+       bus_addr_t addr;
+       int status = 1;
 
-  if (rbt->rb_flags == RBUS_SPACE_ASK_PARENT) {
-    status = rbus_space_free(rbt->rb_parent, bsh, size, &addr);
-  } else if (rbt->rb_flags == RBUS_SPACE_SHARE ||
-            rbt->rb_flags == RBUS_SPACE_DEDICATE) {
-    md_space_unmap(rbt->rb_bt, bsh, size, &addr);
+       if (rbt->rb_flags == RBUS_SPACE_ASK_PARENT) {
+               status = rbus_space_free(rbt->rb_parent, bsh, size, &addr);
+       } else if (rbt->rb_flags == RBUS_SPACE_SHARE ||
+           rbt->rb_flags == RBUS_SPACE_DEDICATE) {
+               md_space_unmap(rbt->rb_bt, bsh, size, &addr);
 
-    extent_free(rbt->rb_ext, addr, size, exflags);
+               extent_free(rbt->rb_ext, addr, size, exflags);
 
-    status = 0;
-  } else {
-    /* error. INVALID rbustag */
-    status = 1;
-  }
-  if (addrp != NULL) {
-    *addrp = addr;
-  }
-  return status;
+               status = 0;
+       } else {
+               /* error. INVALID rbustag */
+               status = 1;
+       }
+       if (addrp != NULL) {
+               *addrp = addr;
+       }
+       return status;
 }
 
 
@@ -217,43 +222,46 @@
  */
 static rbus_tag_t
 rbus_new_body(bt, parent, ex, start, end, offset, flags)
-     bus_space_tag_t bt;
-     rbus_tag_t parent;
-     struct extent *ex;
-     bus_addr_t start, end, offset;
-     int flags;
+       bus_space_tag_t bt;
+       rbus_tag_t parent;
+       struct extent *ex;
+       bus_addr_t start, end, offset;
+       int flags;