d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The elements in the component arrays may be direct Package objects rather

Browse Source 
than references to objects.  In that case, simply use the Package directly.

I think a recent change to ACPI-CA is causing the interpreter to
automatically expand these references.

Reported by:	Olivier Smedts  olivier gid0 org
MFC after:	3 days
This commit is contained in:
John Baldwin 2009-09-22 18:34:23 +00:00
parent 350036a06d
commit fd0a5b2f1e
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/dev/acpi_support/acpi_aiboost.c
View File

@ -46,7 +46,6 @@ ACPI_MODULE_NAME("AIBOOST")
#define DESCSTRLEN 32
struct acpi_aiboost_element{
ACPI_HANDLE h;
uint32_t id;
char desc[DESCSTRLEN];
};
@ -127,22 +126,23 @@ static ACPI_STATUS acpi_aiboost_getcomponent(device_t dev, char *name, struct a
for(i = 1 ; i < o->Package.Count; i++){
elem = &o->Package.Elements[i];
if(elem->Type != ACPI_TYPE_ANY){
printf("NOREF\n");
goto error;
}
c->elem[ i - 1].h = elem->Reference.Handle;
if (elem->Type == ACPI_TYPE_ANY) {
buf2.Pointer = NULL;
buf2.Length = ACPI_ALLOCATE_BUFFER;
buf2.Pointer = NULL;
buf2.Length = ACPI_ALLOCATE_BUFFER;
status = AcpiEvaluateObject(c->elem[i - 1].h, NULL, NULL,
&buf2);
if(ACPI_FAILURE(status)){
printf("FETCH OBJECT\n");
status = AcpiEvaluateObject(elem->Reference.Handle,
NULL, NULL, &buf2);
if (ACPI_FAILURE(status)){
printf("FETCH OBJECT\n");
goto error;
}
subobj = buf2.Pointer;
} else if (elem->Type == ACPI_TYPE_PACKAGE)
subobj = elem;
else {
printf("NO PACKAGE\n");
goto error;
}
subobj = buf2.Pointer;
if(ACPI_FAILURE(acpi_PkgInt32(subobj,0, &c->elem[i -1].id))){
printf("ID FAILED\n");
goto error;
@ -151,15 +151,17 @@ static ACPI_STATUS acpi_aiboost_getcomponent(device_t dev, char *name, struct a
sizeof(c->elem[i - 1].desc));
if(ACPI_FAILURE(status)){
if(status == E2BIG){
c->elem[i-1].desc[DESCSTRLEN-1] = 0;
c->elem[i - 1].desc[DESCSTRLEN-1] = 0;
}else{
printf("DESC FAILED %d\n", i-1);
goto error;
}
}
if(buf2.Pointer)
AcpiOsFree(buf2.Pointer);
if (buf2.Pointer) {
AcpiOsFree(buf2.Pointer);
buf2.Pointer = NULL;
}
}
if(buf.Pointer)