Merge pull request #8 from sl8vz/fix_upstream_driver_support

fix pds_compress usage from other module

Author: MarcDorval

test-feature/pds_compress.py

@@ -527,7 +527,8 @@ def main(options):
     elif options.out_format == "tlv":
         # We may apply this encoding to all the other outputs. However, the TLV
         # is the only one which generates binary data.
-        options.output.reconfigure(encoding='charmap', newline='')
+        if __name__ == '__main__':
+            options.output.reconfigure(encoding='charmap', newline='')
         formattlv(options.output, str_result)
     elif options.out_format == "pds":
         options.output.write(str_result)
@@ -538,14 +539,20 @@ def main(options):
 # This function is only an help for third-party tools that import pds_compress
 # as a python module (also note it is necessary to add .py extention to this in
 # order to import it).
-def compress_string(str_in, extra_options=""):
+def compress_string(str_in, extra_options="", format="pds"):
     global g_defs, g_result, g_ret_value
     g_defs = {}
     g_result = []
     g_ret_value = 0
+    if format == "tlv":
+        extra_options += " --out=tlv"
     options = parse_cmdline([ "-" ] + extra_options.split())
     options.input = io.StringIO(str_in)
-    options.output = io.StringIO()
+    if format == "tlv":
+        options.output = io.StringIO(newline='')
+    else:
+        options.output = io.StringIO()
+
     main(options)
     return options.output.getvalue()
 

test-feature/wfx_test_target.py

@@ -21,9 +21,10 @@
 pds_env['SEND_PDS_FILE'] = "/sys/kernel/debug/ieee80211/phy0/wfx/send_pds"
 pds_env['PDS_DEFINITION_ROOT'] = ""
 pds_env['PDS_DEFINITION_FILE'] = "definitions.in"
-# If using the upstream wfx driver, set below `pds_env['required_options'] = "--out=tlv"`
 pds_env['required_options'] = []
 pds_env['useful_options'] = []
+# If using mainstream driver, set pds_output_format to "tlv"
+pds_env['pds_output_format'] = "pds"
 
 
 class WfxTestTarget(object):
@@ -44,6 +45,7 @@ def __init__(self, nickname, **kwargs):
         self.link = None
         self.required_options = pds_env['required_options']
         self.useful_options = pds_env['useful_options']
+        self.pds_output_format = pds_env['pds_output_format']
         self.fmac_cli = False
 
         if 'host' in kwargs:
@@ -120,7 +122,13 @@ def _prepare_test_data(self, parameters):
 
         pds_string = "#include \"" + pds_env['PDS_DEFINITION_ROOT'] + pds_env['PDS_DEFINITION_FILE']\
                      + "\"\n\n" + pds_compatibility_text + pds_sections
-        compressed_string = compress_string(pds_string, self.required_options)
+
+        compressed_string = compress_string(pds_string, format=self.pds_output_format)
+
+        # The TLV format has some binary data that needs to be included
+        if self.pds_output_format == "tlv":
+            compressed_string = repr(compressed_string).strip("'")
+
         if self.human_trace:
             print('human readable: ' + pds_string)
         if self.compressed_trace: