Changeset 9448

Timestamp:

07/16/09 16:13:21 (4 years ago)

Author:

hvolos

Message:

added some initial multiplexing

Location:

ossiedev/branches/hvolos/components/MIMOEnc

Files:

• MIMOEnc.cpp (modified) (5 diffs)
• MIMOEnc.h (modified) (2 diffs)
• MIMOEnc.prf.xml (modified) (1 diff)
• MIMOEnc.scd.xml (modified) (1 diff)
• MIMOEnc.spd.xml (modified) (2 diffs)

ossiedev/branches/hvolos/components/MIMOEnc/MIMOEnc.cpp

@@ -13 +13 @@
     Resource_impl(uuid), component_running(condition) 
 {
-    dataIn_0 = new standardInterfaces_i::complexShort_p("Symbols_IN");
-    dataOut_0 = new standardInterfaces_i::complexShort_u("MUX_MIMO_Symbols_OUT");
+    dataOut = new standardInterfaces_i::complexShort_u("MIMO_Symbols_OUT");
+    dataIn = new standardInterfaces_i::complexShort_p("Symbols_IN");
 
     //Create the thread for the writer's processing function 
@@ -26 +26 @@
 MIMOEnc_i::~MIMOEnc_i(void)
 {   
-    delete dataIn_0;
-    delete dataOut_0;
+    delete dataOut;
+    delete dataIn;
 }
 
@@ -43 +43 @@
     CORBA::Object_var p;
 
-    p = dataIn_0->getPort(portName);
+    p = dataOut->getPort(portName);
 
     if (!CORBA::is_nil(p))
         return p._retn();
 
-    p = dataOut_0->getPort(portName);
+    p = dataIn->getPort(portName);
 
     if (!CORBA::is_nil(p))
@@ -95 +95 @@
         std::cout << "Property id : " << props[i].id << std::endl;
 
-        if (strcmp(props[i].id, "DCE:4c5f385e-3b3e-11de-b7e0-0000e80014f9") == 0)
+        if (strcmp(props[i].id, "DCE:bc772f0e-6fee-11de-b7e0-0000e80014f9") == 0)
         {
             CORBA::Short simple_temp;
             props[i].value >>= simple_temp;
-            simple_0_value = simple_temp;
+            Mr = simple_temp;
         }
 
-        if (strcmp(props[i].id, "DCE:74a38a7c-3b3e-11de-b7e0-0000e80014f9") == 0)
+        if (strcmp(props[i].id, "DCE:c8545ac2-6fee-11de-b7e0-0000e80014f9") == 0)
         {
+            CORBA::Short simple_temp;
+            props[i].value >>= simple_temp;
+            Nt = simple_temp;
+        }
+
+        if (strcmp(props[i].id, "DCE:ddce813e-6fee-11de-b7e0-0000e80014f9") == 0)
+        {
+          const char * prop_str;
+            props[i].value >>= prop_str;
+            MIMOmethod=prop_str;
+        }
+    }
 }
 
@@ -110 +122 @@
     DEBUG(3, MIMOEnc, "ProcessData() invoked")
 
-    PortTypes::ShortSequence I_out_0, Q_out_0;
+    PortTypes::ShortSequence I_out, Q_out;
 
 
-    PortTypes::ShortSequence *I_in_0(NULL), *Q_in_0(NULL);
-    CORBA::UShort I_in_0_length, Q_in_0_length;
+    PortTypes::ShortSequence *I_in(NULL), *Q_in(NULL);
+    
+    CORBA::UShort Data_length;
 
     while(1)
     {
-        dataIn_0->getData(I_in_0, Q_in_0);
+        dataIn->getData(I_in, Q_in);
 
-        I_in_0_length = I_in_0->length();
-        Q_in_0_length = Q_in_0->length();
+        Data_length = I_in->length();
 
-        I_out_0.length(); //must define length of output
-        Q_out_0.length(); //must define length of output
+
+        I_out.length(Data_length/2); //must define length of output
+        Q_out.length(Data_length/2); //must define length of output
 
         /*insert code here to do work*/
+        
+        for (short int i=0; i<Data_length/Nt;i++){
+                for (short int j=0;j<Nt;j++){
+                I_out[i]=(*I_in)[i*Nt+j];
+                Q_out[i]=(*Q_in)[i*Nt+j];
+                }
+        } 
 
 
-
-
-
-
-        dataIn_0->bufferEmptied();
-        dataOut_0->pushPacket(I_out_0, Q_out_0);
+        dataIn->bufferEmptied();
+        dataOut->pushPacket(I_out, Q_out);
     }
 }

ossiedev/branches/hvolos/components/MIMOEnc/MIMOEnc.h

@@ -19 +19 @@
 #include "standardinterfaces/complexShort_u.h"
 #include "standardinterfaces/complexShort_p.h"
+#include "standardinterfaces/realChar.h"
+#include "standardinterfaces/realChar_u.h"
+#include "standardinterfaces/realChar_p.h"
 
 /** \brief
@@ -72 +75 @@
     omni_thread *processing_thread;     ///< for component writer function
         
-        CORBA::Short simple_0_value;
-        CORBA::String simple_1_value;
+        CORBA::Short Mr; //number of rx antennas
+        CORBA::Short Nt; //number of tx antennas
+        const char * MIMOmethod;
 
     
     // list components provides and uses ports
-        standardInterfaces_i::complexShort_p *dataIn_0;
-        standardInterfaces_i::complexShort_u *dataOut_0;
+        standardInterfaces_i::complexShort_u *dataOut;
+        standardInterfaces_i::complexShort_p *dataIn;
     
 };

ossiedev/branches/hvolos/components/MIMOEnc/MIMOEnc.prf.xml

@@ -5 +5 @@
 <properties>
     <description>These are the properties to configure the device manager</description> 
-    <simple id="DCE:4c5f385e-3b3e-11de-b7e0-0000e80014f9" mode="readonly" name="No of TX Antennas" type="short">
+    <simple id="DCE:bc772f0e-6fee-11de-b7e0-0000e80014f9" mode="readonly" name="RX antennas" type="short">
         <value>2</value> 
-        <description>Specifies the number of TX antennas. 1 disables the MIMO encoding</description> 
+        <description>The number of antennas at the receiver</description> 
         <kind kindtype="configure"/>
     </simple>
-    <simple id="DCE:74a38a7c-3b3e-11de-b7e0-0000e80014f9" mode="readonly" name="MIMO Method" type="string">
+    <simple id="DCE:c8545ac2-6fee-11de-b7e0-0000e80014f9" mode="readonly" name="TX antennas" type="short">
+        <value>2</value> 
+        <description>The number of antennas at the transmiiter</description> 
+        <kind kindtype="configure"/>
+    </simple>
+    <simple id="DCE:ddce813e-6fee-11de-b7e0-0000e80014f9" mode="readonly" name="MIMO Method" type="string">
         <value>STBC</value> 
-        <description>The MIMO method used, currently supports STBC (Alamouti) and VBLAST</description> 
+        <description>The MIMO method used. Available methods: STBC &amp; VBLAST</description> 
         <kind kindtype="configure"/>
     </simple>

ossiedev/branches/hvolos/components/MIMOEnc/MIMOEnc.scd.xml

@@ -17 +17 @@
                 <porttype type="data"/>
             </provides>
-            <uses repid="IDL:standardInterfaces/complexShort:1.0" usesname="MUX_MIMO_Symbols_OUT">
+            <uses repid="IDL:standardInterfaces/complexShort:1.0" usesname="MIMO_Symbols_OUT">
                 <porttype type="data"/>
             </uses>

ossiedev/branches/hvolos/components/MIMOEnc/MIMOEnc.spd.xml

@@ -3 +3 @@
 <!--Created with OSSIE WaveDev-->
 <!--Powered by Python-->
-<softpkg id="DCE:7ca34596-3b3e-11de-b7e0-0000e80014f9" name="MIMOEnc">
+<softpkg id="DCE:e2fcc01c-6fee-11de-b7e0-0000e80014f9" name="MIMOEnc">
     <title/>
-    <description>Implements MIMO methods such as STBC and VBLAST</description> 
+    <description>Implements different MIMO methods such as STBC and VBLAST</description> 
     <author>
         <name>OSSIE Project</name> 
@@ -17 +17 @@
         <localfile name="xml/MIMOEnc/MIMOEnc.scd.xml"/>
     </descriptor>
-    <implementation id="DCE:7ca54f76-3b3e-11de-b7e0-0000e80014f9">
+    <implementation id="DCE:e2fd36e6-6fee-11de-b7e0-0000e80014f9">
         <description>Description</description> 
         <code type="Executable">