Skip to content

Commit 1e03018

Browse files
piedarpiedar
committed
rename fnusb_dev.dev to fnusb_dev.dev_handle
Signed-off-by: Benn Snyder <benn.snyder@gmail.com>
1 parent 6d7a8d6 commit 1e03018

File tree

4 files changed

+67
-67
lines changed

4 files changed

+67
-67
lines changed

‎src/core.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ FREENECTAPI int freenect_open_device(freenect_context *ctx, freenect_device **de
169169
*dev = pdev;
170170

171171
// Do device-specific initialization
172-
if (pdev->usb_cam.dev) {
172+
if (pdev->usb_cam.dev_handle) {
173173
if (freenect_camera_init(pdev) < 0) {
174174
return -1;
175175
}
@@ -207,7 +207,7 @@ FREENECTAPI int freenect_close_device(freenect_device *dev)
207207
freenect_context *ctx = dev->parent;
208208
int res;
209209

210-
if (dev->usb_cam.dev) {
210+
if (dev->usb_cam.dev_handle) {
211211
freenect_camera_teardown(dev);
212212
}
213213

‎src/tilt.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ int update_tilt_state_alt(freenect_device *dev)
101101
{
102102
freenect_context *ctx = dev->parent;
103103

104-
if (dev->usb_audio.dev == NULL)
104+
if (dev->usb_audio.dev_handle == NULL)
105105
{
106106
FN_WARNING("Motor control failed: audio device missing");
107107
return -1;
@@ -118,13 +118,13 @@ int update_tilt_state_alt(freenect_device *dev)
118118
unsigned char buffer[256];
119119
memcpy(buffer, &cmd, 16);
120120

121-
res = libusb_bulk_transfer(dev->usb_audio.dev, 0x01, buffer, 16, &transferred, 250);
121+
res = libusb_bulk_transfer(dev->usb_audio.dev_handle, 0x01, buffer, 16, &transferred, 250);
122122
if (res != 0)
123123
{
124124
return res;
125125
}
126126

127-
res = libusb_bulk_transfer(dev->usb_audio.dev, 0x81, buffer, 256, &transferred, 250); // 104 bytes
127+
res = libusb_bulk_transfer(dev->usb_audio.dev_handle, 0x81, buffer, 256, &transferred, 250); // 104 bytes
128128
if (res != 0)
129129
{
130130
return res;
@@ -149,7 +149,7 @@ int update_tilt_state_alt(freenect_device *dev)
149149

150150
// Reply: skip four uint32_t, then you have three int32_t that give you acceleration in that direction, it seems.
151151
// Units still to be worked out.
152-
return get_reply(dev->usb_audio.dev, ctx);
152+
return get_reply(dev->usb_audio.dev_handle, ctx);
153153
}
154154

155155
int freenect_update_tilt_state(freenect_device *dev)
@@ -195,7 +195,7 @@ int freenect_set_tilt_degs_alt(freenect_device *dev, int tilt_degrees)
195195
return -1;
196196
}
197197

198-
if (dev->usb_audio.dev == NULL)
198+
if (dev->usb_audio.dev_handle == NULL)
199199
{
200200
FN_WARNING("Motor control failed: audio device missing");
201201
return -1;
@@ -212,13 +212,13 @@ int freenect_set_tilt_degs_alt(freenect_device *dev, int tilt_degrees)
212212
unsigned char buffer[20];
213213
memcpy(buffer, &cmd, 20);
214214

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

221-
return get_reply(dev->usb_audio.dev, ctx);
221+
return get_reply(dev->usb_audio.dev_handle, ctx);
222222
}
223223

224224
int freenect_set_tilt_degs(freenect_device *dev, double angle)
@@ -291,13 +291,13 @@ int freenect_set_led_alt(freenect_device *dev, freenect_led_options state)
291291
{
292292
freenect_context *ctx = dev->parent;
293293

294-
if (dev->usb_audio.dev == NULL)
294+
if (dev->usb_audio.dev_handle == NULL)
295295
{
296296
FN_WARNING("Motor control failed: audio device missing");
297297
return -1;
298298
}
299299

300-
return fnusb_set_led_alt(dev->usb_audio.dev, ctx, state);
300+
return fnusb_set_led_alt(dev->usb_audio.dev_handle, ctx, state);
301301
}
302302

303303
int freenect_set_led(freenect_device *dev, freenect_led_options option)

‎src/usb_libusb10.c‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -316,37 +316,37 @@ FN_INTERNAL int fnusb_claim_camera(freenect_device* dev)
316316

317317
#ifndef _WIN32 // todo: necessary?
318318
// Detach an existing kernel driver for the device
319-
ret = libusb_kernel_driver_active(dev->usb_cam.dev, 0);
319+
ret = libusb_kernel_driver_active(dev->usb_cam.dev_handle, 0);
320320
if (ret == 1)
321321
{
322-
ret = libusb_detach_kernel_driver(dev->usb_cam.dev, 0);
322+
ret = libusb_detach_kernel_driver(dev->usb_cam.dev_handle, 0);
323323
if (ret < 0)
324324
{
325325
FN_ERROR("Failed to detach camera kernel driver: %s\n", libusb_error_name(ret));
326-
libusb_close(dev->usb_cam.dev);
327-
dev->usb_cam.dev = NULL;
326+
libusb_close(dev->usb_cam.dev_handle);
327+
dev->usb_cam.dev_handle = NULL;
328328
return ret;
329329
}
330330
}
331331
#endif
332332

333-
ret = libusb_claim_interface(dev->usb_cam.dev, 0);
333+
ret = libusb_claim_interface(dev->usb_cam.dev_handle, 0);
334334
if (ret < 0)
335335
{
336336
FN_ERROR("Failed to claim camera interface: %s\n", libusb_error_name(ret));
337-
libusb_close(dev->usb_cam.dev);
338-
dev->usb_cam.dev = NULL;
337+
libusb_close(dev->usb_cam.dev_handle);
338+
dev->usb_cam.dev_handle = NULL;
339339
return ret;
340340
}
341341

342342
if (dev->usb_cam.PID == PID_K4W_CAMERA)
343343
{
344-
ret = libusb_set_interface_alt_setting(dev->usb_cam.dev, 0, 1);
344+
ret = libusb_set_interface_alt_setting(dev->usb_cam.dev_handle, 0, 1);
345345
if (ret != 0)
346346
{
347347
FN_ERROR("Failed to set alternate interface #1 for K4W: %s\n", libusb_error_name(ret));
348-
libusb_close(dev->usb_cam.dev);
349-
dev->usb_cam.dev = NULL;
348+
libusb_close(dev->usb_cam.dev_handle);
349+
dev->usb_cam.dev_handle = NULL;
350350
return ret;
351351
}
352352
}
@@ -401,11 +401,11 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
401401
dev->motor_control_with_audio_enabled = 0;
402402

403403
dev->usb_cam.parent = dev;
404-
dev->usb_cam.dev = NULL;
404+
dev->usb_cam.dev_handle = NULL;
405405
dev->usb_motor.parent = dev;
406-
dev->usb_motor.dev = NULL;
406+
dev->usb_motor.dev_handle = NULL;
407407
dev->usb_audio.parent = dev;
408-
dev->usb_audio.dev = NULL;
408+
dev->usb_audio.dev_handle = NULL;
409409

410410
libusb_device **devs; // pointer to pointer of device, used to retrieve a list of devices
411411
ssize_t count = libusb_get_device_list (dev->parent->usb.ctx, &devs); //get the list of devices
@@ -435,11 +435,11 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
435435
camera = devs[i]; // found the requested camera
436436
if (ctx->enabled_subdevices & FREENECT_DEVICE_CAMERA)
437437
{
438-
res = libusb_open(camera, &dev->usb_cam.dev);
439-
if (res < 0 || !dev->usb_cam.dev)
438+
res = libusb_open(camera, &dev->usb_cam.dev_handle);
439+
if (res < 0 || !dev->usb_cam.dev_handle)
440440
{
441441
FN_ERROR("Could not open camera: %s\n", libusb_error_name(res));
442-
dev->usb_cam.dev = NULL;
442+
dev->usb_cam.dev_handle = NULL;
443443
goto failure;
444444
}
445445

@@ -500,19 +500,19 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
500500
goto failure;
501501
}
502502

503-
res = libusb_open(motor, &dev->usb_motor.dev);
504-
if (res < 0 || !dev->usb_motor.dev)
503+
res = libusb_open(motor, &dev->usb_motor.dev_handle);
504+
if (res < 0 || !dev->usb_motor.dev_handle)
505505
{
506506
FN_ERROR("Could not open device: %s\n", libusb_error_name(res));
507-
dev->usb_motor.dev = NULL;
507+
dev->usb_motor.dev_handle = NULL;
508508
goto failure;
509509
}
510510

511-
res = libusb_claim_interface(dev->usb_motor.dev, 0);
511+
res = libusb_claim_interface(dev->usb_motor.dev_handle, 0);
512512
if (res < 0) {
513513
FN_ERROR("Could not claim interface: %s\n", libusb_error_name(res));
514-
libusb_close(dev->usb_motor.dev);
515-
dev->usb_motor.dev = NULL;
514+
libusb_close(dev->usb_motor.dev_handle);
515+
dev->usb_motor.dev_handle = NULL;
516516
goto failure;
517517
}
518518

@@ -537,19 +537,19 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
537537
goto failure;
538538
}
539539

540-
res = libusb_open(audio, &dev->usb_audio.dev);
541-
if (res < 0 || !dev->usb_audio.dev)
540+
res = libusb_open(audio, &dev->usb_audio.dev_handle);
541+
if (res < 0 || !dev->usb_audio.dev_handle)
542542
{
543543
FN_ERROR("Could not open device: %s\n", libusb_error_name(res));
544-
dev->usb_audio.dev = NULL;
544+
dev->usb_audio.dev_handle = NULL;
545545
goto failure;
546546
}
547547

548-
res = libusb_claim_interface(dev->usb_audio.dev, 0);
548+
res = libusb_claim_interface(dev->usb_audio.dev_handle, 0);
549549
if (res < 0) {
550550
FN_ERROR("Could not claim interface: %s\n", libusb_error_name(res));
551-
libusb_close(dev->usb_audio.dev);
552-
dev->usb_audio.dev = NULL;
551+
libusb_close(dev->usb_audio.dev_handle);
552+
dev->usb_audio.dev_handle = NULL;
553553
goto failure;
554554
}
555555

@@ -574,7 +574,7 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
574574
{
575575
// Read the serial number from the string descriptor and save it.
576576
unsigned char string_desc[256]; // String descriptors are at most 256 bytes
577-
res = libusb_get_string_descriptor_ascii(dev->usb_audio.dev, desc.iSerialNumber, string_desc, 256);
577+
res = libusb_get_string_descriptor_ascii(dev->usb_audio.dev_handle, desc.iSerialNumber, string_desc, 256);
578578
if (res < 0) {
579579
FN_ERROR("Failed to retrieve serial number for audio device in bootloader state\n");
580580
goto failure;
@@ -605,8 +605,8 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
605605
goto failure;
606606
}
607607

608-
libusb_close(dev->usb_audio.dev);
609-
dev->usb_audio.dev = NULL;
608+
libusb_close(dev->usb_audio.dev_handle);
609+
dev->usb_audio.dev_handle = NULL;
610610

611611
// Wait for the device to reappear.
612612
int loops = 0;
@@ -654,7 +654,7 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
654654
continue;
655655
}
656656
// Save the device handle.
657-
dev->usb_audio.dev = new_dev_handle;
657+
dev->usb_audio.dev_handle = new_dev_handle;
658658

659659
// Verify that we've actually found a device running the right firmware.
660660
num_interfaces = fnusb_num_interfaces(&dev->usb_audio);
@@ -669,7 +669,7 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
669669
else
670670
{
671671
FN_SPEW("Opened audio with matching serial but too few interfaces.\n");
672-
dev->usb_audio.dev = NULL;
672+
dev->usb_audio.dev_handle = NULL;
673673
libusb_close(new_dev_handle);
674674
continue;
675675
}
@@ -685,7 +685,7 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
685685

686686
libusb_free_device_list(new_dev_list, 1);
687687
// If we found the right device, break out of this loop.
688-
if (dev->usb_audio.dev)
688+
if (dev->usb_audio.dev_handle)
689689
break;
690690
// Sleep for a second to give the device more time to reenumerate.
691691
sleep(1);
@@ -695,9 +695,9 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
695695
}
696696
}
697697

698-
if ((dev->usb_cam.dev || !(ctx->enabled_subdevices & FREENECT_DEVICE_CAMERA))
699-
&& (dev->usb_motor.dev || !(ctx->enabled_subdevices & FREENECT_DEVICE_MOTOR))
700-
&& (dev->usb_audio.dev || !(ctx->enabled_subdevices & FREENECT_DEVICE_AUDIO)))
698+
if ((dev->usb_cam.dev_handle || !(ctx->enabled_subdevices & FREENECT_DEVICE_CAMERA))
699+
&& (dev->usb_motor.dev_handle || !(ctx->enabled_subdevices & FREENECT_DEVICE_MOTOR))
700+
&& (dev->usb_audio.dev_handle || !(ctx->enabled_subdevices & FREENECT_DEVICE_AUDIO)))
701701
{
702702
// Each requested subdevice is open.
703703
goto finally;
@@ -713,23 +713,23 @@ FN_INTERNAL int fnusb_open_subdevices(freenect_device *dev, int index)
713713

714714
FN_INTERNAL int fnusb_close_subdevices(freenect_device *dev)
715715
{
716-
if (dev->usb_cam.dev) {
717-
libusb_release_interface(dev->usb_cam.dev, 0);
716+
if (dev->usb_cam.dev_handle) {
717+
libusb_release_interface(dev->usb_cam.dev_handle, 0);
718718
#ifndef _WIN32
719-
libusb_attach_kernel_driver(dev->usb_cam.dev, 0);
719+
libusb_attach_kernel_driver(dev->usb_cam.dev_handle, 0);
720720
#endif
721-
libusb_close(dev->usb_cam.dev);
722-
dev->usb_cam.dev = NULL;
721+
libusb_close(dev->usb_cam.dev_handle);
722+
dev->usb_cam.dev_handle = NULL;
723723
}
724-
if (dev->usb_motor.dev) {
725-
libusb_release_interface(dev->usb_motor.dev, 0);
726-
libusb_close(dev->usb_motor.dev);
727-
dev->usb_motor.dev = NULL;
724+
if (dev->usb_motor.dev_handle) {
725+
libusb_release_interface(dev->usb_motor.dev_handle, 0);
726+
libusb_close(dev->usb_motor.dev_handle);
727+
dev->usb_motor.dev_handle = NULL;
728728
}
729-
if (dev->usb_audio.dev) {
730-
libusb_release_interface(dev->usb_audio.dev, 0);
731-
libusb_close(dev->usb_audio.dev);
732-
dev->usb_audio.dev = NULL;
729+
if (dev->usb_audio.dev_handle) {
730+
libusb_release_interface(dev->usb_audio.dev_handle, 0);
731+
libusb_close(dev->usb_audio.dev_handle);
732+
dev->usb_audio.dev_handle = NULL;
733733
}
734734
return 0;
735735
}
@@ -820,7 +820,7 @@ FN_INTERNAL int fnusb_get_max_iso_packet_size(fnusb_dev *dev, unsigned char endp
820820
{
821821
freenect_context *ctx = dev->parent->parent;
822822

823-
int size = libusb_get_max_iso_packet_size(libusb_get_device(dev->dev), endpoint);
823+
int size = libusb_get_max_iso_packet_size(libusb_get_device(dev->dev_handle), endpoint);
824824
if (size <= 0)
825825
{
826826
FN_WARNING("libusb_get_max_iso_packet_size() returned %d; using default %d\n", size, default_size);
@@ -858,7 +858,7 @@ FN_INTERNAL int fnusb_start_iso(fnusb_dev *dev, fnusb_isoc_stream *strm, fnusb_i
858858
}
859859
else
860860
{
861-
libusb_fill_iso_transfer(strm->xfers[i], dev->dev, endpoint, bufp, pkts * len, pkts, iso_callback, strm, 0);
861+
libusb_fill_iso_transfer(strm->xfers[i], dev->dev_handle, endpoint, bufp, pkts * len, pkts, iso_callback, strm, 0);
862862
libusb_set_iso_packet_lengths(strm->xfers[i], len);
863863

864864
int ret = libusb_submit_transfer(strm->xfers[i]);
@@ -907,18 +907,18 @@ FN_INTERNAL int fnusb_stop_iso(fnusb_dev *dev, fnusb_isoc_stream *strm)
907907

908908
FN_INTERNAL int fnusb_control(fnusb_dev *dev, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint8_t *data, uint16_t wLength)
909909
{
910-
return libusb_control_transfer(dev->dev, bmRequestType, bRequest, wValue, wIndex, data, wLength, 0);
910+
return libusb_control_transfer(dev->dev_handle, bmRequestType, bRequest, wValue, wIndex, data, wLength, 0);
911911
}
912912

913913
FN_INTERNAL int fnusb_bulk(fnusb_dev *dev, uint8_t endpoint, uint8_t *data, int len, int *transferred) {
914914
*transferred = 0;
915-
return libusb_bulk_transfer(dev->dev, endpoint, data, len, transferred, 0);
915+
return libusb_bulk_transfer(dev->dev_handle, endpoint, data, len, transferred, 0);
916916
}
917917

918918
FN_INTERNAL int fnusb_num_interfaces(fnusb_dev *dev) {
919919
int retval = 0;
920920
int res;
921-
libusb_device* d = libusb_get_device(dev->dev);
921+
libusb_device* d = libusb_get_device(dev->dev_handle);
922922
struct libusb_config_descriptor* config;
923923
res = libusb_get_active_config_descriptor(d, &config);
924924
if (res < 0) // Something went wrong

‎src/usb_libusb10.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ typedef struct {
5656

5757
typedef struct {
5858
freenect_device *parent; //so we can go up from the libusb userdata
59-
libusb_device_handle *dev;
59+
libusb_device_handle *dev_handle;
6060
int device_dead; // set to 1 when the underlying libusb_device_handle vanishes (ie, Kinect was unplugged)
6161
int VID;
6262
int PID;

0 commit comments

Comments
 (0)