projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: Kirkwood: Correct header define
[oweals/u-boot.git]
/
include
/
asm-blackfin
/
bitops.h
diff --git
a/include/asm-blackfin/bitops.h
b/include/asm-blackfin/bitops.h
index 7766c4ab0647a7992479c67b7da11b78d2cba31c..2e55b6a619998c234aee9042be7f70e960a112d3 100644
(file)
--- a/
include/asm-blackfin/bitops.h
+++ b/
include/asm-blackfin/bitops.h
@@
-1,7
+1,7
@@
/*
* U-boot - bitops.h Routines for bit operations
*
/*
* U-boot - bitops.h Routines for bit operations
*
- * Copyright (c) 2005
blackfin.uclinux.org
+ * Copyright (c) 2005
-2007 Analog Devices Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
*
* See file CREDITS for list of people who contributed to this
* project.
@@
-18,8
+18,8
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 5
9 Temple Place, Suite 330
, Boston,
- * MA 0211
1-1307
USA
+ * Foundation, Inc., 5
1 Franklin St, Fifth Floor
, Boston,
+ * MA 0211
0-1301
USA
*/
#ifndef _BLACKFIN_BITOPS_H
*/
#ifndef _BLACKFIN_BITOPS_H
@@
-65,9
+65,9
@@
static __inline__ void set_bit(int nr, volatile void *addr)
a += nr >> 5;
mask = 1 << (nr & 0x1f);
a += nr >> 5;
mask = 1 << (nr & 0x1f);
-
save_and_cli
(flags);
+
local_irq_save
(flags);
*a |= mask;
*a |= mask;
-
restore_flags
(flags);
+
local_irq_restore
(flags);
}
static __inline__ void __set_bit(int nr, volatile void *addr)
}
static __inline__ void __set_bit(int nr, volatile void *addr)
@@
-94,9
+94,9
@@
static __inline__ void clear_bit(int nr, volatile void *addr)
a += nr >> 5;
mask = 1 << (nr & 0x1f);
a += nr >> 5;
mask = 1 << (nr & 0x1f);
-
save_and_cli
(flags);
+
local_irq_save
(flags);
*a &= ~mask;
*a &= ~mask;
-
restore_flags
(flags);
+
local_irq_restore
(flags);
}
static __inline__ void change_bit(int nr, volatile void *addr)
}
static __inline__ void change_bit(int nr, volatile void *addr)
@@
-106,9
+106,9
@@
static __inline__ void change_bit(int nr, volatile void *addr)
ADDR += nr >> 5;
mask = 1 << (nr & 31);
ADDR += nr >> 5;
mask = 1 << (nr & 31);
-
save_and_cli
(flags);
+
local_irq_save
(flags);
*ADDR ^= mask;
*ADDR ^= mask;
-
restore_flags
(flags);
+
local_irq_restore
(flags);
}
static __inline__ void __change_bit(int nr, volatile void *addr)
}
static __inline__ void __change_bit(int nr, volatile void *addr)
@@
-129,10
+129,10
@@
static __inline__ int test_and_set_bit(int nr, volatile void *addr)
a += nr >> 5;
mask = 1 << (nr & 0x1f);
a += nr >> 5;
mask = 1 << (nr & 0x1f);
-
save_and_cli
(flags);
+
local_irq_save
(flags);
retval = (mask & *a) != 0;
*a |= mask;
retval = (mask & *a) != 0;
*a |= mask;
-
restore_flags
(flags);
+
local_irq_restore
(flags);
return retval;
}
return retval;
}
@@
-157,10
+157,10
@@
static __inline__ int test_and_clear_bit(int nr, volatile void *addr)
a += nr >> 5;
mask = 1 << (nr & 0x1f);
a += nr >> 5;
mask = 1 << (nr & 0x1f);
-
save_and_cli
(flags);
+
local_irq_save
(flags);
retval = (mask & *a) != 0;
*a &= ~mask;
retval = (mask & *a) != 0;
*a &= ~mask;
-
restore_flags
(flags);
+
local_irq_restore
(flags);
return retval;
}
return retval;
}
@@
-185,10
+185,10
@@
static __inline__ int test_and_change_bit(int nr, volatile void *addr)
a += nr >> 5;
mask = 1 << (nr & 0x1f);
a += nr >> 5;
mask = 1 << (nr & 0x1f);
-
save_and_cli
(flags);
+
local_irq_save
(flags);
retval = (mask & *a) != 0;
*a ^= mask;
retval = (mask & *a) != 0;
*a ^= mask;
-
restore_flags
(flags);
+
local_irq_restore
(flags);
return retval;
}
return retval;
}
@@
-293,10
+293,10
@@
static __inline__ int ext2_set_bit(int nr, volatile void *addr)
ADDR += nr >> 3;
mask = 1 << (nr & 0x07);
ADDR += nr >> 3;
mask = 1 << (nr & 0x07);
-
save_and_cli
(flags);
+
local_irq_save
(flags);
retval = (mask & *ADDR) != 0;
*ADDR |= mask;
retval = (mask & *ADDR) != 0;
*ADDR |= mask;
-
restore_flags
(flags);
+
local_irq_restore
(flags);
return retval;
}
return retval;
}
@@
-308,10
+308,10
@@
static __inline__ int ext2_clear_bit(int nr, volatile void *addr)
ADDR += nr >> 3;
mask = 1 << (nr & 0x07);
ADDR += nr >> 3;
mask = 1 << (nr & 0x07);
-
save_and_cli
(flags);
+
local_irq_save
(flags);
retval = (mask & *ADDR) != 0;
*ADDR &= ~mask;
retval = (mask & *ADDR) != 0;
*ADDR &= ~mask;
-
restore_flags
(flags);
+
local_irq_restore
(flags);
return retval;
}
return retval;
}