diff options
| author | Ben Reynwar | 2010-12-03 21:30:27 -0700 |
|---|---|---|
| committer | Ben Reynwar | 2010-12-03 21:30:27 -0700 |
| commit | ed55c41ce13558b840654cea9c959d32dbaed174 (patch) | |
| tree | e62a8db9087e17a908195dee470b49a176cbda1c /gr-msdd6000/src | |
| parent | 26e7851318dfc691fd4412823a392a15bd1c475e (diff) | |
| parent | dd656e9db5e69ed6b11653deea710e299d72827e (diff) | |
| download | gnuradio-ed55c41ce13558b840654cea9c959d32dbaed174.tar.gz gnuradio-ed55c41ce13558b840654cea9c959d32dbaed174.tar.bz2 gnuradio-ed55c41ce13558b840654cea9c959d32dbaed174.zip | |
Merge branch 'grorg-master'
Diffstat (limited to 'gr-msdd6000/src')
| -rw-r--r-- | gr-msdd6000/src/msdd_rs_source_simple.cc | 5 | ||||
| -rw-r--r-- | gr-msdd6000/src/msdd_source_simple.cc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gr-msdd6000/src/msdd_rs_source_simple.cc b/gr-msdd6000/src/msdd_rs_source_simple.cc index c44808f51..70e692d83 100644 --- a/gr-msdd6000/src/msdd_rs_source_simple.cc +++ b/gr-msdd6000/src/msdd_rs_source_simple.cc @@ -64,7 +64,10 @@ msdd_rs_source_simple::work (int noutput_items, /* Read a buffer out -- looking at UDP payload at this point.*/ rcv->read( &buffer[0], BUF_LEN ); - int seq = *((int*) &buffer[2]); + //int seq = *((int*) &buffer[2]); + int seq; + memcpy(&seq, &buffer[2], 4*sizeof(char)); + char type = buffer[0]; //printf("Sequence %d\n",seq); diff --git a/gr-msdd6000/src/msdd_source_simple.cc b/gr-msdd6000/src/msdd_source_simple.cc index 076a305f1..20b15c43d 100644 --- a/gr-msdd6000/src/msdd_source_simple.cc +++ b/gr-msdd6000/src/msdd_source_simple.cc @@ -64,7 +64,9 @@ msdd_source_simple::work (int noutput_items, char buffer[BUF_LEN]; rcv->read( &buffer[0], BUF_LEN ); - int seq = *((int*) &buffer[2]); + //int seq = *((int*) &buffer[2]); + int seq; + memcpy(&seq, &buffer[2], 4*sizeof(char)); if(d_lastseq == -MSDD_COMPLEX_SAMPLES_PER_PACKET){ // not started case |