From c107b96789e8188904957537c1af195ba9062933 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Fri, 21 Aug 2015 17:56:00 -0700 Subject: [PATCH 1/3] Add option to skip Xbox boot animation. --- hw/xbox/smbus_xbox_smc.c | 20 ++++++++++++++------ vl.c | 4 ++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/hw/xbox/smbus_xbox_smc.c b/hw/xbox/smbus_xbox_smc.c index 577230e1c2..4a80f5652f 100644 --- a/hw/xbox/smbus_xbox_smc.c +++ b/hw/xbox/smbus_xbox_smc.c @@ -20,8 +20,9 @@ #include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus.h" +#include -/* +/* * Hardware is a PIC16LC * http://www.xbox-linux.org/wiki/PIC */ @@ -128,7 +129,7 @@ static uint8_t smc_read_data(SMBusDevice *dev, uint8_t cmd, int n) printf("smc_read_data: addr=0x%02x cmd=0x%02x n=%d\n", dev->i2c.address, cmd, n); #endif - + switch(cmd) { case SMC_REG_VER: return smc_version_string[ @@ -137,9 +138,16 @@ static uint8_t smc_read_data(SMBusDevice *dev, uint8_t cmd, int n) /* pretend to have a composite av pack plugged in */ return SMC_REG_AVPACK_COMPOSITE; - case SMC_REG_SCRATCH: + case SMC_REG_SCRATCH: { + /* Skip boot animation if the "skipanim" flag was set. */ + QemuOpts *opts = qemu_opts_find(qemu_find_opts("machine"), NULL); + if (opts && qemu_opt_get_bool(opts, "skipanim", 0)) + { + return SMC_REG_SCRATCH_SHORT_ANIMATION; + } + return 0; - // return SMC_REG_SCRATCH_SHORT_ANIMATION; + } /* challenge request: * must be non-0 */ @@ -155,14 +163,14 @@ static uint8_t smc_read_data(SMBusDevice *dev, uint8_t cmd, int n) default: break; } - + return 0; } static int smbus_smc_init(SMBusDevice *dev) { SMBusSMCDevice *smc = (SMBusSMCDevice *)dev; - + smc->versionStringIndex = 0; return 0; diff --git a/vl.c b/vl.c index 6b759de490..8d2f0ededd 100644 --- a/vl.c +++ b/vl.c @@ -440,6 +440,10 @@ static QemuOptsList qemu_machine_opts = { .name = "mediaboard_filesystem", .type = QEMU_OPT_STRING, .help = "Chihiro mediaboard filesystem file", + },{ + .name = "skipanim", + .type = QEMU_OPT_BOOL, + .help = "Skip boot animation", }, { /* End of list */ } }, From 8d1b6f659252e5fa195d3dd187ebc099f162c278 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Fri, 21 Aug 2015 19:12:50 -0700 Subject: [PATCH 2/3] Use consistent naming conventions. --- hw/xbox/smbus_xbox_smc.c | 4 ++-- vl.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xbox/smbus_xbox_smc.c b/hw/xbox/smbus_xbox_smc.c index 4a80f5652f..ff329af273 100644 --- a/hw/xbox/smbus_xbox_smc.c +++ b/hw/xbox/smbus_xbox_smc.c @@ -139,9 +139,9 @@ static uint8_t smc_read_data(SMBusDevice *dev, uint8_t cmd, int n) return SMC_REG_AVPACK_COMPOSITE; case SMC_REG_SCRATCH: { - /* Skip boot animation if the "skipanim" flag was set. */ + /* Skip boot animation if the "short_animation" flag was set. */ QemuOpts *opts = qemu_opts_find(qemu_find_opts("machine"), NULL); - if (opts && qemu_opt_get_bool(opts, "skipanim", 0)) + if (opts && qemu_opt_get_bool(opts, "short_animation", 0)) { return SMC_REG_SCRATCH_SHORT_ANIMATION; } diff --git a/vl.c b/vl.c index 8d2f0ededd..e58890fd4f 100644 --- a/vl.c +++ b/vl.c @@ -441,9 +441,9 @@ static QemuOptsList qemu_machine_opts = { .type = QEMU_OPT_STRING, .help = "Chihiro mediaboard filesystem file", },{ - .name = "skipanim", + .name = "short_animation", .type = QEMU_OPT_BOOL, - .help = "Skip boot animation", + .help = "Skip Xbox boot animation", }, { /* End of list */ } }, From ecc1b0b9c141aa389ff690746fa05e418892771d Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Fri, 21 Aug 2015 19:17:22 -0700 Subject: [PATCH 3/3] Process command line args once. --- hw/xbox/smbus_xbox_smc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/xbox/smbus_xbox_smc.c b/hw/xbox/smbus_xbox_smc.c index ff329af273..5d60f36ca3 100644 --- a/hw/xbox/smbus_xbox_smc.c +++ b/hw/xbox/smbus_xbox_smc.c @@ -69,6 +69,7 @@ static const char* smc_version_string = "P01"; typedef struct SMBusSMCDevice { SMBusDevice smbusdev; int versionStringIndex; + bool useShortAnimation; } SMBusSMCDevice; static void smc_quick_cmd(SMBusDevice *dev, uint8_t read) @@ -139,13 +140,8 @@ static uint8_t smc_read_data(SMBusDevice *dev, uint8_t cmd, int n) return SMC_REG_AVPACK_COMPOSITE; case SMC_REG_SCRATCH: { - /* Skip boot animation if the "short_animation" flag was set. */ - QemuOpts *opts = qemu_opts_find(qemu_find_opts("machine"), NULL); - if (opts && qemu_opt_get_bool(opts, "short_animation", 0)) - { + if (smc->useShortAnimation) return SMC_REG_SCRATCH_SHORT_ANIMATION; - } - return 0; } @@ -169,10 +165,14 @@ static uint8_t smc_read_data(SMBusDevice *dev, uint8_t cmd, int n) static int smbus_smc_init(SMBusDevice *dev) { + QemuOpts *opts; SMBusSMCDevice *smc = (SMBusSMCDevice *)dev; smc->versionStringIndex = 0; + opts = qemu_opts_find(qemu_find_opts("machine"), NULL); + smc->useShortAnimation = qemu_opt_get_bool(opts, "short_animation", 0); + return 0; }