pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/OdyX/yoctolib_cpp/commit/0cf7342f1a96cb3bb1adcb93c411b273e358a7f3

41e157469407.css" /> "New build based on revison 27228" · OdyX/yoctolib_cpp@0cf7342 · GitHub
Skip to content

Commit 0cf7342

Browse files
yoctopuceyoctopuce
committed
"New build based on revison 27228"
1 parent bdda93a commit 0cf7342

File tree

8 files changed

+422
-353
lines changed

8 files changed

+422
-353
lines changed

‎FILES.txt‎

Lines changed: 305 additions & 305 deletions
Large diffs are not rendered by default.

‎Sources/yapi/ypkt_lin.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*********************************************************************
22
*
3-
* $Id: ypkt_lin.c 26992 2017-03-30 15:51:01Z seb $
3+
* $Id: ypkt_lin.c 27225 2017-04-21 13:34:58Z seb $
44
*
55
* OS-specific USB packet layer, Linux version
66
*
@@ -198,7 +198,7 @@ static int getUsbStringASCII(libusb_device_handle *hdl, libusb_device *dev, u8 d
198198
len = length-1;
199199
memcpy(data, c->string, len);
200200
data[len] = 0;
201-
HALLOG("return string from cache (%p:%d->%s)\n",dev,desc_index,c->string);
201+
HALENUMLOG("return string from cache (%p:%d->%s)\n",dev,desc_index,c->string);
202202
yLeaveCriticalSection(&yContext->string_cache_cs);
203203
return c->len;
204204
} else {
@@ -242,7 +242,7 @@ static int getUsbStringASCII(libusb_device_handle *hdl, libusb_device *dev, u8 d
242242
memcpy(f->string, data, len+1);
243243
f->len = len;
244244
f->expiration = yapiGetTickCount() + STRING_CACHE_EXPIRATION;
245-
HALLOG("add string to cache (%p:%d->%s)\n",dev,desc_index,f->string);
245+
HALENUMLOG("add string to cache (%p:%d->%s)\n",dev,desc_index,f->string);
246246
}
247247
yLeaveCriticalSection(&yContext->string_cache_cs);
248248

@@ -352,7 +352,7 @@ int yyyUSBGetInterfaces(yInterfaceSt **ifaces,int *nbifaceDetect,char *errmsg)
352352
nbdev = libusb_get_device_list(yContext->libusb,&list);
353353
if (nbdev < 0)
354354
return yLinSetErr("Unable to get device list", nbdev, errmsg);
355-
HALLOG("%d devices found\n",nbdev);
355+
HALENUMLOG("%d devices found\n",nbdev);
356356

357357
// allocate buffer for detected interfaces
358358
*nbifaceDetect = 0;
@@ -390,17 +390,17 @@ int yyyUSBGetInterfaces(yInterfaceSt **ifaces,int *nbifaceDetect,char *errmsg)
390390
goto exit;
391391
}
392392
if (res != 0){
393-
HALLOG("unable to access device %x:%x\n", desc.idVendor, desc.idProduct);
393+
HALENUMLOG("unable to access device %x:%x\n", desc.idVendor, desc.idProduct);
394394
continue;
395395
}
396-
HALLOG("try to get serial for %x:%x:%x (%p)\n", desc.idVendor, desc.idProduct, desc.iSerialNumber, dev);
396+
HALENUMLOG("try to get serial for %x:%x:%x (%p)\n", desc.idVendor, desc.idProduct, desc.iSerialNumber, dev);
397397
res = getUsbStringASCII(hdl, dev, desc.iSerialNumber, iface->serial, YOCTO_SERIAL_LEN);
398398
if (res < 0) {
399-
HALLOG("unable to get serial for device %x:%x\n", desc.idVendor, desc.idProduct);
399+
HALENUMLOG("unable to get serial for device %x:%x\n", desc.idVendor, desc.idProduct);
400400
}
401401
libusb_close(hdl);
402402
(*nbifaceDetect)++;
403-
HALLOG("----Running Dev %x:%x:%d:%s ---\n", iface->vendorid, iface->deviceid, iface->ifaceno, iface->serial);
403+
HALENUMLOG("----Running Dev %x:%x:%d:%s ---\n", iface->vendorid, iface->deviceid, iface->ifaceno, iface->serial);
404404
libusb_free_config_descriptor(config);
405405
}
406406

‎Sources/yapi/ypkt_osx.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*********************************************************************
22
*
3-
* $Id: ypkt_osx.c 26871 2017-03-23 10:03:37Z seb $
3+
* $Id: ypkt_osx.c 27225 2017-04-21 13:34:58Z seb $
44
*
55
* OS-specific USB packet layer, Mac OS X version
66
*
@@ -350,7 +350,7 @@ int yyyUSBGetInterfaces(yInterfaceSt **ifaces,int *nbifaceDetect,char *errmsg)
350350
iface->vendorid = vendorid;
351351
iface->deviceid = deviceid;
352352
get_txt_property(dev,iface->serial,YOCTO_SERIAL_LEN*2, CFSTR(kIOHIDSerialNumberKey));
353-
HALLOG("work on interface %d (%x:%x:%s)\n",deviceIndex,vendorid,deviceid,iface->serial);
353+
HALENUMLOG("work on interface %d (%x:%x:%s)\n",deviceIndex,vendorid,deviceid,iface->serial);
354354
(*nbifaceDetect)++;
355355
}
356356
yFree(dev_refs);

‎Sources/yapi/ypkt_win.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*********************************************************************
22
*
3-
* $Id: ypkt_win.c 27032 2017-04-03 07:28:34Z seb $
3+
* $Id: ypkt_win.c 27225 2017-04-21 13:34:58Z seb $
44
*
55
* OS-specific USB packet layer, Windows version
66
*
@@ -523,12 +523,12 @@ int yyyUSBGetInterfaces(yInterfaceSt **ifaces, int *nbifaceDetect, char *errmsg)
523523
}
524524
(*nbifaceDetect)++;
525525
if (deviceid > YOCTO_DEVID_BOOTLOADER) {
526-
HALLOG("----Running Dev %x:%x:%d:%s ---\n", vendorid, deviceid, ifaceno, iface->serial);
526+
HALENUMLOG("----Running Dev %x:%x:%d:%s ---\n", vendorid, deviceid, ifaceno, iface->serial);
527527
#ifdef LOG_DEVICE_PATH
528-
HALLOG("----DevicePath %s ---\n", iface->devicePath);
528+
HALENUMLOG("----DevicePath %s ---\n", iface->devicePath);
529529
#endif
530530
} else {
531-
HALLOG("----Running Firm %x:%x:%d:%s ---\n", vendorid, deviceid, ifaceno, iface->serial);
531+
HALENUMLOG("----Running Firm %x:%x:%d:%s ---\n", vendorid, deviceid, ifaceno, iface->serial);
532532
}
533533
} else {
534534
//HALLOG("Drop device vendorid=%x inst_state=%x\n", vendorid, inst_state);

‎Sources/yapi/yproto.h‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*********************************************************************
22
*
3-
* $Id: yproto.h 26883 2017-03-24 11:22:53Z seb $
3+
* $Id: yproto.h 27225 2017-04-21 13:34:58Z seb $
44
*
55
* Definitions and prototype common to all supported OS
66
*
@@ -249,6 +249,7 @@ int ymemfind(const u8 *haystack, u32 haystack_len, const u8 *needle, u32 needle_
249249

250250
//#define DEBUG_YAPI_REQ
251251
//#define DEBUG_HAL
252+
//#define DEBUG_HAL_ENUM
252253
//#define DEBUG_DEV_ENUM
253254
//#define DEBUG_DEV_ENUM_VERBOSE
254255
//#define DEBUG_NET_ENUM
@@ -295,6 +296,21 @@ __forceinline void __HALLOG(fmt,...){}
295296
#endif
296297
#endif
297298

299+
#ifdef DEBUG_HAL_ENUM
300+
#define HALENUMLOG dbglog
301+
#else
302+
#if defined(_MSC_VER)
303+
#if (_MSC_VER > MSC_VS2003)
304+
#define HALENUMLOG(fmt,...)
305+
#else
306+
__forceinline void HALENUMLOG(fmt,...){}
307+
#define HALENUMLOG __HALLOG
308+
#endif
309+
#else
310+
#define HALENUMLOG(fmt,args...)
311+
#endif
312+
#endif
313+
298314
#ifdef DEBUG_TCP
299315
#define TCPLOG dbglog
300316
#else

‎Sources/yapi/yversion.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef YOCTO_API_BUILD_NO
2-
#define YOCTO_API_BUILD_NO "27216"
2+
#define YOCTO_API_BUILD_NO "27228"
33
#endif
4-
#define YBUILD_27216
4+
#define YBUILD_27228
55

66
#ifndef YOCTO_API_BUILD_DATE
77
#ifndef RC_INVOKED

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.




Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy