Author: tkreuzer
Date: Sat Feb 14 19:07:36 2015
New Revision: 66269
URL:
http://svn.reactos.org/svn/reactos?rev=66269&view=rev
Log:
[DRIVERS]
Fix a few MSVC warnings
Modified:
trunk/reactos/drivers/bus/acpi/busmgr/power.c
trunk/reactos/drivers/usb/usbhub/fdo.c
trunk/reactos/drivers/usb/usbhub/pdo.c
trunk/reactos/drivers/usb/usbstor/fdo.c
Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Sat Feb 14 19:07:36 2015
@@ -28,7 +28,7 @@
* 1. via "Device Specific (D-State) Control"
* 2. via "Power Resource Control".
* This module is used to manage devices relying on Power Resource Control.
- *
+ *
* An ACPI "power resource object" describes a software controllable power
* plane, clock plane, or other resource used by a power managed device.
* A device may rely on multiple power resources, and a power resource
@@ -37,7 +37,7 @@
/*
* Modified for ReactOS and latest ACPICA
- * Copyright (C)2009 Samuel Serapion
+ * Copyright (C)2009 Samuel Serapion
*/
#include <precomp.h>
@@ -346,13 +346,14 @@
/*
* Prepare a wakeup device, two steps (Ref ACPI 2.0:P229):
- * 1. Power on the power resources required for the wakeup device
+ * 1. Power on the power resources required for the wakeup device
* 2. Execute _DSW (Device Sleep Wake) or (deprecated in ACPI 3.0) _PSW (Power
* State Wake) for the device, if present
*/
int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state)
{
- int i, err = 0;
+ unsigned int i;
+ int err = 0;
if (!dev || !dev->wakeup.flags.valid)
return -1;
@@ -396,7 +397,8 @@
*/
int acpi_disable_wakeup_device_power(struct acpi_device *dev)
{
- int i, err = 0;
+ unsigned int i;
+ int err = 0;
if (!dev || !dev->wakeup.flags.valid)
return -1;
@@ -486,7 +488,7 @@
int result = 0;
struct acpi_handle_list *cl = NULL; /* Current Resources */
struct acpi_handle_list *tl = NULL; /* Target Resources */
- int i = 0;
+ unsigned int i = 0;
if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3))
return_VALUE(-1);
@@ -589,14 +591,14 @@
break;
}
-
+
DPRINT("%s [%s] (%s)\n", acpi_device_name(device),
acpi_device_bid(device), state?"on":"off");
end:
if (result)
ExFreePool(resource);
-
+
return result;
}
@@ -654,7 +656,7 @@
return 0;
}
-int
+int
acpi_power_init (void)
{
int result = 0;
Modified: trunk/reactos/drivers/usb/usbhub/fdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r…
==============================================================================
--- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sat Feb 14 19:07:36 2015
@@ -210,7 +210,7 @@
PHUB_DEVICE_EXTENSION HubDeviceExtension;
PWORK_ITEM_DATA WorkItemData;
PORT_STATUS_CHANGE PortStatus;
- LONG PortId;
+ ULONG PortId;
BOOLEAN SignalResetComplete = FALSE;
DPRINT("Entered DeviceStatusChangeThread, Context %x\n", Context);
Modified: trunk/reactos/drivers/usb/usbhub/pdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r…
==============================================================================
--- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat Feb 14 19:07:36 2015
@@ -307,7 +307,7 @@
case IOCTL_INTERNAL_USB_GET_PORT_STATUS:
{
PORT_STATUS_CHANGE PortStatus;
- LONG PortId;
+ ULONG PortId;
PUCHAR PortStatusBits;
PortStatusBits = (PUCHAR)Stack->Parameters.Others.Argument1;
Modified: trunk/reactos/drivers/usb/usbstor/fdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/fdo.c?…
==============================================================================
--- trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] Sat Feb 14 19:07:36 2015
@@ -40,7 +40,7 @@
IN OUT PIRP Irp)
{
ULONG DeviceCount = 0;
- ULONG Index;
+ LONG Index;
PDEVICE_RELATIONS DeviceRelations;
PIO_STACK_LOCATION IoStack;
@@ -63,7 +63,7 @@
//
// go through array and count device objects
//
- for(Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++)
+ for (Index = 0; Index < max(DeviceExtension->MaxLUN, 1); Index++)
{
if (DeviceExtension->ChildPDO[Index])
{
@@ -391,7 +391,7 @@
case IRP_MN_QUERY_CAPABILITIES:
{
//
- // FIXME: set custom capabilities
+ // FIXME: set custom capabilities
//
IoSkipCurrentIrpStackLocation(Irp);
return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp);