Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
hw
/
block
/
pflash_cfi02.c
diff --git
a/qemu/hw/block/pflash_cfi02.c
b/qemu/hw/block/pflash_cfi02.c
index
074a005
..
b13172c
100644
(file)
--- a/
qemu/hw/block/pflash_cfi02.c
+++ b/
qemu/hw/block/pflash_cfi02.c
@@
-35,8
+35,10
@@
* It does not implement multiple sectors erase
*/
* It does not implement multiple sectors erase
*/
+#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
+#include "qapi/error.h"
#include "qemu/timer.h"
#include "sysemu/block-backend.h"
#include "exec/address-spaces.h"
#include "qemu/timer.h"
#include "sysemu/block-backend.h"
#include "exec/address-spaces.h"
@@
-430,8
+432,8
@@
static void pflash_write (pflash_t *pfl, hwaddr offset,
}
pfl->status = 0x00;
/* Let's wait 5 seconds before chip erase is done */
}
pfl->status = 0x00;
/* Let's wait 5 seconds before chip erase is done */
- timer_mod(pfl->timer,
-
qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (get_ticks_per_sec()
* 5));
+ timer_mod(pfl->timer,
qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
+
(NANOSECONDS_PER_SECOND
* 5));
break;
case 0x30:
/* Sector erase */
break;
case 0x30:
/* Sector erase */
@@
-445,8
+447,8
@@
static void pflash_write (pflash_t *pfl, hwaddr offset,
}
pfl->status = 0x00;
/* Let's wait 1/2 second before sector erase is done */
}
pfl->status = 0x00;
/* Let's wait 1/2 second before sector erase is done */
- timer_mod(pfl->timer,
-
qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (get_ticks_per_sec()
/ 2));
+ timer_mod(pfl->timer,
qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
+
(NANOSECONDS_PER_SECOND
/ 2));
break;
default:
DPRINTF("%s: invalid command %02x (wc 5)\n", __func__, cmd);
break;
default:
DPRINTF("%s: invalid command %02x (wc 5)\n", __func__, cmd);