summaryrefslogtreecommitdiff
path: root/UsbDkController
diff options
context:
space:
mode:
authorDmitry Fleytman <dfleytma@redhat.com>2014-04-18 17:33:29 +0300
committerDmitry Fleytman <dfleytma@redhat.com>2014-05-11 19:26:13 +0300
commiteefbd06435abbdc5ddf4fae88433ef1ec6aa15b0 (patch)
tree3f56d6470531a9edbb158eb18e88a2302669acde /UsbDkController
parentc174d4011b9608ab52b683d9500fabbc481e873e (diff)
UsbDk: Supply USB device descriptors on enumeration
Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>
Diffstat (limited to 'UsbDkController')
-rw-r--r--UsbDkController/UsbDkController.cpp13
-rw-r--r--UsbDkController/stdafx.h1
2 files changed, 10 insertions, 4 deletions
diff --git a/UsbDkController/UsbDkController.cpp b/UsbDkController/UsbDkController.cpp
index 672c960..0383b1a 100644
--- a/UsbDkController/UsbDkController.cpp
+++ b/UsbDkController/UsbDkController.cpp
@@ -68,11 +68,16 @@ void Controller_EnumerateDevices()
for (ULONG deviceIndex = 0; deviceIndex < numberDevices; ++deviceIndex)
{
+ auto &Dev = devicesArray[deviceIndex];
+
tcout << to_tstring(deviceIndex) << TEXT(". ")
- << TEXT("FilterID: ") << devicesArray[deviceIndex].FilterID << TEXT(", ")
- << TEXT("Port: ") << devicesArray[deviceIndex].Port << TEXT(", ")
- << devicesArray[deviceIndex].ID.DeviceID << TEXT(" ")
- << devicesArray[deviceIndex].ID.InstanceID
+ << TEXT("FilterID: ") << Dev.FilterID << TEXT(", ")
+ << TEXT("Port: ") << Dev.Port << TEXT(", ")
+ << TEXT("ID: ")
+ << hex << setw(4) << setfill(L'0') << static_cast<int>(Dev.DeviceDescriptor.idVendor) << TEXT(":")
+ << hex << setw(4) << setfill(L'0') << static_cast<int>(Dev.DeviceDescriptor.idProduct) << TEXT(", ")
+ << Dev.ID.DeviceID << TEXT(" ")
+ << Dev.ID.InstanceID
<< endl;
}
diff --git a/UsbDkController/stdafx.h b/UsbDkController/stdafx.h
index fefb022..9106974 100644
--- a/UsbDkController/stdafx.h
+++ b/UsbDkController/stdafx.h
@@ -13,5 +13,6 @@
#include "windows.h"
#include <tstrings.h>
#include <cfgmgr32.h>
+#include <usbspec.h>
// TODO: reference additional headers your program requires here