From dfdb9c89a5fa2f250d01c61feb2454ca26bb8ed3 Mon Sep 17 00:00:00 2001 From: megacz Date: Wed, 31 Dec 2008 22:06:54 -0800 Subject: [PATCH] search for Ftdi shared library in build/ first --- src/com/ftdi/usb/FtdiUart.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/com/ftdi/usb/FtdiUart.java b/src/com/ftdi/usb/FtdiUart.java index 289f92e..f8cc99f 100644 --- a/src/com/ftdi/usb/FtdiUart.java +++ b/src/com/ftdi/usb/FtdiUart.java @@ -10,11 +10,21 @@ import java.io.*; */ 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(); - 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_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); -- 1.7.10.4