mirror
/
UsbSerial
kopia lustrzana https://github.com/felHR85/UsbSerial
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Removed "always-null" parameter

pull/212/head
Raul Bache 2019-02-20 10:04:23 +01:00
rodzic aeb1227fa2
commit b0f2fd2543
1 zmienionych plików z 37 dodań i 41 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

78
usbserial/src/main/java/com/felhr/usbserial/FTDISerialDevice.java
Wyświetl plik

@ -141,8 +141,8 @@ public class FTDISerialDevice extends UsbSerialDevice
@Override @Override
public void close() public void close()
{ {
setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT3, 0, null); setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT3, 0);
setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT4, 0, null); setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT4, 0);
currentSioSetData = 0x0000; currentSioSetData = 0x0000;
killWorkingThread(); killWorkingThread();
killWriteThread(); killWriteThread();
@ -176,8 +176,8 @@ public class FTDISerialDevice extends UsbSerialDevice
@Override @Override
public void syncClose() public void syncClose()
{ {
setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT3, 0, null); setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT3, 0);
setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT4, 0, null); setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT4, 0);
currentSioSetData = 0x0000; currentSioSetData = 0x0000;
connection.releaseInterface(mInterface); connection.releaseInterface(mInterface);
isOpen = false; isOpen = false;
@ -217,7 +217,7 @@ public class FTDISerialDevice extends UsbSerialDevice
value = FTDI_BAUDRATE_921600; value = FTDI_BAUDRATE_921600;
else else
value = FTDI_BAUDRATE_9600; value = FTDI_BAUDRATE_9600;
setControlCommand(FTDI_SIO_SET_BAUD_RATE, value, 0, null); setControlCommand(FTDI_SIO_SET_BAUD_RATE, value, 0);
} }
@Override @Override
@ -230,35 +230,35 @@ public class FTDISerialDevice extends UsbSerialDevice
currentSioSetData &= ~(1 << 1); currentSioSetData &= ~(1 << 1);
currentSioSetData |= (1 << 2); currentSioSetData |= (1 << 2);
currentSioSetData &= ~(1 << 3); currentSioSetData &= ~(1 << 3);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
case UsbSerialInterface.DATA_BITS_6: case UsbSerialInterface.DATA_BITS_6:
currentSioSetData &= ~1; currentSioSetData &= ~1;
currentSioSetData |= (1 << 1); currentSioSetData |= (1 << 1);
currentSioSetData |= (1 << 2); currentSioSetData |= (1 << 2);
currentSioSetData &= ~(1 << 3); currentSioSetData &= ~(1 << 3);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
case UsbSerialInterface.DATA_BITS_7: case UsbSerialInterface.DATA_BITS_7:
currentSioSetData |= 1; currentSioSetData |= 1;
currentSioSetData |= (1 << 1); currentSioSetData |= (1 << 1);
currentSioSetData |= (1 << 2); currentSioSetData |= (1 << 2);
currentSioSetData &= ~(1 << 3); currentSioSetData &= ~(1 << 3);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
case UsbSerialInterface.DATA_BITS_8: case UsbSerialInterface.DATA_BITS_8:
currentSioSetData &= ~1; currentSioSetData &= ~1;
currentSioSetData &= ~(1 << 1); currentSioSetData &= ~(1 << 1);
currentSioSetData &= ~(1 << 2); currentSioSetData &= ~(1 << 2);
currentSioSetData |= (1 << 3); currentSioSetData |= (1 << 3);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
default: default:
currentSioSetData &= ~1; currentSioSetData &= ~1;
currentSioSetData &= ~(1 << 1); currentSioSetData &= ~(1 << 1);
currentSioSetData &= ~(1 << 2); currentSioSetData &= ~(1 << 2);
currentSioSetData |= (1 << 3); currentSioSetData |= (1 << 3);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
} }
@ -273,25 +273,25 @@ public class FTDISerialDevice extends UsbSerialDevice
currentSioSetData &= ~(1 << 11); currentSioSetData &= ~(1 << 11);
currentSioSetData &= ~(1 << 12); currentSioSetData &= ~(1 << 12);
currentSioSetData &= ~(1 << 13); currentSioSetData &= ~(1 << 13);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
case UsbSerialInterface.STOP_BITS_15: case UsbSerialInterface.STOP_BITS_15:
currentSioSetData |= (1 << 11); currentSioSetData |= (1 << 11);
currentSioSetData &= ~(1 << 12); currentSioSetData &= ~(1 << 12);
currentSioSetData &= ~(1 << 13); currentSioSetData &= ~(1 << 13);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
case UsbSerialInterface.STOP_BITS_2: case UsbSerialInterface.STOP_BITS_2:
currentSioSetData &= ~(1 << 11); currentSioSetData &= ~(1 << 11);
currentSioSetData |= (1 << 12); currentSioSetData |= (1 << 12);
currentSioSetData &= ~(1 << 13); currentSioSetData &= ~(1 << 13);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
default: default:
currentSioSetData &= ~(1 << 11); currentSioSetData &= ~(1 << 11);
currentSioSetData &= ~(1 << 12); currentSioSetData &= ~(1 << 12);
currentSioSetData &= ~(1 << 13); currentSioSetData &= ~(1 << 13);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
} }
} }
@ -305,37 +305,37 @@ public class FTDISerialDevice extends UsbSerialDevice
currentSioSetData &= ~(1 << 8); currentSioSetData &= ~(1 << 8);
currentSioSetData &= ~(1 << 9); currentSioSetData &= ~(1 << 9);
currentSioSetData &= ~(1 << 10); currentSioSetData &= ~(1 << 10);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
case UsbSerialInterface.PARITY_ODD: case UsbSerialInterface.PARITY_ODD:
currentSioSetData |= (1 << 8); currentSioSetData |= (1 << 8);
currentSioSetData &= ~(1 << 9); currentSioSetData &= ~(1 << 9);
currentSioSetData &= ~(1 << 10); currentSioSetData &= ~(1 << 10);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
case UsbSerialInterface.PARITY_EVEN: case UsbSerialInterface.PARITY_EVEN:
currentSioSetData &= ~(1 << 8); currentSioSetData &= ~(1 << 8);
currentSioSetData |= (1 << 9); currentSioSetData |= (1 << 9);
currentSioSetData &= ~(1 << 10); currentSioSetData &= ~(1 << 10);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
case UsbSerialInterface.PARITY_MARK: case UsbSerialInterface.PARITY_MARK:
currentSioSetData |= (1 << 8); currentSioSetData |= (1 << 8);
currentSioSetData |= (1 << 9); currentSioSetData |= (1 << 9);
currentSioSetData &= ~(1 << 10); currentSioSetData &= ~(1 << 10);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
case UsbSerialInterface.PARITY_SPACE: case UsbSerialInterface.PARITY_SPACE:
currentSioSetData &= ~(1 << 8); currentSioSetData &= ~(1 << 8);
currentSioSetData &= ~(1 << 9); currentSioSetData &= ~(1 << 9);
currentSioSetData |= (1 << 10); currentSioSetData |= (1 << 10);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
default: default:
currentSioSetData &= ~(1 << 8); currentSioSetData &= ~(1 << 8);
currentSioSetData &= ~(1 << 9); currentSioSetData &= ~(1 << 9);
currentSioSetData &= ~(1 << 10); currentSioSetData &= ~(1 << 10);
setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0, null); setControlCommand(FTDI_SIO_SET_DATA, currentSioSetData, 0);
break; break;
} }
@ -347,7 +347,7 @@ public class FTDISerialDevice extends UsbSerialDevice
switch(flowControl) switch(flowControl)
{ {
case UsbSerialInterface.FLOW_CONTROL_OFF: case UsbSerialInterface.FLOW_CONTROL_OFF:
setControlCommand(FTDI_SIO_SET_FLOW_CTRL, FTDI_SET_FLOW_CTRL_DEFAULT, 0, null); setControlCommand(FTDI_SIO_SET_FLOW_CTRL, FTDI_SET_FLOW_CTRL_DEFAULT, 0);
rtsCtsEnabled = false; rtsCtsEnabled = false;
dtrDsrEnabled = false; dtrDsrEnabled = false;
break; break;
@ -355,21 +355,21 @@ public class FTDISerialDevice extends UsbSerialDevice
rtsCtsEnabled = true; rtsCtsEnabled = true;
dtrDsrEnabled = false; dtrDsrEnabled = false;
int indexRTSCTS = 0x0001; int indexRTSCTS = 0x0001;
setControlCommand(FTDI_SIO_SET_FLOW_CTRL, FTDI_SET_FLOW_CTRL_DEFAULT, indexRTSCTS, null); setControlCommand(FTDI_SIO_SET_FLOW_CTRL, FTDI_SET_FLOW_CTRL_DEFAULT, indexRTSCTS);
break; break;
case UsbSerialInterface.FLOW_CONTROL_DSR_DTR: case UsbSerialInterface.FLOW_CONTROL_DSR_DTR:
dtrDsrEnabled = true; dtrDsrEnabled = true;
rtsCtsEnabled = false; rtsCtsEnabled = false;
int indexDSRDTR = 0x0002; int indexDSRDTR = 0x0002;
setControlCommand(FTDI_SIO_SET_FLOW_CTRL, FTDI_SET_FLOW_CTRL_DEFAULT, indexDSRDTR , null); setControlCommand(FTDI_SIO_SET_FLOW_CTRL, FTDI_SET_FLOW_CTRL_DEFAULT, indexDSRDTR);
break; break;
case UsbSerialInterface.FLOW_CONTROL_XON_XOFF: case UsbSerialInterface.FLOW_CONTROL_XON_XOFF:
int indexXONXOFF = 0x0004; int indexXONXOFF = 0x0004;
int wValue = 0x1311; int wValue = 0x1311;
setControlCommand(FTDI_SIO_SET_FLOW_CTRL, wValue, indexXONXOFF , null); setControlCommand(FTDI_SIO_SET_FLOW_CTRL, wValue, indexXONXOFF);
break; break;
default: default:
setControlCommand(FTDI_SIO_SET_FLOW_CTRL, FTDI_SET_FLOW_CTRL_DEFAULT, 0, null); setControlCommand(FTDI_SIO_SET_FLOW_CTRL, FTDI_SET_FLOW_CTRL_DEFAULT, 0);
break; break;
} }
} }
@ -379,10 +379,10 @@ public class FTDISerialDevice extends UsbSerialDevice
{ {
if(state) if(state)
{ {
setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SIO_SET_RTS_HIGH, 0, null); setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SIO_SET_RTS_HIGH, 0);
}else }else
{ {
setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SIO_SET_RTS_LOW, 0, null); setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SIO_SET_RTS_LOW, 0);
} }
} }
@ -391,10 +391,10 @@ public class FTDISerialDevice extends UsbSerialDevice
{ {
if(state) if(state)
{ {
setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SIO_SET_DTR_HIGH, 0, null); setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SIO_SET_DTR_HIGH, 0);
}else }else
{ {
setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SIO_SET_DTR_LOW, 0, null); setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SIO_SET_DTR_LOW, 0);
} }
} }
@ -462,18 +462,18 @@ public class FTDISerialDevice extends UsbSerialDevice
// Default Setup // Default Setup
firstTime = true; firstTime = true;
if(setControlCommand(FTDI_SIO_RESET, 0x00, 0, null) < 0) if(setControlCommand(FTDI_SIO_RESET, 0x00, 0) < 0)
return false; return false;
if(setControlCommand(FTDI_SIO_SET_DATA, FTDI_SET_DATA_DEFAULT, 0, null) < 0) if(setControlCommand(FTDI_SIO_SET_DATA, FTDI_SET_DATA_DEFAULT, 0) < 0)
return false; return false;
currentSioSetData = FTDI_SET_DATA_DEFAULT; currentSioSetData = FTDI_SET_DATA_DEFAULT;
if(setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT1, 0, null) < 0) if(setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT1, 0) < 0)
return false; return false;
if(setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT2, 0, null) < 0) if(setControlCommand(FTDI_SIO_MODEM_CTRL, FTDI_SET_MODEM_CTRL_DEFAULT2, 0) < 0)
return false; return false;
if(setControlCommand(FTDI_SIO_SET_FLOW_CTRL, FTDI_SET_FLOW_CTRL_DEFAULT, 0, null) < 0) if(setControlCommand(FTDI_SIO_SET_FLOW_CTRL, FTDI_SET_FLOW_CTRL_DEFAULT, 0) < 0)
return false; return false;
if(setControlCommand(FTDI_SIO_SET_BAUD_RATE, FTDI_BAUDRATE_9600, 0, null) < 0) if(setControlCommand(FTDI_SIO_SET_BAUD_RATE, FTDI_BAUDRATE_9600, 0) < 0)
return false; return false;
// Flow control disabled by default // Flow control disabled by default
@ -483,14 +483,10 @@ public class FTDISerialDevice extends UsbSerialDevice
return true; return true;
} }
private int setControlCommand(int request, int value, int index, byte[] data) private int setControlCommand(int request, int value, int index)
{ {
int dataLength = 0; int dataLength = 0;
if(data != null) int response = connection.controlTransfer(FTDI_REQTYPE_HOST2DEVICE, request, value, mInterface.getId() + 1 + index, null, dataLength, USB_TIMEOUT);
{
dataLength = data.length;
}
int response = connection.controlTransfer(FTDI_REQTYPE_HOST2DEVICE, request, value, mInterface.getId() + 1 + index, data, dataLength, USB_TIMEOUT);
Log.i(CLASS_ID,"Control Transfer Response: " + String.valueOf(response)); Log.i(CLASS_ID,"Control Transfer Response: " + String.valueOf(response));
return response; return response;
} }