style(9) + fix FreeBSD id's.

5 files changed, 41 insertions, 34 deletions

diff --git a/sys/boot/efi/libefi/copy.c b/sys/boot/efi/libefi/copy.c
index ffecba6..01c31d8 100644
--- a/sys/boot/efi/libefi/copy.c
+++ b/sys/boot/efi/libefi/copy.c
@@ -22,9 +22,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
+
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
 /*
  * MD primitives supporting placement of module data 
  *
@@ -39,21 +43,19 @@
 int
 efi_copyin(void *src, vm_offset_t dest, size_t len)
 {
-    bcopy(src, (void*) dest, len);
-    return(len);
+	bcopy(src, (void*) dest, len);
+	return (len);
 }
 
 int
 efi_copyout(vm_offset_t src, void *dest, size_t len)
 {
-    bcopy((void*) src, dest, len);
-    return(len);
+	bcopy((void*) src, dest, len);
+	return (len);
 }
 
 int
 efi_readin(int fd, vm_offset_t dest, size_t len)
 {
-    return(read(fd, (void*) dest, len));
+	return (read(fd, (void*) dest, len));
 }
-
-    
diff --git a/sys/boot/efi/libefi/delay.c b/sys/boot/efi/libefi/delay.c
index 26b45cb..2a5b98b 100644
--- a/sys/boot/efi/libefi/delay.c
+++ b/sys/boot/efi/libefi/delay.c
@@ -22,10 +22,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
 #include <efi.h>
 #include <efilib.h>
 
@@ -36,8 +39,8 @@ delay(int usecs)
 	UINTN junk;
 
 	if (!ev) {
-		if (BS->CreateEvent(EVT_TIMER, TPL_APPLICATION,
-				    0, 0, &ev) != EFI_SUCCESS)
+		if (BS->CreateEvent(EVT_TIMER, TPL_APPLICATION, 0, 0, &ev)
+		    != EFI_SUCCESS)
 			return;
 	}
 
diff --git a/sys/boot/efi/libefi/exit.c b/sys/boot/efi/libefi/exit.c
index 74b29c4..9488f18 100644
--- a/sys/boot/efi/libefi/exit.c
+++ b/sys/boot/efi/libefi/exit.c
@@ -22,16 +22,18 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$FreeBSD$
  */
 
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
 #include <efi.h>
 #include <efilib.h>
 
 void
 exit(int code)
 {
-    BS->Exit(IH, code ? EFI_LOAD_ERROR : EFI_SUCCESS, 0, 0);
+	BS->Exit(IH, code ? EFI_LOAD_ERROR : EFI_SUCCESS, 0, 0);
 }
-
diff --git a/sys/boot/efi/libefi/module.c b/sys/boot/efi/libefi/module.c
index bb2edbe..6c07e28 100644
--- a/sys/boot/efi/libefi/module.c
+++ b/sys/boot/efi/libefi/module.c
@@ -22,14 +22,12 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
-/*
- * alpha-specific module functionality.
- *
- */
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
 
 #include <stand.h>
 
@@ -39,6 +37,6 @@
 int
 efi_autoload(void)
 {
-    /* XXX use PnP to locate stuff here */
-    return(0);
+	/* XXX use PnP to locate stuff here */
+	return (0);
 }
diff --git a/sys/boot/ia64/common/copy.c b/sys/boot/ia64/common/copy.c
index ffecba6..01c31d8 100644
--- a/sys/boot/ia64/common/copy.c
+++ b/sys/boot/ia64/common/copy.c
@@ -22,9 +22,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
+
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
 /*
  * MD primitives supporting placement of module data 
  *
@@ -39,21 +43,19 @@
 int
 efi_copyin(void *src, vm_offset_t dest, size_t len)
 {
-    bcopy(src, (void*) dest, len);
-    return(len);
+	bcopy(src, (void*) dest, len);
+	return (len);
 }
 
 int
 efi_copyout(vm_offset_t src, void *dest, size_t len)
 {
-    bcopy((void*) src, dest, len);
-    return(len);
+	bcopy((void*) src, dest, len);
+	return (len);
 }
 
 int
 efi_readin(int fd, vm_offset_t dest, size_t len)
 {
-    return(read(fd, (void*) dest, len));
+	return (read(fd, (void*) dest, len));
 }
-
-