Fixed PUCCH format 2a identification

srslte/lib/ue/src/ue_ul.c

@@ -252,18 +252,18 @@ int pucch_encode_bits(srslte_uci_data_t *uci_data, srslte_pucch_format_t *format
       *format = SRSLTE_PUCCH_FORMAT_2;    
     }
     // CQI + 1-bit ACK
-    else if (uci_data->uci_cqi_len == SRSLTE_PUCCH_MAX_BITS && uci_data->uci_ack_len == 1) {
+    else if (uci_data->uci_cqi_len > 0 && uci_data->uci_ack_len == 1) {
       *format = SRSLTE_PUCCH_FORMAT_2A;    
       pucch2_bits[0] = uci_data->uci_ack; 
     }
     // CQI + 2-bit ACK 
-    else if (uci_data->uci_cqi_len == SRSLTE_PUCCH_MAX_BITS && uci_data->uci_ack_len == 2) {
+    else if (uci_data->uci_cqi_len > 0 && uci_data->uci_ack_len == 2) {
       *format = SRSLTE_PUCCH_FORMAT_2B;    
       pucch2_bits[0] = uci_data->uci_ack; 
       pucch2_bits[1] = uci_data->uci_ack_2; 
     }
     // CQI + 2-bit ACK + cyclic prefix 
-    else if (uci_data->uci_cqi_len == SRSLTE_PUCCH_MAX_BITS && uci_data->uci_ack_len == 1 && SRSLTE_CP_ISEXT(cp)) {
+    else if (uci_data->uci_cqi_len > 0 && uci_data->uci_ack_len == 1 && SRSLTE_CP_ISEXT(cp)) {
       *format = SRSLTE_PUCCH_FORMAT_2B;    
       pucch2_bits[0] = uci_data->uci_ack; 
       pucch2_bits[1] = uci_data->uci_ack_2; 

srslte/lib/utils/src/vector.c

@@ -402,7 +402,7 @@ void srslte_vec_fprint_hex(FILE *stream, uint8_t *x, uint32_t len) {
   uint32_t i, nbytes; 
   uint8_t byte;
   nbytes = len/8;
-  fprintf(stream, "[", len);
+  fprintf(stream, "[");
   for (i=0;i<nbytes;i++) {
     byte = (uint8_t) srslte_bit_pack(&x, 8);
     fprintf(stream, "%02x ", byte);