nsxfeval.c (193529) | nsxfeval.c (197104) |
---|---|
1/******************************************************************************* 2 * 3 * Module Name: nsxfeval - Public interfaces to the ACPI subsystem 4 * ACPI Object evaluation interfaces 5 * 6 ******************************************************************************/ 7 8/****************************************************************************** --- 644 unchanged lines hidden (view full) --- 653 UINT32 NestingLevel, 654 void *Context, 655 void **ReturnValue) 656{ 657 ACPI_GET_DEVICES_INFO *Info = Context; 658 ACPI_STATUS Status; 659 ACPI_NAMESPACE_NODE *Node; 660 UINT32 Flags; | 1/******************************************************************************* 2 * 3 * Module Name: nsxfeval - Public interfaces to the ACPI subsystem 4 * ACPI Object evaluation interfaces 5 * 6 ******************************************************************************/ 7 8/****************************************************************************** --- 644 unchanged lines hidden (view full) --- 653 UINT32 NestingLevel, 654 void *Context, 655 void **ReturnValue) 656{ 657 ACPI_GET_DEVICES_INFO *Info = Context; 658 ACPI_STATUS Status; 659 ACPI_NAMESPACE_NODE *Node; 660 UINT32 Flags; |
661 ACPI_DEVICE_ID Hid; 662 ACPI_COMPATIBLE_ID_LIST *Cid; | 661 ACPI_DEVICE_ID *Hid; 662 ACPI_DEVICE_ID_LIST *Cid; |
663 UINT32 i; 664 BOOLEAN Found; | 663 UINT32 i; 664 BOOLEAN Found; |
665 int NoMatch; |
|
665 666 667 Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); 668 if (ACPI_FAILURE (Status)) 669 { 670 return (Status); 671 } 672 --- 37 unchanged lines hidden (view full) --- 710 { 711 return (AE_OK); 712 } 713 else if (ACPI_FAILURE (Status)) 714 { 715 return (AE_CTRL_DEPTH); 716 } 717 | 666 667 668 Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); 669 if (ACPI_FAILURE (Status)) 670 { 671 return (Status); 672 } 673 --- 37 unchanged lines hidden (view full) --- 711 { 712 return (AE_OK); 713 } 714 else if (ACPI_FAILURE (Status)) 715 { 716 return (AE_CTRL_DEPTH); 717 } 718 |
718 if (ACPI_STRNCMP (Hid.Value, Info->Hid, sizeof (Hid.Value)) != 0) | 719 NoMatch = ACPI_STRCMP (Hid->String, Info->Hid); 720 ACPI_FREE (Hid); 721 722 if (NoMatch) |
719 { 720 /* 721 * HID does not match, attempt match within the 722 * list of Compatible IDs (CIDs) 723 */ 724 Status = AcpiUtExecute_CID (Node, &Cid); 725 if (Status == AE_NOT_FOUND) 726 { --- 4 unchanged lines hidden (view full) --- 731 return (AE_CTRL_DEPTH); 732 } 733 734 /* Walk the CID list */ 735 736 Found = FALSE; 737 for (i = 0; i < Cid->Count; i++) 738 { | 723 { 724 /* 725 * HID does not match, attempt match within the 726 * list of Compatible IDs (CIDs) 727 */ 728 Status = AcpiUtExecute_CID (Node, &Cid); 729 if (Status == AE_NOT_FOUND) 730 { --- 4 unchanged lines hidden (view full) --- 735 return (AE_CTRL_DEPTH); 736 } 737 738 /* Walk the CID list */ 739 740 Found = FALSE; 741 for (i = 0; i < Cid->Count; i++) 742 { |
739 if (ACPI_STRNCMP (Cid->Id[i].Value, Info->Hid, 740 sizeof (ACPI_COMPATIBLE_ID)) == 0) | 743 if (ACPI_STRCMP (Cid->Ids[i].String, Info->Hid) == 0) |
741 { 742 /* Found a matching CID */ 743 744 Found = TRUE; 745 break; 746 } 747 } 748 --- 264 unchanged lines hidden --- | 744 { 745 /* Found a matching CID */ 746 747 Found = TRUE; 748 break; 749 } 750 } 751 --- 264 unchanged lines hidden --- |