Changeset 9276

Timestamp:

04/22/09 14:54:03 (4 years ago)

Author:

mcarrick

Message:

updating component with improved interface

Location:

ossiedev/branches/mcarrick/ossiedev-trunk/components/CostasLoop

Files:

• C_Makefile (added)
• CostasLoop.cpp (modified) (2 diffs)
• CostasLoopFPGAInterface.c (modified) (3 diffs)
• CostasLoopFPGAInterface.h (modified) (1 diff)

ossiedev/branches/mcarrick/ossiedev-trunk/components/CostasLoop/CostasLoop.cpp

@@ -125 +125 @@
     CORBA::UShort I_in_0_length;
 
-
-    unsigned long i_data, q_data;
-    unsigned long data;
-
     // open FPGA interface
     openInterface();
@@ -141 +137 @@
         Q_out_0.length(I_in_0_length); //must define length of output
 
-        // get sample from FPGA
-        readFPGA(i_data,q_data);
+        openFPGAInterface();
 
-        // write new data
-        writeFPGA(data);
+        // different methods for transmitting data:
+        //     1) push all data at once over bus into FIFOs on FPGA, and
+        //     return all data at once from output FIFOs on FPGA
+        //     2) push data sample by sample to FPGA and recieve sample
+        //     by sample
+
+        CostasLoopProcessing();
+
+        closeFPGAInterface();
 
         dataIn_0->bufferEmptied();

ossiedev/branches/mcarrick/ossiedev-trunk/components/CostasLoop/CostasLoopFPGAInterface.c

@@ -5 +5 @@
 #include <unistd.h> // using 'close'
 #include <sys/mman.h> // using 'mmap', 'munmap'
+#include <math.h>
 
 #define TXDEMO_BASE_ADDRESS  0xc1a00000
 #define TXDEMO_SLAVE_REG0OFF 0
-#define TXDEMO_SLAVE_REG1OFF 4
+#define TXDEMO_SLAVE_REG1OFF 12
 #define TXDEMO_RESET_REG_OFF 64
 
@@ -15 +16 @@
 
 void *mapped_base, *mapped_dev_base;
+unsigned long val;
+unsigned int maskI = 0xFFFF0000;
+unsigned int maskQ = 0x0000FFFF;
 int memfd;
 
-void openInterface()
+void openFPGAInterface()
 {
-    // initalize interface to FPGA
 
     off_t dev_base = TXDEMO_BASE_ADDRESS;
@@ -42 +45 @@
 }
 
-void writeFPGA(unsigned long data)
+void CostasLoopProcessing()
 {
-    // write to the FPGA interface
+    char command[10];
+    while(1)
+    {
+        printf("Enter test/exit: ");
+        scanf("%s", command);
+        if( strcmp( command, "test" ) == 0 )
+        {
+            // push zeros through to flush system
+            *((unsigned long *) (mapped_dev_base + TXDEMO_SLAVE_REG1OFF)) = 0x00000000;
+            *((unsigned long *) (mapped_dev_base + TXDEMO_SLAVE_REG1OFF)) = 0x00000000;
+            *((unsigned long *) (mapped_dev_base + TXDEMO_SLAVE_REG1OFF)) = 0x00000000;
+            *((unsigned long *) (mapped_dev_base + TXDEMO_SLAVE_REG1OFF)) = 0x00000000;
 
-    unsigned long val;
+            // perform reads to cycle through undefined bits
+            unsigned int i = 0;
+            for (i = 0; i < 20; i++)
+            {
+                // write zeros to circuit
+                *((unsigned long *) (mapped_dev_base + TXDEMO_SLAVE_REG1OFF)) = 0x00000000;
 
-    // perform write
-    *((unsigned long*)(mapped_dev_base + TXDEMO_SLAVE_REG1OFF)) = val;
+                // read from circuit
+                val = *((unsigned long *) (mapped_dev_base + TXDEMO_SLAVE_REG0OFF));
+
+                printf("Value off bus: #%x", val);
+
+                // get I and Q bits
+                signed long iside = maskI & val;
+                iside = (iside >> 16);
+                signed short qside = maskQ & val;
+
+                // convert from hex to decimal
+                int isideINT = iside;
+                int qsideINT = qside;
+
+                // scale
+                float isideFloat = isideINT / pow(2,15);
+                float qsideFloat = qsideINT / pow(2,15);
+
+                printf(" I: %1.3f", isideFloat);
+                printf(" Q: %1.3f\n", qsideFloat);
+
+            }
+        }
+        else if( strcmp( command, "exit" ) == 0 )
+        {
+            break;
+        }
+        else
+        {
+            printf("Illegal command.\n");
+        }
+    }
 }
 
-void readFPGA(unsigned long i_data, unsigned long q_data)
+void closeFPGAInterface()
 {
-    // read from the FPGA interface
-
-    unsigned long val;
-
-    // perform read
-    val = *((unsigned long *) (mapped_dev_base + TXDEMO_SLAVE_REG0OFF));
-}
-
-void closeInterface()
-{
-    // close the interface
 
     if( munmap(mapped_base, MAP_SIZE) == -1 )

ossiedev/branches/mcarrick/ossiedev-trunk/components/CostasLoop/CostasLoopFPGAInterface.h

@@ -1 +1 @@
 extern "C" {
-        void openInterface();
-        void writeFPGA(unsigned long data);
-        void readFPGA(unsigned long i_data, unsigned long q_data);
-        void closeInterface();
+        void openFPGAInterface();
+        void CostasLoopProcessing();
+        void closeFPGAInterface();
 }