projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BREAKPOINT: move from cpu/irq.h to cpu/attr.h
[bertos.git]
/
bertos
/
drv
/
dataflash.c
diff --git
a/bertos/drv/dataflash.c
b/bertos/drv/dataflash.c
index 554d15b88baec39cc6039993b5e0a055ad85d935..68047d5b5cac4e1743ea14df89140aadf84dd666 100644
(file)
--- a/
bertos/drv/dataflash.c
+++ b/
bertos/drv/dataflash.c
@@
-27,11
+27,9
@@
* the GNU General Public License.
*
* Copyright 2007 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2007 Develer S.r.l. (http://www.develer.com/)
- *
* -->
*
* -->
*
- * \brief Function library for dataflash AT45DB family (implementation).
- *
+ * \brief Function library for dataflash AT45DB family (implementation).
*
* \version $Id: dataflash.c 21658 2008-06-05 16:42:54Z asterix $
* \author Daniele Basile <asterix@develer.com>
*
* \version $Id: dataflash.c 21658 2008-06-05 16:42:54Z asterix $
* \author Daniele Basile <asterix@develer.com>
@@
-46,17
+44,15
@@
#include <cfg/module.h>
// Define logging setting (for cfg/log.h module).
#include <cfg/module.h>
// Define logging setting (for cfg/log.h module).
-#define LOG_LEVEL
DATAFLASH_LOG_LEVEL
-#define LOG_
VERBOSITY DATAFLASH_LOG_VERBOSITY
+#define LOG_LEVEL DATAFLASH_LOG_LEVEL
+#define LOG_
FORMAT DATAFLASH_LOG_FORMAT
#include <cfg/log.h>
#include <drv/timer.h>
#include <kern/kfile.h>
#include <cfg/log.h>
#include <drv/timer.h>
#include <kern/kfile.h>
-#if CONFIG_KERNEL
-#include <kern/proc.h>
-#endif
+#include <cpu/power.h> /* cpu_relax() */
#include <string.h>
#include <string.h>
@@
-213,11
+209,7
@@
static uint8_t dataflash_cmd(DataFlash *fd, dataflash_page_t page_addr, dataflas
* is high.
*/
while (!(dataflash_stat(fd) & BUSY_BIT))
* is high.
*/
while (!(dataflash_stat(fd) & BUSY_BIT))
- {
- #if CONFIG_KERNEL
- proc_switch();
- #endif
- }
+ cpu_relax();
stat = dataflash_stat(fd);
stat = dataflash_stat(fd);