From: adam <adam@megacz.com>
Date: Mon, 11 Sep 2006 13:15:17 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~101
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=319c0456fd1b43a1ab3334238041a9faf182b8dd;p=slipway.git

checkpoint
---

diff --git a/src/com/ftdi/usb/ftdi.i b/src/com/ftdi/usb/ftdi.i
index e279ab3..3fbcc67 100644
--- a/src/com/ftdi/usb/ftdi.i
+++ b/src/com/ftdi/usb/ftdi.i
@@ -102,12 +102,21 @@ int ftdi_read_pins(struct ftdi_context *ftdi, signed char pins[]);
   $action
   if (result) {
     jclass clazz = (*jenv)->FindClass(jenv, "java/lang/RuntimeException");
-    (*jenv)->ThrowNew(jenv, clazz, "ftdi_setflowctrleturned nonzero result");
+    (*jenv)->ThrowNew(jenv, clazz, "ftdi_setflowctrl() returned nonzero result");
     return $null;
   }
 }
 int ftdi_setflowctrl(struct ftdi_context *ftdi, int flowctrl);
 
+%exception ftdi_usb_reset {
+  $action
+  if (result) {
+    jclass clazz = (*jenv)->FindClass(jenv, "java/lang/RuntimeException");
+    (*jenv)->ThrowNew(jenv, clazz, "ftdi_usb_reset() nonzero result");
+    return $null;
+  }
+}
+int ftdi_usb_reset(struct ftdi_context *ftdi);
 
 /*
 int ftdi_set_interface(struct ftdi_context *ftdi, enum ftdi_interface interface);
@@ -125,7 +134,6 @@ int ftdi_usb_open_desc(struct ftdi_context *ftdi, int vendor, int product,
 int ftdi_usb_open_dev(struct ftdi_context *ftdi, struct usb_device *dev);
     
 int ftdi_usb_close(struct ftdi_context *ftdi);
-int ftdi_usb_reset(struct ftdi_context *ftdi);
 int ftdi_usb_purge_buffers(struct ftdi_context *ftdi);
 
 int ftdi_read_data_set_chunksize(struct ftdi_context *ftdi, unsigned int chunksize);
diff --git a/src/edu/berkeley/obits/device/atmel/FtdiChip.java b/src/edu/berkeley/obits/device/atmel/FtdiChip.java
index 18b4087..94d860f 100644
--- a/src/edu/berkeley/obits/device/atmel/FtdiChip.java
+++ b/src/edu/berkeley/obits/device/atmel/FtdiChip.java
@@ -13,6 +13,7 @@ public class FtdiChip {
     public FtdiChip() {
         example.ftdi_init(context);
         example.ftdi_usb_open(context, 0x6666, 0x3133);
+        example.ftdi_usb_reset(context);
         example.ftdi_set_baudrate(context, 750 * 1000);
         example.ftdi_set_line_property(context, 8, 0, 0);
     }