Changeset 5490

Timestamp:

10/24/07 09:29:32 (6 years ago)

Author:

jgaeddert

Message:

working on PACKET_RS_512 subheader decoder; still does not pass simple test

Files:

• experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.cpp (modified) (4 diffs)

experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.cpp

@@ -534 +534 @@
     // port_id      16
     // expansion    64
-    buf1[0] = (packet_id >> 0)  & 0x0F;
-    buf1[1] = (packet_id >> 4)  & 0x0F;
-    buf1[2] = (packet_id >> 8)  & 0x0F;
-    buf1[3] = (packet_id >> 12) & 0x0F;
-
-    buf1[4] = (src_id >> 0 ) & 0x0F;
-    buf1[5] = (src_id >> 4 ) & 0x0F;
-
-    buf1[6] = (dst_id >> 0 ) & 0x0F;
-    buf1[7] = (dst_id >> 4 ) & 0x0F;
-
-    buf1[8] = (app_id >> 0 ) & 0x0F;
-    buf1[9] = (app_id >> 4 ) & 0x0F;
-
-    buf1[10] = (port_id >> 0 ) & 0x0F;
-    buf1[11] = (port_id >> 4 ) & 0x0F;
+    printf("packet_id = %d\n", packet_id);
+    buf1[0] = (packet_id >> 0)  & 0xFF;
+    buf1[1] = (packet_id >> 8)  & 0xFF;
+    buf1[2] = (packet_id >> 16) & 0xFF;
+    buf1[3] = (packet_id >> 24) & 0xFF;
+    printf("buf1[0] = %d\n", buf1[0]);
+    printf("buf1[1] = %d\n", buf1[1]);
+    printf("buf1[2] = %d\n", buf1[2]);
+    printf("buf1[3] = %d\n", buf1[3]);
+    printf("packet_id = %d\n", packet_id);
+
+    buf1[4] = (src_id >> 0 ) & 0xFF;
+    buf1[5] = (src_id >> 8 ) & 0xFF;
+
+    buf1[6] = (dst_id >> 0 ) & 0xFF;
+    buf1[7] = (dst_id >> 8 ) & 0xFF;
+
+    buf1[8] = (app_id >> 0 ) & 0xFF;
+    buf1[9] = (app_id >> 8 ) & 0xFF;
+
+    buf1[10] = (port_id >> 0 ) & 0xFF;
+    buf1[11] = (port_id >> 8 ) & 0xFF;
 
     buf1[12] = 7;
@@ -561 +567 @@
         crc.PutByte(buf1[i]);
     UINT32 crc_code = crc.Done();
-
-    buf1[16] = (crc_code >> 0 )  & 0x0F;
-    buf1[17] = (crc_code >> 4 )  & 0x0F;
-    buf1[18] = (crc_code >> 8 )  & 0x0F;
-    buf1[19] = (crc_code >> 12 ) & 0x0F;
+    std::cout << "crc (encoder): 0x" << std::hex << crc_code << std::endl;
+
+    buf1[16] = (crc_code >> 0 )  & 0xFF;
+    buf1[17] = (crc_code >> 8 )  & 0xFF;
+    buf1[18] = (crc_code >> 16 ) & 0xFF;
+    buf1[19] = (crc_code >> 24 ) & 0xFF;
+    for (unsigned int i=0; i<4; i++)
+        printf("crc[%d] = %d\n", i, (unsigned int) (buf1[16+i]));
 
     // 3. repack 20 8-bit symbols (+2 bits) into 27 6-bit symbols
@@ -587 +596 @@
 
     // 5. unpack to output buffer
-    SigProc::repack_bytes(buf1, 6, 27, output, 1, output_length, &num_written);
+    SigProc::repack_bytes(buf1, 6, 35, output, 1, output_length, &num_written);
     num_written += 3; // pad to 213
     printf("PACKET_RS_512 subheader: num_written: %d (should be 213)\n", num_written);
@@ -777 +786 @@
         crc.PutByte( buf2[i] );
     UINT32 crc_code = crc.Done();
-    unsigned long crc_rx(0);
-    for (unsigned int i=1; i<4; i++) {
-        crc_rx <<= 4;
-        crc_rx |= buf2[20-i-1];
-    }
-    //printf("crc_rx = %d, crc_code = %d\n", crc_rx, crc_code);
-    std::cout << "crc_rc: 0x" << std::hex << crc_rx << ", crc_code = 0x" << crc_code << std::endl;
+    UINT32 crc_rx(0);
+    for (unsigned int i=0; i<4; i++)
+        printf("crc[%d] = %d\n", i, (unsigned char) (buf2[16+i]));
+    for (unsigned int i=0; i<4; i++) {
+        crc_rx <<= 8;
+        crc_rx |= 0xFF & (UINT32) (buf2[20-i-1]);
+    }
+    crc_rx = 0;
+    crc_rx |= (buf2[16] << 0);
+    crc_rx |= (buf2[17] << 8);
+    crc_rx |= (buf2[18] << 16);
+    crc_rx |= (buf2[19] << 24);
+    std::cout << "crc_rx: 0x" << std::hex << crc_rx << ", crc_code = 0x" << crc_code << std::endl;
+    if (crc_rx != crc_code) {
+        printf("ERROR! PACKET_RS_512 subheader did not pass cyclic redundancy check\n");
+        //return false;
+    } else {
+        printf("PACKET_RS_512 subheader passed cyclic redundancy check\n");
+    }
 
     // 5. decode 16 8-bit symbols...
-    
+    // variable     num bits
+    // ----         ----
+    // packet_id    32
+    // src_id       16
+    // dst_id       16
+    // app_id       16
+    // port_id      16
+    // expansion    64
+    packet_id = 0;
+    printf("buf2[0] = %d\n", buf2[0]);
+    printf("buf2[1] = %d\n", buf2[1]);
+    printf("buf2[2] = %d\n", buf2[2]);
+    printf("buf2[3] = %d\n", buf2[3]);
+    for (unsigned int i=0; i<4; i++) {
+        packet_id <<= 8;
+        packet_id |= 0xFF & (unsigned long) (buf2[4-i-1]);
+    }
+    packet_id = 0;
+    packet_id |= (buf2[0] << 0);
+    packet_id |= (buf2[1] << 8);
+    packet_id |= (buf2[2] << 16);
+    packet_id |= (buf2[3] << 24);
+
+    src_id = 0;
+    src_id |= buf2[5];
+    src_id <<= 8;
+    src_id |= buf2[4];
+/*
+    buf1[6] = (dst_id >> 0 ) & 0x0F;
+    buf1[7] = (dst_id >> 4 ) & 0x0F;
+
+    buf1[8] = (app_id >> 0 ) & 0x0F;
+    buf1[9] = (app_id >> 4 ) & 0x0F;
+
+    buf1[10] = (port_id >> 0 ) & 0x0F;
+    buf1[11] = (port_id >> 4 ) & 0x0F;
+
+    buf1[12] = 7;
+    buf1[13] = 7;
+    buf1[14] = 7;
+    buf1[15] = 7;
+*/
     return true;
 }