diff options
Diffstat (limited to 'android/main.c')
| -rw-r--r-- | android/main.c | 170 |
1 files changed, 168 insertions, 2 deletions
diff --git a/android/main.c b/android/main.c index f20ea7b..56ae698 100644 --- a/android/main.c +++ b/android/main.c @@ -155,6 +155,65 @@ _adjustPartitionSize( const char* description, return convertMBToBytes(imageMB); } +/* Parses a -webcam option, extracting 'name', and 'dir' values. + * Param: + * param - -webcam option, that should be formatted as such: + * name=<name>[,dir=<direction>] + * name, name_size - buffer (and its size) where to receive <name> + * dir, dir_size - buffer (and its size) where to receive <direction> + */ +static void +_parseWebcamOption(const char* param, + char* name, size_t name_size, + char* dir, size_t dir_size) +{ + const char* dr; + const char* wc_opt = param; + + /* Must start with 'name=' */ + if (strlen(wc_opt) <= 5 || memcmp(wc_opt, "name=", 5)) { + derror("Invalid value for -webcam parameter: %s\n", param); + exit(1); + } + + /* Move on to 'name' value. */ + wc_opt += 5; + dr = strchr(wc_opt, ','); + if (dr == NULL) { + dr = wc_opt + strlen(wc_opt); + } + + /* Make sure that <name> fits */ + if ((dr - wc_opt) < name_size) { + memcpy(name, wc_opt, dr - wc_opt); + name[dr - wc_opt] = '\0'; + if (*dr == '\0') { + /* Default direction value is 'front' */ + strcpy(dir, "front"); + return; + } else { + dr++; + } + } else { + derror("Invalid <name> value for -webcam parameter: %s\n", param); + exit(1); + } + + /* Parse 'dir'. Must begin with 'dir=' */ + if (strlen(dr) <= 4 || memcmp(dr, "dir=", 4)) { + derror("Invalid value for -webcam parameter: %s\n", param); + exit(1); + } + dr += 4; + /* Check the bounds, and the values */ + if (strlen(dr) >= dir_size || (strcmp(dr, "front") && strcmp(dr, "back"))) { + derror("Invalid <direction> value for -webcam parameter: %s\n" + "Valid values are: 'front', or 'back'\n", param); + exit(1); + } + strcpy(dir, dr); +} + int main(int argc, char **argv) { char tmp[MAX_PATH]; @@ -396,6 +455,17 @@ int main(int argc, char **argv) opts->trace = tracePath; } + /* Update CPU architecture for HW configs created from build dir. */ + if (inAndroidBuild) { +#if defined(TARGET_ARM) + free(android_hw->hw_cpu_arch); + android_hw->hw_cpu_arch = ASTRDUP("arm"); +#elif defined(TARGET_I386) + free(android_hw->hw_cpu_arch); + android_hw->hw_cpu_arch = ASTRDUP("x86"); +#endif + } + n = 1; /* generate arguments for the underlying qemu main() */ { @@ -485,8 +555,15 @@ int main(int argc, char **argv) args[n++] = opts->dns_server; } - hw->disk_ramdisk_path = avdInfo_getRamdiskPath(avd); - D("autoconfig: -ramdisk %s", hw->disk_ramdisk_path); + /* opts->ramdisk is never NULL (see createAVD) here */ + if (opts->ramdisk) { + AFREE(hw->disk_ramdisk_path); + hw->disk_ramdisk_path = ASTRDUP(opts->ramdisk); + } + else if (!hw->disk_ramdisk_path[0]) { + hw->disk_ramdisk_path = avdInfo_getRamdiskPath(avd); + D("autoconfig: -ramdisk %s", hw->disk_ramdisk_path); + } /* -partition-size is used to specify the max size of both the system * and data partition sizes. @@ -1063,6 +1140,95 @@ int main(int argc, char **argv) args[n++] = opts->memcheck; } + if (opts->gpu) { + const char* gpu = opts->gpu; + if (!strcmp(gpu,"on") || !strcmp(gpu,"enable")) { + hw->hw_gpu_enabled = 1; + } else if (!strcmp(gpu,"off") || !strcmp(gpu,"disable")) { + hw->hw_gpu_enabled = 0; + } else if (!strcmp(gpu,"auto")) { + /* Nothing to do */ + } else { + derror("Invalid value for -gpu <mode> parameter: %s\n", gpu); + derror("Valid values are: on, off or auto\n"); + exit(1); + } + } + + if (opts->fake_camera) { + if (!strcmp(opts->fake_camera, "back") || + !strcmp(opts->fake_camera, "front") || + !strcmp(opts->fake_camera, "off")) { + hw->hw_fakeCamera = ASTRDUP(opts->fake_camera); + } else { + derror("Invalid value for -fake-camera <mode> parameter: %s\n", + opts->fake_camera); + derror("Valid values are: back, front, or off\n"); + exit(1); + } + } + + if (opts->webcam != NULL) { + ParamList* pl = opts->webcam; + int webcam_num = 0; + for ( ; pl != NULL; pl = pl->next ) { + char webcam_name[64]; + char webcam_dir[16]; + if (!strcmp(pl->param, "off")) { + /* If 'off' is passed, there must be no other -webcam options. */ + if (webcam_num || pl->next != NULL) { + derror("'-webcam off' cannot be combined with other -webcam otions\n"); + exit(1); + } + break; + } + if (!strcmp(pl->param, "list")) { + /* If 'list' is passed, there must be no other -webcam options. */ + if (webcam_num || pl->next != NULL) { + derror("'-webcam list' cannot be combined with other -webcam otions\n"); + exit(1); + } + args[n++] = "-list-webcam"; + break; + } + /* Extract name, and direction */ + _parseWebcamOption(pl->param, webcam_name, sizeof(webcam_name), + webcam_dir, sizeof(webcam_dir)); + /* Save them to appropriate field in hw.ini */ + switch (webcam_num) { + case 0: + hw->hw_webcam_0_name = ASTRDUP(webcam_name); + hw->hw_webcam_0_direction = ASTRDUP(webcam_dir); + break; + case 1: + hw->hw_webcam_1_name = ASTRDUP(webcam_name); + hw->hw_webcam_1_direction = ASTRDUP(webcam_dir); + break; + case 2: + hw->hw_webcam_2_name = ASTRDUP(webcam_name); + hw->hw_webcam_2_direction = ASTRDUP(webcam_dir); + break; + case 3: + hw->hw_webcam_3_name = ASTRDUP(webcam_name); + hw->hw_webcam_3_direction = ASTRDUP(webcam_dir); + break; + case 4: + hw->hw_webcam_4_name = ASTRDUP(webcam_name); + hw->hw_webcam_4_direction = ASTRDUP(webcam_dir); + break; + case 5: + hw->hw_webcam_5_name = ASTRDUP(webcam_name); + hw->hw_webcam_5_direction = ASTRDUP(webcam_dir); + break; + default: + derror("Too many -webcam options. Maximum number of -webcam options is 6\n"); + exit(1); + } + webcam_num++; + } + hw->hw_webcam_count = webcam_num; + } + /* physical memory is now in hw->hw_ramSize */ hw->avd_name = ASTRDUP(avdInfo_getName(avd)); |