Merge branch 'master' of github.com:jgaeddert/liquid-dsp

jgaeddert · Feb 25, 2016 · 2e4c137 · 2e4c137
2 parents f04f643 + f6a33a6
commit 2e4c137
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/include/liquid.h b/include/liquid.h
@@ -3649,8 +3649,8 @@ unsigned int flexframegen_getframelen(flexframegen _q);
 //  _payload        :   payload data [size: _payload_len x 1]
 //  _payload_len    :   payload data length
 void flexframegen_assemble(flexframegen    _q,
-                           unsigned char * _header,
-                           unsigned char * _payload,
+                           const unsigned char * _header,
+                           const unsigned char * _payload,
                            unsigned int    _payload_len);
 
 // write samples of assembled frame, two samples at a time, returning
@@ -3897,8 +3897,8 @@ unsigned int ofdmflexframegen_getframelen(ofdmflexframegen _q);
 //  _payload        :   payload data [size: _payload_len x 1]
 //  _payload_len    :   payload data length
 void ofdmflexframegen_assemble(ofdmflexframegen _q,
-                               unsigned char * _header,
-                               unsigned char * _payload,
+                               const unsigned char * _header,
+                               const unsigned char * _payload,
                                unsigned int    _payload_len);
 
 // write symbols of assembled frame

diff --git a/src/framing/src/flexframegen.c b/src/framing/src/flexframegen.c
@@ -286,8 +286,8 @@ unsigned int flexframegen_getframelen(flexframegen _q)
 //  _payload        :   variable payload buffer (configured by setprops method)
 //  _payload_dec_len:   length of payload
 void flexframegen_assemble(flexframegen    _q,
-                           unsigned char * _header,
-                           unsigned char * _payload,
+                           const unsigned char * _header,
+                           const unsigned char * _payload,
                            unsigned int    _payload_dec_len)
 {
     // reset object

diff --git a/src/framing/src/ofdmflexframegen.c b/src/framing/src/ofdmflexframegen.c
@@ -351,8 +351,8 @@ unsigned int ofdmflexframegen_getframelen(ofdmflexframegen _q)
 //  _payload        :   payload data [size: _payload_len x 1]
 //  _payload_len    :   payload data length
 void ofdmflexframegen_assemble(ofdmflexframegen _q,
-                               unsigned char *  _header,
-                               unsigned char *  _payload,
+                               const unsigned char *  _header,
+                               const unsigned char *  _payload,
                                unsigned int     _payload_len)
 {
     // check payload length and reconfigure if necessary
@@ -620,8 +620,8 @@ void ofdmflexframegen_write_header(ofdmflexframegen _q,
             } else {
                 //printf("  random header symbol\n");
                 // load random symbol
-                unsigned int sym = modem_gen_rand_sym(_q->mod_payload);
-                modem_modulate(_q->mod_payload, sym, &_q->X[i]);
+                unsigned int sym = modem_gen_rand_sym(_q->mod_header);
+                modem_modulate(_q->mod_header, sym, &_q->X[i]);
             }
         } else {
             // ignore subcarrier (ofdmframegen handles nulls and pilots)