added my Recipes
This commit is contained in:
@@ -0,0 +1,92 @@
|
||||
From 6b822b36739222d0c864249992b5d28e3ff4d948 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Friedli <adrian.friedli@husqvarnagroup.com>
|
||||
Date: Mon, 3 Sep 2018 17:58:27 +0200
|
||||
Subject: [PATCH] Use toolchain from environment variables
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/42]
|
||||
Signed-off-by: Adrian Friedli <adrian.friedli@husqvarnagroup.com>
|
||||
Signed-off-by: Ankit Navik <ankit.tarot@gmail.com>
|
||||
---
|
||||
Makefile.inc | 7 ++++---
|
||||
WTGService/Makefile | 2 +-
|
||||
console_src/Makefile | 2 +-
|
||||
lib/Makefile | 6 +++---
|
||||
4 files changed, 9 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/Makefile.inc b/Makefile.inc
|
||||
index b0edf5a..0094bdf 100644
|
||||
--- a/Makefile.inc
|
||||
+++ b/Makefile.inc
|
||||
@@ -13,14 +13,15 @@
|
||||
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
|
||||
# USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
+AR ?= ar
|
||||
LIB=lib
|
||||
DUT=dut
|
||||
CA=ca
|
||||
UCC=ucc
|
||||
CON=console_src
|
||||
WTG=WTGService
|
||||
-MAKE=make
|
||||
+MAKE?=make
|
||||
|
||||
# This is for WMM-PS
|
||||
#for Ext TG
|
||||
@@ -46,7 +47,7 @@ CFLAGS = -g -O2 -D_REENTRANT -Wall -I../inc
|
||||
|
||||
DUTLIBS = ../lib/libwfa_dut.a -lpthread
|
||||
CALIBS = ../lib/libwfa_ca.a -lpthread
|
||||
-RANLIB = ranlib
|
||||
+RANLIB ?= ranlib
|
||||
|
||||
LIBWFA_NAME_DUT = libwfa_dut.a
|
||||
LIBWFA_NAME_CA = libwfa_ca.a
|
||||
diff --git a/WTGService/Makefile b/WTGService/Makefile
|
||||
index 5312eb6..4855771 100644
|
||||
--- a/WTGService/Makefile
|
||||
+++ b/WTGService/Makefile
|
||||
@@ -13,7 +13,7 @@
|
||||
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
|
||||
# USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
-CC=gcc
|
||||
+CC?=gcc
|
||||
CFLAGS= -Wall
|
||||
LIB=-lpthread
|
||||
|
||||
diff --git a/console_src/Makefile b/console_src/Makefile
|
||||
index 8282283..d1098eb 100644
|
||||
--- a/console_src/Makefile
|
||||
+++ b/console_src/Makefile
|
||||
@@ -14,7 +14,7 @@
|
||||
# USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
CFLAGS = -g -DWFA_DEBUG -pthread
|
||||
|
||||
TARGETS = wfa_con
|
||||
diff --git a/lib/Makefile b/lib/Makefile
|
||||
index ffcef94..299b8d6 100644
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -17,9 +17,9 @@
|
||||
include ../Makefile.inc
|
||||
|
||||
all: ${LIB_OBJS}
|
||||
- ar crv ${LIBWFA_NAME} $?
|
||||
- ar crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT}
|
||||
- ar crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA}
|
||||
+ $(AR) crv ${LIBWFA_NAME} $?
|
||||
+ $(AR) crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT}
|
||||
+ $(AR) crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA}
|
||||
${RANLIB} ${LIBWFA_NAME} ${LIBWFA_NAME_DUT} ${LIBWFA_NAME_CA}
|
||||
|
||||
wfa_tg.o: wfa_tg.c ../inc/wfa_agt.h ../inc/wfa_types.h ../inc/wfa_rsp.h ../inc/wfa_tlv.h ../inc/wfa_tg.h
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 2b7d6cf62296ff4e25e5ad909aa39a257bf9ff78 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 31 Aug 2022 19:37:35 -0700
|
||||
Subject: [PATCH] wfa_cmdproc: Store return value into location
|
||||
|
||||
Fixes
|
||||
| wfa_cmdproc.c:100:20: error: incompatible integer to pointer conversion assigning to 'int *' from 'int' [-Wint-conversion]
|
||||
| paramValue = atoi(str);
|
||||
| ^ ~~~~~~~~~
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/57]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/wfa_cmdproc.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/wfa_cmdproc.c b/lib/wfa_cmdproc.c
|
||||
index 9f5fd16..49a3f16 100644
|
||||
--- a/lib/wfa_cmdproc.c
|
||||
+++ b/lib/wfa_cmdproc.c
|
||||
@@ -97,7 +97,7 @@ int getParamValueInt(char *pcmdStr, char *pParam, int *paramValue)
|
||||
if(strcasecmp(pcmdStr, pParam) == 0)
|
||||
{
|
||||
str = strtok_r(NULL, ",", &pcmdStr);
|
||||
- paramValue = atoi(str);
|
||||
+ *paramValue = atoi(str);
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From 451b162c903a1ef070a75dc18171620f3beef7b3 Mon Sep 17 00:00:00 2001
|
||||
From: Ankit Navik <ankit.tarot@gmail.com>
|
||||
Date: Tue, 25 Dec 2018 00:36:59 +0530
|
||||
Subject: [PATCH 2/3] Add missing include, removes unnedded stuff and add non
|
||||
glibc rpc
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Reto Schneider <code@reto-schneider.ch>
|
||||
Signed-off-by: Ankit Navik <ankit.tarot@gmail.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
inc/wfa_tg.h | 3 +++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 2c41a17..5c4ad8c 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -15,7 +15,7 @@
|
||||
#
|
||||
include Makefile.inc
|
||||
|
||||
-DIRS= ${LIB} ${DUT} ${CA} ${TC} ${WTG} ${CON}
|
||||
+DIRS= ${LIB} ${DUT} ${CA} ${TC}
|
||||
|
||||
all:
|
||||
for i in ${DIRS}; do \
|
||||
diff --git a/inc/wfa_tg.h b/inc/wfa_tg.h
|
||||
index 799bf9f..a1804dd 100644
|
||||
--- a/inc/wfa_tg.h
|
||||
+++ b/inc/wfa_tg.h
|
||||
@@ -24,6 +24,9 @@
|
||||
#ifndef _WFA_TG_H
|
||||
#define _WFA_TG_H
|
||||
|
||||
+#ifndef _WINDOWS
|
||||
+#include <pthread.h>
|
||||
+#endif
|
||||
#include <sys/time.h>
|
||||
|
||||
/* maximum number of streams to support */
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
From fc7b7106dd0d8d123f20cbd8d408637fbc315e17 Mon Sep 17 00:00:00 2001
|
||||
From: Ankit Navik <ankit.tarot@gmail.com>
|
||||
Date: Tue, 25 Dec 2018 01:12:32 +0530
|
||||
Subject: [PATCH 3/3] fix path to /usr/sbin for script and make script for
|
||||
generic shell
|
||||
|
||||
Signed-off-by: Ankit Navik <ankit.tarot@gmail.com>
|
||||
---
|
||||
lib/wfa_cs.c | 4 ++--
|
||||
scripts/dev_send_frame | 2 +-
|
||||
scripts/sta_reset_parm | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/wfa_cs.c b/lib/wfa_cs.c
|
||||
index 6b1f5a2..2a18533 100644
|
||||
--- a/lib/wfa_cs.c
|
||||
+++ b/lib/wfa_cs.c
|
||||
@@ -319,7 +319,7 @@ int wfaStaGetIpConfig(int len, BYTE *caCmdBuf, int *respLen, BYTE *respBuf)
|
||||
/*
|
||||
* check a script file (the current implementation specific)
|
||||
*/
|
||||
- ret = access("/usr/local/sbin/getipconfig.sh", F_OK);
|
||||
+ ret = access("/usr/sbin/getipconfig.sh", F_OK);
|
||||
if(ret == -1)
|
||||
{
|
||||
ipconfigResp->status = STATUS_ERROR;
|
||||
@@ -2115,7 +2115,7 @@ int wfaStaPresetParams(int len, BYTE *caCmdBuf, int *respLen, BYTE *respBuf)
|
||||
st = remove("/tmp/processid.txt");
|
||||
}
|
||||
|
||||
- sprintf(cmdStr, "/usr/local/sbin/findprocess.sh %s /tmp/processid.txt\n", "wpa_supplicant");
|
||||
+ sprintf(cmdStr, "/usr/sbin/findprocess.sh %s /tmp/processid.txt\n", "wpa_supplicant");
|
||||
st = system(cmdStr);
|
||||
|
||||
tmpfd = fopen("/tmp/processid.txt", "r+");
|
||||
diff --git a/scripts/dev_send_frame b/scripts/dev_send_frame
|
||||
index 9e6afd3..3c37d61 100644
|
||||
--- a/scripts/dev_send_frame
|
||||
+++ b/scripts/dev_send_frame
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright (c) 2016 Wi-Fi Alliance
|
||||
diff --git a/scripts/sta_reset_parm b/scripts/sta_reset_parm
|
||||
index 2aff1f1..2c1c31e 100644
|
||||
--- a/scripts/sta_reset_parm
|
||||
+++ b/scripts/sta_reset_parm
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/bash
|
||||
+#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright (c) 2016 Wi-Fi Alliance
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From cca2f9901fb4fdcdd49066fe434eae512964143f Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 9 Feb 2019 07:59:47 -0800
|
||||
Subject: [PATCH 4/4] run ranlib per library and use AR
|
||||
|
||||
Use AR variable to invoke archiver instead of hardcoding, helps cross
|
||||
compile
|
||||
|
||||
compiler ranlib e.g. llvm-ranlib fails to operate on multiple archives
|
||||
on single invocation
|
||||
|
||||
fixes errors like
|
||||
arm-yoe-linux-musleabi-llvm-ranlib: error: Exactly one archive should be specified.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/47]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
lib/Makefile | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/Makefile b/lib/Makefile
|
||||
index 299b8d6..5fca322 100644
|
||||
--- a/lib/Makefile
|
||||
+++ b/lib/Makefile
|
||||
@@ -20,7 +20,9 @@ all: ${LIB_OBJS}
|
||||
$(AR) crv ${LIBWFA_NAME} $?
|
||||
$(AR) crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT}
|
||||
$(AR) crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA}
|
||||
- ${RANLIB} ${LIBWFA_NAME} ${LIBWFA_NAME_DUT} ${LIBWFA_NAME_CA}
|
||||
+ ${RANLIB} ${LIBWFA_NAME}
|
||||
+ ${RANLIB} ${LIBWFA_NAME_DUT}
|
||||
+ ${RANLIB} ${LIBWFA_NAME_CA}
|
||||
|
||||
wfa_tg.o: wfa_tg.c ../inc/wfa_agt.h ../inc/wfa_types.h ../inc/wfa_rsp.h ../inc/wfa_tlv.h ../inc/wfa_tg.h
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
Mark extern variables with 'extern' keyword
|
||||
|
||||
This ensures that compilers with -fno-common does not generate multiple definitions
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signedd-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
--- a/lib/wfa_cs.c
|
||||
+++ b/lib/wfa_cs.c
|
||||
@@ -71,7 +71,7 @@ int wfaExecuteCLI(char *CLI);
|
||||
|
||||
/* Since the two definitions are used all over the CA function */
|
||||
char gCmdStr[WFA_CMD_STR_SZ];
|
||||
-dutCmdResponse_t gGenericResp;
|
||||
+extern dutCmdResponse_t gGenericResp;
|
||||
int wfaTGSetPrio(int sockfd, int tgClass);
|
||||
void create_apts_msg(int msg, unsigned int txbuf[],int id);
|
||||
|
||||
--- a/lib/wfa_thr.c
|
||||
+++ b/lib/wfa_thr.c
|
||||
@@ -41,7 +41,7 @@
|
||||
/*
|
||||
* external global thread sync variables
|
||||
*/
|
||||
-tgWMM_t wmm_thr[WFA_THREADS_NUM];
|
||||
+extern tgWMM_t wmm_thr[WFA_THREADS_NUM];
|
||||
extern int resetsnd;
|
||||
extern int resetrcv;
|
||||
extern int newCmdOn;
|
||||
Reference in New Issue
Block a user