From bc8c3a602bceaba0e6d34a1ba8b776b56b00d766 Mon Sep 17 00:00:00 2001 From: James O'Shannessy Date: Mon, 27 Aug 2018 15:08:14 +1000 Subject: Public push of AVIRT. Follow readme for building in/out of tree for Ubuntu/AGL/etc. Signed-off-by: James O'Shannessy --- .vscode/tasks.json | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .vscode/tasks.json (limited to '.vscode/tasks.json') diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..c901648 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,73 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "type": "shell", + "presentation": { + "reveal": "always" + }, + "tasks": [ + { + "label": "Make Driver", + "command": "CONFIG_AVIRT=m CONFIG_AVIRT_BUILDLOCAL=y CONFIG_AVIRT_DUMMYAP=m make -C /lib/modules/$(uname -r)/build/ M=$(pwd)", + "group": "build", + "problemMatcher": [ + "$gcc" + ] + }, + { + "label": "Clean Driver", + "command": "CONFIG_AVIRT=m CONFIG_AVIRT_BUILDLOCAL=y CONFIG_AVIRT_DUMMYAP=m make -C /lib/modules/$(uname -r)/build/ M=$(pwd) clean", + "group": "build", + "problemMatcher": [ + "$gcc" + ] + }, + { + "label": "Deploy Drivers", + "command": "sudo sh -c './unload.sh && ./loadDrivers.sh'", + "problemMatcher": [] + }, + { + "label": "Make and Deploy Drivers", + "command": "make && sudo sh -c './unload.sh && ./loadDrivers.sh'", + "problemMatcher": [] + }, + { + "label": "Unload new drivers", + "command": "sudo sh unload.sh", + "problemMatcher": [] + }, + { + "label": "Load new drivers", + "command": "sudo sh ./loadDrivers.sh", + "problemMatcher": [] + }, + { + "label": "Make Driver AGL", + "type": "shell", + "command": "./make-agl.sh bf869951", + "group": "build", + "problemMatcher": [ + "$gcc" + ] + }, + { + "label": "Clean Driver AGL", + "type": "shell", + "command": "./make-agl.sh bf869951 clean", + "group": "build", + "problemMatcher": [ + "$gcc" + ] + }, + { + "label": "Deploy Driver AGL", + "type": "shell", + "command": "rsync -av avirt_core.ko dummy/avirt_dummyap.ko root@192.168.1.198:~/", + "problemMatcher": [ + "$gcc" + ] + }, + ] +} \ No newline at end of file -- cgit 1.2.3-korg From c656cad43025265094bf5139c1265d4bcc0ba84c Mon Sep 17 00:00:00 2001 From: James O'Shannessy Date: Sat, 15 Sep 2018 00:44:37 -0700 Subject: Add updates to Makefiles and tasks for building Add required changes to Makefile and KConfig to implement building of loopback audio path as part of standard make execution. Signed-off-by: James O'Shannessy --- .vscode/tasks.json | 4 ++-- Kconfig | 1 + Makefile | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to '.vscode/tasks.json') diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c901648..d8063e7 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,7 +9,7 @@ "tasks": [ { "label": "Make Driver", - "command": "CONFIG_AVIRT=m CONFIG_AVIRT_BUILDLOCAL=y CONFIG_AVIRT_DUMMYAP=m make -C /lib/modules/$(uname -r)/build/ M=$(pwd)", + "command": "CONFIG_AVIRT=m CONFIG_AVIRT_BUILDLOCAL=y CONFIG_AVIRT_DUMMYAP=m CONFIG_AVIRT_LOOPBACKAP=m make -C /lib/modules/$(uname -r)/build/ M=$(pwd)", "group": "build", "problemMatcher": [ "$gcc" @@ -17,7 +17,7 @@ }, { "label": "Clean Driver", - "command": "CONFIG_AVIRT=m CONFIG_AVIRT_BUILDLOCAL=y CONFIG_AVIRT_DUMMYAP=m make -C /lib/modules/$(uname -r)/build/ M=$(pwd) clean", + "command": "CONFIG_AVIRT=m CONFIG_AVIRT_BUILDLOCAL=y CONFIG_AVIRT_DUMMYAP=m CONFIG_AVIRT_LOOPBACKAP=m make -C /lib/modules/$(uname -r)/build/ M=$(pwd) clean", "group": "build", "problemMatcher": [ "$gcc" diff --git a/Kconfig b/Kconfig index 0e2a52a..b15bcbe 100644 --- a/Kconfig +++ b/Kconfig @@ -16,5 +16,6 @@ menuconfig AVIRT if AVIRT source "drivers/staging/avirt/dummy/Kconfig" +source "drivers/staging/avirt/loopback/Kconfig" endif diff --git a/Makefile b/Makefile index 0c02c23..dfdc715 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ ccflags-y += -I${CCFLAGS_AVIRT} $(info $(KERNELRELEASE)) obj-$(CONFIG_AVIRT_DUMMYAP) += dummy/ +obj-$(CONFIG_AVIRT_LOOPBACKAP) += loopback/ ### # For out-of-tree building @@ -27,7 +28,9 @@ else endif all: - CONFIG_AVIRT=m CONFIG_AVIRT_BUILDLOCAL=y CONFIG_AVIRT_DUMMYAP=m \ + CONFIG_AVIRT=m CONFIG_AVIRT_BUILDLOCAL=y \ + CONFIG_AVIRT_DUMMYAP=m \ + CONFIG_AVIRT_LOOPBACKAP=m \ make -C $(KERNEL_SRC) M=$(PWD) clean: -- cgit 1.2.3-korg From cce1002dbeb69354cc9fe5076f13739d815c56ef Mon Sep 17 00:00:00 2001 From: Mark Farrugia Date: Mon, 8 Oct 2018 17:25:46 +1100 Subject: Update VSC tasks, XDS conf Signed-off-by: Mark Farrugia --- .vscode/tasks.json | 134 +++++++++++++++++++++++++---------------------------- xds-project.conf | 4 +- 2 files changed, 64 insertions(+), 74 deletions(-) (limited to '.vscode/tasks.json') diff --git a/.vscode/tasks.json b/.vscode/tasks.json index d8063e7..8a0a070 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,73 +1,63 @@ { - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "type": "shell", - "presentation": { - "reveal": "always" - }, - "tasks": [ - { - "label": "Make Driver", - "command": "CONFIG_AVIRT=m CONFIG_AVIRT_BUILDLOCAL=y CONFIG_AVIRT_DUMMYAP=m CONFIG_AVIRT_LOOPBACKAP=m make -C /lib/modules/$(uname -r)/build/ M=$(pwd)", - "group": "build", - "problemMatcher": [ - "$gcc" - ] - }, - { - "label": "Clean Driver", - "command": "CONFIG_AVIRT=m CONFIG_AVIRT_BUILDLOCAL=y CONFIG_AVIRT_DUMMYAP=m CONFIG_AVIRT_LOOPBACKAP=m make -C /lib/modules/$(uname -r)/build/ M=$(pwd) clean", - "group": "build", - "problemMatcher": [ - "$gcc" - ] - }, - { - "label": "Deploy Drivers", - "command": "sudo sh -c './unload.sh && ./loadDrivers.sh'", - "problemMatcher": [] - }, - { - "label": "Make and Deploy Drivers", - "command": "make && sudo sh -c './unload.sh && ./loadDrivers.sh'", - "problemMatcher": [] - }, - { - "label": "Unload new drivers", - "command": "sudo sh unload.sh", - "problemMatcher": [] - }, - { - "label": "Load new drivers", - "command": "sudo sh ./loadDrivers.sh", - "problemMatcher": [] - }, - { - "label": "Make Driver AGL", - "type": "shell", - "command": "./make-agl.sh bf869951", - "group": "build", - "problemMatcher": [ - "$gcc" - ] - }, - { - "label": "Clean Driver AGL", - "type": "shell", - "command": "./make-agl.sh bf869951 clean", - "group": "build", - "problemMatcher": [ - "$gcc" - ] - }, - { - "label": "Deploy Driver AGL", - "type": "shell", - "command": "rsync -av avirt_core.ko dummy/avirt_dummyap.ko root@192.168.1.198:~/", - "problemMatcher": [ - "$gcc" - ] - }, - ] -} \ No newline at end of file + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "type": "shell", + "presentation": { + "reveal": "always" + }, + "tasks": [ + { + "label": "Make Driver", + "command": "make all", + "group": "build", + "problemMatcher": ["$gcc"] + }, + { + "label": "Clean Driver", + "command": "make clean", + "group": "build", + "problemMatcher": ["$gcc"] + }, + { + "label": "Deploy Drivers", + "command": "sudo sh -c './scripts/unload.sh && ./scripts/load.sh'", + "problemMatcher": [] + }, + { + "label": "Make and Deploy Drivers", + "command": "make all && sudo sh -c './scripts/unload.sh && ./scripts/load.sh'", + "problemMatcher": [] + }, + { + "label": "Unload new drivers", + "command": "sudo sh ./scripts/unload.sh", + "problemMatcher": [] + }, + { + "label": "Load new drivers", + "command": "sudo sh ./scripts/load.sh", + "problemMatcher": [] + }, + { + "label": "Make Driver AGL", + "type": "shell", + "command": "./scripts/make-agl.sh 6864c558", + "group": "build", + "problemMatcher": ["$gcc"] + }, + { + "label": "Clean Driver AGL", + "type": "shell", + "command": "./scripts/make-agl.sh 6864c558 clean", + "group": "build", + "problemMatcher": ["$gcc"] + }, + { + "label": "Deploy Driver AGL", + "type": "shell", + "command": "rsync -av avirt_core.ko dummy/avirt_dummyap.ko loopback/avirt_loopbackap.ko root@192.168.1.193:/lib/modules/4.14.0-yocto-standard/extra", + "problemMatcher": ["$gcc"] + } + ] +} diff --git a/xds-project.conf b/xds-project.conf index 59a82f8..6296119 100644 --- a/xds-project.conf +++ b/xds-project.conf @@ -1,4 +1,4 @@ # XDS project settings export XDS_AGENT_URL=localhost:8800 -export XDS_PROJECT_ID=4ad79245-a1c3-11e8-82d3-0242ac110002 -export XDS_SDK_ID=bf869951 +export XDS_PROJECT_ID=1c520c49 +export XDS_SDK_ID=6864c558 -- cgit 1.2.3-korg