Selective merge from 9.2.0-merge branch

Did not cherry pick AKA' changes
Wi-FiTestSuite · Sep 23, 2016 · dfafa3a · dfafa3a
1 parent 3f9ef23
commit dfafa3a
Show file tree

Hide file tree

Showing 69 changed files with 124 additions and 92 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 
@@ -15,7 +15,7 @@
 #
 include Makefile.inc
 
-DIRS= ${LIB} ${DUT} ${CA} ${TC}
+DIRS= ${LIB} ${DUT} ${CA} ${TC} ${WTG} ${CON}
 
 all:
 	for i in ${DIRS}; do \

diff --git a/Makefile.inc b/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 
@@ -18,6 +18,8 @@ LIB=lib
 DUT=dut
 CA=ca
 UCC=ucc
+CON=console_src
+WTG=WTGService
 MAKE=make
 
 # This is for WMM-PS

diff --git a/WTGService/Makefile b/WTGService/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 

diff --git a/WTGService/WTG.c b/WTGService/WTG.c
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/WTGService/WTG.conf b/WTGService/WTG.conf
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 

diff --git a/WTGService/WTG.h b/WTGService/WTG.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/WTGService/WTGService.sh b/WTGService/WTGService.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 

diff --git a/WTGService/WTGService_VE.sh b/WTGService/WTGService_VE.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 

diff --git a/WTGService/installWTG.sh b/WTGService/installWTG.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 

diff --git a/WTGService/startPCE_VE.sh b/WTGService/startPCE_VE.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 

diff --git a/WTGService/uninstallWTG.sh b/WTGService/uninstallWTG.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 

diff --git a/buildEssentials.sh b/buildEssentials.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 
@@ -18,9 +18,12 @@
 
 #To install the build essentials
 
+lsb_release -a | grep Release: | grep 6.*
+if [ $? -eq 0 ]
+then 
 cp /etc/apt/sources.list /etc/apt/sources.list.orig
 cp -f sources.list /etc/apt
-
+fi
 apt-get update
 
 echo y > yfile

diff --git a/ca/Makefile b/ca/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 

diff --git a/ca/wfa_ca.c b/ca/wfa_ca.c
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/console_src/Makefile b/console_src/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 

diff --git a/console_src/mpx.c b/console_src/mpx.c
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/console_src/mpx.h b/console_src/mpx.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/console_src/wfa_con.c b/console_src/wfa_con.c
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/console_src/wfa_con.h b/console_src/wfa_con.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/console_src/wfa_sndrcv.c b/console_src/wfa_sndrcv.c
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/console_src/wfa_util.c b/console_src/wfa_util.c
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/dut/Makefile b/dut/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 Wi-Fi Alliance
+# Copyright (c) 2016 Wi-Fi Alliance
 # 
 # Permission to use, copy, modify, and/or distribute this software for any 
 # purpose with or without fee is hereby granted, provided that the above 

diff --git a/dut/wfa_dut.c b/dut/wfa_dut.c
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/dut/wfa_dut.h b/dut/wfa_dut.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/dut/wfa_dut_init.c b/dut/wfa_dut_init.c
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_agt.h b/inc/wfa_agt.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_agtctrl.h b/inc/wfa_agtctrl.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_ca.h b/inc/wfa_ca.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_ca_resp.h b/inc/wfa_ca_resp.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_cmds.h b/inc/wfa_cmds.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -423,7 +423,7 @@ enum
 	PROG_TYPE_WFDS,
     PROG_TYPE_HS2,
     PROG_TYPE_HS2_R2,
-	PROG_TYPE_NAN
+	PROG_TYPE_NAN,
 };
 
 typedef struct ca_sta_dev_sendframe
@@ -1236,6 +1236,7 @@ typedef struct ca_sta_preset_parameters
     BYTE ftoa;
     BYTE ftds;
     BYTE activescan;
+    WORD oper_chn;
     BYTE tdls;
     BYTE tdlsMode;
 

diff --git a/inc/wfa_debug.h b/inc/wfa_debug.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_main.h b/inc/wfa_main.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_miscs.h b/inc/wfa_miscs.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_portall.h b/inc/wfa_portall.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_rsp.h b/inc/wfa_rsp.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_sock.h b/inc/wfa_sock.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_stdincs.h b/inc/wfa_stdincs.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_tg.h b/inc/wfa_tg.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_tlv.h b/inc/wfa_tlv.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_tlv_old.h b/inc/wfa_tlv_old.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_types.h b/inc/wfa_types.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_utils.h b/inc/wfa_utils.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above

diff --git a/inc/wfa_ver.h b/inc/wfa_ver.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-* Copyright (c) 2015 Wi-Fi Alliance
+* Copyright (c) 2016 Wi-Fi Alliance
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -21,6 +21,6 @@
 #define WFA_VER_H
 
 #define WFA_VERNAM_LEN      32
-#define WFA_SYSTEM_VER      "PCEDUT-Wi-FiTestSuite- 9.0.0"
+#define WFA_SYSTEM_VER      "PCEDUT-Wi-FiTestSuite- 9.2.0"
 
 #endif