cleanup

[slipway.git] / src / edu / berkeley / slipway / FtdiBoardSlave.c

diff --git a/src/edu/berkeley/slipway/FtdiBoardSlave.c b/src/edu/berkeley/slipway/FtdiBoardSlave.c
index 920e46b..e9aba2e 100644 (file)
--- a/src/edu/berkeley/slipway/FtdiBoardSlave.c
+++ b/src/edu/berkeley/slipway/FtdiBoardSlave.c
@@ -109,9 +109,9 @@ void fpga_interrupts(int on) {
   if (on) {\r
     //FISUA = 0x1;\r
     FISCR = 0x80;\r
-    FISUD = 0x08;\r
+    FISUA = 0x01;\r
   } else {\r
-    FISUD = 0;\r
+    FISUA = 0;\r
     FISCR = 0;\r
   }\r
 }\r
@@ -125,9 +125,9 @@ inline void conf(int z, int y, int x, int d) {
 \r
 #define TIMERVAL 100\r
 \r
-ISR(SIG_FPGA_INTERRUPT15) { \r
+ISR(SIG_FPGA_INTERRUPT0) { \r
   interrupt_count++;\r
-  //fpga_interrupts(1);\r
+  fpga_interrupts(1);\r
   sei();\r
 }\r
 \r
@@ -153,8 +153,9 @@ inline int hex(char c) {
 }\r
 \r
 int readFPGA() {\r
+  fpga_interrupts(0);\r
   int ret = FISUA;\r
-  //fpga_interrupts(1);\r
+  fpga_interrupts(1);\r
   return ret;\r
 }\r
 \r
@@ -203,7 +204,7 @@ int main() {
         flag=1;\r
         send(readFPGA());\r
         break;\r
-        /*\r
+\r
       case 3: {\r
         int32_t local_interrupt_count = interrupt_count;\r
         interrupt_count = 0;\r
@@ -213,7 +214,7 @@ int main() {
         send((local_interrupt_count >>  0) & 0xff);\r
         break;\r
       }\r
-        */\r
+\r
         /*\r
       case 3:\r
         //init_timer();\r