specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed all warnings and fixed bug, as GetCommFeature would actually not do anything

Browse source
This commit is contained in:
Kristian Sloth Lauszus 2018-01-14 15:14:52 +01:00
parent eb885aca4d
commit dc1cdada87
2 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
cdcacm.cpp
View file

@ -278,8 +278,7 @@ uint8_t ACM::Poll() {
}
uint8_t ACM::RcvData(uint16_t *bytes_rcvd, uint8_t *dataptr) {
uint8_t rv;
rv = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, bytes_rcvd, dataptr);
uint8_t rv = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, bytes_rcvd, dataptr);
if(rv && rv != hrNAK) {
Release();
}
@ -287,8 +286,7 @@ uint8_t ACM::RcvData(uint16_t *bytes_rcvd, uint8_t *dataptr) {
}
uint8_t ACM::SndData(uint16_t nbytes, uint8_t *dataptr) {
uint8_t rv;
rv = pUsb->outTransfer(bAddress, epInfo[epDataOutIndex].epAddr, nbytes, dataptr);
uint8_t rv = pUsb->outTransfer(bAddress, epInfo[epDataOutIndex].epAddr, nbytes, dataptr);
if(rv && rv != hrNAK) {
Release();
}
@ -296,8 +294,7 @@ uint8_t ACM::SndData(uint16_t nbytes, uint8_t *dataptr) {
}
uint8_t ACM::SetCommFeature(uint16_t fid, uint8_t nbytes, uint8_t *dataptr) {
uint8_t rv;
rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCOUT, CDC_SET_COMM_FEATURE, (fid & 0xff), (fid >> 8), bControlIface, nbytes, nbytes, dataptr, NULL));
uint8_t rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCOUT, CDC_SET_COMM_FEATURE, (fid & 0xff), (fid >> 8), bControlIface, nbytes, nbytes, dataptr, NULL));
if(rv && rv != hrNAK) {
Release();
}
@ -305,17 +302,15 @@ uint8_t ACM::SetCommFeature(uint16_t fid, uint8_t nbytes, uint8_t *dataptr) {
}
uint8_t ACM::GetCommFeature(uint16_t fid, uint8_t nbytes, uint8_t *dataptr) {
uint8_t rv;
uint8_t rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCIN, CDC_GET_COMM_FEATURE, (fid & 0xff), (fid >> 8), bControlIface, nbytes, nbytes, dataptr, NULL));
if(rv && rv != hrNAK) {
Release();
}
return rv;
rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCIN, CDC_GET_COMM_FEATURE, (fid & 0xff), (fid >> 8), bControlIface, nbytes, nbytes, dataptr, NULL));
}
uint8_t ACM::ClearCommFeature(uint16_t fid) {
uint8_t rv;
rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCOUT, CDC_CLEAR_COMM_FEATURE, (fid & 0xff), (fid >> 8), bControlIface, 0, 0, NULL, NULL));
uint8_t rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCOUT, CDC_CLEAR_COMM_FEATURE, (fid & 0xff), (fid >> 8), bControlIface, 0, 0, NULL, NULL));
if(rv && rv != hrNAK) {
Release();
}
@ -323,8 +318,7 @@ uint8_t ACM::ClearCommFeature(uint16_t fid) {
}
uint8_t ACM::SetLineCoding(const LINE_CODING *dataptr) {
uint8_t rv;
rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCOUT, CDC_SET_LINE_CODING, 0x00, 0x00, bControlIface, sizeof (LINE_CODING), sizeof (LINE_CODING), (uint8_t*)dataptr, NULL));
uint8_t rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCOUT, CDC_SET_LINE_CODING, 0x00, 0x00, bControlIface, sizeof (LINE_CODING), sizeof (LINE_CODING), (uint8_t*)dataptr, NULL));
if(rv && rv != hrNAK) {
Release();
}
@ -332,8 +326,7 @@ uint8_t ACM::SetLineCoding(const LINE_CODING *dataptr) {
}
uint8_t ACM::GetLineCoding(LINE_CODING *dataptr) {
uint8_t rv;
rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCIN, CDC_GET_LINE_CODING, 0x00, 0x00, bControlIface, sizeof (LINE_CODING), sizeof (LINE_CODING), (uint8_t*)dataptr, NULL));
uint8_t rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCIN, CDC_GET_LINE_CODING, 0x00, 0x00, bControlIface, sizeof (LINE_CODING), sizeof (LINE_CODING), (uint8_t*)dataptr, NULL));
if(rv && rv != hrNAK) {
Release();
}
@ -341,8 +334,7 @@ uint8_t ACM::GetLineCoding(LINE_CODING *dataptr) {
}
uint8_t ACM::SetControlLineState(uint8_t state) {
uint8_t rv;
rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCOUT, CDC_SET_CONTROL_LINE_STATE, state, 0, bControlIface, 0, 0, NULL, NULL));
uint8_t rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCOUT, CDC_SET_CONTROL_LINE_STATE, state, 0, bControlIface, 0, 0, NULL, NULL));
if(rv && rv != hrNAK) {
Release();
}
@ -350,8 +342,7 @@ uint8_t ACM::SetControlLineState(uint8_t state) {
}
uint8_t ACM::SendBreak(uint16_t duration) {
uint8_t rv;
rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCOUT, CDC_SEND_BREAK, (duration & 0xff), (duration >> 8), bControlIface, 0, 0, NULL, NULL));
uint8_t rv = ( pUsb->ctrlReq(bAddress, 0, bmREQ_CDCOUT, CDC_SEND_BREAK, (duration & 0xff), (duration >> 8), bControlIface, 0, 0, NULL, NULL));
if(rv && rv != hrNAK) {
Release();
}

18
cdcftdi.cpp
View file

@ -276,7 +276,6 @@ uint8_t FTDI::Poll() {
uint8_t FTDI::SetBaudRate(uint32_t baud) {
uint16_t baud_value, baud_index = 0;
uint32_t divisor3;
uint8_t rv = 0;
divisor3 = 48000000 / 2 / baud; // divisor shifted 3 bits to the left
if(wFTDIType == FT232AM) {
@ -307,7 +306,7 @@ uint8_t FTDI::SetBaudRate(uint32_t baud) {
}
USBTRACE2("baud_value:", baud_value);
USBTRACE2("baud_index:", baud_index);
rv = pUsb->ctrlReq(bAddress, 0, bmREQ_FTDI_OUT, FTDI_SIO_SET_BAUD_RATE, baud_value & 0xff, baud_value >> 8, baud_index, 0, 0, NULL, NULL);
uint8_t rv = pUsb->ctrlReq(bAddress, 0, bmREQ_FTDI_OUT, FTDI_SIO_SET_BAUD_RATE, baud_value & 0xff, baud_value >> 8, baud_index, 0, 0, NULL, NULL);
if(rv && rv != hrNAK) {
Release();
}
@ -315,8 +314,7 @@ uint8_t FTDI::SetBaudRate(uint32_t baud) {
}
uint8_t FTDI::SetModemControl(uint16_t signal) {
uint8_t rv;
rv = pUsb->ctrlReq(bAddress, 0, bmREQ_FTDI_OUT, FTDI_SIO_MODEM_CTRL, signal & 0xff, signal >> 8, 0, 0, 0, NULL, NULL);
uint8_t rv = pUsb->ctrlReq(bAddress, 0, bmREQ_FTDI_OUT, FTDI_SIO_MODEM_CTRL, signal & 0xff, signal >> 8, 0, 0, 0, NULL, NULL);
if(rv && rv != hrNAK) {
Release();
}
@ -324,8 +322,7 @@ uint8_t FTDI::SetModemControl(uint16_t signal) {
}
uint8_t FTDI::SetFlowControl(uint8_t protocol, uint8_t xon, uint8_t xoff) {
uint8_t rv;
rv = pUsb->ctrlReq(bAddress, 0, bmREQ_FTDI_OUT, FTDI_SIO_SET_FLOW_CTRL, xon, xoff, protocol << 8, 0, 0, NULL, NULL);
uint8_t rv = pUsb->ctrlReq(bAddress, 0, bmREQ_FTDI_OUT, FTDI_SIO_SET_FLOW_CTRL, xon, xoff, protocol << 8, 0, 0, NULL, NULL);
if(rv && rv != hrNAK) {
Release();
}
@ -333,8 +330,7 @@ uint8_t FTDI::SetFlowControl(uint8_t protocol, uint8_t xon, uint8_t xoff) {
}
uint8_t FTDI::SetData(uint16_t databm) {
uint8_t rv;
rv = pUsb->ctrlReq(bAddress, 0, bmREQ_FTDI_OUT, FTDI_SIO_SET_DATA, databm & 0xff, databm >> 8, 0, 0, 0, NULL, NULL);
uint8_t rv = pUsb->ctrlReq(bAddress, 0, bmREQ_FTDI_OUT, FTDI_SIO_SET_DATA, databm & 0xff, databm >> 8, 0, 0, 0, NULL, NULL);
if(rv && rv != hrNAK) {
Release();
}
@ -342,8 +338,7 @@ uint8_t FTDI::SetData(uint16_t databm) {
}
uint8_t FTDI::RcvData(uint16_t *bytes_rcvd, uint8_t *dataptr) {
uint8_t rv;
rv = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, bytes_rcvd, dataptr);
uint8_t rv = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, bytes_rcvd, dataptr);
if(rv && rv != hrNAK) {
Release();
}
@ -351,8 +346,7 @@ uint8_t FTDI::RcvData(uint16_t *bytes_rcvd, uint8_t *dataptr) {
}
uint8_t FTDI::SndData(uint16_t nbytes, uint8_t *dataptr) {
uint8_t rv;
rv = pUsb->outTransfer(bAddress, epInfo[epDataOutIndex].epAddr, nbytes, dataptr);
uint8_t rv = pUsb->outTransfer(bAddress, epInfo[epDataOutIndex].epAddr, nbytes, dataptr);
if(rv && rv != hrNAK) {
Release();
}