28c28
< __FBSDID("$FreeBSD: head/sys/dev/acpi_support/acpi_hp.c 195185 2009-06-30 09:51:41Z rpaulo $");
---
> __FBSDID("$FreeBSD: head/sys/dev/acpi_support/acpi_hp.c 195325 2009-07-03 21:12:37Z rpaulo $");
94a95
> #define ACPI_HP_METHOD_VERBOSE 21
123a125
> int verbose; /* add debug output */
277a280,285
> {
> .name = "verbose",
> .method = ACPI_HP_METHOD_VERBOSE,
> .description = "Verbosity level",
> .access = CTLTYPE_INT | CTLFLAG_RW
> },
337,340c345,348
< int wireless;
< int new_wlan_status;
< int new_bluetooth_status;
< int new_wwan_status;
---
> int wireless;
> int new_wlan_status;
> int new_bluetooth_status;
> int new_wwan_status;
348c356,357
< device_printf(sc->wmi_dev, "Wireless status is %x\n", wireless);
---
> if (sc->verbose)
> device_printf(sc->wmi_dev, "Wireless status is %x\n", wireless);
394,397c403,407
< device_printf(sc->wmi_dev,
< "WLAN on air changed to %i "
< "(new_wlan_status is %i)\n",
< sc->was_wlan_on_air, new_wlan_status);
---
> if (sc->verbose)
> device_printf(sc->wmi_dev,
> "WLAN on air changed to %i "
> "(new_wlan_status is %i)\n",
> sc->was_wlan_on_air, new_wlan_status);
407,409c417,422
< device_printf(sc->wmi_dev, "BLUETOOTH on air changed"
< " to %i (new_bluetooth_status is %i)\n",
< sc->was_bluetooth_on_air, new_bluetooth_status);
---
> if (sc->verbose)
> device_printf(sc->wmi_dev,
> "BLUETOOTH on air changed"
> " to %i (new_bluetooth_status is %i)\n",
> sc->was_bluetooth_on_air,
> new_bluetooth_status);
418,420c431,435
< device_printf(sc->wmi_dev, "WWAN on air changed to %i"
< " (new_wwan_status is %i)\n",
< sc->was_wwan_on_air, new_wwan_status);
---
> if (sc->verbose)
> device_printf(sc->wmi_dev,
> "WWAN on air changed to %i"
> " (new_wwan_status is %i)\n",
> sc->was_wwan_on_air, new_wwan_status);
443c458
< int arg;
---
> int arg;
462a478
> sc->verbose = 0;
556c572
< int ret;
---
> int ret;
583,588c599,604
< struct acpi_hp_softc *sc;
< int arg;
< int oldarg;
< int error = 0;
< int function;
< int method;
---
> struct acpi_hp_softc *sc;
> int arg;
> int oldarg;
> int error = 0;
> int function;
> int method;
611c627
< int val = 0;
---
> int val = 0;
698a715,717
> case ACPI_HP_METHOD_VERBOSE:
> val = sc->verbose;
> break;
710c729,730
< if (method != ACPI_HP_METHOD_CMI_DETAIL)
---
> if (method != ACPI_HP_METHOD_CMI_DETAIL &&
> method != ACPI_HP_METHOD_VERBOSE)
761a782,784
> case ACPI_HP_METHOD_VERBOSE:
> sc->verbose = arg;
> break;
797,805c820,828
< UINT32 params[5] = { 0x55434553,
< is_write?2:1,
< command,
< is_write?4:0,
< val};
< UINT32* result;
< ACPI_OBJECT *obj;
< ACPI_BUFFER in = { sizeof(params), &params };
< ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL };
---
> UINT32 params[5] = { 0x55434553,
> is_write?2:1,
> command,
> is_write?4:0,
> val};
> UINT32* result;
> ACPI_OBJECT *obj;
> ACPI_BUFFER in = { sizeof(params), &params };
> ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL };
830c853,854
< int length;
---
> int length;
>
850,863c874,885
< * 0 Setting Name [string]
< * 1 Value (comma separated, asterisk marks the current value) [string]
< * 2 Path within the bios hierarchy [string]
< * 3 IsReadOnly [int]
< * 4 DisplayInUI [int]
< * 5 RequiresPhysicalPresence [int]
< * 6 Sequence for ordering within the bios settings (absolute) [int]
< * 7 Length of prerequisites array [int]
< * 8 Prerequisite1 [string]
< * 9 Prerequisite2 [string]
< * 10 Prerequisite3 [string]
< * 11 Current value (in case of enum) [string] / Array length [int]
< * 12 Enum length [int] / Array values
< * 13ff Enum value at index x [string]
---
> * 0 Setting Name [string]
> * 1 Value (comma separated, asterisk marks the current value) [string]
> * 2 Path within the bios hierarchy [string]
> * 3 IsReadOnly [int]
> * 4 DisplayInUI [int]
> * 5 RequiresPhysicalPresence [int]
> * 6 Sequence for ordering within the bios settings (absolute) [int]
> * 7 Length of prerequisites array [int]
> * 8..8+[7] PrerequisiteN [string]
> * 9+[7] Current value (in case of enum) [string] / Array length [int]
> * 10+[7] Enum length [int] / Array values
> * 11+[7]ff Enum value at index x [string]
869,876c891,899
< ACPI_OBJECT *obj;
< ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL };
< int i;
< int outlen;
< int size = 255;
< int has_enums = 0;
< char string_buffer[size];
< int enumbase;
---
> ACPI_OBJECT *obj;
> ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL };
> int i;
> int outlen;
> int size = 255;
> int has_enums = 0;
> int valuebase = 0;
> char string_buffer[size];
> int enumbase;
889a913,917
> if (obj->Package.Count >= 8 &&
> obj->Package.Elements[7].Type == ACPI_TYPE_INTEGER) {
> valuebase = 8 + obj->Package.Elements[7].Integer.Value;
> }
>
891c919
< if (obj->Package.Count >= 13 &&
---
> if (valuebase > 7 && obj->Package.Count > valuebase + 1 &&
899,912c927,932
< obj->Package.Elements[7].Type == ACPI_TYPE_INTEGER &&
< obj->Package.Elements[8].Type == ACPI_TYPE_STRING &&
< obj->Package.Elements[9].Type == ACPI_TYPE_STRING &&
< obj->Package.Elements[10].Type == ACPI_TYPE_STRING &&
< ((obj->Package.Elements[11].Type == ACPI_TYPE_STRING &&
< obj->Package.Elements[12].Type == ACPI_TYPE_INTEGER &&
< obj->Package.Count >=
< 13+obj->Package.Elements[12].Integer.Value) ||
< (obj->Package.Elements[11].Type == ACPI_TYPE_INTEGER &&
< obj->Package.Count >=
< 12+obj->Package.Elements[11].Integer.Value))
< ) {
< enumbase = obj->Package.Elements[11].Type == ACPI_TYPE_STRING?
< 12:11;
---
> obj->Package.Elements[valuebase].Type == ACPI_TYPE_STRING &&
> obj->Package.Elements[valuebase+1].Type == ACPI_TYPE_INTEGER &&
> obj->Package.Count > valuebase +
> obj->Package.Elements[valuebase+1].Integer.Value
> ) {
> enumbase = valuebase + 1;
927,931c947,950
< if (enumbase == 12)
< strlcat(outbuf, acpi_hp_get_string_from_object(
< &obj->Package.Elements[11],
< string_buffer, size),
< outsize);
---
> strlcat(outbuf, acpi_hp_get_string_from_object(
> &obj->Package.Elements[valuebase], string_buffer,
> size),
> outsize);
939c958
< for (i = enumbase+1; i < enumbase + 1 +
---
> for (i = enumbase + 1; i < enumbase + 1 +
983,984c1002,1003
< unsigned int hi;
< unsigned int lo;
---
> unsigned int hi;
> unsigned int lo;
1013,1016c1032,1035
< int i;
< int length = strlen(buffer);
< UINT8 *uin;
< UINT8 uout;
---
> int i;
> int length = strlen(buffer);
> UINT8 *uin;
> UINT8 uout;
1047,1048c1066,1067
< struct acpi_hp_softc *sc;
< int ret;
---
> struct acpi_hp_softc *sc;
> int ret;
1079,1080c1098,1099
< struct acpi_hp_softc *sc;
< int ret;
---
> struct acpi_hp_softc *sc;
> int ret;
1109,1115c1128,1134
< struct acpi_hp_softc *sc;
< int pos, i, l, ret;
< UINT8 instance;
< UINT8 maxInstance;
< UINT32 sequence;
< int linesize = 1025;
< char line[linesize];
---
> struct acpi_hp_softc *sc;
> int pos, i, l, ret;
> UINT8 instance;
> UINT8 maxInstance;
> UINT32 sequence;
> int linesize = 1025;
> char line[linesize];