mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-09 08:35:19 +02:00
84 lines
2.9 KiB
Diff
84 lines
2.9 KiB
Diff
|
From 898b269952d096ce3f990c51b02457c27e16b83c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kurt Mahan <kmahan@freescale.com>
|
||
|
|
Date: Sun, 9 Dec 2007 02:25:49 -0700
|
||
|
|
Subject: [PATCH] Clean up formatting.
|
||
|
|
|
||
|
|
LTIBName: mcfv4e-bitops-cleanup
|
||
|
|
Signed-off-by: Kurt Mahan <kmahan@freescale.com>
|
||
|
|
---
|
||
|
|
include/asm-m68k/bitops.h | 21 ++++++++++++++-------
|
||
|
|
1 files changed, 14 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
--- a/include/asm-m68k/bitops.h
|
||
|
|
+++ b/include/asm-m68k/bitops.h
|
||
|
|
@@ -478,7 +478,8 @@ static __inline__ int __constant_coldfir
|
||
|
|
return retval;
|
||
|
|
}
|
||
|
|
#else
|
||
|
|
-static __inline__ int __constant_coldfire_test_and_set_bit(int nr,volatile void * vaddr)
|
||
|
|
+static __inline__ int __constant_coldfire_test_and_set_bit(int nr,
|
||
|
|
+ volatile void *vaddr)
|
||
|
|
{
|
||
|
|
char retval;
|
||
|
|
volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
|
||
|
|
@@ -516,7 +517,8 @@ static __inline__ void __constant_coldfi
|
||
|
|
: "+QUd" (*p) : "di" (nr & 7));
|
||
|
|
}
|
||
|
|
#else
|
||
|
|
-static __inline__ void __constant_coldfire_set_bit(int nr, volatile void * vaddr)
|
||
|
|
+static __inline__ void __constant_coldfire_set_bit(int nr,
|
||
|
|
+ volatile void *vaddr)
|
||
|
|
{
|
||
|
|
volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
|
||
|
|
__asm__ __volatile__ ("bset %1,(%3)"
|
||
|
|
@@ -524,7 +526,8 @@ static __inline__ void __constant_coldfi
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-static __inline__ void __generic_coldfire_set_bit(int nr, volatile void *vaddr)
|
||
|
|
+static __inline__ void __generic_coldfire_set_bit(int nr,
|
||
|
|
+ volatile void *vaddr)
|
||
|
|
{
|
||
|
|
__asm__ __volatile__ ("bset %1,%0"
|
||
|
|
: "=m" (((volatile char *)vaddr)[(nr^31) >> 3])
|
||
|
|
@@ -552,7 +555,8 @@ static __inline__ int __constant_coldfir
|
||
|
|
return retval;
|
||
|
|
}
|
||
|
|
#else
|
||
|
|
-static __inline__ int __constant_coldfire_test_and_clear_bit(int nr, volatile void *vaddr)
|
||
|
|
+static __inline__ int __constant_coldfire_test_and_clear_bit(int nr,
|
||
|
|
+ volatile void *vaddr)
|
||
|
|
{
|
||
|
|
char retval;
|
||
|
|
volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
|
||
|
|
@@ -599,7 +603,8 @@ static __inline__ void __constant_coldfi
|
||
|
|
: "+QUd" (*p) : "id" (nr & 7));
|
||
|
|
}
|
||
|
|
#else
|
||
|
|
-static __inline__ void __constant_coldfire_clear_bit(int nr, volatile void * vaddr)
|
||
|
|
+static __inline__ void __constant_coldfire_clear_bit(int nr,
|
||
|
|
+ volatile void *vaddr)
|
||
|
|
{
|
||
|
|
volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
|
||
|
|
__asm__ __volatile__ ("bclr %1,(%3)"
|
||
|
|
@@ -636,7 +641,8 @@ static __inline__ int __constant_coldfir
|
||
|
|
return retval;
|
||
|
|
}
|
||
|
|
#else
|
||
|
|
-static __inline__ int __constant_coldfire_test_and_change_bit(int nr, volatile void * vaddr)
|
||
|
|
+static __inline__ int __constant_coldfire_test_and_change_bit(int nr,
|
||
|
|
+ volatile void *vaddr)
|
||
|
|
{
|
||
|
|
char retval;
|
||
|
|
volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
|
||
|
|
@@ -678,7 +684,8 @@ static __inline__ void __constant_coldfi
|
||
|
|
: "+QUd" (*p) : "id" (nr & 7));
|
||
|
|
}
|
||
|
|
#else
|
||
|
|
-static __inline__ void __constant_coldfire_change_bit(int nr, volatile void * vaddr)
|
||
|
|
+static __inline__ void __constant_coldfire_change_bit(int nr,
|
||
|
|
+ volatile void *vaddr)
|
||
|
|
{
|
||
|
|
volatile char *p = &((volatile char *)vaddr)[(nr^31) >> 3];
|
||
|
|
__asm__ __volatile__ ("bchg %1,(%3)"
|