m-labs · Mar 19, 2016 · Mar 19, 2016
Showing with 5 additions and 4 deletions.

+2 −2 artiq/gateware/rtio/analyzer.py

+2 −1 artiq/runtime/analyzer.c

+1 −1 artiq/runtime/analyzer.h
diff --git a/artiq/gateware/rtio/analyzer.py b/artiq/gateware/rtio/analyzer.py
@@ -165,7 +165,7 @@ def __init__(self, membus):
                                        alignment_bits=data_alignment)
         self.last_address = CSRStorage(aw + data_alignment,
                                        alignment_bits=data_alignment)
-        self.byte_count = CSRStatus(32)  # only read when shut down
+        self.byte_count = CSRStatus(64)  # only read when shut down
 
         self.sink = stream.Endpoint(
             [("data", dw),
@@ -199,7 +199,7 @@ def __init__(self, membus):
             )
         ]
 
-        message_count = Signal(32 - log2_int(message_len//8))
+        message_count = Signal(64 - log2_int(message_len//8))
         self.comb += self.byte_count.status.eq(
             message_count << log2_int(message_len//8))
         self.sync += [

diff --git a/artiq/runtime/analyzer.c b/artiq/runtime/analyzer.c
@@ -93,8 +93,9 @@ int analyzer_input(void *data, int length)
     return -1;
 }
 
-void analyzer_poll(void **data, int *length)
+void analyzer_poll(void **data, int *length, int *close_flag)
 {
+    *close_flag = 0;
     switch(send_state) {
         case SEND_STATE_HEADER:
             *length = sizeof(struct analyzer_header) - offset_consumed;

diff --git a/artiq/runtime/analyzer.h b/artiq/runtime/analyzer.h
@@ -7,7 +7,7 @@ void analyzer_start(void);
 void analyzer_end(void);
 
 int analyzer_input(void *data, int length);
-void analyzer_poll(void **data, int *length);
+void analyzer_poll(void **data, int *length, int *close_flag);
 void analyzer_ack_consumed(int length);
 void analyzer_ack_sent(int length);