Introduce a consistent coding style

This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:

	-bap
	-psl
	-T PrivatePtr
	-T pmWait
	-T _XFUNCPROTOBEGIN
	-T _XFUNCPROTOEND
	-T _X_EXPORT

The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.

The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.

The comparison was done with this script:

dir1=$1
dir2=$2

for dir in $dir1 $dir2; do
	(cd $dir && find . -name '*.o' | while read file; do
		dir=`dirname $file`
		base=`basename $file .o`
		dump=$dir/$base.dump
		objdump -d $file > $dump
	done)
done

find $dir1 -name '*.dump' | while read dump; do
	otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
	diff -u $dump $otherdump
done

Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 30 insertions, 27 deletions

diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h
index 03c479144..bacd4aa0d 100644
--- a/hw/xfree86/os-support/bsd/memrange.h
+++ b/hw/xfree86/os-support/bsd/memrange.h
@@ -10,36 +10,37 @@
 #define _MEMRANGE_H
 
 /* Memory range attributes */
-#define MDF_UNCACHEABLE		(1<<0)	/* region not cached */
-#define MDF_WRITECOMBINE	(1<<1)	/* region supports "write combine"
-					 * action */
-#define MDF_WRITETHROUGH	(1<<2)	/* write-through cached */
-#define MDF_WRITEBACK		(1<<3)	/* write-back cached */
-#define MDF_WRITEPROTECT	(1<<4)	/* read-only region */
+#define MDF_UNCACHEABLE		(1<<0)  /* region not cached */
+#define MDF_WRITECOMBINE	(1<<1)  /* region supports "write combine"
+                                         * action */
+#define MDF_WRITETHROUGH	(1<<2)  /* write-through cached */
+#define MDF_WRITEBACK		(1<<3)  /* write-back cached */
+#define MDF_WRITEPROTECT	(1<<4)  /* read-only region */
 #define MDF_ATTRMASK		(0x00ffffff)
 
-#define MDF_FIXBASE		(1<<24)	/* fixed base */
-#define MDF_FIXLEN		(1<<25)	/* fixed length */
-#define MDF_FIRMWARE		(1<<26)	/* set by firmware (XXX not useful?) */
-#define MDF_ACTIVE		(1<<27)	/* currently active */
-#define MDF_BOGUS		(1<<28)	/* we don't like it */
-#define MDF_FIXACTIVE		(1<<29)	/* can't be turned off */
-#define MDF_BUSY		(1<<30)	/* range is in use */
+#define MDF_FIXBASE		(1<<24) /* fixed base */
+#define MDF_FIXLEN		(1<<25) /* fixed length */
+#define MDF_FIRMWARE		(1<<26) /* set by firmware (XXX not useful?) */
+#define MDF_ACTIVE		(1<<27) /* currently active */
+#define MDF_BOGUS		(1<<28) /* we don't like it */
+#define MDF_FIXACTIVE		(1<<29) /* can't be turned off */
+#define MDF_BUSY		(1<<30) /* range is in use */
 
 struct mem_range_desc {
-	u_int64_t mr_base;
-	u_int64_t mr_len;
-	int     mr_flags;
-	char    mr_owner[8];
+    u_int64_t mr_base;
+    u_int64_t mr_len;
+    int mr_flags;
+    char mr_owner[8];
 };
 
 struct mem_range_op {
-	struct mem_range_desc *mo_desc;
-	int     mo_arg[2];
+    struct mem_range_desc *mo_desc;
+    int mo_arg[2];
 #define MEMRANGE_SET_UPDATE	0
 #define MEMRANGE_SET_REMOVE	1
-	/* XXX want a flag that says "set and undo when I exit" */
+    /* XXX want a flag that says "set and undo when I exit" */
 };
+
 #define MEMRANGE_GET	_IOWR('m', 50, struct mem_range_op)
 #define MEMRANGE_SET	_IOW('m', 51, struct mem_range_op)
 
@@ -47,16 +48,18 @@ struct mem_range_op {
 
 struct mem_range_softc;
 struct mem_range_ops {
-	void    (*init) __P((struct mem_range_softc * sc));
-	int     (*set) __P((struct mem_range_softc * sc, struct mem_range_desc * mrd, int *arg));
-	void    (*initAP) __P((struct mem_range_softc * sc));
+    void (*init) __P((struct mem_range_softc * sc));
+    int (*set)
+        __P((struct mem_range_softc * sc, struct mem_range_desc * mrd,
+             int *arg));
+    void (*initAP) __P((struct mem_range_softc * sc));
 };
 
 struct mem_range_softc {
-	struct mem_range_ops *mr_op;
-	int     mr_cap;
-	int     mr_ndesc;
-	struct mem_range_desc *mr_desc;
+    struct mem_range_ops *mr_op;
+    int mr_cap;
+    int mr_ndesc;
+    struct mem_range_desc *mr_desc;
 };
 
 extern struct mem_range_softc mem_range_softc;