| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | /* $NetBSD: acpi.c,v 1.151 2010/03/03 06:54:25 jruoho Exp $ */ | | 1 | /* $NetBSD: acpi.c,v 1.152 2010/03/03 06:57:05 jruoho Exp $ */ |
| 2 | | | 2 | |
| 3 | /*- | | 3 | /*- |
| 4 | * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. | | 4 | * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. |
| 5 | * All rights reserved. | | 5 | * All rights reserved. |
| 6 | * | | 6 | * |
| 7 | * This code is derived from software contributed to The NetBSD Foundation | | 7 | * This code is derived from software contributed to The NetBSD Foundation |
| 8 | * by Charles M. Hannum of By Noon Software, Inc. | | 8 | * by Charles M. Hannum of By Noon Software, Inc. |
| 9 | * | | 9 | * |
| 10 | * Redistribution and use in source and binary forms, with or without | | 10 | * Redistribution and use in source and binary forms, with or without |
| 11 | * modification, are permitted provided that the following conditions | | 11 | * modification, are permitted provided that the following conditions |
| 12 | * are met: | | 12 | * are met: |
| 13 | * 1. Redistributions of source code must retain the above copyright | | 13 | * 1. Redistributions of source code must retain the above copyright |
| 14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
| @@ -60,27 +60,27 @@ | | | @@ -60,27 +60,27 @@ |
| 60 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | | 60 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| 61 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | | 61 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
| 62 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | | 62 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| 63 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | | 63 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| 64 | * POSSIBILITY OF SUCH DAMAGE. | | 64 | * POSSIBILITY OF SUCH DAMAGE. |
| 65 | */ | | 65 | */ |
| 66 | | | 66 | |
| 67 | /* | | 67 | /* |
| 68 | * Autoconfiguration support for the Intel ACPI Component Architecture | | 68 | * Autoconfiguration support for the Intel ACPI Component Architecture |
| 69 | * ACPI reference implementation. | | 69 | * ACPI reference implementation. |
| 70 | */ | | 70 | */ |
| 71 | | | 71 | |
| 72 | #include <sys/cdefs.h> | | 72 | #include <sys/cdefs.h> |
| 73 | __KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.151 2010/03/03 06:54:25 jruoho Exp $"); | | 73 | __KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.152 2010/03/03 06:57:05 jruoho Exp $"); |
| 74 | | | 74 | |
| 75 | #include "opt_acpi.h" | | 75 | #include "opt_acpi.h" |
| 76 | #include "opt_pcifixup.h" | | 76 | #include "opt_pcifixup.h" |
| 77 | | | 77 | |
| 78 | #include <sys/param.h> | | 78 | #include <sys/param.h> |
| 79 | #include <sys/systm.h> | | 79 | #include <sys/systm.h> |
| 80 | #include <sys/device.h> | | 80 | #include <sys/device.h> |
| 81 | #include <sys/malloc.h> | | 81 | #include <sys/malloc.h> |
| 82 | #include <sys/mutex.h> | | 82 | #include <sys/mutex.h> |
| 83 | #include <sys/kernel.h> | | 83 | #include <sys/kernel.h> |
| 84 | #include <sys/proc.h> | | 84 | #include <sys/proc.h> |
| 85 | #include <sys/sysctl.h> | | 85 | #include <sys/sysctl.h> |
| 86 | | | 86 | |
| @@ -922,27 +922,27 @@ acpi_make_devnode(ACPI_HANDLE handle, ui | | | @@ -922,27 +922,27 @@ acpi_make_devnode(ACPI_HANDLE handle, ui |
| 922 | } | | 922 | } |
| 923 | | | 923 | |
| 924 | if (ad->ad_name[0] == '\0') | | 924 | if (ad->ad_name[0] == '\0') |
| 925 | ad->ad_name[0] = '_'; | | 925 | ad->ad_name[0] = '_'; |
| 926 | | | 926 | |
| 927 | TAILQ_INSERT_TAIL(&as->as_devnodes, ad, ad_list); | | 927 | TAILQ_INSERT_TAIL(&as->as_devnodes, ad, ad_list); |
| 928 | | | 928 | |
| 929 | if (type != ACPI_TYPE_DEVICE) | | 929 | if (type != ACPI_TYPE_DEVICE) |
| 930 | return AE_OK; | | 930 | return AE_OK; |
| 931 | | | 931 | |
| 932 | if ((ad->ad_devinfo->Valid & ACPI_VALID_HID) == 0) | | 932 | if ((ad->ad_devinfo->Valid & ACPI_VALID_HID) == 0) |
| 933 | return AE_OK; | | 933 | return AE_OK; |
| 934 | | | 934 | |
| 935 | #ifdef ACPI_EXTRA_DEBUG | | 935 | #ifdef ACPIVERBOSE |
| 936 | aprint_normal_dev(sc->sc_dev, | | 936 | aprint_normal_dev(sc->sc_dev, |
| 937 | "HID %s found in scope %s level %d\n", | | 937 | "HID %s found in scope %s level %d\n", |
| 938 | ad->ad_devinfo->HardwareId.String, | | 938 | ad->ad_devinfo->HardwareId.String, |
| 939 | as->as_name, ad->ad_level); | | 939 | as->as_name, ad->ad_level); |
| 940 | | | 940 | |
| 941 | if (ad->ad_devinfo->Valid & ACPI_VALID_UID) | | 941 | if (ad->ad_devinfo->Valid & ACPI_VALID_UID) |
| 942 | aprint_normal(" UID %s\n", | | 942 | aprint_normal(" UID %s\n", |
| 943 | ad->ad_devinfo->UniqueId.String); | | 943 | ad->ad_devinfo->UniqueId.String); |
| 944 | | | 944 | |
| 945 | if (ad->ad_devinfo->Valid & ACPI_VALID_ADR) | | 945 | if (ad->ad_devinfo->Valid & ACPI_VALID_ADR) |
| 946 | aprint_normal(" ADR 0x%016" PRIx64 "\n", | | 946 | aprint_normal(" ADR 0x%016" PRIx64 "\n", |
| 947 | ad->ad_devinfo->Address); | | 947 | ad->ad_devinfo->Address); |
| 948 | | | 948 | |