diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:59 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:59 -0800 |
commit | c27f813900a3c114562efbb8df1065e94766fc48 (patch) | |
tree | d95919283707dcab61009e27007374a745c9541e /hw/goldfish_nand.c | |
parent | 0852ad57fa372f9b2854e4df685eaba8d8ef6790 (diff) | |
download | external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.zip external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.tar.gz external_qemu-c27f813900a3c114562efbb8df1065e94766fc48.tar.bz2 |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'hw/goldfish_nand.c')
-rw-r--r-- | hw/goldfish_nand.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/hw/goldfish_nand.c b/hw/goldfish_nand.c index e3042bf..61b075e 100644 --- a/hw/goldfish_nand.c +++ b/hw/goldfish_nand.c @@ -9,12 +9,12 @@ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. */ -#include "vl.h" +#include "qemu_file.h" #include "goldfish_nand_reg.h" #include "goldfish_nand.h" -#include "android_utils.h" -#include "android_debug.h" -#include "android.h" +#include "android/utils/tempfile.h" +#include "qemu_debug.h" +#include "android/android.h" #define DEBUG 1 #if DEBUG @@ -153,9 +153,6 @@ static int nand_dev_state_load(QEMUFile* f, void* opaque, int version_id) } -extern void vmemcpy(target_ulong ptr, char *buf, int size); /* copy memory from the simulated virtual space to a buffer in QEMU */ -extern void pmemcpy(target_ulong ptr, char *buf, int size); /* copy memory from the QEMU buffer to simulated virtual space */ - static int do_read(int fd, void* buf, size_t size) { int ret; |