i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32588 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2009-08-21 21:50:30 +00:00
parent e535c8c017
commit 4271a1354c
1 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp
+57 -38
View File
@@ -51,25 +51,27 @@ ReadBatteryStatus(battery_driver_cookie* cookie, acpi_battery_info* batteryStatu
goto exit; goto exit;
object = (acpi_object_type*)buffer.pointer; object = (acpi_object_type*)buffer.pointer;
if (object->object_type != ACPI_TYPE_PACKAGE || if (object->object_type != ACPI_TYPE_PACKAGE
object->data.package.count < 4) { || object->data.package.count < 4) {
status = B_ERROR; status = B_ERROR;
goto exit; goto exit;
} }
pointer = object->data.package.objects; pointer = object->data.package.objects;
batteryStatus->state = (pointer->object_type == ACPI_TYPE_INTEGER)
? pointer->data.integer : -1;
batteryStatus->state = (pointer->object_type == ACPI_TYPE_INTEGER) ?
pointer->data.integer : -1;
pointer++; pointer++;
batteryStatus->current_rate = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryStatus->current_rate = (pointer->object_type == ACPI_TYPE_INTEGER)
pointer->data.integer : -1; ? pointer->data.integer : -1;
pointer++; pointer++;
batteryStatus->capacity = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryStatus->capacity = (pointer->object_type == ACPI_TYPE_INTEGER)
pointer->data.integer : -1; ? pointer->data.integer : -1;
pointer++; pointer++;
batteryStatus->voltage = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryStatus->voltage = (pointer->object_type == ACPI_TYPE_INTEGER)
pointer->data.integer : -1; ? pointer->data.integer : -1;
exit: exit:
free(buffer.pointer); free(buffer.pointer);
@@ -95,52 +97,69 @@ ReadBatteryInfo(battery_driver_cookie* cookie,
goto exit; goto exit;
object = (acpi_object_type*)buffer.pointer; object = (acpi_object_type*)buffer.pointer;
if (object->object_type != ACPI_TYPE_PACKAGE || if (object->object_type != ACPI_TYPE_PACKAGE
object->data.package.count < 13) { || object->data.package.count < 13) {
status = B_ERROR; status = B_ERROR;
goto exit; goto exit;
} }
pointer = object->data.package.objects; pointer = object->data.package.objects;
batteryInfo->power_unit = (pointer->object_type == ACPI_TYPE_INTEGER)
? pointer->data.integer : -1;
batteryInfo->power_unit = (pointer->object_type == ACPI_TYPE_INTEGER) ?
pointer->data.integer : -1;
pointer++; pointer++;
batteryInfo->design_capacity = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryInfo->design_capacity = (pointer->object_type == ACPI_TYPE_INTEGER)
pointer->data.integer : -1; ? pointer->data.integer : -1;
pointer++; pointer++;
batteryInfo->last_full_charge = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryInfo->last_full_charge = (pointer->object_type == ACPI_TYPE_INTEGER)
pointer->data.integer : -1; ? pointer->data.integer : -1;
pointer++; pointer++;
batteryInfo->technology = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryInfo->technology = (pointer->object_type == ACPI_TYPE_INTEGER)
pointer->data.integer : -1; ? pointer->data.integer : -1;
pointer++; pointer++;
batteryInfo->design_voltage = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryInfo->design_voltage = (pointer->object_type == ACPI_TYPE_INTEGER)
pointer->data.integer : -1; ? pointer->data.integer : -1;
pointer++; pointer++;
batteryInfo->design_capacity_warning = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryInfo->design_capacity_warning =
pointer->data.integer : -1; (pointer->object_type == ACPI_TYPE_INTEGER)
? pointer->data.integer : -1;
pointer++; pointer++;
batteryInfo->design_capacity_low = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryInfo->design_capacity_low =
pointer->data.integer : -1; (pointer->object_type == ACPI_TYPE_INTEGER)
? pointer->data.integer : -1;
pointer++; pointer++;
batteryInfo->capacity_granularity_1 = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryInfo->capacity_granularity_1 =
pointer->data.integer : -1; (pointer->object_type == ACPI_TYPE_INTEGER)
? pointer->data.integer : -1;
pointer++; pointer++;
batteryInfo->capacity_granularity_2 = (pointer->object_type == ACPI_TYPE_INTEGER) ? batteryInfo->capacity_granularity_2 =
pointer->data.integer : -1; (pointer->object_type == ACPI_TYPE_INTEGER)
? pointer->data.integer : -1;
pointer++; pointer++;
strlcpy(batteryInfo->model_number, (pointer->object_type == ACPI_TYPE_STRING) ? strlcpy(batteryInfo->model_number,
pointer->data.string.string : "", sizeof(batteryInfo->model_number)); (pointer->object_type == ACPI_TYPE_STRING)
? pointer->data.string.string : "", sizeof(batteryInfo->model_number));
pointer++; pointer++;
strlcpy(batteryInfo->serial_number, (pointer->object_type == ACPI_TYPE_STRING) ? strlcpy(batteryInfo->serial_number,
pointer->data.string.string : "", sizeof(batteryInfo->serial_number)); (pointer->object_type == ACPI_TYPE_STRING)
? pointer->data.string.string : "", sizeof(batteryInfo->serial_number));
pointer++; pointer++;
strlcpy(batteryInfo->type, (pointer->object_type == ACPI_TYPE_STRING) ? strlcpy(batteryInfo->type, (pointer->object_type == ACPI_TYPE_STRING)
pointer->data.string.string : "", sizeof(batteryInfo->type)); ? pointer->data.string.string : "", sizeof(batteryInfo->type));
pointer++; pointer++;
strlcpy(batteryInfo->oem_info, (pointer->object_type == ACPI_TYPE_STRING) ? strlcpy(batteryInfo->oem_info, (pointer->object_type == ACPI_TYPE_STRING)
pointer->data.string.string : "", sizeof(batteryInfo->oem_info)); ? pointer->data.string.string : "", sizeof(batteryInfo->oem_info));
exit: exit:
free(buffer.pointer); free(buffer.pointer);