<div dir="ltr"><div class="gmail_default" style="font-family:verdana,sans-serif">That's a good idea. I will add a check for elements. </div></div><div class="gmail_extra"> <div class="gmail_quote">On Mon, Sep 22, 2014 at 4:36 PM, Colin Ian King <<a href="mailto:colin.king@canonical.com" target="_blank">colin.king@canonical.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 22/09/14 03:06, Alex Hung wrote: > Hi, > > I filed a LP bug #1370924 but forgot to include this information on the > patch... > > On Mon, Sep 22, 2014 at 9:52 AM, Alex Hung <<a href="mailto:alex.hung@canonical.com">alex.hung@canonical.com</a> > <mailto:<a href="mailto:alex.hung@canonical.com">alex.hung@canonical.com</a>>> wrote: > > Signed-off-by: Alex Hung <<a href="mailto:alex.hung@canonical.com">alex.hung@canonical.com</a> > <mailto:<a href="mailto:alex.hung@canonical.com">alex.hung@canonical.com</a>>> <div><div class="h5">> --- > src/acpi/method/method.c | 85 > ++++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 83 insertions(+), 2 deletions(-) > > diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c > index a21e4b1..5d42852 100644 > --- a/src/acpi/method/method.c > +++ b/src/acpi/method/method.c > @@ -62,7 +62,7 @@ > * _CBA PCI f/w spec Y > * _CCA 6.2.17 Y > * _CDM 6.2.1 Y > - * _CID 6.1.2 N > + * _CID 6.1.2 Y > * _CLS 6.1.3 N requires PCI SIG class info > * _CPC 8.4.5 Y > * _CRS 6.2.2 Y > @@ -1060,10 +1060,91 @@ static int method_test_HID(fwts_framework *fw) > "_HID", NULL, 0, method_test_HID_return, NULL); > } > > +static void method_valid_CID_Type( > + fwts_framework *fw, > + char *name, > + ACPI_OBJECT *obj) > +{ > + char tmp[8]; > + > + switch (obj->Type) { > + case ACPI_TYPE_STRING: > + if (obj->String.Pointer) { > + if > (method_valid_HID_string(obj->String.Pointer)) > + fwts_passed(fw, > + "%s returned a string '%s' " > + "as expected.", > + name, obj->String.Pointer); > + else > + fwts_failed(fw, LOG_LEVEL_MEDIUM, > + "MethodCIDInvalidString", > + "%s returned a string '%s' " > + "but it was not a valid PNP > ID or a " > + "valid ACPI ID.", > + name, obj->String.Pointer); > + } else { > + fwts_failed(fw, LOG_LEVEL_MEDIUM, > + "Method_CIDNullString", > + "%s returned a NULL string.", name); > + } > + break; > + case ACPI_TYPE_INTEGER: > + if (method_valid_EISA_ID((uint32_t)obj->Integer.Value, > + tmp, sizeof(tmp))) > + fwts_passed(fw, "%s returned an integer " > + "0x%8.8" PRIx64 " (EISA ID %s).", > + name, (uint64_t)obj->Integer.Value, > tmp); > + else > + fwts_failed(fw, LOG_LEVEL_MEDIUM, > + "MethodCIDInvalidInteger", > + "%s returned a integer 0x%8.8" > PRIx64 " " > + "(EISA ID %s) but the this is not a > valid " > + "EISA ID encoded PNP ID.", > + name, (uint64_t)obj->Integer.Value, > tmp); > + break; > + } > +} > + > +static void method_test_CID_return( > + fwts_framework *fw, > + char *name, > + ACPI_BUFFER *buf, > + ACPI_OBJECT *obj, > + void *private) > +{ > + uint32_t i; > + ACPI_OBJECT *pkg; > + > + FWTS_UNUSED(buf); > + FWTS_UNUSED(private); > + > + if (obj == NULL) { > + method_failed_null_object(fw, name, "a buffer or > integer"); > + return; > + } > + > + switch (obj->Type) { > + case ACPI_TYPE_STRING: > + case ACPI_TYPE_INTEGER: > + method_valid_CID_Type(fw, name, obj); > + break; > + case ACPI_TYPE_PACKAGE: > + for (i = 0; i < obj->Package.Count; i++){ > + pkg = &obj->Package.Elements[i]; > + method_valid_CID_Type(fw, name, pkg); > + } > + break; </div></div>Section 3.1.2 does state: "An Integer or String containing a single CID or a Package containing a list of CIDs" ..so should we conclude from that statement that the package should have 1 or more elements? If so, perhaps that is worth checking too. <div class="HOEnZb"><div class="h5"> > + default: > + fwts_failed(fw, LOG_LEVEL_MEDIUM, > "Method_CIDBadReturnType", > + "%s did not return a string or an integer.", > name); > + break; > + } > +} > + > static int method_test_CID(fwts_framework *fw) > { > return method_evaluate_method(fw, METHOD_OPTIONAL, > - "_CID", NULL, 0, method_test_HID_return, NULL); > + "_CID", NULL, 0, method_test_CID_return, NULL); > } > > static int method_test_HRV(fwts_framework *fw) > -- > 1.9.1 > > > > > -- > Cheers, > Alex Hung > > </div></div>-- fwts-devel mailing list <a href="mailto:fwts-devel@lists.ubuntu.com">fwts-devel@lists.ubuntu.com</a> Modify settings or unsubscribe at: <a href="https://lists.ubuntu.com/mailman/listinfo/fwts-devel" target="_blank">https://lists.ubuntu.com/mailman/listinfo/fwts-devel</a> </blockquote></div> -- <div dir="ltr">Cheers, Alex Hung </div> </div>