Index: /experimental/components/Packetizer/trunk/Packetizer-metadata/configure.ac =================================================================== --- /experimental/components/Packetizer/trunk/Packetizer-metadata/configure.ac (revision 4368) +++ /experimental/components/Packetizer/trunk/Packetizer-metadata/configure.ac (revision 5182) @@ -4,4 +4,5 @@ AC_PREFIX_DEFAULT("/sdr") +AC_PROG_CC AC_PROG_CXX AC_PROG_INSTALL Index: /experimental/components/Packetizer/trunk/Packetizer-metadata/src/Depacketizer.h =================================================================== --- /experimental/components/Packetizer/trunk/Packetizer-metadata/src/Depacketizer.h (revision 5168) +++ /experimental/components/Packetizer/trunk/Packetizer-metadata/src/Depacketizer.h (revision 5182) @@ -22,6 +22,6 @@ -#ifndef DEPACKETIZERSIMPLEBPSK_IMPL_H -#define DEPACKETIZERSIMPLEBPSK_IMPL_H +#ifndef DEPACKETIZER_IMPL_H +#define DEPACKETIZER_IMPL_H #include @@ -85,8 +85,10 @@ enum { EXTRACT_PN_SYNC_CODE, + EXTRACT_PACKET_TYPE, EXTRACT_CONTROL_CODES, - EXTRACT_DATA_BLOCK + EXTRACT_HEADER, + EXTRACT_DATA_BLOCK, + EXTRACT_EOM_CODE } operationalMode; - }; Index: /experimental/components/Packetizer/trunk/Packetizer-metadata/src/binary_sequence.h =================================================================== --- /experimental/components/Packetizer/trunk/Packetizer-metadata/src/binary_sequence.h (revision 5182) +++ /experimental/components/Packetizer/trunk/Packetizer-metadata/src/binary_sequence.h (revision 5182) @@ -0,0 +1,54 @@ +/**************************************************************************** + +Copyright 2007 Virginia Polytechnic Institute and State University + +This file is part of the OSSIE Packetizer. + +OSSIE Packetizer is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + OSSIE Packetizer is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with OSSIE Packetizer; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +****************************************************************************/ + +#ifndef __BINARY_SEQUENCE_H__ +#define __BINARY_SEQUENCE_H__ + +#include +#include +#include +#include +#include + +typedef unsigned char UINT8; +typedef bool BIT; +struct binary_sequence; +typedef struct binary_sequence binary_sequence_t; + +struct binary_sequence { + /// sequence array + UINT8 * s; + + /// length of array + unsigned int s_len; +}; + +binary_sequence_t * binary_sequence_create(); + +void binary_sequence_initialize(binary_sequence_t * bs, unsigned int num_bits); + +void binary_sequence_destroy(binary_sequence_t * s); + +void binary_sequence_push(BIT b); + +signed int binary_sequence_correlate(binary_sequence_t * s1, binary_sequence_t * s2); + +#endif Index: /experimental/components/Packetizer/trunk/Packetizer-metadata/src/Packetizer.h =================================================================== --- /experimental/components/Packetizer/trunk/Packetizer-metadata/src/Packetizer.h (revision 5168) +++ /experimental/components/Packetizer/trunk/Packetizer-metadata/src/Packetizer.h (revision 5182) @@ -22,6 +22,6 @@ -#ifndef PACKETIZERSIMPLEBPSK_IMPL_H -#define PACKETIZERSIMPLEBPSK_IMPL_H +#ifndef PACKETIZER_IMPL_H +#define PACKETIZER_IMPL_H #include Index: /experimental/components/Packetizer/trunk/Packetizer-metadata/src/Depacketizer.cpp =================================================================== --- /experimental/components/Packetizer/trunk/Packetizer-metadata/src/Depacketizer.cpp (revision 5168) +++ /experimental/components/Packetizer/trunk/Packetizer-metadata/src/Depacketizer.cpp (revision 5182) @@ -116,4 +116,6 @@ { DEBUG(3, Depacketizer, "run_loop() thread started") + +#if 0 #ifdef LOGGING @@ -218,5 +220,7 @@ output_bits_log.close(); #endif -} - - + +#endif // 0 +} + + Index: /experimental/components/Packetizer/trunk/Packetizer-metadata/src/binary_sequence.c =================================================================== --- /experimental/components/Packetizer/trunk/Packetizer-metadata/src/binary_sequence.c (revision 5182) +++ /experimental/components/Packetizer/trunk/Packetizer-metadata/src/binary_sequence.c (revision 5182) @@ -0,0 +1,51 @@ +/**************************************************************************** + +Copyright 2007 Virginia Polytechnic Institute and State University + +This file is part of the OSSIE Packetizer. + +OSSIE Packetizer is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + OSSIE Packetizer is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with OSSIE Packetizer; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +****************************************************************************/ + +#include "binary_sequence.h" + +binary_sequence_t * binary_sequence_create() +{ + binary_sequence_t * bs; + + // allocate memory for binary sequence + bs = (binary_sequence_t*) malloc( sizeof(binary_sequence_t) ); + + // initialize variables + bs->s_len = 0; + bs->s = NULL; + + return bs; +} + +void binary_sequence_initialize(binary_sequence_t * bs, unsigned int num_bits) +{ + if (bs->s == NULL) + printf("ERROR! binary sequence already initialized!\n"); + + // initialize length + bs->s_len = num_bits / 8; + + // initialze array with zeros + bs->s = (UINT8*) calloc( bs->s_len, sizeof(UINT8) ); +} + + + Index: /experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.h =================================================================== --- /experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.h (revision 5168) +++ /experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.h (revision 5182) @@ -32,4 +32,8 @@ #define PN_CONTROL_CODE_LENGTH 7 #define NUM_CONTROL_CODES 7 + +extern "C" { +#include "binary_sequence.h" +} /// Forward error correction scheme Index: /experimental/components/Packetizer/trunk/Packetizer-metadata/Makefile.am =================================================================== --- /experimental/components/Packetizer/trunk/Packetizer-metadata/Makefile.am (revision 4843) +++ /experimental/components/Packetizer/trunk/Packetizer-metadata/Makefile.am (revision 5182) @@ -2,5 +2,5 @@ bin_PROGRAMS = Packetizer Depacketizer -bindir = $(prefix)/dom/bin +bindir = $(prefix)/bin # ---------- Packetizer ---------- @@ -13,8 +13,10 @@ src/PNCodes.h \ src/PNCodes.cpp \ + src/binary_sequence.h \ + src/binary_sequence.c \ src/main_packetizer.cpp ossieName1 = Packetizer -xml1dir = $(prefix)/dom/xml/$(ossieName1) +xml1dir = $(prefix)/xml/$(ossieName1) dist_xml1_DATA = \ xml/Packetizer.prf.xml \ @@ -35,5 +37,5 @@ ossieName2 = Depacketizer -xml2dir = $(prefix)/dom/xml/$(ossieName2) +xml2dir = $(prefix)/xml/$(ossieName2) dist_xml2_DATA = \ xml/Depacketizer.prf.xml \