Skip to content

Commit 2386b37

Browse files
piedarpiedar
committed
Log error names for libusb calls
Signed-off-by: Benn Snyder <[email protected]>
1 parent 83e57e1 commit 2386b37

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎src/tilt.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ int get_reply(libusb_device_handle* dev, freenect_context *ctx){
6464
int res = 0;
6565
res = libusb_bulk_transfer(dev, 0x81, buffer, 512, &transferred, 100);
6666
if (res != 0) {
67-
FN_ERROR("get_reply(): libusb_bulk_transfer failed: %d (transferred = %d)\n", res, transferred);
67+
FN_ERROR("get_reply(): libusb_bulk_transfer failed: %s (transferred = %d)\n", libusb_error_name(res), transferred);
6868
} else if (transferred != 12) {
6969
FN_ERROR("get_reply(): weird - got %d bytes (expected 12)\n", transferred);
7070
} else {
@@ -214,7 +214,7 @@ int freenect_set_tilt_degs_alt(freenect_device *dev, int tilt_degrees)
214214

215215
res = libusb_bulk_transfer(dev->usb_audio.dev, 0x01, buffer, 20, &transferred, 250);
216216
if (res != 0) {
217-
FN_ERROR("freenect_set_tilt_alt(): libusb_bulk_transfer failed: %d (transferred = %d)\n", res, transferred);
217+
FN_ERROR("freenect_set_tilt_alt(): libusb_bulk_transfer failed: %s (transferred = %d)\n", libusb_error_name(res), transferred);
218218
return res;
219219
}
220220

@@ -281,7 +281,7 @@ FN_INTERNAL int fnusb_set_led_alt(libusb_device_handle * dev, freenect_context *
281281
int transferred = 0;
282282
int res = libusb_bulk_transfer(dev, 0x01, buffer, 20, &transferred, 100);
283283
if (res != 0) {
284-
FN_WARNING("fnusb_set_led_alt(): libusb_bulk_transfer failed: %d (transferred = %d)\n", res, transferred);
284+
FN_WARNING("fnusb_set_led_alt(): libusb_bulk_transfer failed: %s (transferred = %d)\n", libusb_error_name(res), transferred);
285285
return res;
286286
}
287287
return get_reply(dev, ctx);

‎src/usb_libusb10.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -214,23 +214,23 @@ FN_INTERNAL int fnusb_list_device_attributes(freenect_context *ctx, struct freen
214214
res = libusb_get_device_descriptor(audio_device, &audio_desc);
215215
if (res != 0)
216216
{
217-
FN_WARNING("Failed to get audio serial descriptors of K4W or 1473 device: %d\n", res);
217+
FN_WARNING("Failed to get audio serial descriptors of K4W or 1473 device: %s\n", libusb_error_name(res));
218218
}
219219
else
220220
{
221221
libusb_device_handle * audio_handle = NULL;
222222
res = libusb_open(audio_device, &audio_handle);
223223
if (res != 0)
224224
{
225-
FN_WARNING("Failed to open audio device for serial of K4W or 1473 device: %d\n", res);
225+
FN_WARNING("Failed to open audio device for serial of K4W or 1473 device: %s\n", libusb_error_name(res));
226226
}
227227
else
228228
{
229229
res = libusb_get_string_descriptor_ascii(audio_handle, audio_desc.iSerialNumber, serial, 256);
230230
libusb_close(audio_handle);
231231
if (res != 0)
232232
{
233-
FN_WARNING("Failed to get audio serial of K4W or 1473 device: %d\n", res);
233+
FN_WARNING("Failed to get audio serial of K4W or 1473 device: %s\n", libusb_error_name(res));
234234
}
235235
}
236236
}
@@ -348,7 +348,7 @@ FN_INTERNAL int fnusb_keep_alive_led(freenect_context* ctx, libusb_device* audio
348348

349349
res = libusb_open(audio, &audioHandle);
350350
if (res < 0) {
351-
FN_ERROR("Failed to set the LED of K4W or 1473 device: %d\n", res);
351+
FN_ERROR("Failed to set the LED of K4W or 1473 device: %s\n", libusb_error_name(res));
352352
return res;
353353
}
354354

@@ -359,14 +359,14 @@ FN_INTERNAL int fnusb_keep_alive_led(freenect_context* ctx, libusb_device* audio
359359

360360
res = libusb_open(audio, &audioHandle);
361361
if (res < 0) {
362-
FN_ERROR("Failed to set the LED of K4W or 1473 device: %d\n", res);
362+
FN_ERROR("Failed to set the LED of K4W or 1473 device: %s\n", libusb_error_name(res));
363363
return res;
364364
}
365365

366366
res = libusb_claim_interface(audioHandle, 0);
367367
if (res < 0)
368368
{
369-
FN_ERROR("Unable to claim interface %d\n", res);
369+
FN_ERROR("Unable to claim interface %s\n", libusb_error_name(res));
370370
}
371371
else
372372
{
@@ -423,7 +423,7 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
423423
res = libusb_open(camera, &dev->usb_cam.dev);
424424
if (res < 0 || !dev->usb_cam.dev)
425425
{
426-
FN_ERROR("Could not open camera: %d\n", res);
426+
FN_ERROR("Could not open camera: %s\n", libusb_error_name(res));
427427
dev->usb_cam.dev = NULL;
428428
goto failure;
429429
}
@@ -481,21 +481,21 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
481481
struct libusb_device_descriptor desc;
482482
res = libusb_get_device_descriptor(motor, &desc);
483483
if (res < 0) {
484-
FN_ERROR("Could not query device: %d\n", res);
484+
FN_ERROR("Could not query device: %s\n", libusb_error_name(res));
485485
goto failure;
486486
}
487487

488488
res = libusb_open(motor, &dev->usb_motor.dev);
489489
if (res < 0 || !dev->usb_motor.dev)
490490
{
491-
FN_ERROR("Could not open device: %d\n", res);
491+
FN_ERROR("Could not open device: %s\n", libusb_error_name(res));
492492
dev->usb_motor.dev = NULL;
493493
goto failure;
494494
}
495495

496496
res = libusb_claim_interface(dev->usb_motor.dev, 0);
497497
if (res < 0) {
498-
FN_ERROR("Could not claim interface: %d\n", res);
498+
FN_ERROR("Could not claim interface: %s\n", libusb_error_name(res));
499499
libusb_close(dev->usb_motor.dev);
500500
dev->usb_motor.dev = NULL;
501501
goto failure;
@@ -518,21 +518,21 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
518518
struct libusb_device_descriptor desc;
519519
res = libusb_get_device_descriptor(audio, &desc);
520520
if (res < 0) {
521-
FN_ERROR("Could not query device: %d\n", res);
521+
FN_ERROR("Could not query device: %s\n", libusb_error_name(res));
522522
goto failure;
523523
}
524524

525525
res = libusb_open(audio, &dev->usb_audio.dev);
526526
if (res < 0 || !dev->usb_audio.dev)
527527
{
528-
FN_ERROR("Could not open device: %d\n", res);
528+
FN_ERROR("Could not open device: %s\n", libusb_error_name(res));
529529
dev->usb_audio.dev = NULL;
530530
goto failure;
531531
}
532532

533533
res = libusb_claim_interface(dev->usb_audio.dev, 0);
534534
if (res < 0) {
535-
FN_ERROR("Could not claim interface: %d\n", res);
535+
FN_ERROR("Could not claim interface: %s\n", libusb_error_name(res));
536536
libusb_close(dev->usb_audio.dev);
537537
dev->usb_audio.dev = NULL;
538538
goto failure;
@@ -742,7 +742,7 @@ static void LIBUSB_CALL iso_callback(struct libusb_transfer *xfer)
742742
int res;
743743
res = libusb_submit_transfer(xfer);
744744
if (res != 0) {
745-
FN_ERROR("iso_callback(): failed to resubmit transfer after successful completion: %d\n", res);
745+
FN_ERROR("iso_callback(): failed to resubmit transfer after successful completion: %s\n", libusb_error_name(res));
746746
strm->dead_xfers++;
747747
if (res == LIBUSB_ERROR_NO_DEVICE) {
748748
strm->parent->device_dead = 1;
@@ -790,7 +790,7 @@ static void LIBUSB_CALL iso_callback(struct libusb_transfer *xfer)
790790
int res;
791791
res = libusb_submit_transfer(xfer);
792792
if (res != 0) {
793-
FN_ERROR("Isochronous transfer resubmission failed after unknown error: %d\n", res);
793+
FN_ERROR("Isochronous transfer resubmission failed after unknown error: %s\n", libusb_error_name(res));
794794
strm->dead_xfers++;
795795
if (res == LIBUSB_ERROR_NO_DEVICE) {
796796
strm->parent->device_dead = 1;
@@ -849,7 +849,7 @@ FN_INTERNAL int fnusb_start_iso(fnusb_dev *dev, fnusb_isoc_stream *strm, fnusb_i
849849
int ret = libusb_submit_transfer(strm->xfers[i]);
850850
if (ret < 0)
851851
{
852-
FN_WARNING("Failed to submit isochronous transfer %d: %d\n", i, ret);
852+
FN_WARNING("Failed to submit isochronous transfer %d: %s\n", i, libusb_error_name(ret));
853853
strm->dead_xfers++;
854854
}
855855
}

0 commit comments

Comments
 (0)