diff options
| author | msmith <msmith@FreeBSD.org> | 2001-09-07 03:00:30 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 2001-09-07 03:00:30 +0000 |
| commit | 477d47f1466397dc6f8a4be3bf7d406d1c7834ab (patch) | |
| tree | bd5eb3c300ec4736abbe91ebd2fd71726e447719 | |
| parent | aa26f8f1ffc4995430795c7db834c1fdd433ef4d (diff) | |
| download | FreeBSD-src-477d47f1466397dc6f8a4be3bf7d406d1c7834ab.zip FreeBSD-src-477d47f1466397dc6f8a4be3bf7d406d1c7834ab.tar.gz | |
Now that this code is MD, we don't need the i386 ifdefs.
| -rw-r--r-- | sys/amd64/acpica/OsdEnvironment.c | 15 | ||||
| -rw-r--r-- | sys/i386/acpica/OsdEnvironment.c | 15 |
2 files changed, 18 insertions, 12 deletions
diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c index 8b8e663..6ba605a 100644 --- a/sys/amd64/acpica/OsdEnvironment.c +++ b/sys/amd64/acpica/OsdEnvironment.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000 Michael Smith + * Copyright (c) 2000,2001 Michael Smith * Copyright (c) 2000 BSDi * All rights reserved. * @@ -33,19 +33,17 @@ #include "acpi.h" -#ifdef __i386__ #include <machine/pc/bios.h> -#endif ACPI_STATUS AcpiOsInitialize(void) { -#ifdef __i386__ /* - * Prevent the PnP BIOS code from interfering with our own scan of ISA devices. + * Prevent the PnP BIOS code from interfering with our own scan of + * ISA devices. */ PnPBIOStable = NULL; -#endif + return(NULL); } @@ -60,5 +58,10 @@ AcpiOsGetRootPointer( UINT32 Flags, ACPI_PHYSICAL_ADDRESS *RsdpPhysicalAddress) { + /* + * The loader passes the physical address at which it found the + * RSDP in a hint. We could recover this rather than searching + * manually here. + */ return(AcpiFindRootPointer(Flags, RsdpPhysicalAddress)); } diff --git a/sys/i386/acpica/OsdEnvironment.c b/sys/i386/acpica/OsdEnvironment.c index 8b8e663..6ba605a 100644 --- a/sys/i386/acpica/OsdEnvironment.c +++ b/sys/i386/acpica/OsdEnvironment.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000 Michael Smith + * Copyright (c) 2000,2001 Michael Smith * Copyright (c) 2000 BSDi * All rights reserved. * @@ -33,19 +33,17 @@ #include "acpi.h" -#ifdef __i386__ #include <machine/pc/bios.h> -#endif ACPI_STATUS AcpiOsInitialize(void) { -#ifdef __i386__ /* - * Prevent the PnP BIOS code from interfering with our own scan of ISA devices. + * Prevent the PnP BIOS code from interfering with our own scan of + * ISA devices. */ PnPBIOStable = NULL; -#endif + return(NULL); } @@ -60,5 +58,10 @@ AcpiOsGetRootPointer( UINT32 Flags, ACPI_PHYSICAL_ADDRESS *RsdpPhysicalAddress) { + /* + * The loader passes the physical address at which it found the + * RSDP in a hint. We could recover this rather than searching + * manually here. + */ return(AcpiFindRootPointer(Flags, RsdpPhysicalAddress)); } |
