From b9c61ae2dae94350cd208e0b17050fd8b4ed6dc6 Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Tue, 28 Mar 2017 11:41:39 +0200
Subject: [PATCH] pdq2: crc/frame register accessors

---
 artiq/coredevice/pdq2.py | 46 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/artiq/coredevice/pdq2.py b/artiq/coredevice/pdq2.py
index d0452e868..737e60fe7 100644
--- a/artiq/coredevice/pdq2.py
+++ b/artiq/coredevice/pdq2.py
@@ -61,10 +61,46 @@ class PDQ2:
         self.bus.write(data << 16)
         delay_mu(self.bus.ref_period_mu)  # get to 20ns min cs high
 
+    @kernel
+    def write_reg(self, adr, data, board):
+        self.write((_PDQ2_CMD(board, 0, adr, 1) << 24) | (data << 16))
+
+    @kernel
+    def read_reg(self, adr, board):
+        self.bus.set_xfer(self.chip_select, 16, 8)
+        self.write(_PDQ2_CMD(board, 0, adr, 0) << 24)
+        self.bus.read_async()
+        self.bus.set_xfer(self.chip_select, 16, 0)
+        return self.bus.input_async() & 0xff
+
     @kernel
     def write_config(self, config, board=0xf):
-        board &= 0xf
-        self.write(
-                (_PDQ2_CMD(board, 0, _PDQ2_ADR_CONFIG, 1) << 24) |
-                (config << 16)
-                )
+        self.write_reg(_PDQ2_ADR_CONFIG, config, board)
+
+    @kernel
+    def read_config(self, board=0xf):
+        return self.read_reg(_PDQ2_ADR_CONFIG, board)
+
+    @kernel
+    def write_crc(self, crc, board=0xf):
+        self.write_reg(_PDQ2_ADR_CRC, crc, board)
+
+    @kernel
+    def read_crc(self, board=0xf):
+        return self.read_reg(_PDQ2_ADR_CRC, board)
+
+    @kernel
+    def write_frame(self, frame, board=0xf):
+        self.write_reg(_PDQ2_ADR_FRAME, frame, board)
+
+    @kernel
+    def read_frame(self, board=0xf):
+        return self.read_reg(_PDQ2_ADR_FRAME, board)
+
+    @kernel
+    def write_mem(self, mem, adr, data, board=0xf):
+        pass
+
+    @kernel
+    def read_mem(self, mem, adr, data, board=0xf):
+        pass