summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/libopenusb1-glue.c6
-rw-r--r--src/libusb-glue.c6
-rw-r--r--src/libusb1-glue.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/src/libopenusb1-glue.c b/src/libopenusb1-glue.c
index 64f641c..55a4961 100644
--- a/src/libopenusb1-glue.c
+++ b/src/libopenusb1-glue.c
@@ -1336,7 +1336,7 @@ ptp_usb_getdata(PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler) {
break;
}
}
- if (usbdata.length == 0xffffffffU) {
+ if (rlen == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ) {
/* Copy first part of data to 'data' */
putfunc_ret =
handler->putfunc(
@@ -1352,7 +1352,7 @@ ptp_usb_getdata(PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler) {
uint16_t xret;
xret = ptp_read_func(
- PTP_USB_BULK_HS_MAX_PACKET_LEN_READ,
+ 0x20000000,
handler,
params->data,
&readdata,
@@ -1360,7 +1360,7 @@ ptp_usb_getdata(PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler) {
);
if (xret != PTP_RC_OK)
return xret;
- if (readdata < PTP_USB_BULK_HS_MAX_PACKET_LEN_READ)
+ if (readdata < 0x20000000)
break;
}
return PTP_RC_OK;
diff --git a/src/libusb-glue.c b/src/libusb-glue.c
index 580cdb8..f9d3a26 100644
--- a/src/libusb-glue.c
+++ b/src/libusb-glue.c
@@ -1323,7 +1323,7 @@ ptp_usb_getdata (PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler)
break;
}
}
- if (usbdata.length == 0xffffffffU) {
+ if (rlen == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ) {
/* Copy first part of data to 'data' */
putfunc_ret =
handler->putfunc(
@@ -1339,7 +1339,7 @@ ptp_usb_getdata (PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler)
uint16_t xret;
xret = ptp_read_func(
- PTP_USB_BULK_HS_MAX_PACKET_LEN_READ,
+ 0x20000000,
handler,
params->data,
&readdata,
@@ -1347,7 +1347,7 @@ ptp_usb_getdata (PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler)
);
if (xret != PTP_RC_OK)
return xret;
- if (readdata < PTP_USB_BULK_HS_MAX_PACKET_LEN_READ)
+ if (readdata < 0x20000000)
break;
}
return PTP_RC_OK;
diff --git a/src/libusb1-glue.c b/src/libusb1-glue.c
index c59a933..404d684 100644
--- a/src/libusb1-glue.c
+++ b/src/libusb1-glue.c
@@ -1336,7 +1336,7 @@ ptp_usb_getdata (PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler)
break;
}
}
- if (usbdata.length == 0xffffffffU) {
+ if (rlen == PTP_USB_BULK_HS_MAX_PACKET_LEN_READ) {
/* Copy first part of data to 'data' */
putfunc_ret =
handler->putfunc(
@@ -1352,7 +1352,7 @@ ptp_usb_getdata (PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler)
uint16_t xret;
xret = ptp_read_func(
- PTP_USB_BULK_HS_MAX_PACKET_LEN_READ,
+ 0x20000000,
handler,
params->data,
&readdata,
@@ -1360,7 +1360,7 @@ ptp_usb_getdata (PTPParams* params, PTPContainer* ptp, PTPDataHandler *handler)
);
if (xret != PTP_RC_OK)
return xret;
- if (readdata < PTP_USB_BULK_HS_MAX_PACKET_LEN_READ)
+ if (readdata < 0x20000000)
break;
}
return PTP_RC_OK;