X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=windows.c;h=4bbce822940ddded91546be3eb811c2d69650be2;hb=da8730199a215c9ccd938202fb55ac9e3f58a0b2;hp=730870a4c1671200e0dbb4b88062b57375eb34ca;hpb=8eb18f7b5a459cde640f307ce46248851fdaec42;p=libserialport.git

diff --git a/windows.c b/windows.c
index 730870a..4bbce82 100644
--- a/windows.c
+++ b/windows.c
@@ -24,51 +24,6 @@
 /* USB path is a string of at most 8 decimal numbers < 128 separated by dots */
 #define MAX_USB_PATH  (8*3 + 7*1 + 1)
 
-/* The stuff below is not yet available in MinGW apparently. Define it here. */
-
-#ifndef USB_NODE_CONNECTION_INFORMATION_EX
-typedef struct _USB_NODE_CONNECTION_INFORMATION_EX {
-	ULONG ConnectionIndex;
-	USB_DEVICE_DESCRIPTOR DeviceDescriptor;
-	UCHAR CurrentConfigurationValue;
-	UCHAR Speed;
-	BOOLEAN DeviceIsHub;
-	USHORT DeviceAddress;
-	ULONG NumberOfOpenPipes;
-	USB_CONNECTION_STATUS ConnectionStatus;
-	USB_PIPE_INFO PipeList[];
-} USB_NODE_CONNECTION_INFORMATION_EX, *PUSB_NODE_CONNECTION_INFORMATION_EX;
-#endif
-
-#ifndef USB_GET_NODE_CONNECTION_INFORMATION_EX
-#define USB_GET_NODE_CONNECTION_INFORMATION_EX 274
-#endif
-
-#ifndef IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX
-#define IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX \
-	CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_INFORMATION_EX, \
-	METHOD_BUFFERED, FILE_ANY_ACCESS)
-#endif
-
-#ifndef CM_DRP_COMPATIBLEIDS
-#define CM_DRP_COMPATIBLEIDS 0x03
-#endif
-#ifndef CM_DRP_CLASS
-#define CM_DRP_CLASS 0x08
-#endif
-#ifndef CM_DRP_FRIENDLYNAME
-#define CM_DRP_FRIENDLYNAME 0x0d
-#endif
-#ifndef CM_DRP_ADDRESS
-#define CM_DRP_ADDRESS 0x1d
-#endif
-
-#ifndef CM_Get_DevNode_Registry_PropertyA
-CMAPI CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyA(DEVINST dnDevInst, \
-	ULONG ulProperty, PULONG pulRegDataType, PVOID Buffer, \
-	PULONG pulLength, ULONG ulFlags);
-#endif
-
 static void enumerate_hub(struct sp_port *port, char *hub_name,
                           char *parent_path);
 
@@ -556,7 +511,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 		strcpy(name, data);
 #endif
 		if (type == REG_SZ) {
-			DEBUG("Found port %s", name);
+			DEBUG_FMT("Found port %s", name);
 			if (!(*list = list_append(*list, name))) {
 				SET_ERROR(ret, SP_ERR_MEM, "list append failed");
 				goto out;