remove whitespace from end of lines Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c Modified: trunk/reactos/drivers/bus/acpi/ospm/bn.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c Modified: trunk/reactos/drivers/bus/acpi/ospm/include/bm.h Modified: trunk/reactos/drivers/bus/acpi/ospm/include/bn.h Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c Modified: trunk/reactos/drivers/bus/acpi/ospm/pdo.c Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/drivers/bus/pci/pcidef.h Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/serenum/detect.c Modified: trunk/reactos/drivers/bus/serenum/fdo.c Modified: trunk/reactos/drivers/bus/serenum/misc.c Modified: trunk/reactos/drivers/bus/serenum/pdo.c Modified: trunk/reactos/drivers/bus/serenum/serenum.c Modified: trunk/reactos/drivers/bus/serenum/serenum.h Modified: trunk/reactos/drivers/dd/blue/blue.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.h Modified: trunk/reactos/drivers/dd/debugout/debugout.c Modified: trunk/reactos/drivers/dd/green/createclose.c Modified: trunk/reactos/drivers/dd/green/dispatch.c Modified: trunk/reactos/drivers/dd/green/green.c Modified: trunk/reactos/drivers/dd/green/green.h Modified: trunk/reactos/drivers/dd/green/keyboard.c Modified: trunk/reactos/drivers/dd/green/misc.c Modified: trunk/reactos/drivers/dd/green/pnp.c Modified: trunk/reactos/drivers/dd/green/screen.c Modified: trunk/reactos/drivers/dd/mpu401/mpu401.c Modified: trunk/reactos/drivers/dd/mpu401/portio.c Modified: trunk/reactos/drivers/dd/null/null.c Modified: trunk/reactos/drivers/dd/parallel/parallel.c Modified: trunk/reactos/drivers/dd/parallel/parallel.h Modified: trunk/reactos/drivers/dd/ramdrv/ramdrv.c Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/cleanup.c Modified: trunk/reactos/drivers/dd/serial/close.c Modified: trunk/reactos/drivers/dd/serial/create.c Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/info.c Modified: trunk/reactos/drivers/dd/serial/legacy.c Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/power.c Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.c Modified: trunk/reactos/drivers/dd/serial/serial.h Modified: trunk/reactos/drivers/dd/sndblst/portio.c Modified: trunk/reactos/drivers/dd/sndblst/sndblst.c Modified: trunk/reactos/drivers/dd/sound/dsp.c Modified: trunk/reactos/drivers/dd/sound/mixer.c Modified: trunk/reactos/drivers/dd/sound/sb16.c Modified: trunk/reactos/drivers/dd/sound/sb16.h Modified: trunk/reactos/drivers/dd/sound/sound.c Modified: trunk/reactos/drivers/dd/sound/wave.c Modified: trunk/reactos/drivers/dd/sound/wave.h Modified: trunk/reactos/drivers/dd/test/test.c Modified: trunk/reactos/drivers/fs/cdfs/cdfs.c Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c Modified: trunk/reactos/drivers/fs/cdfs/close.c Modified: trunk/reactos/drivers/fs/cdfs/common.c Modified: trunk/reactos/drivers/fs/cdfs/create.c Modified: trunk/reactos/drivers/fs/cdfs/dirctl.c Modified: trunk/reactos/drivers/fs/cdfs/fcb.c Modified: trunk/reactos/drivers/fs/cdfs/finfo.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c Modified: trunk/reactos/drivers/fs/cdfs/misc.c Modified: trunk/reactos/drivers/fs/cdfs/rw.c Modified: trunk/reactos/drivers/fs/ext2/attr.c Modified: trunk/reactos/drivers/fs/ext2/blockdev.c Modified: trunk/reactos/drivers/fs/ext2/dir.c Modified: trunk/reactos/drivers/fs/ext2/ext2fs.h Modified: trunk/reactos/drivers/fs/ext2/file.c Modified: trunk/reactos/drivers/fs/ext2/inode.c Modified: trunk/reactos/drivers/fs/ext2/quota.c Modified: trunk/reactos/drivers/fs/ext2/rw.c Modified: trunk/reactos/drivers/fs/ext2/security.c Modified: trunk/reactos/drivers/fs/ext2/super.c Modified: trunk/reactos/drivers/fs/fs_rec/fat.c Modified: trunk/reactos/drivers/fs/minix/bitops.c Modified: trunk/reactos/drivers/fs/minix/block.c Modified: trunk/reactos/drivers/fs/minix/blockdev.c Modified: trunk/reactos/drivers/fs/minix/cache.c Modified: trunk/reactos/drivers/fs/minix/dir.c Modified: trunk/reactos/drivers/fs/minix/inode.c Modified: trunk/reactos/drivers/fs/minix/minix.h Modified: trunk/reactos/drivers/fs/minix/mount.c Modified: trunk/reactos/drivers/fs/minix/rw.c Modified: trunk/reactos/drivers/fs/ms/create.c Modified: trunk/reactos/drivers/fs/ms/finfo.c [truncated at 100 lines; 288 more skipped] _____
Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c --- trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -16,7 +16,7 @@
#ifdef ALLOC_PRAGMA
-// Make the initialization routines discardable, so that they +// Make the initialization routines discardable, so that they // don't waste space
#pragma alloc_text(init, DriverEntry) @@ -27,8 +27,8 @@ NTSTATUS STDCALL ACPIDispatchDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { PIO_STACK_LOCATION IrpSp; NTSTATUS Status; _____
Modified: trunk/reactos/drivers/bus/acpi/ospm/bn.c --- trunk/reactos/drivers/bus/acpi/ospm/bn.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/bn.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -176,7 +176,7 @@
* ------------- * Either fixed-feature or generic (namespace) types. */ - if (strncmp(device->id.hid, BN_HID_POWER_BUTTON, + if (strncmp(device->id.hid, BN_HID_POWER_BUTTON, sizeof(BM_DEVICE_HID)) == 0) {
if (device->id.type == BM_TYPE_FIXED_BUTTON) { @@ -185,7 +185,7 @@
/* Register for fixed-feature events. */ status = acpi_install_fixed_event_handler( - ACPI_EVENT_POWER_BUTTON, bn_notify_fixed, + ACPI_EVENT_POWER_BUTTON, bn_notify_fixed, (void*)button); } else { @@ -201,7 +201,7 @@ * ------------- * Either fixed-feature or generic (namespace) types. */ - else if (strncmp( device->id.hid, BN_HID_SLEEP_BUTTON, + else if (strncmp( device->id.hid, BN_HID_SLEEP_BUTTON, sizeof(BM_DEVICE_HID)) == 0) {
if (device->id.type == BM_TYPE_FIXED_BUTTON) { @@ -210,7 +210,7 @@
/* Register for fixed-feature events. */ status = acpi_install_fixed_event_handler( - ACPI_EVENT_SLEEP_BUTTON, bn_notify_fixed, + ACPI_EVENT_SLEEP_BUTTON, bn_notify_fixed, (void*)button); } else { @@ -224,7 +224,7 @@ * LID Switch? * ----------- */ - else if (strncmp( device->id.hid, BN_HID_LID_SWITCH, + else if (strncmp( device->id.hid, BN_HID_LID_SWITCH, sizeof(BM_DEVICE_HID)) == 0) {
button->type = BN_TYPE_LID_SWITCH; @@ -360,7 +360,7 @@ */ MEMCPY(criteria.hid, BN_HID_LID_SWITCH, sizeof(BN_HID_LID_SWITCH)); status = bm_register_driver(&criteria, &driver); - + if (status == AE_NOT_FOUND) status = AE_OK;
@@ -457,13 +457,13 @@
case BN_TYPE_POWER_BUTTON_FIXED: DEBUG_PRINT(ACPI_INFO, ("Fixed-feature button status change event detected.\n")); - /*bm_generate_event(button->device_handle, BN_PROC_ROOT, + /*bm_generate_event(button->device_handle, BN_PROC_ROOT, BN_PROC_POWER_BUTTON, BN_NOTIFY_STATUS_CHANGE, 0);*/ break;
case BN_TYPE_SLEEP_BUTTON_FIXED: DEBUG_PRINT(ACPI_INFO, ("Fixed-feature button status change event detected.\n")); - /*bm_generate_event(button->device_handle, BN_PROC_ROOT, + /*bm_generate_event(button->device_handle, BN_PROC_ROOT, BN_PROC_SLEEP_BUTTON, BN_NOTIFY_STATUS_CHANGE, 0);*/ break;
@@ -507,11 +507,11 @@ case BM_NOTIFY_DEVICE_ADDED: status = bn_add_device(device_handle, context); break; - + case BM_NOTIFY_DEVICE_REMOVED: status = bn_remove_device(context); break; - + case BN_NOTIFY_STATUS_CHANGE: DEBUG_PRINT(ACPI_INFO, ("Button status change event detected.\n"));
@@ -525,7 +525,7 @@
case BN_TYPE_POWER_BUTTON: case BN_TYPE_POWER_BUTTON_FIXED: - /*bm_generate_event(device_handle, BN_PROC_ROOT, + /*bm_generate_event(device_handle, BN_PROC_ROOT, BN_PROC_POWER_BUTTON, notify_type, 0);*/ break;
_____
Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bm.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -214,7 +214,7 @@
* Evaluate _STA: * -------------- */ - status = bm_evaluate_simple_integer(device->acpi_handle, "_STA", + status = bm_evaluate_simple_integer(device->acpi_handle, "_STA", &(device->status));
return status; @@ -263,12 +263,12 @@ }
if (info.valid & ACPI_VALID_UID) { - MEMCPY((void*)device->id.uid, (void*)info.unique_id, + MEMCPY((void*)device->id.uid, (void*)info.unique_id, sizeof(BM_DEVICE_UID)); }
if (info.valid & ACPI_VALID_HID) { - MEMCPY((void*)device->id.hid, (void*)info.hardware_id, + MEMCPY((void*)device->id.hid, (void*)info.hardware_id, sizeof(BM_DEVICE_HID)); }
@@ -311,7 +311,7 @@ /* * Presence of _DCK indicates a docking station. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_DCK", &acpi_handle))) { device->flags |= BM_FLAGS_DOCKING_STATION; } @@ -320,7 +320,7 @@ * Presence of _EJD and/or _EJx indicates 'ejectable'. * TODO: _EJx... */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_EJD", &acpi_handle))) { device->flags |= BM_FLAGS_EJECTABLE; } @@ -328,9 +328,9 @@ /* * Presence of _PR0 or _PS0 indicates 'power manageable'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR0", &acpi_handle)) || - ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS0", &acpi_handle))) { device->flags |= BM_FLAGS_POWER_CONTROL; } @@ -338,7 +338,7 @@ /* * Presence of _CRS indicates 'configurable'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_CRS", &acpi_handle))) { device->flags |= BM_FLAGS_CONFIGURABLE; } @@ -351,9 +351,9 @@ /* * Presence of _HID or _ADR indicates 'identifiable'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_HID", &acpi_handle)) || - ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_ADR", &acpi_handle))) { device->flags |= BM_FLAGS_IDENTIFIABLE; } @@ -361,7 +361,7 @@ /* * Presence of _STA indicates 'dynamic status'. */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_STA", &acpi_handle))) { device->flags |= BM_FLAGS_DYNAMIC_STATUS; } @@ -428,7 +428,7 @@ /* * Device Type: * ------------ - */ + */ switch (acpi_type) { case INTERNAL_TYPE_SCOPE: device->id.type = BM_TYPE_SCOPE; @@ -481,7 +481,7 @@ /* * Power Management: * ----------------- - * If this node doesn't provide direct power control + * If this node doesn't provide direct power control * then we inherit PM capabilities from its parent. * * TODO: Inherit! @@ -572,8 +572,8 @@ if (ACPI_SUCCESS(status)) {
/* - * TODO: This is a hack to get around the problem - * identifying scope objects. Scopes + * TODO: This is a hack to get around the problem + * identifying scope objects. Scopes * somehow need to be uniquely identified. */ status = acpi_get_type(child_handle, &acpi_type); @@ -621,7 +621,7 @@ else { level--; child_handle = parent_handle; - acpi_get_parent(parent_handle, + acpi_get_parent(parent_handle, &parent_handle);
if (parent) { @@ -683,7 +683,7 @@ node->device.acpi_handle = ACPI_ROOT_OBJECT; node->device.id.type = BM_TYPE_FIXED_BUTTON; if (device_hid) { - MEMCPY((void*)node->device.id.hid, device_hid, + MEMCPY((void*)node->device.id.hid, device_hid, sizeof(node->device.id.hid)); } node->device.flags = BM_FLAGS_FIXED_FEATURE; @@ -950,14 +950,14 @@ */ DEBUG_PRINT(ACPI_INFO, ("Registering for all device notifications.\n"));
- status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, &bm_notify, NULL); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to register for standard notifications.\n")); return_ACPI_STATUS(status); }
- status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_install_notify_handler(ACPI_ROOT_OBJECT, ACPI_DEVICE_NOTIFY, &bm_notify, NULL); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to register for device-specific notifications.\n")); @@ -1019,13 +1019,13 @@
DEBUG_PRINT(ACPI_INFO, ("Unregistering for device notifications.\n"));
- status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, &bm_notify); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to un-register for standard notifications.\n")); }
- status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, + status = acpi_remove_notify_handler(ACPI_ROOT_OBJECT, ACPI_DEVICE_NOTIFY, &bm_notify); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_ERROR, ("Unable to un-register for device-specific notifications.\n")); _____
Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmnotify.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -63,13 +63,13 @@
DEBUG_PRINT(ACPI_INFO, ("Sending notify [0x%02x] to device [0x%02x].\n", notify_type, node->device.handle));
- if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || + if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || !(node->driver.notify)) { DEBUG_PRINT(ACPI_WARN, ("No driver installed for device [0x%02x].\n", node->device.handle)); return_ACPI_STATUS(AE_NOT_EXIST); }
- status = node->driver.notify(notify_type, node->device.handle, + status = node->driver.notify(notify_type, node->device.handle, &(node->driver.context));
return_ACPI_STATUS(status); @@ -130,7 +130,7 @@ if (ACPI_FAILURE(status)) { return_ACPI_STATUS(status); } - + if (old_status == node->device.status) { return_ACPI_STATUS(AE_OK); } @@ -138,12 +138,12 @@ if (status_change) { *status_change = TRUE; } - + /* * Device Insertion? * ----------------- */ - if ((device->status & BM_STATUS_PRESENT) && + if ((device->status & BM_STATUS_PRESENT) && !(old_status & BM_STATUS_PRESENT)) { /* TODO: Make sure driver is loaded, and if not, load. */ status = bm_generate_notify(node, BM_NOTIFY_DEVICE_ADDED); @@ -153,7 +153,7 @@ * Device Removal? * --------------- */ - else if (!(device->status & BM_STATUS_PRESENT) && + else if (!(device->status & BM_STATUS_PRESENT) && (old_status & BM_STATUS_PRESENT)) { /* TODO: Unload driver if last device instance. */ status = bm_generate_notify(node, BM_NOTIFY_DEVICE_REMOVED); @@ -247,7 +247,7 @@ /* * Device-Specific or Standard? * ---------------------------- - * Device-specific notifies are forwarded to the control module's + * Device-specific notifies are forwarded to the control module's * notify() function for processing. Standard notifies are handled * internally. */ _____
Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpm.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -72,21 +72,21 @@
/* * Calculate Power State: * ---------------------- - * Try to infer the devices's power state by checking the state of - * the devices's power resources. We start by evaluating _PR0 - * (resource requirements at D0) and work through _PR1 and _PR2. - * We know the current devices power state when all resources (for - * a give Dx state) are ON. If no power resources are on then the + * Try to infer the devices's power state by checking the state of + * the devices's power resources. We start by evaluating _PR0 + * (resource requirements at D0) and work through _PR1 and _PR2. + * We know the current devices power state when all resources (for + * a give Dx state) are ON. If no power resources are on then the * device is assumed to be off (D3). */ for (i=ACPI_STATE_D0; i<ACPI_STATE_D3; i++) {
- status = bm_evaluate_reference_list(device->acpi_handle, + status = bm_evaluate_reference_list(device->acpi_handle, object_name, &pr_list);
if (ACPI_SUCCESS(status)) {
- status = bm_pr_list_get_state(&pr_list, + status = bm_pr_list_get_state(&pr_list, &list_state);
if (ACPI_SUCCESS(status)) { @@ -137,7 +137,7 @@ device->power.state = ACPI_STATE_UNKNOWN;
if (device->flags & BM_FLAGS_POWER_STATE) { - status = bm_evaluate_simple_integer(device->acpi_handle, + status = bm_evaluate_simple_integer(device->acpi_handle, "_PSC", &(device->power.state)); } else { @@ -204,24 +204,24 @@ /* * Get Resources: * -------------- - * Get the power resources associated with the device's current + * Get the power resources associated with the device's current * and target power states. */ if (device->power.state != ACPI_STATE_UNKNOWN) { object_name[3] = '0' + device->power.state; - bm_evaluate_reference_list(device->acpi_handle, + bm_evaluate_reference_list(device->acpi_handle, object_name, ¤t_list); }
object_name[3] = '0' + state; - bm_evaluate_reference_list(device->acpi_handle, object_name, + bm_evaluate_reference_list(device->acpi_handle, object_name, &target_list);
/* * Transition Resources: * --------------------- - * Transition all power resources referenced by this device to - * the correct power state (taking into consideration sequencing + * Transition all power resources referenced by this device to + * the correct power state (taking into consideration sequencing * and dependencies to other devices). */ if (current_list.count || target_list.count) { @@ -234,7 +234,7 @@ /* * Execute _PSx: * ------------- - * Execute the _PSx method corresponding to the target Dx state, + * Execute the _PSx method corresponding to the target Dx state, * if it exists. */ object_name[2] = 'S'; @@ -287,17 +287,17 @@ * Power Management Flags: * ----------------------- */ - if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PSC", + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PSC", &acpi_handle))) { device->power.flags |= BM_FLAGS_POWER_STATE; }
- if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_IRC", + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_IRC", &acpi_handle))) { device->power.flags |= BM_FLAGS_INRUSH_CURRENT; }
- if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PRW", + if (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PRW", &acpi_handle))) { device->power.flags |= BM_FLAGS_WAKE_CAPABLE; } @@ -317,22 +317,22 @@ * Figure out which Dx states are supported by this device for the * S0 (working) state. Note that D0 and D3 are required (assumed). */ - device->power.dx_supported[ACPI_STATE_S0] = BM_FLAGS_D0_SUPPORT | + device->power.dx_supported[ACPI_STATE_S0] = BM_FLAGS_D0_SUPPORT | BM_FLAGS_D3_SUPPORT;
- if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR1", - &acpi_handle))) || - (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS1", + if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR1", + &acpi_handle))) || + (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS1", &acpi_handle)))) { - device->power.dx_supported[ACPI_STATE_S0] |= + device->power.dx_supported[ACPI_STATE_S0] |= BM_FLAGS_D1_SUPPORT; }
- if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR2", - &acpi_handle))) || - (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS2", + if ((ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PR2", + &acpi_handle))) || + (ACPI_SUCCESS(acpi_get_handle(device->acpi_handle, "_PS2", &acpi_handle)))) { - device->power.dx_supported[ACPI_STATE_S0] |= + device->power.dx_supported[ACPI_STATE_S0] |= BM_FLAGS_D2_SUPPORT; }
@@ -352,28 +352,28 @@ /* * Evalute _SxD: * ------------- - * Which returns the highest (power) Dx state supported in - * this system (Sx) state. We convert this value to a bit + * Which returns the highest (power) Dx state supported in + * this system (Sx) state. We convert this value to a bit * mask of supported states (conceptually simpler). */ - status = bm_evaluate_simple_integer(device->acpi_handle, + status = bm_evaluate_simple_integer(device->acpi_handle, object_name, &dx_supported); if (ACPI_SUCCESS(status)) { switch (dx_supported) { case 0: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D0_SUPPORT; /* fall through */ case 1: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D1_SUPPORT; /* fall through */ case 2: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D2_SUPPORT; /* fall through */ case 3: - device->power.dx_supported[i] |= + device->power.dx_supported[i] |= BM_FLAGS_D3_SUPPORT; break; } @@ -381,12 +381,12 @@ /* * Validate: * --------- - * Mask of any states that _Sx_d falsely advertises - * (e.g.claims D1 support but neither _PR2 or _PS2 - * exist). In other words, S1-S5 can't offer a Dx + * Mask of any states that _Sx_d falsely advertises + * (e.g.claims D1 support but neither _PR2 or _PS2 + * exist). In other words, S1-S5 can't offer a Dx * state that isn't supported by S0. */ - device->power.dx_supported[i] &= + device->power.dx_supported[i] &=
device->power.dx_supported[ACPI_STATE_S0]; }
_____
Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmpower.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -27,7 +27,7 @@
* TODO: * ----- * 1. Sequencing of power resource list transitions. - * 2. Global serialization of power resource transtions (see ACPI + * 2. Global serialization of power resource transtions (see ACPI * spec section 7.1.2/7.1.3). * 3. Better error handling. */ @@ -51,13 +51,13 @@ BM_NOTIFY notify_type, BM_HANDLE device_handle, void **context); - + ACPI_STATUS bm_pr_request ( BM_REQUEST *request, void *context);
- +
/*********************************************************************** ***** * Internal Functions
************************************************************************ ****/ @@ -133,7 +133,7 @@
pr->state = ACPI_STATE_UNKNOWN;
- /* + /* * Evaluate _STA: * -------------- * Evalute _STA to determine whether the power resource is ON or OFF. @@ -151,7 +151,7 @@ }
/* - * Mask off all bits but the first as some systems return non-standard + * Mask off all bits but the first as some systems return non-standard * values (e.g. 0x51). */ switch (device_status & 0x01) { @@ -269,7 +269,7 @@ * ----------------------------- * The current state of a list of power resources is ON if all * power resources are currently in the ON state. In other words, - * if any power resource in the list is OFF then the collection + * if any power resource in the list is OFF then the collection * isn't fully ON. */ for (i = 0; i < pr_list->count; i++) { @@ -328,13 +328,13 @@ /* * Reference Target: * ----------------- - * Reference all resources for the target power state first (so - * the device doesn't get turned off while transitioning). Power + * Reference all resources for the target power state first (so + * the device doesn't get turned off while transitioning). Power * resources that aren't on (new reference count of 1) are turned on. */ for (i = 0; i < target_list->count; i++) {
- status = bm_get_device_context(target_list->handles[i], + status = bm_get_device_context(target_list->handles[i], (BM_DRIVER_CONTEXT*)(&pr)); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_WARN, ("Invalid reference to power resource [0x%02X].\n", target_list->handles[i])); @@ -355,12 +355,12 @@ * Dereference Current: * -------------------- * Dereference all resources for the current power state. Power - * resources no longer referenced (new reference count of 0) are + * resources no longer referenced (new reference count of 0) are * turned off. */ for (i = 0; i < current_list->count; i++) {
- status = bm_get_device_context(current_list->handles[i], + status = bm_get_device_context(current_list->handles[i], (BM_DRIVER_CONTEXT*)(&pr)); if (ACPI_FAILURE(status)) { DEBUG_PRINT(ACPI_WARN, ("Invalid reference to power resource [0x%02X].\n", target_list->handles[i])); @@ -434,7 +434,7 @@ pr->device_handle = device->handle; pr->acpi_handle = device->acpi_handle;
- /* + /* * Get information on this power resource. */ status = acpi_evaluate_object(pr->acpi_handle, NULL, NULL, &buffer); _____
Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmrequest.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -62,7 +62,7 @@
DEBUG_PRINT(ACPI_INFO, ("Sending request [0x%02x] to device [0x%02x].\n", request->command, node->device.handle));
- if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || + if (!(node->device.flags & BM_FLAGS_DRIVER_CONTROL) || !(node->driver.request)) { DEBUG_PRINT(ACPI_WARN, ("No driver installed for device [0x%02x].\n", node->device.handle)); return_ACPI_STATUS(AE_NOT_EXIST); @@ -137,7 +137,7 @@ if (ACPI_FAILURE(status)) { break; } - status = bm_copy_to_buffer(&(request->buffer), + status = bm_copy_to_buffer(&(request->buffer), &(device->power.state), sizeof(BM_POWER_STATE)); break;
@@ -145,7 +145,7 @@ { BM_POWER_STATE *power_state = NULL;
- status = bm_cast_buffer(&(request->buffer), + status = bm_cast_buffer(&(request->buffer), (void**)&power_state, sizeof(BM_POWER_STATE)); if (ACPI_FAILURE(status)) { break; _____
Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmsearch.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -57,7 +57,7 @@
return AE_BAD_PARAMETER; }
- /* + /* * Present? * -------- * We're only going to match on devices that are present. @@ -67,22 +67,22 @@ return AE_NOT_FOUND; }
- /* + /* * type? */ if (criteria->type && !(criteria->type & device->id.type)) { return AE_NOT_FOUND; }
- /* + /* * hid? */ - if ((criteria->hid[0]) && (0 != STRNCMP(criteria->hid, + if ((criteria->hid[0]) && (0 != STRNCMP(criteria->hid, device->id.hid, sizeof(BM_DEVICE_HID)))) { return AE_NOT_FOUND; }
- /* + /* * adr? */ if ((criteria->adr) && (criteria->adr != device->id.adr)) { @@ -149,7 +149,7 @@ if (node->scope.head) { status = bm_compare(&(node->device), criteria); if (ACPI_SUCCESS(status)) { - results->handles[results->count++] = + results->handles[results->count++] = node->device.handle; } node = node->scope.head; @@ -163,16 +163,16 @@ else { status = bm_compare(&(node->device), criteria); if (ACPI_SUCCESS(status)) { - results->handles[results->count++] = + results->handles[results->count++] = node->device.handle; }
/* * Locate Next Device: * ------------------- - * The next node is either a peer at this level - * (node->next is valid), or we work are way back - * up the tree until we either find a non-parsed + * The next node is either a peer at this level + * (node->next is valid), or we work are way back + * up the tree until we either find a non-parsed * peer or hit the top (node->parent is NULL). */ while (!node->next && node->parent) { _____
Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -199,7 +199,7 @@
if (!package || (package->type != ACPI_TYPE_PACKAGE) || (package->package.count == 0) || !package_format || - (package_format->length < 1) || + (package_format->length < 1) || (!package_format->pointer) || !buffer) { return_ACPI_STATUS(AE_BAD_PARAMETER); } @@ -228,7 +228,7 @@ tail_offset += sizeof(ACPI_INTEGER); break; case 'S': - size_required += sizeof(u8*) + + size_required += sizeof(u8*) + sizeof(ACPI_INTEGER) + 1; tail_offset += sizeof(ACPI_INTEGER); break; @@ -243,12 +243,12 @@ case ACPI_TYPE_BUFFER: switch (format[i]) { case 'S': - size_required += sizeof(u8*) + + size_required += sizeof(u8*) + element->string.length + 1; tail_offset += sizeof(u8*); break; case 'B': - size_required += sizeof(u8*) + + size_required += sizeof(u8*) + element->buffer.length; tail_offset += sizeof(u8*); break; @@ -293,14 +293,14 @@ case ACPI_TYPE_INTEGER: switch (format[i]) { case 'N': - *((ACPI_INTEGER*)head) = + *((ACPI_INTEGER*)head) = element->integer.value; head += sizeof(ACPI_INTEGER); break; case 'S': pointer = (u8**)head; *pointer = tail; - *((ACPI_INTEGER*)tail) = + *((ACPI_INTEGER*)tail) = element->integer.value; head += sizeof(ACPI_INTEGER*); tail += sizeof(ACPI_INTEGER); @@ -320,7 +320,7 @@ case 'S': pointer = (u8**)head; *pointer = tail; - memcpy(tail, element->string.pointer, + memcpy(tail, element->string.pointer, element->string.length); head += sizeof(u8*); tail += element->string.length; @@ -331,7 +331,7 @@ case 'B': pointer = (u8**)head; *pointer = tail; - memcpy(tail, element->buffer.pointer, + memcpy(tail, element->buffer.pointer, element->buffer.length); head += sizeof(u8*); tail += element->buffer.length; @@ -361,11 +361,11 @@ * PARAMETERS: <TBD> * * RETURN: AE_OK - * AE_BUFFER_OVERFLOW Evaluated object returned data, but + * AE_BUFFER_OVERFLOW Evaluated object returned data, but * caller did not provide buffer. * * DESCRIPTION: Helper for acpi_evaluate_object that handles buffer - * allocation. Note that the caller is responsible for + * allocation. Note that the caller is responsible for * freeing buffer->pointer! *
************************************************************************ ****/ @@ -389,8 +389,8 @@ /* * Evalute Object: * --------------- - * The first attempt is just to get the size of the object data - * (that is unless there's no return data, e.g. _INI); the second + * The first attempt is just to get the size of the object data + * (that is unless there's no return data, e.g. _INI); the second * gets the data. */ status = acpi_evaluate_object(acpi_handle, pathname, arguments, buffer); @@ -407,14 +407,14 @@ }
/* Re-evaluate -- this time it should work */ - status = acpi_evaluate_object(acpi_handle, pathname, + status = acpi_evaluate_object(acpi_handle, pathname, arguments, buffer); }
if (ACPI_FAILURE(status)) { DEBUG_EVAL_ERROR(ACPI_WARN, acpi_handle, pathname, status); if (buffer && buffer->pointer) { - acpi_os_free(buffer->pointer); + acpi_os_free(buffer->pointer); buffer->pointer = NULL; buffer->length = 0; } @@ -467,7 +467,7 @@ * Validate Data: * -------------- */ - status = bm_cast_buffer(&buffer, (void**)&element, + status = bm_cast_buffer(&buffer, (void**)&element, sizeof(ACPI_OBJECT)); if (ACPI_FAILURE(status)) { DEBUG_EVAL_ERROR(ACPI_WARN, acpi_handle, pathname, status); @@ -535,7 +535,7 @@ * Validate Package: * ----------------- */ - status = bm_cast_buffer(&buffer, (void**)&package, + status = bm_cast_buffer(&buffer, (void**)&package, sizeof(ACPI_OBJECT)); if (ACPI_FAILURE(status)) { DEBUG_EVAL_ERROR(ACPI_WARN, acpi_handle, pathname, status); @@ -571,7 +571,7 @@ * Resolve reference string (e.g. "_PR_.CPU_") to an * ACPI_HANDLE. */ - status = acpi_get_handle(acpi_handle, + status = acpi_get_handle(acpi_handle, element->string.pointer, &reference_handle); if (ACPI_FAILURE(status)) { status = AE_BAD_DATA; @@ -583,7 +583,7 @@ /* * Resolve ACPI_HANDLE to BM_HANDLE. */ - status = bm_get_handle(reference_handle, + status = bm_get_handle(reference_handle, &(reference_list->handles[i])); if (ACPI_FAILURE(status)) { status = AE_BAD_DATA; _____
Modified: trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c --- trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/busmgr/bmxface.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -79,7 +79,7 @@
if (!BM_NODE_PRESENT(node->parent)) { return_ACPI_STATUS(AE_OK); } - + /* * Dynamic Status? * --------------- @@ -94,7 +94,7 @@ * Evaluate _STA: * -------------- */ - status = bm_evaluate_simple_integer(node->device.acpi_handle, "_STA", + status = bm_evaluate_simple_integer(node->device.acpi_handle, "_STA", &(node->device.status)); if (ACPI_SUCCESS(status)) { *device_status = node->device.status; @@ -232,7 +232,7 @@ /* * Install driver: * ---------------- - * For each match, record the driver information and execute the + * For each match, record the driver information and execute the * driver's Notify() funciton (if present) to notify the driver * of the device's presence. */ @@ -247,7 +247,7 @@ DEBUG_PRINT(ACPI_INFO, ("Registering driver for device [0x%02x].\n", node->device.handle));
/* Notify driver of new device. */ - status = driver->notify(BM_NOTIFY_DEVICE_ADDED, + status = driver->notify(BM_NOTIFY_DEVICE_ADDED, node->device.handle, &(node->driver.context)); if (ACPI_SUCCESS(status)) { node->driver.notify = driver->notify; @@ -319,7 +319,7 @@ DEBUG_PRINT(ACPI_INFO, ("Unregistering driver for device [0x%02x].\n", node->device.handle));
/* Notify driver of device removal. */ - status = node->driver.notify(BM_NOTIFY_DEVICE_REMOVED, + status = node->driver.notify(BM_NOTIFY_DEVICE_REMOVED, node->device.handle, &(node->driver.context));
node->device.flags &= ~BM_FLAGS_DRIVER_CONTROL; _____
Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c 2005-05-08 02:16:32 UTC (rev 15108) @@ -128,7 +128,7 @@
RESOURCE* resource; ULONG i; KIRQL Dirql; - + /* Count number of resources */ Done = FALSE; resource = resources; @@ -161,7 +161,7 @@ } resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); } - + /* Allocate memory */ *ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1); ResourceList = (PCM_RESOURCE_LIST)ExAllocatePool(PagedPool, *ResourceListSize); @@ -175,7 +175,7 @@ ResourceList->List[0].PartialResourceList.Revision = 1; ResourceList->List[0].PartialResourceList.Count = NumberOfResources; ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; - + /* Fill resources list structure */ Done = FALSE; resource = resources; @@ -189,7 +189,7 @@ for (i = 0; i < irq_data->number_of_interrupts; i++) { ResourceDescriptor->Type = CmResourceTypeInterrupt; - + ResourceDescriptor->ShareDisposition = (irq_data->shared_exclusive == SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); ResourceDescriptor->Flags = @@ -253,7 +253,7 @@ } resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); } - + acpi_rs_dump_resource_list(resource); return TRUE; } _____
Modified: trunk/reactos/drivers/bus/acpi/ospm/include/bm.h --- trunk/reactos/drivers/bus/acpi/ospm/include/bm.h 2005-05-08 02:15:21 UTC (rev 15107) +++ trunk/reactos/drivers/bus/acpi/ospm/include/bm.h 2005-05-08 02:16:32 UTC (rev 15108) @@ -158,7 +158,7 @@
#define BM_HID_SLEEP_BUTTON "PNP0C0E"
/* - * BM_DEVICE_CID: + * BM_DEVICE_CID: * The compatibility ID can be a string with 44 characters * The extra pad is in case there is a change. It also * provides 8 byte alignment for the BM_DEVICE_ID structure. @@ -564,7 +564,7 @@
ACPI_STATUS [truncated at 1000 lines; 39227 more skipped]