1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-29 16:44:03 +00:00

Style fix.

Pointed out by: njl
This commit is contained in:
Takanori Watanabe 2004-03-31 17:21:14 +00:00
parent 9661523edf
commit 247648affb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=127678

View File

@ -145,45 +145,6 @@ static int acpi_child_location_str_method(device_t acdev, device_t child,
static int acpi_child_pnpinfo_str_method(device_t acdev, device_t child,
char *buf, size_t buflen);
int
acpi_child_location_str_method(device_t cbdev, device_t child, char *buf,
size_t buflen)
{
struct acpi_device *dinfo= device_get_ivars(child);
dinfo = device_get_ivars(child);
if(dinfo->ad_handle)
snprintf(buf, buflen, "path=%s", acpi_name(dinfo->ad_handle));
else
snprintf(buf, buflen, "magic=unknown");
return (0);
}
int
acpi_child_pnpinfo_str_method(device_t cbdev, device_t child, char *buf,
size_t buflen)
{
struct acpi_device *dinfo = device_get_ivars(child);
ACPI_DEVICE_INFO adinfo;
ACPI_BUFFER adbuf = {sizeof(adinfo), &adinfo};
char * end;
int error;
dinfo = device_get_ivars(child);
error = AcpiGetObjectInfo(dinfo->ad_handle, &adbuf);
if(error)
snprintf(buf, buflen, "Unknown");
else
snprintf(buf, buflen, "_HID=%s _UID=%u",
(adinfo.Valid & ACPI_VALID_HID)?
adinfo.HardwareId.Value : "UNKNOWN",
(unsigned int)((adinfo.Valid & ACPI_VALID_UID)?
strtoul(adinfo.UniqueId.Value, &end, 10):0 ));
return (0);
}
static device_method_t acpi_methods[] = {
/* Device interface */
@ -738,6 +699,55 @@ acpi_print_child(device_t bus, device_t child)
return (retval);
}
/*
* Location hint for devctl(8)
*/
int
acpi_child_location_str_method(device_t cbdev, device_t child, char *buf,
size_t buflen)
{
struct acpi_device *dinfo = device_get_ivars(child);
if (dinfo->ad_handle)
snprintf(buf, buflen, "path=%s", acpi_name(dinfo->ad_handle));
else
snprintf(buf, buflen, "magic=unknown");
return (0);
}
/*
* PnP information for devctl(8)
*/
int
acpi_child_pnpinfo_str_method(device_t cbdev, device_t child, char *buf,
size_t buflen)
{
struct acpi_device *dinfo = device_get_ivars(child);
ACPI_DEVICE_INFO *adinfo;
ACPI_BUFFER adbuf = {ACPI_ALLOCATE_BUFFER, NULL};
char *end;
int error;
error = AcpiGetObjectInfo(dinfo->ad_handle, &adbuf);
adinfo = (ACPI_DEVICE_INFO *) adbuf.Pointer;
if (error)
snprintf(buf, buflen, "Unknown");
else
snprintf(buf, buflen, "_HID=%s _UID=%lu",
(adinfo->Valid & ACPI_VALID_HID)?
adinfo->HardwareId.Value : "UNKNOWN",
((adinfo->Valid & ACPI_VALID_UID)?
strtoul(adinfo->UniqueId.Value, &end, 10):0 ));
if (adinfo)
AcpiOsFree(adinfo);
return (0);
}
/*
* Handle per-device ivars
*/