PERFORCE change 173801 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Wed Jan 27 20:21:05 UTC 2010
http://p4web.freebsd.org/chv.cgi?CH=173801
Change 173801 by hselasky at hselasky_laptop001 on 2010/01/27 20:20:14
LibUSB:
- add new USB API functions to check
if an opened USB device is still connected.
- fix four compile warnings
- patch by: HPS
Affected files ...
.. //depot/projects/usb/src/lib/libusb/libusb.3#20 edit
.. //depot/projects/usb/src/lib/libusb/libusb.h#12 edit
.. //depot/projects/usb/src/lib/libusb/libusb10.c#21 edit
.. //depot/projects/usb/src/lib/libusb/libusb10_io.c#12 edit
.. //depot/projects/usb/src/lib/libusb/libusb20.3#7 edit
.. //depot/projects/usb/src/lib/libusb/libusb20.c#15 edit
.. //depot/projects/usb/src/lib/libusb/libusb20.h#10 edit
.. //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#8 edit
.. //depot/projects/usb/src/lib/libusb/libusb20_int.h#9 edit
.. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#12 edit
.. //depot/projects/usb/src/lib/libusb/usb.h#4 edit
Differences ...
==== //depot/projects/usb/src/lib/libusb/libusb.3#20 (text+ko) ====
@@ -231,6 +231,14 @@
.Pp
.
.Ft int
+.Fn libusb_check_connected "libusb_device_handle *devh"
+Test if USB device is still connected. Returns 0 on success,
+LIBUSB_ERROR_NO_DEVICE if has been disconnected and a LIBUSB_ERROR
+code on failure.
+.
+.Pp
+.
+.Ft int
.Fn libusb_kernel_driver_active "libusb_device_handle *devh" "int interface"
Determine if a driver is active on a interface. Returns 0 if no kernel driver
is active, returns 1 if a kernel driver is active, returns LIBUSB_ERROR_NO_DEVICE
@@ -488,6 +496,7 @@
.Fn usb_find_devices
.Fn usb_device
.Fn usb_get_busses
+.Fn usb_check_connected
.
.Sh SEE ALSO
.Xr libusb20 3 ,
==== //depot/projects/usb/src/lib/libusb/libusb.h#12 (text+ko) ====
@@ -323,6 +323,7 @@
int libusb_claim_interface(libusb_device_handle * devh, int interface_number);
int libusb_release_interface(libusb_device_handle * devh, int interface_number);
int libusb_reset_device(libusb_device_handle * devh);
+int libusb_check_connected(libusb_device_handle * devh);
int libusb_kernel_driver_active(libusb_device_handle * devh, int interface);
int libusb_detach_kernel_driver(libusb_device_handle * devh, int interface);
int libusb_attach_kernel_driver(libusb_device_handle * devh, int interface);
==== //depot/projects/usb/src/lib/libusb/libusb10.c#21 (text+ko) ====
@@ -351,7 +351,7 @@
/* make sure our event loop detects the new device */
dummy = 0;
err = write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy));
- if (err < sizeof(dummy)) {
+ if (err < (int)sizeof(dummy)) {
/* ignore error, if any */
DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open write failed!");
}
@@ -426,7 +426,7 @@
/* make sure our event loop detects the closed device */
dummy = 0;
err = write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy));
- if (err < sizeof(dummy)) {
+ if (err < (int)sizeof(dummy)) {
/* ignore error, if any */
DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_close write failed!");
}
@@ -658,6 +658,21 @@
}
int
+libusb_check_connected(struct libusb20_device *pdev)
+{
+ libusb_device *dev;
+ int err;
+
+ dev = libusb_get_device(pdev);
+ if (dev == NULL)
+ return (LIBUSB20_ERROR_INVALID_PARAM);
+
+ err = libusb20_dev_check_connected(pdev);
+
+ return (err ? LIBUSB_ERROR_NO_DEVICE : 0);
+}
+
+int
libusb_kernel_driver_active(struct libusb20_device *pdev, int interface)
{
if (pdev == NULL)
==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#12 (text+ko) ====
@@ -139,7 +139,7 @@
err = LIBUSB_ERROR_IO;
if (err < 1) {
- for (i = 0; i != nfds; i++) {
+ for (i = 0; i != (int)nfds; i++) {
if (ppdev[i] != NULL) {
CTX_UNLOCK(ctx);
libusb_unref_device(libusb_get_device(ppdev[i]));
@@ -148,7 +148,7 @@
}
goto do_done;
}
- for (i = 0; i != nfds; i++) {
+ for (i = 0; i != (int)nfds; i++) {
if (ppdev[i] != NULL) {
dev = libusb_get_device(ppdev[i]);
==== //depot/projects/usb/src/lib/libusb/libusb20.3#7 (text+ko) ====
@@ -143,6 +143,8 @@
.Ft int
.Fn libusb20_dev_reset "struct libusb20_device *pdev"
.Ft int
+.Fn libusb20_dev_check_connected "struct libusb20_device *pdev"
+.Ft int
.Fn libusb20_dev_set_power_mode "struct libusb20_device *pdev" "uint8_t power_mode"
.Ft uint8_t
.Fn libusb20_dev_get_power_mode "struct libusb20_device *pdev"
@@ -677,6 +679,15 @@
This function returns zero on success else a LIBUSB20_ERROR value is
returned.
.
+.
+.Pp
+.
+.Fn libusb20_dev_check_connected
+will check if an opened USB device is still connected.
+.
+This function returns zero if the device is still connected else a LIBUSB20_ERROR value is returned.
+.
+.
.Pp
.
.Fn libusb20_dev_set_power_mode
==== //depot/projects/usb/src/lib/libusb/libusb20.c#15 (text+ko) ====
@@ -67,6 +67,7 @@
#define dummy_set_config_index (void *)dummy_int
#define dummy_set_alt_index (void *)dummy_int
#define dummy_reset_device (void *)dummy_int
+#define dummy_check_connected (void *)dummy_int
#define dummy_set_power_mode (void *)dummy_int
#define dummy_get_power_mode (void *)dummy_int
#define dummy_kernel_driver_active (void *)dummy_int
@@ -673,6 +674,15 @@
}
int
+libusb20_dev_check_connected(struct libusb20_device *pdev)
+{
+ int error;
+
+ error = pdev->methods->check_connected(pdev);
+ return (error);
+}
+
+int
libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode)
{
int error;
==== //depot/projects/usb/src/lib/libusb/libusb20.h#10 (text+ko) ====
@@ -250,6 +250,7 @@
int libusb20_dev_req_string_sync(struct libusb20_device *pdev, uint8_t index, uint16_t langid, void *ptr, uint16_t len);
int libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev, uint8_t index, void *ptr, uint16_t len);
int libusb20_dev_reset(struct libusb20_device *pdev);
+int libusb20_dev_check_connected(struct libusb20_device *pdev);
int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode);
uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev);
int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index);
==== //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#8 (text+ko) ====
@@ -795,6 +795,19 @@
return (usb_close(dev));
}
+int
+usb_check_connected(usb_dev_handle * dev)
+{
+ int err;
+
+ err = libusb20_dev_check_connected((void *)dev);
+
+ if (err)
+ return (-1);
+
+ return (0);
+}
+
const char *
usb_strerror(void)
{
==== //depot/projects/usb/src/lib/libusb/libusb20_int.h#9 (text+ko) ====
@@ -101,6 +101,7 @@
typedef int (libusb20_get_power_mode_t)(struct libusb20_device *pdev, uint8_t *power_mode);
typedef int (libusb20_set_alt_index_t)(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index);
typedef int (libusb20_set_config_index_t)(struct libusb20_device *pdev, uint8_t index);
+typedef int (libusb20_check_connected_t)(struct libusb20_device *pdev);
/* USB transfer specific */
typedef int (libusb20_tr_open_t)(struct libusb20_transfer *xfer, uint32_t MaxBufSize, uint32_t MaxFrameCount, uint8_t ep_no);
@@ -117,6 +118,7 @@
m(n, kernel_driver_active) \
m(n, process) \
m(n, reset_device) \
+ m(n, check_connected) \
m(n, set_power_mode) \
m(n, get_power_mode) \
m(n, set_alt_index) \
==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#12 (text+ko) ====
@@ -67,6 +67,7 @@
static libusb20_set_config_index_t ugen20_set_config_index;
static libusb20_set_alt_index_t ugen20_set_alt_index;
static libusb20_reset_device_t ugen20_reset_device;
+static libusb20_check_connected_t ugen20_check_connected;
static libusb20_set_power_mode_t ugen20_set_power_mode;
static libusb20_get_power_mode_t ugen20_get_power_mode;
static libusb20_kernel_driver_active_t ugen20_kernel_driver_active;
@@ -553,6 +554,25 @@
}
static int
+ugen20_check_connected(struct libusb20_device *pdev)
+{
+ uint32_t plugtime;
+ int error = 0;
+
+ if (ioctl(pdev->file_ctrl, USB_GET_PLUGTIME, &plugtime)) {
+ error = LIBUSB20_ERROR_NO_DEVICE;
+ goto done;
+ }
+
+ if (pdev->session_data.plugtime != plugtime) {
+ error = LIBUSB20_ERROR_NO_DEVICE;
+ goto done;
+ }
+done:
+ return (error);
+}
+
+static int
ugen20_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode)
{
int temp;
==== //depot/projects/usb/src/lib/libusb/usb.h#4 (text+ko) ====
@@ -291,6 +291,7 @@
int usb_resetep(usb_dev_handle * dev, unsigned int ep);
int usb_clear_halt(usb_dev_handle * dev, unsigned int ep);
int usb_reset(usb_dev_handle * dev);
+int usb_check_connected(usb_dev_handle * dev);
const char *usb_strerror(void);
void usb_init(void);
void usb_set_debug(int level);
More information about the p4-projects
mailing list