Author: akhaldi
Date: Sun Mar 17 15:27:52 2013
New Revision: 58542
URL:
http://svn.reactos.org/svn/reactos?rev=58542&view=rev
Log:
[USBEHCI]
* Fix some format specifiers.
Modified:
trunk/reactos/drivers/usb/usbehci/hardware.cpp
trunk/reactos/drivers/usb/usbehci/usb_queue.cpp
Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa…
==============================================================================
--- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sun Mar 17 15:27:52 2013
@@ -252,9 +252,9 @@
DPRINT1("Controler EHCI has Port Power Control\n");
}
- DPRINT1("Controller Port Routing Rules %d\n",
m_Capabilities.HCSParams.PortRouteRules);
- DPRINT1("Number of Ports per Companion Controller %d\n",
m_Capabilities.HCSParams.PortPerCHC);
- DPRINT1("Number of Companion Controller %d\n",
m_Capabilities.HCSParams.CHCCount);
+ DPRINT1("Controller Port Routing Rules %lu\n",
m_Capabilities.HCSParams.PortRouteRules);
+ DPRINT1("Number of Ports per Companion Controller %lu\n",
m_Capabilities.HCSParams.PortPerCHC);
+ DPRINT1("Number of Companion Controller %lu\n",
m_Capabilities.HCSParams.CHCCount);
if (m_Capabilities.HCSParams.PortIndicator)
{
@@ -363,11 +363,11 @@
m_Capabilities.HCSParamsLong =
READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCSPARAMS));
m_Capabilities.HCCParamsLong =
READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCCPARAMS));
- DPRINT1("Controller has %d Length\n", m_Capabilities.Length);
+ DPRINT1("Controller has %c Length\n", m_Capabilities.Length);
DPRINT1("Controller EHCI Version %x\n",
m_Capabilities.HCIVersion);
DPRINT1("Controller EHCI Caps HCSParamsLong %x\n",
m_Capabilities.HCSParamsLong);
DPRINT1("Controller EHCI Caps HCCParamsLong %x\n",
m_Capabilities.HCCParamsLong);
- DPRINT1("Controller has %d Ports\n",
m_Capabilities.HCSParams.PortCount);
+ DPRINT1("Controller has %lu Ports\n",
m_Capabilities.HCSParams.PortCount);
//
// print capabilities
@@ -597,7 +597,7 @@
// lets wait a bit
//
Timeout.QuadPart = 50;
- DPRINT1("Waiting %d milliseconds for port reset\n",
Timeout.LowPart);
+ DPRINT1("Waiting %lu milliseconds for port reset\n",
Timeout.LowPart);
//
// convert to 100 ns units (absolute)
@@ -915,7 +915,7 @@
// delay is 50 ms for port reset as per USB 2.0 spec
//
Timeout.QuadPart = 50;
- DPRINT1("Waiting %d milliseconds for port reset\n", Timeout.LowPart);
+ DPRINT1("Waiting %lu milliseconds for port reset\n", Timeout.LowPart);
//
// convert to 100 ns units (absolute)
@@ -1047,7 +1047,7 @@
// delay is 50 ms
//
Timeout.QuadPart = 50;
- DPRINT1("Waiting %d milliseconds for port to recover after reset\n",
Timeout.LowPart);
+ DPRINT1("Waiting %lu milliseconds for port to recover after reset\n",
Timeout.LowPart);
//
// convert to 100 ns units (absolute)
@@ -1100,7 +1100,7 @@
// delay is 100 ms
//
Timeout.QuadPart = 100;
- DPRINT1("Waiting %d milliseconds for port to stabilize after
connection\n", Timeout.LowPart);
+ DPRINT1("Waiting %lu milliseconds for port to stabilize after
connection\n", Timeout.LowPart);
//
// convert to 100 ns units (absolute)
@@ -1180,7 +1180,7 @@
// delay is 20 ms
//
Timeout.QuadPart = 20;
- DPRINT1("Waiting %d milliseconds for port power up\n",
Timeout.LowPart);
+ DPRINT1("Waiting %lu milliseconds for port power up\n",
Timeout.LowPart);
//
// convert to 100 ns units (absolute)
@@ -1394,7 +1394,7 @@
{
if (PortStatus & EHCI_PRT_CONNECTED)
{
- DPRINT1("Device connected on port %d\n", i);
+ DPRINT1("Device connected on port %lu\n", i);
if (This->m_Capabilities.HCSParams.CHCCount)
{
@@ -1418,7 +1418,7 @@
}
else
{
- DPRINT1("Device disconnected on port %d\n", i);
+ DPRINT1("Device disconnected on port %lu\n", i);
//
// work to do
Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu…
==============================================================================
--- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Sun Mar 17 15:27:52 2013
@@ -610,7 +610,7 @@
if (Entry == &HeadQueueHead->LinkedQueueHeads)
{
- DPRINT1("Warnnig; Only %d QueueHeads in HeadQueueHead\n", Index);
+ DPRINT1("Warnnig; Only %lu QueueHeads in HeadQueueHead\n", Index);
Count = Index + 1;
break;
}
@@ -684,7 +684,7 @@
LastQueueHead->HorizontalLinkPointer = QueueHead->HorizontalLinkPointer;
LastQueueHead->NextQueueHead = QueueHead->NextQueueHead;
- DPRINT1("Periodic QueueHead %p Addr $x unlinked\n", QueueHead,
QueueHead->PhysicalAddr);
+ DPRINT1("Periodic QueueHead %p Addr %x unlinked\n", QueueHead,
QueueHead->PhysicalAddr);
// insert into completed list
InsertTailList(&m_CompletedRequestAsyncList,
&QueueHead->LinkedQueueHeads);
@@ -765,7 +765,7 @@
//
IsQueueHeadComplete = Request->IsQueueHeadComplete(QueueHead);
- DPRINT("Request %p QueueHead %p Complete %d\n", Request, QueueHead,
IsQueueHeadComplete);
+ DPRINT("Request %p QueueHead %p Complete %c\n", Request, QueueHead,
IsQueueHeadComplete);
//
// check if queue head is complete
@@ -841,7 +841,7 @@
//
IsQueueHeadComplete = Request->IsQueueHeadComplete(QueueHead);
- DPRINT("Request %p QueueHead %p Complete %d\n", Request, QueueHead,
IsQueueHeadComplete);
+ DPRINT("Request %p QueueHead %p Complete %c\n", Request, QueueHead,
IsQueueHeadComplete);
//
// check if queue head is complete