Message ID | 20210126220512.194272-3-alex.hung@canonical.com |
---|---|
State | Accepted |
Headers | show |
Series | [V2] acpi: method: update _DDC argument size (mantis 2137) | expand |
On 1/27/21 6:05 AM, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/acpi/method/method.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c > index 8ef5da5e..598ffe76 100644 > --- a/src/acpi/method/method.c > +++ b/src/acpi/method/method.c > @@ -4562,16 +4562,17 @@ static void method_test_DDC_return( > > static int method_test_DDC(fwts_framework *fw) > { > + static int values[] = { 128, 256, 384, 512 }; > ACPI_OBJECT arg[1]; > uint32_t i; > > - for (i = 128; i <= 256; i <<= 1) { > + for (i = 0; i < FWTS_ARRAY_SIZE(values); i++) { > arg[0].Type = ACPI_TYPE_INTEGER; > - arg[0].Integer.Value = 128; > + arg[0].Integer.Value = values[i]; > > if (method_evaluate_method(fw, METHOD_OPTIONAL, > "_DDC", arg, 1, method_test_DDC_return, > - &i) == FWTS_NOT_EXIST) > + (void *) &values[i]) == FWTS_NOT_EXIST) > break; > } > return FWTS_OK; > Acked-by: Ivan Hu <ivan.hu@canonical.com>
On 26/01/2021 22:05, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/acpi/method/method.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c > index 8ef5da5e..598ffe76 100644 > --- a/src/acpi/method/method.c > +++ b/src/acpi/method/method.c > @@ -4562,16 +4562,17 @@ static void method_test_DDC_return( > > static int method_test_DDC(fwts_framework *fw) > { > + static int values[] = { 128, 256, 384, 512 }; > ACPI_OBJECT arg[1]; > uint32_t i; > > - for (i = 128; i <= 256; i <<= 1) { > + for (i = 0; i < FWTS_ARRAY_SIZE(values); i++) { > arg[0].Type = ACPI_TYPE_INTEGER; > - arg[0].Integer.Value = 128; > + arg[0].Integer.Value = values[i]; > > if (method_evaluate_method(fw, METHOD_OPTIONAL, > "_DDC", arg, 1, method_test_DDC_return, > - &i) == FWTS_NOT_EXIST) > + (void *) &values[i]) == FWTS_NOT_EXIST) > break; > } > return FWTS_OK; > Acked-by: Colin Ian King <colin.king@canonical.com>
On 26/01/2021 22:05, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/acpi/method/method.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c > index 8ef5da5e..598ffe76 100644 > --- a/src/acpi/method/method.c > +++ b/src/acpi/method/method.c > @@ -4562,16 +4562,17 @@ static void method_test_DDC_return( > > static int method_test_DDC(fwts_framework *fw) > { > + static int values[] = { 128, 256, 384, 512 }; > ACPI_OBJECT arg[1]; > uint32_t i; > > - for (i = 128; i <= 256; i <<= 1) { > + for (i = 0; i < FWTS_ARRAY_SIZE(values); i++) { > arg[0].Type = ACPI_TYPE_INTEGER; > - arg[0].Integer.Value = 128; > + arg[0].Integer.Value = values[i]; > > if (method_evaluate_method(fw, METHOD_OPTIONAL, > "_DDC", arg, 1, method_test_DDC_return, > - &i) == FWTS_NOT_EXIST) > + (void *) &values[i]) == FWTS_NOT_EXIST) > break; > } > return FWTS_OK; > Acked-by: Colin Ian King <colin.king@canonical.com>
diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c index 8ef5da5e..598ffe76 100644 --- a/src/acpi/method/method.c +++ b/src/acpi/method/method.c @@ -4562,16 +4562,17 @@ static void method_test_DDC_return( static int method_test_DDC(fwts_framework *fw) { + static int values[] = { 128, 256, 384, 512 }; ACPI_OBJECT arg[1]; uint32_t i; - for (i = 128; i <= 256; i <<= 1) { + for (i = 0; i < FWTS_ARRAY_SIZE(values); i++) { arg[0].Type = ACPI_TYPE_INTEGER; - arg[0].Integer.Value = 128; + arg[0].Integer.Value = values[i]; if (method_evaluate_method(fw, METHOD_OPTIONAL, "_DDC", arg, 1, method_test_DDC_return, - &i) == FWTS_NOT_EXIST) + (void *) &values[i]) == FWTS_NOT_EXIST) break; } return FWTS_OK;
Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/acpi/method/method.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)