diff options
| author | 2013-09-19 08:08:38 +0200 | |
|---|---|---|
| committer | 2013-09-19 08:08:38 +0200 | |
| commit | 17a5fa85e2978b385448e1a16822cb31ba64e284 (patch) | |
| tree | 460f759a5a1fbaebc4bec4c073ff167112c721a6 /src/device.c | |
| parent | f631e8e055dfcdae440631902ed8a38eb5109cb8 (diff) | |
| download | usbmuxd-17a5fa85e2978b385448e1a16822cb31ba64e284.tar.gz usbmuxd-17a5fa85e2978b385448e1a16822cb31ba64e284.tar.bz2 | |
make sure usbmuxd -x does not terminate when unpaired devices are still present
Diffstat (limited to 'src/device.c')
| -rw-r--r-- | src/device.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/device.c b/src/device.c index 27e25d5..99e0153 100644 --- a/src/device.c +++ b/src/device.c | |||
| @@ -693,21 +693,21 @@ void device_set_visible(int device_id) | |||
| 693 | } ENDFOREACH | 693 | } ENDFOREACH |
| 694 | } | 694 | } |
| 695 | 695 | ||
| 696 | int device_get_count(void) | 696 | int device_get_count(int include_hidden) |
| 697 | { | 697 | { |
| 698 | int count = 0; | 698 | int count = 0; |
| 699 | FOREACH(struct mux_device *dev, &device_list) { | 699 | FOREACH(struct mux_device *dev, &device_list) { |
| 700 | if((dev->state == MUXDEV_ACTIVE) && dev->visible) | 700 | if((dev->state == MUXDEV_ACTIVE) && (include_hidden || dev->visible)) |
| 701 | count++; | 701 | count++; |
| 702 | } ENDFOREACH | 702 | } ENDFOREACH |
| 703 | return count; | 703 | return count; |
| 704 | } | 704 | } |
| 705 | 705 | ||
| 706 | int device_get_list(struct device_info *p) | 706 | int device_get_list(int include_hidden, struct device_info *p) |
| 707 | { | 707 | { |
| 708 | int count = 0; | 708 | int count = 0; |
| 709 | FOREACH(struct mux_device *dev, &device_list) { | 709 | FOREACH(struct mux_device *dev, &device_list) { |
| 710 | if((dev->state == MUXDEV_ACTIVE) && dev->visible) { | 710 | if((dev->state == MUXDEV_ACTIVE) && (include_hidden || dev->visible)) { |
| 711 | p->id = dev->id; | 711 | p->id = dev->id; |
| 712 | p->serial = usb_get_serial(dev->usbdev); | 712 | p->serial = usb_get_serial(dev->usbdev); |
| 713 | p->location = usb_get_location(dev->usbdev); | 713 | p->location = usb_get_location(dev->usbdev); |
