Roc: Fix GPIO_WRITE

Author: PascalBoeschoten

src/CommandLineUtilities/AliceLowlevelFrontend/AliceLowlevelFrontend.h

@@ -224,12 +224,28 @@ class ScaWriteRpc: DimRpcInfoWrapper
 
     std::string write(uint32_t command, uint32_t data)
     {
-      auto string = std::to_string(command) + ',' + std::to_string(data);
+      auto string = std::to_string(data) + ',' + std::to_string(command);
       setString(string);
       return stripPrefix(getString());
     }
 };
 
+class ScaGpioWriteRpc: DimRpcInfoWrapper
+{
+  public:
+    ScaGpioWriteRpc(const std::string& serviceName)
+      : DimRpcInfoWrapper(serviceName)
+    {
+    }
+
+    std::string write(uint32_t data)
+    {
+      setString(std::to_string(data));
+      return stripPrefix(getString());
+    }
+};
+
+
 class StringRpcServer: public DimRpc
 {
   public:

src/CommandLineUtilities/AliceLowlevelFrontend/ProgramAliceLowlevelFrontendClient.cxx

@@ -71,22 +71,31 @@ class ProgramAliceLowlevelFrontendClient: public Program
       Alf::RegisterWriteRpc writeRpc(names.registerWriteRpc());
       Alf::ScaReadRpc scaReadRpc(names.scaRead());
       Alf::ScaWriteRpc scaWriteRpc(names.scaWrite());
+      Alf::ScaGpioWriteRpc scaGpioWriteRpc(names.scaGpioWrite());
       Alf::PublishRpc publishRpc(names.publishStartCommandRpc());
 
       publishRpc.publish("ALF/TEST/1", 1.0, {0x1fc});
       publishRpc.publish("ALF/TEST/2", 3.0, {0x100, 0x104, 0x108});
 
+      for (int i = 0; i < 10; ++i) {
+        cout << "SCA GPIO write" << endl;
+        cout << "  result: " << scaGpioWriteRpc.write(0x0f0f0f0f) << endl;
+      }
+
+//      for (int i = 0; i < 10; ++i) {
+//        auto transactionId = i + 0x10000;
+//        cout << "SCA write" << endl;
+//        cout << "  result: " << scaWriteRpc.write(0xffff + transactionId, i) << endl;
+//        cout << "SCA read" << endl;
+//        cout << "  result: " << scaReadRpc.read() << endl;
+//      }
+
       cout << "1k writes to 0x1fc..." << endl;
       for (int i = 0; i < 1000; ++i) {
         readRpc.readRegister(0x1fc);
       }
       cout << "Done!" << endl;
 
-      cout << "SCA read" << endl;
-      cout << "  result: " << scaReadRpc.read() << endl;
-      cout << "SCA write" << endl;
-      cout << "  result: " << scaWriteRpc.write(0x0, 0x0) << endl;
-
       while (!isSigInt())
       {
         cout << "-------------------------------------\n";

src/CommandLineUtilities/AliceLowlevelFrontend/Sca.cxx

@@ -60,13 +60,16 @@ void Sca::write(uint32_t command, uint32_t data)
   barWrite(Registers::WRITE_DATA, data);
   barWrite(Registers::WRITE_COMMAND, command);
   executeCommand();
-  //auto time = barRead(Registers::TIME);
+  auto time = barRead(Registers::TIME) * 4;
+//  printf("Sca::write  DATA=0x%x   CH=0x%x   TR=0x%x   CMD=0x%x   TIME(ns)=%u\n", data, command >> 24, (command >> 16) & 0xff,
+    command & 0xff, time);
 }
 
 auto Sca::read() -> ReadResult
 {
   auto data = barRead(Registers::READ_DATA);
   auto command = barRead(Registers::READ_COMMAND);
+//  printf("Sca::read   DATA=0x%x   CH=0x%x   TR=0x%x   CMD=0x%x\n", data, command >> 24, (command >> 16) & 0xff, command & 0xff);
   checkError(command);
   return { data, command };
 }
@@ -121,7 +124,8 @@ void Sca::gpioEnable()
 
 auto Sca::gpioWrite(uint32_t data) -> ReadResult
 {
-  init();
+//  printf("Sca::gpioWrite DATA=0x%x\n", data);
+  initialize();
   // WR REGISTER OUT DATA
   write(0x02040010, data);
   // RD DATA