t/gr-ieee802-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Windows build error from non-const array size

Browse Source
This commit is contained in:
Ryan Volz
2023-07-20 17:03:15 -04:00
committed by Bastian Bloessl
parent 83c02a1b66
commit 1b88193094
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/decode_mac.cc
+2 -2
View File
@@ -162,8 +162,8 @@ public:
{ {
int n_cbps = d_ofdm.n_cbps; int n_cbps = d_ofdm.n_cbps;
int first[n_cbps]; int first[MAX_BITS_PER_SYM];
int second[n_cbps]; int second[MAX_BITS_PER_SYM];
int s = std::max(d_ofdm.n_bpsc / 2, 1); int s = std::max(d_ofdm.n_bpsc / 2, 1);
for (int j = 0; j < n_cbps; j++) { for (int j = 0; j < n_cbps; j++) {
lib/utils.cc
+2 -2
View File
@@ -224,8 +224,8 @@ void interleave(
{ {
int n_cbps = ofdm.n_cbps; int n_cbps = ofdm.n_cbps;
int first[n_cbps]; int first[MAX_BITS_PER_SYM];
int second[n_cbps]; int second[MAX_BITS_PER_SYM];
int s = std::max(ofdm.n_bpsc / 2, 1); int s = std::max(ofdm.n_bpsc / 2, 1);
for (int j = 0; j < n_cbps; j++) { for (int j = 0; j < n_cbps; j++) {
lib/utils.h
+2 -1
View File
@@ -28,7 +28,8 @@ using gr::ieee802_11::Encoding;
#define MAX_PAYLOAD_SIZE 1500 #define MAX_PAYLOAD_SIZE 1500
#define MAX_PSDU_SIZE (MAX_PAYLOAD_SIZE + 28) // MAC, CRC #define MAX_PSDU_SIZE (MAX_PAYLOAD_SIZE + 28) // MAC, CRC
#define MAX_SYM (((16 + 8 * MAX_PSDU_SIZE + 6) / 24) + 1) #define MAX_SYM (((16 + 8 * MAX_PSDU_SIZE + 6) / 24) + 1)
#define MAX_ENCODED_BITS ((16 + 8 * MAX_PSDU_SIZE + 6) * 2 + 288) #define MAX_BITS_PER_SYM 288
#define MAX_ENCODED_BITS ((16 + 8 * MAX_PSDU_SIZE + 6) * 2 + MAX_BITS_PER_SYM)
#define dout d_debug&& std::cout #define dout d_debug&& std::cout
#define mylog(msg) \ #define mylog(msg) \