diff options
Diffstat (limited to 'android')
-rw-r--r-- | android/avd/info.c | 62 | ||||
-rw-r--r-- | android/avd/info.h | 1 | ||||
-rw-r--r-- | android/cmdline-options.h | 1 | ||||
-rw-r--r-- | android/help.c | 22 | ||||
-rw-r--r-- | android/main.c | 36 |
5 files changed, 94 insertions, 28 deletions
diff --git a/android/avd/info.c b/android/avd/info.c index e738065..6766c96 100644 --- a/android/avd/info.c +++ b/android/avd/info.c @@ -92,6 +92,12 @@ AvdInfo* android_avdInfo; */ #define SDCARD_PATH "sdcard.path" +/* the config.ini key that is used to indicate the absolute path + * to the second SD Card image file, if you don't want to place it in + * the content directory. + */ +#define SDCARD2_PATH "sdcard2.path" + /* certain disk image files are mounted read/write by the emulator * to ensure that several emulators referencing the same files * do not corrupt these files, we need to lock them and respond @@ -675,7 +681,26 @@ EXIT: return l->pPath[0]; } +static void _sdcardLoadImages(ImageLoader* l, AvdInfo* i, AvdInfoParams* params, AvdImageType sdcardImage) +{ + imageLoader_set(l, sdcardImage); + imageLoader_load(l, IMAGE_OPTIONAL | + IMAGE_IGNORE_IF_LOCKED); + /* if the file was not found, ignore it */ + if (l->pPath[0] && !path_exists(l->pPath[0])) + { + D("ignoring non-existing %s at %s: %s", + l->imageText, l->pPath[0], strerror(errno)); + + /* if the user provided the SD Card path by hand, + * warn him. */ + if (params->forcePaths[sdcardImage] != NULL) + dwarning("ignoring non-existing SD Card image"); + + imageLoader_setPath(l, NULL); + } +} /* find the correct path of all image files we're going to need * and lock the files that need it. @@ -772,23 +797,8 @@ _getImagePaths(AvdInfo* i, AvdInfoParams* params ) * already used, we must ignore it. */ if (!noSdCard) { - imageLoader_set (l, AVD_IMAGE_SDCARD); - imageLoader_load(l, IMAGE_OPTIONAL | - IMAGE_IGNORE_IF_LOCKED); - - /* if the file was not found, ignore it */ - if (l->pPath[0] && !path_exists(l->pPath[0])) - { - D("ignoring non-existing %s at %s: %s", - l->imageText, l->pPath[0], strerror(errno)); - - /* if the user provided the SD Card path by hand, - * warn him. */ - if (params->forcePaths[AVD_IMAGE_SDCARD] != NULL) - dwarning("ignoring non-existing SD Card image"); - - imageLoader_setPath(l, NULL); - } + _sdcardLoadImages(l, i, params, AVD_IMAGE_SDCARD); + _sdcardLoadImages(l, i, params, AVD_IMAGE_SDCARD2); } return 0; @@ -1043,22 +1053,24 @@ _getSkin( AvdInfo* i, AvdInfoParams* params ) } /* If the user didn't explicitely provide an SD Card path, - * check the SDCARD_PATH key in config.ini and use that if + * check the specfied key in config.ini and use that if * available. */ static void -_getSDCardPath( AvdInfo* i, AvdInfoParams* params ) +_getSDCardPath(AvdInfo* i, AvdInfoParams* params, AvdImageType sdcardImage, + const char* iniKey ) { const char* path; - if (params->forcePaths[AVD_IMAGE_SDCARD] != NULL) + if (params->forcePaths[sdcardImage] != NULL) { return; + } - path = iniFile_getString(i->configIni, SDCARD_PATH); + path = iniFile_getString(i->configIni, iniKey); if (path == NULL) return; - params->forcePaths[AVD_IMAGE_SDCARD] = path; + params->forcePaths[sdcardImage] = path; } AvdInfo* @@ -1087,7 +1099,8 @@ avdInfo_new( const char* name, AvdInfoParams* params ) * obsolete SDKs. */ _getSearchPaths(i); - _getSDCardPath(i, params); + _getSDCardPath(i, params, AVD_IMAGE_SDCARD, SDCARD_PATH); + _getSDCardPath(i, params, AVD_IMAGE_SDCARD2, SDCARD2_PATH); /* don't need this anymore */ iniFile_free(i->rootIni); @@ -1255,6 +1268,9 @@ _getBuildImagePaths( AvdInfo* i, AvdInfoParams* params ) if (!noSdCard) { imageLoader_set (l, AVD_IMAGE_SDCARD); imageLoader_load(l, IMAGE_OPTIONAL | IMAGE_IGNORE_IF_LOCKED); + + imageLoader_set (l, AVD_IMAGE_SDCARD2); + imageLoader_load(l, IMAGE_OPTIONAL | IMAGE_IGNORE_IF_LOCKED); } return 0; diff --git a/android/avd/info.h b/android/avd/info.h index 19df807..75dab89 100644 --- a/android/avd/info.h +++ b/android/avd/info.h @@ -58,6 +58,7 @@ _AVD_IMG(USERDATA,"userdata-qemu.img", "user data") \ _AVD_IMG(CACHE,"cache.img","cache") \ _AVD_IMG(SDCARD,"sdcard.img","SD Card") \ + _AVD_IMG(SDCARD2,"sdcard2.img","SD Card 2") \ /* define the enumared values corresponding to each AVD image type * examples are: AVD_IMAGE_KERNEL, AVD_IMAGE_SYSTEM, etc.. diff --git a/android/cmdline-options.h b/android/cmdline-options.h index 6a4e7ff..fabac5c 100644 --- a/android/cmdline-options.h +++ b/android/cmdline-options.h @@ -76,6 +76,7 @@ CFG_PARAM( cache, "<file>", "cache partition image (default is temporary file CFG_FLAG ( no_cache, "disable the cache partition" ) CFG_FLAG ( nocache, "same as -no-cache" ) OPT_PARAM( sdcard, "<file>", "SD card image (default <system>/sdcard.img") +OPT_PARAM( sdcard2, "<file>", "SD card 2 image (default <system>/sdcard2.img") OPT_FLAG ( wipe_data, "reset the use data image (copy it from initdata)" ) CFG_PARAM( avd, "<name>", "use a specific android virtual device" ) CFG_PARAM( skindir, "<dir>", "search skins in <dir> (default <system>/skins)" ) diff --git a/android/help.c b/android/help.c index a142f9d..cbca332 100644 --- a/android/help.c +++ b/android/help.c @@ -120,8 +120,8 @@ help_build_images( stralloc_t* out ) " You can use the -sysdir, -system, -kernel, -ramdisk, -datadir, -data options\n" " to specify different search directories or specific image files. You can\n" - " also use the -cache and -sdcard options to indicate specific cache partition\n" - " and SD Card image files.\n\n" + " also use the -cache, -sdcard, and -sdcard2 options to indicate specific \n" + " cache partition and SD Card image files.\n\n" " For more details, see the corresponding -help-<option> section.\n\n" @@ -166,6 +166,7 @@ help_disk_images( stralloc_t* out ) " system-qemu.img an *optional* persistent system image\n" " cache.img an *optional* cache partition image\n" " sdcard.img an *optional* SD Card partition image\n\n" + " sdcard2.img an *optional* second SD Card partition image\n\n" " If you use a virtual device, its content directory should store\n" " all writable images, and read-only ones will be found from the\n" @@ -181,7 +182,7 @@ help_disk_images( stralloc_t* out ) " can still run the emulator by explicitely providing the paths to\n" " *all* required disk images through a combination of the following\n" " options: -sysdir, -datadir, -kernel, -ramdisk, -system, -data, -cache\n" - " and -sdcard\n\n" + " -sdcard, and -sdcard2\n\n" " The actual logic being that the emulator should be able to find all\n" " images from the options you give it.\n\n" @@ -621,6 +622,21 @@ help_sdcard(stralloc_t* out) } static void +help_sdcard2(stralloc_t* out) +{ + PRINTF( + " use '-sdcard2 <file>' to specify a second SD Card image file that will be attached\n" + " to the emulator. By default, the 'sdcard.img' file is searched in the data\n" + " directory.\n\n" + + " if the file does not exist, the emulator will still start, but without a\n" + " second SD Card attached.\n\n" + + " see '-help-disk-images' for more information about disk image files\n\n" + ); +} + +static void help_skindir(stralloc_t* out) { PRINTF( diff --git a/android/main.c b/android/main.c index e791efe..de048b9 100644 --- a/android/main.c +++ b/android/main.c @@ -1795,6 +1795,7 @@ int main(int argc, char **argv) int n; char* opt; int use_sdcard_img = 0; + int use_sdcard2_img = 0; int serial = 0; int gps_serial = 0; int radio_serial = 0; @@ -2059,6 +2060,14 @@ int main(int argc, char **argv) D("autoconfig: -sdcard %s", opts->sdcard); } } + + if (!opts->sdcard2 && opts->datadir) { + bufprint(tmp, tmpend, "%s/sdcard2.img", opts->datadir); + if (path_exists(tmp)) { + opts->sdcard2 = qemu_strdup(tmp); + D("autoconfig: -sdcard2 %s", opts->sdcard2); + } + } } /* setup the virtual device parameters from our options @@ -2079,6 +2088,7 @@ int main(int argc, char **argv) _forceAvdImagePath(AVD_IMAGE_USERDATA, opts->data, "user data", 0); _forceAvdImagePath(AVD_IMAGE_CACHE, opts->cache, "cache", 0); _forceAvdImagePath(AVD_IMAGE_SDCARD, opts->sdcard, "SD Card", 0); + _forceAvdImagePath(AVD_IMAGE_SDCARD2, opts->sdcard2, "SD Card 2", 0); /* we don't accept -skindir without -skin now * to simplify the autoconfig stuff with virtual devices @@ -2471,11 +2481,14 @@ int main(int argc, char **argv) args[n++] = strdup(tmp); } - if (hw->hw_sdCard != 0) + if (hw->hw_sdCard != 0) { opts->sdcard = (char*) avdInfo_getImageFile(avd, AVD_IMAGE_SDCARD); - else if (opts->sdcard) { + opts->sdcard2 = (char*) avdInfo_getImageFile(avd, AVD_IMAGE_SDCARD2); + + } else if (opts->sdcard || opts->sdcard2) { dwarning( "Emulated hardware doesn't support SD Cards" ); opts->sdcard = NULL; + opts->sdcard2 = NULL; } if(opts->sdcard) { @@ -2497,6 +2510,25 @@ int main(int argc, char **argv) } } + if(opts->sdcard2) { + uint64_t size; + if (path_get_size(opts->sdcard2, &size) == 0) { + /* see if we have an sdcard image. get its size if it exists */ + /* due to what looks like limitations of the MMC protocol, one has + * to use an SD Card image that is equal or larger than 9 MB + */ + if (size < 9*1024*1024ULL) { + fprintf(stderr, "### WARNING: SD Card files must be at least 9MB, ignoring '%s'\n", opts->sdcard2); + } else { + args[n++] = "-hdb"; + args[n++] = opts->sdcard2; + use_sdcard2_img = 1; + } + } else { + D("no SD Card image at '%s'", opts->sdcard2); + } + } + if (!opts->logcat || opts->logcat[0] == 0) { opts->logcat = getenv("ANDROID_LOG_TAGS"); if (opts->logcat && opts->logcat[0] == 0) |