From c27f813900a3c114562efbb8df1065e94766fc48 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 10 Feb 2009 15:43:59 -0800 Subject: auto import from //branches/cupcake/...@130745 --- hw/goldfish_nand.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'hw/goldfish_nand.c') 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; -- cgit v1.1