upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Staticize pnp methods, style fixes. Remove unused variable to unbreak

Browse source 
kernel build.
This commit is contained in:
Nate Lawson 2004-03-31 17:35:28 +00:00
parent cd284d7a6a
commit 63600cc345
2 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sys/dev/acpica/acpi.c
View file

@ -165,8 +165,8 @@ static device_method_t acpi_methods[] = {
DEVMETHOD(bus_get_resource, acpi_get_resource),
DEVMETHOD(bus_alloc_resource, acpi_alloc_resource),
DEVMETHOD(bus_release_resource, acpi_release_resource),
DEVMETHOD(bus_child_pnpinfo_str, acpi_child_pnpinfo_str_method),
DEVMETHOD(bus_child_location_str, acpi_child_location_str_method),
DEVMETHOD(bus_child_pnpinfo_str, acpi_child_pnpinfo_str_method),
DEVMETHOD(bus_child_location_str, acpi_child_location_str_method),
DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
@ -699,11 +699,8 @@ acpi_print_child(device_t bus, device_t child)
return (retval);
}
/*
* Location hint for devctl(8)
*/
int
/* Location hint for devctl(8) */
static int
acpi_child_location_str_method(device_t cbdev, device_t child, char *buf,
size_t buflen)
{
@ -716,31 +713,28 @@ acpi_child_location_str_method(device_t cbdev, device_t child, char *buf,
return (0);
}
/*
* PnP information for devctl(8)
*/
int
/* PnP information for devctl(8) */
static 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};
ACPI_DEVICE_INFO *adinfo;
struct acpi_device *dinfo = device_get_ivars(child);
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->Valid & ACPI_VALID_HID) ?
adinfo->HardwareId.Value : "UNKNOWN",
((adinfo->Valid & ACPI_VALID_UID)?
strtoul(adinfo->UniqueId.Value, &end, 10):0 ));
(adinfo->Valid & ACPI_VALID_UID) ?
strtoul(adinfo->UniqueId.Value, &end, 10) : 0);
if (adinfo)
AcpiOsFree(adinfo);

10
sys/dev/acpica/acpi_pci.c
View file

@ -136,12 +136,12 @@ acpi_pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
struct acpi_pci_devinfo *dinfo;
switch (which) {
case ACPI_IVAR_HANDLE:
case ACPI_IVAR_HANDLE:
dinfo = device_get_ivars(child);
*result = (uintptr_t)dinfo->ap_handle;
return(0);
return (0);
}
return(pci_read_ivar(dev, child, which, result));
return (pci_read_ivar(dev, child, which, result));
}
static int
@ -149,10 +149,10 @@ acpi_pci_child_location_str_method(device_t cbdev, device_t child, char *buf,
size_t buflen)
{
struct acpi_pci_devinfo *dinfo = device_get_ivars(child);
int status;
pci_child_location_str_method(cbdev, child, buf, buflen);
if(dinfo->ap_handle){
if (dinfo->ap_handle) {
strlcat(buf, " path=", buflen);
strlcat(buf, acpi_name(dinfo->ap_handle), buflen);
}