Minor style cleanups.

This commit is contained in:
njl 2003-08-28 16:30:31 +00:00
parent b40752df7c
commit 638644189e
6 changed files with 8 additions and 17 deletions

View File

@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
u_long amd64_acpi_root;
SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0,
"The physical address of the RSDP");
"The physical address of the RSDP");
ACPI_STATUS
AcpiOsInitialize(void)

View File

@ -38,9 +38,8 @@ acpi_machdep_init(device_t dev)
{
struct acpi_softc *sc;
if ((sc = device_get_softc(dev)) == NULL) {
if ((sc = device_get_softc(dev)) == NULL)
return (ENXIO);
}
acpi_install_wakeup_handler(sc);

View File

@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
int
acpi_sleep_machdep(struct acpi_softc *sc, int state)
{
return (0);
}

View File

@ -42,42 +42,39 @@ extern u_int64_t ia64_efi_acpi20_table;
u_long ia64_acpi_root;
SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &ia64_acpi_root, 0,
"The physical address of the RSDP");
"The physical address of the RSDP");
ACPI_STATUS
AcpiOsInitialize(void)
{
return(NULL);
}
ACPI_STATUS
AcpiOsTerminate(void)
{
return(NULL);
}
ACPI_STATUS
AcpiOsGetRootPointer(UINT32 Flags, ACPI_POINTER *RsdpAddress)
{
if (ia64_acpi_root == 0) {
if (ia64_efi_acpi20_table) {
/* XXX put under bootverbose. */
printf("Using ACPI2.0 table at 0x%lx\n",
ia64_efi_acpi20_table);
ia64_efi_acpi20_table);
ia64_acpi_root = ia64_efi_acpi20_table;
} else if (ia64_efi_acpi_table) {
/* XXX put under bootverbose. */
printf("Using ACPI1.x table at 0x%lx\n",
ia64_efi_acpi_table);
ia64_efi_acpi_table);
ia64_acpi_root = ia64_efi_acpi_table;
} else
return(AE_NOT_FOUND);
return (AE_NOT_FOUND);
}
RsdpAddress->PointerType = ACPI_PHYSICAL_POINTER;
RsdpAddress->Pointer.Physical = ia64_acpi_root;
return(AE_OK);
return (AE_OK);
}

View File

@ -37,12 +37,10 @@ acpi_machdep_init(device_t dev)
{
struct acpi_softc *sc;
if ((sc = device_get_softc(dev)) == NULL) {
if ((sc = device_get_softc(dev)) == NULL)
return (ENXIO);
}
acpi_install_wakeup_handler(sc);
return (0);
}

View File

@ -35,7 +35,6 @@
int
acpi_sleep_machdep(struct acpi_softc *sc, int state)
{
return (0);
}
@ -43,4 +42,3 @@ void
acpi_install_wakeup_handler(struct acpi_softc *sc)
{
}