SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@236 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2016-08-23 13:24:12 +00:00
parent 7b227f15ac
commit fb25f8dbfe
16 changed files with 136 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/io/piusb.cpp
View File

@@ -298,7 +298,7 @@ bool PIUSB::closeDevice() {
int PIUSB::read(void * read_to, int max_size) {
#ifdef PIP_USB
if (!opened_ || ep_read.isNull()) return -1;
if (isClosed() || ep_read.isNull()) return -1;
switch (ep_read.transfer_type) {
case Endpoint::Bulk: /*piCoutObj << "bulk read" << max_size;*/ return usb_bulk_read(hdev, ep_read.address, (char * )read_to, max_size, timeout_r); break;
case Endpoint::Interrupt: return usb_interrupt_read(hdev, ep_read.address, (char * )read_to, max_size, timeout_r); break;
@@ -313,7 +313,7 @@ int PIUSB::read(void * read_to, int max_size) {
int PIUSB::write(const void * data, int max_size) {
#ifdef PIP_USB
if (!opened_ || ep_write.isNull()) return -1;
if (isClosed() || ep_write.isNull()) return -1;
switch (ep_read.transfer_type) {
case Endpoint::Bulk: /*piCoutObj << "bulk write" << max_size;*/ return usb_bulk_write(hdev, ep_write.address, (char * )const_cast<void * >(data), max_size, timeout_w); break;
case Endpoint::Interrupt: return usb_interrupt_write(hdev, ep_read.address, (char * )data, max_size, timeout_w); break;
@@ -328,7 +328,7 @@ int PIUSB::write(const void * data, int max_size) {
int PIUSB::controlWrite(const void * data, int max_size) {
#ifdef PIP_USB
if (!opened_) return -1;
if (isClosed()) return -1;
//return usb_control_msg(hdev, );
return -1;
#else
@@ -339,7 +339,7 @@ int PIUSB::controlWrite(const void * data, int max_size) {
void PIUSB::flush() {
#ifdef PIP_USB
if (!opened_) return;
if (isClosed()) return;
if (!ep_read.isNull()) usb_resetep(hdev, ep_read.address);
if (!ep_write.isNull()) usb_resetep(hdev, ep_write.address);
#endif