projects
/
slipway.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7898ca4
)
search for Ftdi shared library in build/ first
author
megacz
<adam@megacz.com>
Thu, 1 Jan 2009 06:06:54 +0000
(22:06 -0800)
committer
megacz
<adam@megacz.com>
Thu, 1 Jan 2009 06:06:54 +0000
(22:06 -0800)
src/com/ftdi/usb/FtdiUart.java
patch
|
blob
|
history
diff --git
a/src/com/ftdi/usb/FtdiUart.java
b/src/com/ftdi/usb/FtdiUart.java
index
289f92e
..
f8cc99f
100644
(file)
--- a/
src/com/ftdi/usb/FtdiUart.java
+++ b/
src/com/ftdi/usb/FtdiUart.java
@@
-10,11
+10,21
@@
import java.io.*;
*/
public class FtdiUart {
*/
public class FtdiUart {
+ static {
+ try {
+ File f = new File("build/"+System.mapLibraryName("FtdiUartNative"));
+ if (f.exists()) System.load(f.getAbsolutePath());
+ else System.loadLibrary("FtdiUartNative");
+ } catch (Exception e) {
+ throw new RuntimeException();
+ }
+ }
+
private SWIGTYPE_p_ftdi_context context = FtdiUartNative.new_ftdi_context();
private SWIGTYPE_p_ftdi_context context = FtdiUartNative.new_ftdi_context();
- public FtdiUart(int vendor, int product, int baud) throws IOException {
+ public FtdiUart(int vendorId, int productId, int baud) throws IOException {
FtdiUartNative.ftdi_init(context);
FtdiUartNative.ftdi_init(context);
- FtdiUartNative.ftdi_usb_open(context, vendor, product);
+ FtdiUartNative.ftdi_usb_open(context, vendorId, productId);
FtdiUartNative.ftdi_usb_reset(context);
FtdiUartNative.ftdi_set_baudrate(context, baud);
FtdiUartNative.ftdi_set_line_property(context, 8, 0, 0);
FtdiUartNative.ftdi_usb_reset(context);
FtdiUartNative.ftdi_set_baudrate(context, baud);
FtdiUartNative.ftdi_set_line_property(context, 8, 0, 0);