summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-01-10 21:50:55 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-01-10 21:50:55 +0000
commit331b11a642211cc78b3a1736cfad6c99dd51f07a (patch)
treeeb4b534a98b718a2656e2a3c401ea0217b26b249
parenta86000dd992ebbb6a575199d04a2f40f5a63a38a (diff)
spacing
-rw-r--r--sys/arch/zaurus/stand/zboot/compat_linux.h22
-rw-r--r--sys/arch/zaurus/stand/zboot/conf.c14
-rw-r--r--sys/arch/zaurus/stand/zboot/unixsys.S4
-rw-r--r--sys/arch/zaurus/stand/zbsdmod/zbsdmod.c4
4 files changed, 22 insertions, 22 deletions
diff --git a/sys/arch/zaurus/stand/zboot/compat_linux.h b/sys/arch/zaurus/stand/zboot/compat_linux.h
index ea88879922e..d785b91f71f 100644
--- a/sys/arch/zaurus/stand/zboot/compat_linux.h
+++ b/sys/arch/zaurus/stand/zboot/compat_linux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat_linux.h,v 1.2 2005/01/10 21:10:57 uwe Exp $ */
+/* $OpenBSD: compat_linux.h,v 1.3 2005/01/10 21:50:54 deraadt Exp $ */
/*
* Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
@@ -45,17 +45,17 @@
#define __NR__new_select (__NR_SYSCALL_BASE+142)
#define __NR_select __NR__new_select /* XXX */
#define __NR_syscall (__NR_SYSCALL_BASE+113)
-#define linux__sys2(x) #x
-#define linux__sys1(x) linux__sys2(x)
+#define linux__sys2(x) #x
+#define linux__sys1(x) linux__sys2(x)
#define linux__syscall(name) "swi\t" linux__sys1(__NR_##name) "\n\t"
-#define linux__syscall_return(type, res) \
-do { \
- if ((unsigned long)(res) >= (unsigned long)(-125)) { \
- errno = -(res); \
- res = -1; \
- } \
- return (type) (res); \
-} while (0)
+#define linux__syscall_return(type, res) \
+ do { \
+ if ((unsigned long)(res) >= (unsigned long)(-125)) { \
+ errno = -(res); \
+ res = -1; \
+ } \
+ return (type) (res); \
+ } while (0)
#undef SYS_select
#define SYS_select __NR__new_select
diff --git a/sys/arch/zaurus/stand/zboot/conf.c b/sys/arch/zaurus/stand/zboot/conf.c
index 32394a0f0be..7218e298eea 100644
--- a/sys/arch/zaurus/stand/zboot/conf.c
+++ b/sys/arch/zaurus/stand/zboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.1 2005/01/10 00:25:03 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.2 2005/01/10 21:50:54 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -13,8 +13,8 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
@@ -50,18 +50,18 @@ int debug = 1;
#endif
void (*zaurus_probe1[])(void) = {
- cninit
+ cninit
};
#if 0
void (*zaurus_probe2[])(void) = {
- diskprobe
+ diskprobe
};
#endif
struct zaurus_boot_probes probe_list[] = {
- { "probing", zaurus_probe1, NENTS(zaurus_probe1) },
+ { "probing", zaurus_probe1, NENTS(zaurus_probe1) },
#if 0
- { "disk", zaurus_probe2, NENTS(zaurus_probe2) }
+ { "disk", zaurus_probe2, NENTS(zaurus_probe2) }
#endif
};
int nibprobes = NENTS(probe_list);
diff --git a/sys/arch/zaurus/stand/zboot/unixsys.S b/sys/arch/zaurus/stand/zboot/unixsys.S
index d5cbe025fe5..3c12e7db0d4 100644
--- a/sys/arch/zaurus/stand/zboot/unixsys.S
+++ b/sys/arch/zaurus/stand/zboot/unixsys.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: unixsys.S,v 1.2 2005/01/10 21:10:57 uwe Exp $ */
+/* $OpenBSD: unixsys.S,v 1.3 2005/01/10 21:50:54 deraadt Exp $ */
/*
* Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
@@ -46,7 +46,7 @@ RSYSCALL(exit)
Lerrno:
.word errno
-
+
ENTRY(__syscall)
ENTRY(syscall)
swi __NR_syscall
diff --git a/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c b/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c
index efb91c524fb..9d5a6b6ed1b 100644
--- a/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c
+++ b/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD */
+/* $OpenBSD: zbsdmod.c,v 1.3 2005/01/10 21:50:54 deraadt Exp $ */
/*
* Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
@@ -202,7 +202,7 @@ zbsdmod_close(struct inode *ino, struct file *f)
elf32bsdboot();
printk("%s: boot failed\n", ZBOOTDEV_NAME);
#else
- printk("/* boot() */\n");
+ printk("/* boot() */\n");
#endif
}
isopen = 0;