diff --git a/.github/workflows/github_ci.yml b/.github/workflows/github_ci.yml
index 7b5c758a..832cbfc2 100644
--- a/.github/workflows/github_ci.yml
+++ b/.github/workflows/github_ci.yml
@@ -2,10 +2,10 @@ name: GitHub CI
 
 on:
   push:
-    branches: [ stable, development]
+    branches: [ stable, development, helios_stage]
 
   pull_request:
-    branches: [ stable, development]
+    branches: [ stable, development, helios_stage]
 
 jobs:
   build:
@@ -44,17 +44,13 @@ jobs:
           languages: ${{ matrix.language }}
           debug: true
 
-      - name: Linting
-        run: |
-          make demo_avr check
-          make demo_avr_cpp check
-          make demo_riscv check
-
       - name: Build
         run: |
           make demo_avr
           make demo_avr_cpp
           make demo_riscv
+          make demo_helios_avr
+          make demo_helios_riscv
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index bc2a1ed7..a5066287 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -5,10 +5,12 @@ on:
     branches:
     - stable
     - development
+    - helios_stage
   pull_request:
     branches:
     - stable
     - development
+    - helios_stage
 
 jobs:
   build:
diff --git a/.gitignore b/.gitignore
index 82f9ae17..07daea91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,44 @@
-.scannerwork
-sonar-cfamily-reproducer.zip
-temp
-out/
-tools/
-backup/
-bkp/
-projects/
-*.elf
-*.bin
-*.d
-*.o
-*.ko
-*.obj
-*.dll
-*.so
-*.so.*
-*.dylib
-*.lib
-*.la
-*.lo
-*.a
-*.ilk
-*.map
-*.dis
-*.new
-*.bkp
-*.backup
-*.b
-*.dev
-*.old
-*.temp
-*.tmp
-*.sw*
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-*.hex
-*.mod*
-*.cmd
-*.todo
+.scannerwork
+.vscode/
+sonar-cfamily-reproducer.zip
+temp
+out/
+tools/
+backup/
+bkp/
+projects/
+*.elf
+*.bin
+*.d
+*.o
+*.ko
+*.obj
+*.dll
+*.so
+*.so.*
+*.dylib
+*.lib
+*.la
+*.lo
+*.a
+*.ilk
+*.map
+*.dis
+*.new
+*.bkp
+*.backup
+*.b
+*.dev
+*.old
+*.temp
+*.tmp
+*.sw*
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+*.mod*
+*.cmd
+*.todo
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index e1140042..f4353993 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -8,7 +8,8 @@
             "intelliSenseMode": "${default}",
             "compilerPath": "/usr/bin/gcc",
             "cStandard": "gnu17",
-            "cppStandard": "gnu++14"
+            "cppStandard": "gnu++14",
+            "compileCommands": "${workspaceFolder}/.vscode/compile_commands.json"
         }
     ],
     "version": 4
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9adbd8ac..4fef0018 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -35,8 +35,50 @@
 					"text": "b plug"
 				},
 			],
-
-
+		},
+		{
+			"name": "FE310 Debug (JLink)",
+			"type": "cppdbg",
+			"request": "launch",
+			"miDebuggerServerAddress": ":2331",
+			"program": "${workspaceFolder}/out/${input:project}/${input:project}.elf",
+			"stopAtEntry": false,
+			"cwd": "${workspaceFolder}",
+			"MIMode": "gdb",
+			"svdPath": "",
+			"externalConsole": false,
+			"showDisplayString": true,
+			"variables": {
+				"elfPath": "${workspaceFolder}/out/${input:project}/${input:project}.elf"
+			},
+			"miDebuggerPath": "${workspaceFolder}/tools/risc-v-toolchain/bin/riscv64-unknown-elf-gdb",
+			"miDebuggerArgs": "${elfPath}",
+			"setupCommands":
+			[
+				{
+					"text": "b init"
+				},
+				{
+					"text": "b plug"
+				},
+			],
+			"postRemoteConnectCommands": [
+				{
+					"text": "file ${elfPath}"
+				},
+				{
+					"text": "monitor halt"
+				},
+				{
+					"text": "load"
+				},
+				{
+					"text": "monitor reset"
+				},
+				{
+					"text": "monitor go"
+				}
+			]
 		}
 	],
 	"inputs": [
@@ -48,6 +90,7 @@
 				"demo_avr",
 				"demo_avr_cpp",
 				"demo_riscv",
+				"demo_helios_riscv"
 			],
 			"default": "demo_avr"
 		},
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b46e6ca1..afd7a788 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -39,7 +39,9 @@
         "*.sx": "c",
         "*.{c,c.dev.c.temp,c.tmp,c.old,h,h.dev,h.old,h.temp,h.tmp)": "C",
         "*.{cpp,cpp.dev,cpp.temp,cpp.tmp,cpp.old}": "C++",
-        "*.{S,S.old,S.dev.S.temp,S.tmp,s.old,s.temp,s.tmp,s.dev,asm,asm.old,asm.dev.asm.temp,asm.tmp,inc,inc.old,inc.temp,inc.tmp,ld,ld.old,ld.temp,ld.tmp,ld.sx,ld.sx.old,ld.sx.temp,ld.sx.tmp,lst}": "coffeescript"
+        "*.{S,S.old,S.dev.S.temp,S.tmp,s.old,s.temp,s.tmp,s.dev,asm,asm.old,asm.dev.asm.temp,asm.tmp,inc,inc.old,inc.temp,inc.tmp,ld,ld.old,ld.temp,ld.tmp,ld.sx,ld.sx.old,ld.sx.temp,ld.sx.tmp,lst}": "coffeescript",
+        "cc_os_sched.h": "c",
+        "cc_os.h": "c"
     },
     "files.autoSave": "afterDelay",
     "files.autoSaveDelay": 100,
@@ -57,5 +59,6 @@
     "workbench.settings.openDefaultKeybindings": true,
     "C_Cpp.autocompleteAddParentheses": true,
     "git.alwaysSignOff": true,
-    "files.autoGuessEncoding": true
+    "files.autoGuessEncoding": true,
+    "sonarlint.pathToCompileCommands": "${workspaceFolder}/.vscode/compile_commands.json"
 }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 30135475..05131b42 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 # Contributing Guidlines
-- Use tabs, width=8, commit of **code** with spaces and whitespaces will be rejected.
+- Use tabs, width=8, commit of **code** with spaces and trailing whitespaces will be rejected.
 - Use Spaces, width=4, for **documentation** that is "<filename>.md"
 - Use the coding format that is set in the current repo as of 3-jul-2021.
 - We recommend going through Cyancore sources by taking help of README in each folder before you start with project. It is our duty to ensure the code is simple and understandable.
diff --git a/makefile b/Makefile
similarity index 100%
rename from makefile
rename to Makefile
diff --git a/README.md b/README.md
index fbabdac7..037c29d6 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 <body>
   <div align="center">
     <i>An unified software platform for embedded system projects ...</i><br>
-    <i>From India with Pride!</i><br><br>
+    <i>From Bharat with Pride!</i><br><br>
   </div>
 </body>
 
diff --git a/mk/help.mk b/mk/help.mk
index 553ffbe3..4d26033f 100644
--- a/mk/help.mk
+++ b/mk/help.mk
@@ -1,6 +1,6 @@
 #
 # CYANCORE LICENSE
-# Copyrights (C) 2019, Cyancore Team
+# Copyrights (C) 2023, Cyancore Team
 #
 # File Name		: help.mk
 # Description		: This file prints cyancore build help
@@ -8,7 +8,66 @@
 # Organisation		: Cyancore Core-Team
 #
 
-.PHONY: help
+T_ALLOWLIST	+= help
+
+HELP		:="\
+==================< Cyancore Make Help >==================\n\
+Usage: make [<project_name>|default|...] (V=|PP=|...)\n\
+\n\
+Examples:\n\
+$$ make demo_avr \# Builds project demo_avr\n\
+$$ make clean \# Cleans the build out folder \n\
+$$ make demo_avr V=1 \# Builds demo_avr with verbose\n\
+$$ make list \# Displays all the available projects\n\
+$$ make get_all_tc \# Fetches all toolchains\n\
+\n\
+----------\n\
+Variables:\n\
+----------\n\
+V=(*0/1) Verbose build logs.\n\
+If 1, the build will spew all the build logs.\n\
+\n\
+PP=(*0/1) PreProcess stage enable.\n\
+If 1, the build engine shall generate/save preprocessed\n\
+file which can be used for debugging.\n\
+\n\
+DEBUG=(*0/1/2/3/5) Enable build with debug code.\n\
+This Flag is used to enable debug routines to log info\n\
+while program executes. Visit libsyslog directory for\n\
+more info.\n\
+\n\
+* - marks default value\n\
+For more variablea that can be passed,\n\
+please visit [DOCS REPO]\n\
+\n\
+--------\n\
+Targets:\n\
+--------\n\
+project_name: Name of the project.\n\
+The build engine will automatically create dynamic target\n\
+using project name. Any following target which will\n\
+depend on project name will be marked with \`~\`.\n\
+\n\
+~ default: The default target of make, this need not be\n\
+passed. This uses multi threaded build.\n\
+~ cyancore: This performs 1 thread build.\n\
+Use this for debug as it will be slow than default.\n\
+~ clean: Cleans the project build artifacts.\n\
+~ check: Perform static analysis.\n\
+clean: Cleans all the build artifacts.\n\
+list: Displays all the projects available for build.\n\
+get_all_tc: Fetches all Toolchains.\n\
+get_avr_tc: Fetches AVR Toolchain.\n\
+get_arm_tc: Fetches ARM Toolchain.\n\
+get_riscv_tc: Fetches RISC-V Toolchain.\n\
+qemu_test: Performs build and runs a demo on qemu.\n\
+\n\
+For more targets/info, please visit [DOCS REPO].\n\
+\n\
+----------------------------------------------------------\n\
+DOCS REPO: https://github.com/VisorFolks/cc_docs\n\
+----------------------------------------------------------\
+"
 
 help:
-	less mk/usage_help.txt
+	echo -e $(HELP)
diff --git a/mk/project.mk b/mk/project.mk
index 24243b98..57599030 100644
--- a/mk/project.mk
+++ b/mk/project.mk
@@ -13,13 +13,12 @@
 #------------< Project Search >-------------#
 #*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*#
 
-include mk/path.mk
 include mk/mk_helper.mk
 include mk/qemu.mk
 include mk/picotool.mk
 
 P_TARGETS	+= default cyancore check version copy_to_remote clean_remote
-T_ALLOWLIST	+= help list clean all_projects
+T_ALLOWLIST	+= list clean all_projects
 PROJECT_LIST	:= $(shell ls projects/ -I *.template -I *.src)
 
 .PHONY: aux_target
@@ -59,7 +58,6 @@ ifeq ($(CMD),)
 CMD		:= default
 endif
 
-.PHONY: $(PROJECT)
 $(PROJECT): $(CMD)
 
 endif
diff --git a/mk/qemu.mk b/mk/qemu.mk
index e65ce18e..ac776340 100644
--- a/mk/qemu.mk
+++ b/mk/qemu.mk
@@ -1,6 +1,6 @@
 #
 # CYANCORE LICENSE
-# Copyrights (C) 2019, Cyancore Team
+# Copyrights (C) 2023, Cyancore Team
 #
 # File Name		: qemu.mk
 # Description		: This file helps fetch and build qemu
@@ -8,7 +8,7 @@
 # Organisation		: Cyancore Core-Team
 #
 
-T_ALLOWLIST	+= get_qemu clean_qemu
+T_ALLOWLIST	+= get_qemu clean_qemu qemu_test
 
 QEMU_CHECKOUT	:= v7.2.0
 QEMU_PATH	:= $(TOOLS_ROOT)/qemu
@@ -43,3 +43,15 @@ clean_qemu:
 	@echo "< ! > Removing cc-qemu installation ..."
 	rm -rf $(QEMU_OUT_PATH) $(QEMU_PATH)
 	@echo "< / > Done!"
+
+qemu_test:
+ifeq ($(realpath $(QEMU_OUT_PATH)/bin/qemu-system-riscv32),)
+	$(info < x > QEMU is not installed...)
+	$(info < ! > Please run `make get_qemu`)
+	$(error < x > Stopping demo simulation!)
+endif
+	make demo_qemu_sifive_e
+	@echo
+	@echo "Press Ctrl+A - X to exit!"
+	@echo
+	$(QEMU_OUT_PATH)/bin/qemu-system-riscv32 -machine sifive_e -device loader,file=out/qemu_sifive_e_bl/qemu_sifive_e_bl.elf -kernel out/demo_qemu_sifive_e/demo_qemu_sifive_e.elf -nographic 
diff --git a/mk/slib.mk b/mk/slib.mk
index 1973addd..3382b067 100644
--- a/mk/slib.mk
+++ b/mk/slib.mk
@@ -18,8 +18,6 @@ include mk/lobj.mk
 SLIB		:= $(addprefix $(OUT)/,$(SLIB))
 HEADER		:= $(addprefix $(LIB_INCLUDE_PATH)/,$(LIB_HEADER))
 
-.PHONY: slib
-
 slib: $(SLIB)
 
 $(SLIB): $(HEADER) $(LIB_OBJS)
diff --git a/mk/tc.mk b/mk/tc.mk
index 7abd3e42..9e920770 100644
--- a/mk/tc.mk
+++ b/mk/tc.mk
@@ -10,10 +10,11 @@
 
 include mk/path.mk
 
-ifeq ($(findstring arm-v7,$(ARCH)),arm)
+ifeq ($(findstring arm,$(ARCH)),arm)
 TC	?= $(TOOLS_ROOT)/arm-toolchain/bin/arm-none-eabi
-TI	:= $(TOOLS_ROOT)/arm-toolchain/arm-none-eabi/include
-TL	:= $(TOOLS_ROOT)/arm-toolchain/arm-none-eabi/lib
+TI	:= $(TOOLS_ROOT)/arm-toolchain/lib/gcc/arm-none-eabi/$(TC_VER)/include-fixed/
+TI	+= $(TOOLS_ROOT)/arm-toolchain/arm-none-eabi/include/
+TL	:= $(TOOLS_ROOT)/arm-toolchain/lib/gcc/arm-none-eabi/$(TC_VER)/$(TL_TYPE)/
 endif
 
 ifeq ($(findstring riscv,$(ARCH)),riscv)
diff --git a/mk/tc_get.mk b/mk/tc_get.mk
index cdaa630d..7548ef2d 100644
--- a/mk/tc_get.mk
+++ b/mk/tc_get.mk
@@ -15,9 +15,9 @@ T_ALLOWLIST	+= get_all_tc get_avr_tc get_arm_tc get_riscv_tc
 # GIT REPO RECOMMENDED
 # Provide git repo path for toolchains for better experience
 ESIZE_REPO	:= https://github.com/VisorFolks/cc_elf_size.git
-AVR_TC_REPO	?=
-RISC_V_TC_REPO	?=
-ARM_TC_REPO	?=
+AVR_TC_REPO	?= https://github.com/VisorFolks/avr-toolchain
+RISC_V_TC_REPO	?= https://github.com/VisorFolks/risc-v-toolchain
+ARM_TC_REPO	?= https://github.com/VisorFolks/arm-toolchain
 
 get_all_tc: --tc_clear get_avr_tc get_arm_tc get_riscv_tc
 
diff --git a/mk/usage_help.txt b/mk/usage_help.txt
deleted file mode 100644
index 1f284c9b..00000000
--- a/mk/usage_help.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-==================< Cyancore Make Help >==================
-Usage   : make <option> <command>
-option  : {list | get_all_tc | get_arm_tc | get_avr_tv |
-           get_riscv_tc | help} or <Project Name>
-command : default (implicit) | clean | check | cyancore |
-	  copy_to_remote clean_remote | all_projects
-----------------------------------------------------------
-> Project Name:
-* The project name is the name of directory under
-  src/project which needs to be built.
-* To get the list of projects run 'make list'.
-----------------------------------------------------------
-> list:
-* This option lists the available projects.
-> get_all_tc:
-* This option fetches all the toolchains of supported
-  platforms.
-> get_arm_tc:
-* This option fetches ARM-v7 toolchain.
-> get_avr_tc:
-* This option fetches AVR-8 toolchain.
-> get_riscv_tc:
-* This option fetched RISC-V toolchain.
-
-> cyancore (avoid if not needed):
-* This command builds the project with 1 thread
-> check:
-* This command performs cppcheck on code base for
-  the project.
-> copy_to_remote:
-* This command copies the bin, elf and hex to remote
-  machine.
-> clean_remote:
-* This command removes folders from remote machine.
-> all_projects:
-* This command build all the projects listed by make list
-==========================================================
diff --git a/projects/demo_helios.src/build.mk b/projects/demo_helios.src/build.mk
new file mode 100644
index 00000000..d44adcf3
--- /dev/null
+++ b/projects/demo_helios.src/build.mk
@@ -0,0 +1,19 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2019-2023, Cyancore Team
+#
+# File Name		: build.mk
+# Description		: This file build project sources and specifies
+#			  project properties
+# Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+DEMO_DIR	:= $(GET_PATH)
+
+OPTIMIZATION	:= s
+
+EXE_MODE	:= terravisor
+
+DIR		:= $(DEMO_DIR)
+include mk/obj.mk
diff --git a/projects/demo_helios.src/project.c b/projects/demo_helios.src/project.c
new file mode 100644
index 00000000..5a77a309
--- /dev/null
+++ b/projects/demo_helios.src/project.c
@@ -0,0 +1,52 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019 - 2023, Cyancore Team
+ *
+ * File Name		: project.c
+ * Description		: This file consists of project srouces
+ * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+#include <stdio.h>
+#include <driver.h>
+#include <terravisor/bootstrap.h>
+#include <driver/onboardled.h>
+#include <terravisor/helios/helios.h>
+
+#define TASK_WAIT_TICKS		10
+
+void task_handler(void);
+
+static helios_task_t Task_A;
+static helios_task_t Task_B;
+static helios_task_t Task_C;
+
+/* Define Plug */
+void plug()
+{
+	bootstrap();
+	driver_setup_all();
+
+	syslog(info, "Demo HELIOS!\n");
+	helios_add_task(&Task_A, "Task A", &task_handler, (helios_args)NULL, 5, 255, (uintptr_t) NULL);
+	helios_add_task(&Task_B, "Task B", &task_handler, (helios_args)NULL, 7, 255, (uintptr_t) NULL);
+	helios_add_task(&Task_C, "Task C", &task_handler, (helios_args)NULL, 4, 255, (uintptr_t) NULL);
+	helios_run();
+}
+
+/* Define Play */
+void play()
+{
+	/* < ! > Play looping code here*/
+	return;
+}
+
+/* Define the Task Handler */
+void task_handler(void)
+{
+	while(true)
+	{
+		printf("In Task: %s\n", helios_get_curr_task_name());
+		helios_task_wait(TASK_WAIT_TICKS);
+	}
+}
diff --git a/projects/demo_helios_avr/build.mk b/projects/demo_helios_avr/build.mk
new file mode 100644
index 00000000..dd292c5d
--- /dev/null
+++ b/projects/demo_helios_avr/build.mk
@@ -0,0 +1,19 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2019-2023, Cyancore Team
+#
+# File Name		: build.mk
+# Description		: This file build project sources and specifies
+#			  project properties
+# Primary Author	: Pranjal Chdanda [pranjalchanda08@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+PROJECT_DIR	:= $(GET_PATH)
+
+include $(PROJECT_DIR)/../demo_helios.src/build.mk
+include $(PROJECT_DIR)/config.mk
+include $(PROJECT_DIR)/helios_config.mk
+
+DIR		:= $(PROJECT_DIR)
+include mk/obj.mk
diff --git a/projects/demo_helios_avr/config.mk b/projects/demo_helios_avr/config.mk
new file mode 100644
index 00000000..44eb2fff
--- /dev/null
+++ b/projects/demo_helios_avr/config.mk
@@ -0,0 +1,22 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2019-2023, Cyancore Team
+#
+# File Name		: config.mk
+# Description		: This file consists of project config
+# Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+COMPILER	:= gcc
+TC_VER		:= 5.4.0
+FAMILY		:= mega_avr
+PLATFORM	:= atmega328p
+HEAP_SIZE 	:= 500
+STACK_SIZE 	:= 256
+STDLOG_MEMBUF	:= 0
+BOOTMSGS	:= 0
+EARLYCON_SERIAL	:= 0
+CONSOLE_SERIAL	:= 0
+OBRDLED_ENABLE	:= 1
+TERRAKERN	:= helios
diff --git a/projects/demo_helios_avr/helios_config.mk b/projects/demo_helios_avr/helios_config.mk
new file mode 100644
index 00000000..ba80daae
--- /dev/null
+++ b/projects/demo_helios_avr/helios_config.mk
@@ -0,0 +1,16 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2019-2023, Cyancore Team
+#
+# File Name		: helios_config.mk
+# Description		: This file consists of HELIOS kernal configuration
+# Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+HELIOS_USE_DYNAMIC 		:= 1
+HELIOS_HEAP_SIZE 		:= 1024
+HELIOS_MAX_THREAD 		:= 4
+HELIOS_IDLE_TASK_STACK_LEN 	:= 255
+HELIOS_POWER_SAVE_EN 		:= 0
+HELIOS_ANTI_DEADLOCK		:= 0
diff --git a/projects/demo_helios_riscv/build.mk b/projects/demo_helios_riscv/build.mk
new file mode 100644
index 00000000..dd292c5d
--- /dev/null
+++ b/projects/demo_helios_riscv/build.mk
@@ -0,0 +1,19 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2019-2023, Cyancore Team
+#
+# File Name		: build.mk
+# Description		: This file build project sources and specifies
+#			  project properties
+# Primary Author	: Pranjal Chdanda [pranjalchanda08@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+PROJECT_DIR	:= $(GET_PATH)
+
+include $(PROJECT_DIR)/../demo_helios.src/build.mk
+include $(PROJECT_DIR)/config.mk
+include $(PROJECT_DIR)/helios_config.mk
+
+DIR		:= $(PROJECT_DIR)
+include mk/obj.mk
diff --git a/projects/demo_helios_riscv/config.mk b/projects/demo_helios_riscv/config.mk
new file mode 100644
index 00000000..ace2ac5e
--- /dev/null
+++ b/projects/demo_helios_riscv/config.mk
@@ -0,0 +1,22 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2019-2023, Cyancore Team
+#
+# File Name		: config.mk
+# Description		: This file consists of project config
+# Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+COMPILER	:= gcc
+TC_VER		:= 10.2.0
+FAMILY		:= sifive
+PLATFORM	:= fe310g002
+HEAP_SIZE 	:= 3K
+STACK_SIZE 	:= 1K
+STDLOG_MEMBUF	:= 1
+BOOTMSGS	:= 1
+EARLYCON_SERIAL	:= 1
+CONSOLE_SERIAL	:= 1
+OBRDLED_ENABLE	:= 1
+TERRAKERN	:= helios
diff --git a/projects/demo_helios_riscv/helios_config.mk b/projects/demo_helios_riscv/helios_config.mk
new file mode 100644
index 00000000..ba80daae
--- /dev/null
+++ b/projects/demo_helios_riscv/helios_config.mk
@@ -0,0 +1,16 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2019-2023, Cyancore Team
+#
+# File Name		: helios_config.mk
+# Description		: This file consists of HELIOS kernal configuration
+# Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+HELIOS_USE_DYNAMIC 		:= 1
+HELIOS_HEAP_SIZE 		:= 1024
+HELIOS_MAX_THREAD 		:= 4
+HELIOS_IDLE_TASK_STACK_LEN 	:= 255
+HELIOS_POWER_SAVE_EN 		:= 0
+HELIOS_ANTI_DEADLOCK		:= 0
diff --git a/projects/demo_qemu_sifive_e/build.mk b/projects/demo_qemu_sifive_e/build.mk
index 85bf524e..680dcd9f 100644
--- a/projects/demo_qemu_sifive_e/build.mk
+++ b/projects/demo_qemu_sifive_e/build.mk
@@ -17,4 +17,4 @@ DIR		:= $(PROJECT_DIR)
 include mk/obj.mk
 
 aux_target:
-	make qemu_sifive_e_bl
+	make qemu_sifive_e_bl DEBUG=0
diff --git a/src/arch/arm/32m/README.md b/src/arch/arm-m/32/README.md
similarity index 100%
rename from src/arch/arm/32m/README.md
rename to src/arch/arm-m/32/README.md
diff --git a/src/arch/arm-m/32/common_v6_v7/supervisor/arch.c b/src/arch/arm-m/32/common_v6_v7/supervisor/arch.c
new file mode 100644
index 00000000..c74180b5
--- /dev/null
+++ b/src/arch/arm-m/32/common_v6_v7/supervisor/arch.c
@@ -0,0 +1,134 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019, Cyancore Team
+ *
+ * File Name		: arch.c
+ * Description		: This file consists of architecture specific function that
+ *			  cannot be inlined. Hence, present in c file.
+ * Primary Author	: Mayuri Lokhande [mayurilokhande01@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <status.h>
+#include <syslog.h>
+#include <mmio.h>
+#include <arch.h>
+#include <visor/workers.h>
+
+static void arch_ecall_handler()
+{
+	context_frame_t *frame = get_context_frame();
+	vret_t vres;
+	machine_call(frame->r0, frame->r1, frame->r3, &vres);
+	frame->r0 = vres.p;
+	frame->r1 = vres.size;
+	frame->r2 = vres.status;
+	return;
+}
+
+/**
+ *arch_early_setup - This function is called in the early stages of boot
+ *
+ * @brief This function is respinsible to clean reset cpu status/control registers.
+ *
+ */
+void arch_early_setup()
+{
+	arch_di();
+
+}
+
+/**
+ * arch_setup - This function is called after initial setup is done
+ *
+ * @brief This function is called after initial setup is done.
+ */
+void arch_setup()
+{
+	return;
+}
+
+void arch_di_save_state(istate_t *sreg_i_backup)
+{
+	*
+}
+
+void arch_ei_restore_state(istate_t *sreg_i_backup)
+{
+
+}
+
+/**
+ * arch_core_index - Returns code index
+ */
+
+_WEAK unsigned int arch_core_index()
+{
+	return 0;
+}
+
+void _NORETURN arch_panic_handler_callback()
+{
+	context_frame_t *frame;
+	frame = get_context_frame();
+	if(!frame)
+		goto panic;
+	syslog_stdout_enable();
+	sysdbg("r0=%p\tr1=%p\tr2=%p\tr3=%p\tr4=%p\tr5=%p\n",
+		frame->r0, frame->r1, frame->r2, frame->r3, frame->r4, frame->r5);
+	sysdbg("r6=%p\tr7=%p\tr8=%p\tr9=%p\tr10=%p\tr11=%p\n",
+		frame->r6, frame->r7, frame->r8, frame->r9, frame->r10, frame->r11);
+	sysdbg("r12=%p\tr13=%p\tr14=%p\tr15=%p\tAPSR=%p\n",
+		frame->r12, frame->r13, frame->r14, frame->r15, frame->apsr);
+#if DEBUG==0
+	syslog(info, "APSR=%p\n", frame->apsr);
+#endif
+panic:
+	while(1) arch_wfi();
+}
+
+static cpu_sleep_t sleep_flag;
+
+/**
+ * arch_suspended_state_was
+ *
+ * @brief This function checks for the suspended state
+ * and returns true or flase based on arg.
+ *
+ * @param[in] state: suspended state
+ * @return bool: True/False
+ */
+
+bool arch_suspended_state_was(cpu_sleep_t state)
+{
+	assert(state != resume);
+	if(!sleep_flag)
+		return false;
+	return (sleep_flag == state);
+}
+
+/**
+ * arch_signal_suspend
+ *
+ * @brief This function is intended to be called before cpu enters
+ * suspend state. By passing the state, we store and use to check while
+ * exiting resume routine.
+ *
+ * @param[in] state: Suspend state of cpu
+ */
+void arch_signal_suspend(cpu_sleep_t state)
+{
+	sleep_flag = state;
+}
+
+/**
+ * @brief This function signals resume of cpu. It is intended
+ * to be called after exiting resume routine.
+ */
+void arch_signal_resume(void)
+{
+	sleep_flag = resume;
+}
diff --git a/src/arch/arm/32m/common_v6_v7/supervisor/arch_vectors.c b/src/arch/arm-m/32/common_v6_v7/supervisor/arch_vectors.c
similarity index 93%
rename from src/arch/arm/32m/common_v6_v7/supervisor/arch_vectors.c
rename to src/arch/arm-m/32/common_v6_v7/supervisor/arch_vectors.c
index f02f765c..6fafacf9 100644
--- a/src/arch/arm/32m/common_v6_v7/supervisor/arch_vectors.c
+++ b/src/arch/arm-m/32/common_v6_v7/supervisor/arch_vectors.c
@@ -10,8 +10,9 @@
  */
 
 #include <status.h>
+#include <stdint.h>
 
-extern uint8_t _start_start;
+extern void _stack_start();
 extern void init(void);
 #define proto_irq_func(x)	extern void int_##x(void)
 proto_irq_func(1);
@@ -37,8 +38,8 @@ proto_irq_func(14);
  * deref based on irq id and call respective handler.
  */
 
-const void (*arch_vectors[N_IRQ+1](void)) _SECTION(".archvectors") =
-[
+void (*arch_vectors[N_IRQ+1])(void) _SECTION(".archvectors") =
+{
 	&_stack_start,		// Stack start value has higher address of stack
 				// with as assumption that stack grows towards
 				// lower address
@@ -58,4 +59,4 @@ const void (*arch_vectors[N_IRQ+1](void)) _SECTION(".archvectors") =
 	&int_12,		// IRQ 12 -> N/A 
 	&int_13,		// IRQ 13 -> PendSV
 	&int_14,		// IRQ 14 -> SysTick
-];
+};
diff --git a/src/arch/arm-m/32/common_v6_v7/supervisor/asm.S b/src/arch/arm-m/32/common_v6_v7/supervisor/asm.S
new file mode 100644
index 00000000..ba30f7d4
--- /dev/null
+++ b/src/arch/arm-m/32/common_v6_v7/supervisor/asm.S
@@ -0,0 +1,53 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2022-2023, Cyancore Team
+ *
+ * File Name		: asm.S
+ * Description		: This file consists of all the function written in asm
+ *			  like ISR, context management and panic handler
+ * Primary Author	: Mayuri Lokhande [mayurilokhande01@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#include <asm.inc>
+
+.altmacro
+.macro INT id
+
+function int_\id
+	push	{r0}
+	mov	r0, #\id
+	b	isr
+.endm
+
+/**
+ * isr - interrupt service routine function
+ * @brief This function is called from interrupt router.
+ * It is responsible to do context management before and after
+ * calling the interrupt handler function.
+ */
+
+.weak isr
+function isr
+	push	{r1-r7, lr}
+	mrs	r1, msp
+	bl	exception_handler
+	pop	{r1-r7}
+	pop	{r0}
+	mov	lr, r0
+	pop	{r0}
+	mov	pc, lr
+
+/**
+ * Interrupt Router Declaration Table
+ * 1-14 Interrupt routers are define as of now. If possible more can
+ * be added. But during compile time only necessary interrupt router
+ * functions will be retained and others are cleaned up.
+ */
+/*==========< Interrupt router functions >==========*/
+.set i, 1
+.rept 14
+	INT %i
+.set i, i+1
+.endr
+
diff --git a/src/arch/arm-m/32/common_v6_v7/supervisor/build.mk b/src/arch/arm-m/32/common_v6_v7/supervisor/build.mk
new file mode 100644
index 00000000..badef973
--- /dev/null
+++ b/src/arch/arm-m/32/common_v6_v7/supervisor/build.mk
@@ -0,0 +1,16 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2023, Cyancore Team
+#
+# File Name		: build.mk
+# Description		: Build script for this directory.
+# Primary Authod	: Akash Kollipara [akashkollipara@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+ARM32_M_S_ARCH_DIR	:= $(GET_PATH)
+
+$(eval $(call add_include,$(ARM32_M_S_ARCH_DIR)/include/))
+
+DIR		:= $(ARM32_M_S_ARCH_DIR)
+include mk/obj.mk
diff --git a/src/arch/arm-m/32/common_v6_v7/supervisor/exception_handler.c b/src/arch/arm-m/32/common_v6_v7/supervisor/exception_handler.c
new file mode 100644
index 00000000..92310a3f
--- /dev/null
+++ b/src/arch/arm-m/32/common_v6_v7/supervisor/exception_handler.c
@@ -0,0 +1,109 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019, Cyancore Team
+ *
+ * File Name		: interrupt_handler.c
+ * Description		: This file consists of arch interrupt handler sources.
+ * Primary Author	: Mayuri Lokhande [mayurilokhande01@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <status.h>
+#include <string.h>
+#include <assert.h>
+#include <arch.h>
+#include <assert.h>
+
+static context_frame_t *local_frame;
+
+static void set_context_frame(*frame)
+{
+	local_frame = frame;
+}
+
+bool in_isr(void)
+{
+	return (local_frame != NULL) ? true : false ;
+}
+
+/**
+ * int_handler - Array of Interrupt handler pointers
+ *
+ * @brief This is a function pointer array which consists of addresses of corresponding
+ * interrupt handler functions. This is by default assigned as arch_panic_handler.
+ */
+static void (* exhandler[N_EXCEP])(void) = {{[0 ... N_EXCEP-1] = arch_panic_handler}};
+
+/**
+ * arch_register_interrupt_handlers - Registers arch interrupt handlers
+ *  @brief This function is responsible to registers all architectural level
+ * Interrupt handling functions.
+ *
+ *  @param[in] id: Interrupt ID
+ *  @param[in] *handler - function pointer of interrupt handling function.
+ */
+
+void arch_register_interrupt_handler(unsigned int id, void(* handler)(void))
+{
+	/*Check if Interrupt ID is valid*/
+	assert((id > 0) && (id <= N_EXCEP));
+
+	/*
+	 * Decrement ID as array indexing starts from 0.
+	 * ID = 0 is CPU entry address.
+	*/
+	id --;
+
+	/*Store interrupt handler*/
+	exhandler[id] = handler;
+}
+
+/**
+ * Exception handler - Executes Interrupt handler corresponding to int ID
+ *
+ * @brief This function is called by ISR. It executes function pointed by int_handler.
+ * It accepts int ID as argument, which indexes the interrupt handling function.
+ *
+ * @param[in] id: Interrupt ID
+ */
+
+void exception_handler(unsigned int id, context_frame_t *frame)
+{
+	set_context_frame(frame);
+
+	/*Check if Interrupt ID is valid*/
+	if((id > 0) && (id <= N_EXCEP))
+	{
+		/*
+		 * Decrement ID as array indexing starts from 0.
+		 * ID = 0 is CPU entry address.
+		*/
+		id --;
+
+		/* Get corresponding interrupt handling function */
+		void (*handler)(void) = exhandler[id]
+
+		/* Check if the handler is valid*/
+		assert(handler)
+
+		/* Execute exception handler */
+		handler();
+	}
+	else if(id == 65535)
+		plat_panic_handler_callback();
+	else if(id == 65536)
+		arch_panic_handler_callback();
+	else{}
+	set_context_frame(NULL);
+	return;
+}
+
+context_frame_t *get_context_frame()
+{
+	if(local_frame)
+		return local_frame;
+	return NULL;
+}
diff --git a/src/arch/arm-m/32/common_v6_v7/supervisor/include/arch.h b/src/arch/arm-m/32/common_v6_v7/supervisor/include/arch.h
new file mode 100644
index 00000000..7e48edf3
--- /dev/null
+++ b/src/arch/arm-m/32/common_v6_v7/supervisor/include/arch.h
@@ -0,0 +1,119 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019, Cyancore Team
+ *
+ * File Name		: arch.h
+ * Description		: This file prototypes arch related functions and
+ *			  defines inline-able arch functions.
+ * Primary Author	: Mayuri Lokhande [mayurilokhande01@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#pragma once
+#define _ARCH_H_
+
+#include <arm.h>
+#include <visor_call.h>
+
+/**
+ * arch_early_setup - This needs to be called in early stages of boot
+ */
+void arch_early_setup();
+
+/**
+ * arch_setup - This needs to be called after intial setup is completed.
+ */
+void arch_setup();
+
+/**
+ * arch_wfi - Wait for interrupt, with sleep mode
+ */
+void arch_wfi();
+void arch_di_save_state(istate *);
+void arch_ei_restore_state(istate *);
+
+/**
+ * arch_panic_handler - Executes when arch error occurs
+ */
+void arch_panic_handler();
+
+/**
+ * arch_register_interrupt_handler - Registers interrupt handler for
+ * arch specific interrupt vectors
+ */
+void arch_register_interrupt_handler(unsigned int, void(*)(void));
+
+/**
+ * arch_super_call - perform machine call
+ * @brief This function performs svc call
+ *
+ * @param[in] code: universal call code
+ * @param[in] r0: first argument
+ * @param[in] r1: second argument
+ * @param[in] r2: third argument
+ * @param[in] *ret: return struct
+ */
+#define arch_visor_call	arch_super_call
+static inline void arch_super_call(unsigned int code, unsigned int arg0, unsigned int arg1, unsigned int arg2, vret_t *ret)
+{
+	if(ret == NULL)
+		return;
+	register uint32_t r0 asm("r0") = code;
+	register uint32_t r1 asm("r1") = arg0;
+	register uint32_t r2 asm("r2") = arg1;
+	register uint32_t r3 asm("r3") = arg2;
+	asm volatile("svc"
+				:"+r" (r0), "+r" (r1), "+r"(r2)
+				:"r" (r0), "r" (r1), "r" (r2), "r" (r3)
+				:"memory");
+
+	ret->p = r0;
+	ret->size = r1;
+	ret->status = r2;
+	return;
+}
+
+ /**
+ *  arch_ei - arch enable global interrupts
+ */
+static inline void arch_ei()
+{
+	asm volatile("cpsie iaf");
+}
+
+/**
+ *  arch_ei - arch enable global interrupts
+ */
+static inline void arch_di()
+{
+	asm volatile("cpsid iaf");
+}
+
+static inline void arch_nop()
+{
+	asm volatile("nop");
+}
+
+static inline void arch_wfi()
+{
+	asm volatile("wfi");
+}
+
+static inline void arch_isb()
+{
+	asm volatile("isb");
+}
+
+static inline void arch_dsb()
+{
+	asm volatile("dsb");
+}
+
+static inline void arch_dmb()
+{
+	asm volatile("dmb");
+}
+
+bool arch_suspended_state_was(cpu_sleep_t);
+void arch_signal_suspend(cpu_sleep_t);
+void arch_signal_resume(void);
diff --git a/src/arch/arm-m/32/common_v6_v7/supervisor/include/arm.h b/src/arch/arm-m/32/common_v6_v7/supervisor/include/arm.h
new file mode 100644
index 00000000..832c0835
--- /dev/null
+++ b/src/arch/arm-m/32/common_v6_v7/supervisor/include/arm.h
@@ -0,0 +1,67 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019, Cyancore Team
+ *
+ * File Name		: arch.h
+ * Description		: This file prototypes arch related functions and
+ *			  defines inline-able arch functions.
+ * Primary Author	: Mayuri Lokhande [mayurilokhande01@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#pragma once
+#define _ARM_H
+#include<stdint.h>
+#include<string.h>
+#include<stdbool.h>
+
+
+typedef struct context_frame
+{
+	uint8_t r15, r14, r13, r12, r11, r10, r9, r8,
+		r7, r6, r5, r4, r3, r2, r1, APSR, r0;
+}context_frame_t;
+
+typedef uint32_t istate_t;
+
+static inline unsigned int arch_core_impid()
+{
+	unsigned int ret;
+	asm volatile("cpuid %0, implementer" : "=r"(ret));
+	return ret;
+}
+
+static inline unsigned int arch_core_varid()
+{
+	unsigned int ret;
+	asm volatile("cpuid %0, varid" : "=r"(ret));
+	return ret;
+}
+
+static inline unsigned int arch_core_archid()
+{
+	unsigned int ret;
+	asm volatile("cpuid %0, architecture" : "=r"(ret));
+	return ret;
+}
+
+static inline unsigned int arch_core_partno()
+{
+	unsigned int ret;
+	asm volatile("cpuid %0, partno" : "=r"(ret));
+}
+
+static inline unsigned int arch_core_revid()
+{
+	unsigned int ret;
+	asm volatile("cpuid %0, revision" : "=r"(ret));
+}
+
+static inline void arch_update_sp(uint32_t *p)
+{
+	asm volatile("mov sp, %0" : : "r"(p));
+}
+
+context_frame_t *get_context_frame();
+bool in_isr(void);
+void arch_panic_handler_callback();
diff --git a/src/arch/arm/32m/common_v6_v7/supervisor/init.c b/src/arch/arm-m/32/common_v6_v7/supervisor/init.c
similarity index 100%
rename from src/arch/arm/32m/common_v6_v7/supervisor/init.c
rename to src/arch/arm-m/32/common_v6_v7/supervisor/init.c
diff --git a/src/arch/arm/32m/common_v6_v7/supervisor/systick.c b/src/arch/arm-m/32/common_v6_v7/supervisor/systick.c
similarity index 100%
rename from src/arch/arm/32m/common_v6_v7/supervisor/systick.c
rename to src/arch/arm-m/32/common_v6_v7/supervisor/systick.c
diff --git a/src/arch/arm/32m/common_v6_v7/supervisor/build.mk b/src/arch/arm-m/32/common_v7/supervisor/build.mk
similarity index 100%
rename from src/arch/arm/32m/common_v6_v7/supervisor/build.mk
rename to src/arch/arm-m/32/common_v7/supervisor/build.mk
diff --git a/src/arch/arm/32m/common_v7/supervisor/build.mk b/src/arch/arm-m/32/m0/supervisor/build.mk
similarity index 100%
rename from src/arch/arm/32m/common_v7/supervisor/build.mk
rename to src/arch/arm-m/32/m0/supervisor/build.mk
diff --git a/src/arch/arm-m/32/m0p/supervisor/build.mk b/src/arch/arm-m/32/m0p/supervisor/build.mk
new file mode 100644
index 00000000..90e91f64
--- /dev/null
+++ b/src/arch/arm-m/32/m0p/supervisor/build.mk
@@ -0,0 +1,16 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2023, Cyancore Team
+#
+# File Name		: build.mk
+# Description		: Build script for this directory.
+# Primary Authod	: Akash Kollipara [akashkollipara@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+ARM32_M0P_T_ARCH_DIR	:= $(GET_PATH)
+
+include $(ARM32_M0P_T_ARCH_DIR)/../../common_v6_v7/supervisor/build.mk
+
+DIR		:= $(ARM32_M0P_T_ARCH_DIR)
+include mk/obj.mk
diff --git a/src/arch/arm/32m/m0/supervisor/build.mk b/src/arch/arm-m/32/m4/supervisor/build.mk
similarity index 100%
rename from src/arch/arm/32m/m0/supervisor/build.mk
rename to src/arch/arm-m/32/m4/supervisor/build.mk
diff --git a/src/arch/arm/32m/common_v6_v7/supervisor/asm.S b/src/arch/arm/32m/common_v6_v7/supervisor/asm.S
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/arch/arm/32m/common_v6_v7/supervisor/exception_handler.c b/src/arch/arm/32m/common_v6_v7/supervisor/exception_handler.c
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/arch/arm/32m/m0p/supervisor/build.mk b/src/arch/arm/32m/m0p/supervisor/build.mk
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/arch/arm/32m/m4/supervisor/build.mk b/src/arch/arm/32m/m4/supervisor/build.mk
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/arch/avr/8/common_5x_6/terravisor/arch.c b/src/arch/avr/8/common_5x_6/terravisor/arch.c
index 0ed970f4..b1db93e9 100644
--- a/src/arch/avr/8/common_5x_6/terravisor/arch.c
+++ b/src/arch/avr/8/common_5x_6/terravisor/arch.c
@@ -17,7 +17,7 @@
 #include <plat_arch.h>
 #include <mmio.h>
 #include <arch.h>
-#include <terravisor/workers.h>
+#include <visor/workers.h>
 
 /**
  * arch_early_setup - This function is called in the early stages of boot
@@ -25,7 +25,7 @@
  * @brief This function is responsible to clean reset cpu status/control registers.
  *
  */
-void (* const p_mcall)(unsigned int, unsigned int, unsigned int, unsigned int, mret_t *) = &machine_call;
+void (* const p_vcall)(unsigned int, unsigned int, unsigned int, unsigned int, vret_t *) = &vcall_handler;
 void arch_early_setup()
 {
 	arch_di();
diff --git a/src/arch/avr/8/common_5x_6/terravisor/include/arch.h b/src/arch/avr/8/common_5x_6/terravisor/include/arch.h
index 1b311713..5c7f212b 100644
--- a/src/arch/avr/8/common_5x_6/terravisor/include/arch.h
+++ b/src/arch/avr/8/common_5x_6/terravisor/include/arch.h
@@ -16,7 +16,7 @@
 #include <avr.h>
 #include <mmio.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 
 /**
  * arch_early_setup - This needs to be called in early stages of boot
@@ -56,7 +56,7 @@ static inline unsigned int arch_core_index()
 }
 
 /**
- * arch_machine_call - perform machine call
+ * arch_visor_call - perform machine call
  *
  * @brief This function emulates the machine
  * call to maintain consistency.
@@ -67,12 +67,12 @@ static inline unsigned int arch_core_index()
  * @param[in] a2: third argument
  * @param[in] *ret: return value
  */
-static inline void arch_machine_call(unsigned int code, unsigned int a0, unsigned int a1, unsigned int a2, mret_t *ret)
+static inline void arch_visor_call(unsigned int code, unsigned int a0, unsigned int a1, unsigned int a2, vret_t *ret)
 {
-	extern void (*const p_mcall)(unsigned int, unsigned int, unsigned int, unsigned int, mret_t*);
+	extern void (*const p_vcall)(unsigned int, unsigned int, unsigned int, unsigned int, vret_t*);
 	if(ret == NULL)
 		return;
-	p_mcall(code, a0, a1, a2, ret);
+	p_vcall(code, a0, a1, a2, ret);
 	return;
 }
 
diff --git a/src/arch/riscv/32/i/terravisor/arch.c b/src/arch/riscv/32/i/terravisor/arch.c
index a0becfe5..5f0c286c 100644
--- a/src/arch/riscv/32/i/terravisor/arch.c
+++ b/src/arch/riscv/32/i/terravisor/arch.c
@@ -14,18 +14,18 @@
 #include <syslog.h>
 #include <arch.h>
 #include <lock/lock.h>
-#include <terravisor/workers.h>
+#include <visor/workers.h>
 #include <interrupt.h>
 
-static void arch_mcall_handler()
+static void arch_vcall_handler()
 {
 	context_frame_t *frame = get_context_frame();
-	mret_t mres;
-	machine_call(frame->a0, frame->a1, frame->a2, frame->a3, &mres);
+	vret_t vres;
+	vcall_handler(frame->a0, frame->a1, frame->a2, frame->a3, &vres);
 	fence(w, w);
-	frame->a0 = mres.p;
-	frame->a1 = mres.size;
-	frame->a2 = mres.status;
+	frame->a0 = vres.p;
+	frame->a1 = vres.size;
+	frame->a2 = vres.status;
 	return;
 }
 
@@ -72,13 +72,13 @@ void arch_early_setup()
  */
 void arch_setup()
 {
-	link_interrupt(int_arch, 11, &arch_mcall_handler);
+	link_interrupt(int_arch, 11, &arch_vcall_handler);
 	return;
 }
 
 void arch_setup2()
 {
-	link_interrupt(int_arch, 11, &arch_mcall_handler);
+	link_interrupt(int_arch, 11, &arch_vcall_handler);
 	return;
 }
 
diff --git a/src/arch/riscv/32/i/terravisor/include/arch.h b/src/arch/riscv/32/i/terravisor/include/arch.h
index ad957d51..c60066f7 100644
--- a/src/arch/riscv/32/i/terravisor/include/arch.h
+++ b/src/arch/riscv/32/i/terravisor/include/arch.h
@@ -14,7 +14,7 @@
 #include <stdbool.h>
 #include <resource.h>
 #include <riscv.h>
-#include <machine_call.h>
+#include <visor_call.h>
 
 /**
  * arch_early_setup - This needs to be called in early stages of boot
@@ -63,7 +63,7 @@ static inline unsigned int arch_core_index()
 }
 
 /**
- * arch_machine_call - perform machine call
+ * arch_visor_call - perform machine call
  *
  * @brief This function performs environment call
  * in m mode
@@ -74,7 +74,7 @@ static inline unsigned int arch_core_index()
  * @param[in] a2: third argument
  * @param[in] *ret: return struct
  */
-static inline void arch_machine_call(unsigned int code, unsigned int arg0, unsigned int arg1, unsigned int arg2, mret_t *ret)
+static inline void arch_visor_call(unsigned int code, unsigned int arg0, unsigned int arg1, unsigned int arg2, vret_t *ret)
 {
 	if(ret == NULL)
 		return;
diff --git a/src/driver/console/con_serial_mega_avr/console_serial.c b/src/driver/console/con_serial_mega_avr/console_serial.c
index 5a839077..6a713907 100644
--- a/src/driver/console/con_serial_mega_avr/console_serial.c
+++ b/src/driver/console/con_serial_mega_avr/console_serial.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <lock/spinlock.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <arch.h>
 #include <driver.h>
 #include <interrupt.h>
@@ -30,25 +30,25 @@ static void console_serial_read_irq_handler(void);
 
 static status_t console_serial_setup()
 {
-	mret_t mres;
+	vret_t vres;
 	const swdev_t *sp;
 	const module_t *dp;
 	hw_devid_t devid;
-	arch_machine_call(fetch_sp, console_uart, 0, 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_sp, console_uart, 0, 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("Console could not found!\n");
-		return mres.status;
+		return vres.status;
 	}
-	sp = (swdev_t *) mres.p;
+	sp = (swdev_t *) vres.p;
 	devid = sp->hwdev_id;
-	arch_machine_call(fetch_dp, (devid & 0xff00), (devid & 0x00ff), 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_dp, (devid & 0xff00), (devid & 0x00ff), 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("UART Device %d not found!\n", devid);
-		return mres.status;
+		return vres.status;
 	}
-	dp = (module_t *)mres.p;
+	dp = (module_t *)vres.p;
 	console_port = (uart_port_t *)malloc(sizeof(uart_port_t));
 	if(!console_port)
 		return error_memory_low;
diff --git a/src/driver/console/con_serial_mega_avr/earlycon_serial.c b/src/driver/console/con_serial_mega_avr/earlycon_serial.c
index 05d8a527..35ce138b 100644
--- a/src/driver/console/con_serial_mega_avr/earlycon_serial.c
+++ b/src/driver/console/con_serial_mega_avr/earlycon_serial.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <lock/spinlock.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <arch.h>
 #include <driver.h>
 #include <interrupt.h>
@@ -27,25 +27,25 @@ static uart_port_t *earlycon_port;
 
 static status_t earlycon_serial_setup()
 {
-	mret_t mres;
+	vret_t vres;
 	swdev_t *sp;
 	module_t *dp;
 	hw_devid_t devid;
-	arch_machine_call(fetch_sp, console_uart, 0, 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_sp, console_uart, 0, 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("Console could not found!\n");
-		return mres.status;
+		return vres.status;
 	}
-	sp = (swdev_t *) mres.p;
+	sp = (swdev_t *) vres.p;
 	devid = sp->hwdev_id;
-	arch_machine_call(fetch_dp, (devid & 0xff00), (devid & 0x00ff), 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_dp, (devid & 0xff00), (devid & 0x00ff), 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("UART Device %d not found!\n", devid);
-		return mres.status;
+		return vres.status;
 	}
-	dp = (module_t *)mres.p;
+	dp = (module_t *)vres.p;
 	earlycon_port = (uart_port_t *)malloc(sizeof(uart_port_t));
 	if(!earlycon_port)
 		return error_memory_low;
diff --git a/src/driver/console/con_serial_rpi/build.mk b/src/driver/console/con_serial_rpi/build.mk
new file mode 100644
index 00000000..52f3a081
--- /dev/null
+++ b/src/driver/console/con_serial_rpi/build.mk
@@ -0,0 +1,21 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2019, Cyancore Team
+#
+# File Name		: build.mk
+# Description		: This file accumulates sources of console serial
+# Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+DIR		:= $(GET_PATH)
+
+EARLYCON_SERIAL	?= 0
+CONSOLE_SERIAL	?= 0
+
+$(eval $(call add_define,EARLYCON_SERIAL))
+$(eval $(call add_define,CONSOLE_SERIAL))
+
+ifeq ($(filter $(CONSOLE_SERIAL) $(EARLYCON_SERIAL),1),1)
+include mk/obj.mk
+endif
diff --git a/src/driver/console/con_serial_sifive/console_serial.c b/src/driver/console/con_serial_sifive/console_serial.c
index 4bd9c194..0d1f55b5 100644
--- a/src/driver/console/con_serial_sifive/console_serial.c
+++ b/src/driver/console/con_serial_sifive/console_serial.c
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <lock/spinlock.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <arch.h>
 #include <driver.h>
 #include <interrupt.h>
diff --git a/src/driver/console/con_serial_sifive/earlycon_serial.c b/src/driver/console/con_serial_sifive/earlycon_serial.c
index bb71d828..12792cb1 100644
--- a/src/driver/console/con_serial_sifive/earlycon_serial.c
+++ b/src/driver/console/con_serial_sifive/earlycon_serial.c
@@ -16,7 +16,7 @@
 #include <syslog.h>
 #include <lock/spinlock.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <arch.h>
 #include <driver.h>
 #include <interrupt.h>
diff --git a/src/driver/interrupt/plic/plic.c b/src/driver/interrupt/plic/plic.c
index 96df39bc..16a17b8c 100644
--- a/src/driver/interrupt/plic/plic.c
+++ b/src/driver/interrupt/plic/plic.c
@@ -15,7 +15,7 @@
 #include <stdbool.h>
 #include <assert.h>
 #include <arch.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <interrupt.h>
 #include <resource.h>
 #include <driver.h>
@@ -33,14 +33,14 @@ static plic_port_t *port;
 
 static status_t plic_setup()
 {
-	mret_t mres;
+	vret_t vres;
 	const module_t *dp;
 
-	arch_machine_call(fetch_dp, plic, 0, 0, &mres);
+	arch_visor_call(fetch_dp, plic, 0, 0, &vres);
 
-	if(mres.status != success)
-		return mres.status;
-	dp = (module_t *)mres.p;
+	if(vres.status != success)
+		return vres.status;
+	dp = (module_t *)vres.p;
 	port = (plic_port_t *)malloc(sizeof(plic_port_t));
 	if(!port)
 		return error_memory_low;
diff --git a/src/driver/onboardled/onboardled.c b/src/driver/onboardled/onboardled.c
index 0f619b3c..a0966ad7 100644
--- a/src/driver/onboardled/onboardled.c
+++ b/src/driver/onboardled/onboardled.c
@@ -13,7 +13,7 @@
 #include <syslog.h>
 #include <stdlib.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <lock/lock.h>
 #include <driver.h>
 #include <driver/onboardled.h>
@@ -73,19 +73,19 @@ status_t onboardled_off(void)
 
 static status_t onboardled_setup(void)
 {
-	mret_t mres;
+	vret_t vres;
 	status_t ret;
 
 	lock_acquire(&obledlock);
-	arch_machine_call(fetch_sp, onboard_led, 0, 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_sp, onboard_led, 0, 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("%p - sp node could not be found!\n", onboard_led);
-		ret = mres.status;
+		ret = vres.status;
 		goto exit;
 	}
-	obled_sp = (swdev_t *) mres.p;
-	ret = mres.status;
+	obled_sp = (swdev_t *) vres.p;
+	ret = vres.status;
 
 	obledPort = (gpio_port_t *)malloc(sizeof(gpio_port_t) *
 			obled_sp->pmux->npins);
diff --git a/src/driver/sysclk/sysclk_prci/sysclk_prci.c b/src/driver/sysclk/sysclk_prci/sysclk_prci.c
index 4d3ab45d..dfa61634 100644
--- a/src/driver/sysclk/sysclk_prci/sysclk_prci.c
+++ b/src/driver/sysclk/sysclk_prci/sysclk_prci.c
@@ -16,7 +16,7 @@
 #include <syslog.h>
 #include <assert.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <driver.h>
 #include <arch.h>
 #include <platform.h>
@@ -31,7 +31,7 @@ static status_t sysclk_disable();
 static status_t sysclk_setup()
 {
 	status_t ret = success;
-	mret_t mres;
+	vret_t vres;
 	module_t *dp;
 	sysclk_port_t *port;
 	istate_t ist;
@@ -41,30 +41,30 @@ static status_t sysclk_setup()
 		return error_memory_low;
 	port = sysclk;
 
-	arch_machine_call(fetch_dp, clock, 0, 0, &mres);
+	arch_visor_call(fetch_dp, clock, 0, 0, &vres);
 
-	if(mres.status != success)
+	if(vres.status != success)
 	{
 		sysdbg2("Clock not found in DP!\n");
 		port->base_clk = 0;
-		ret = mres.status;
+		ret = vres.status;
 		goto cleanup_exit;
 	}
-	port->base_clk = *((unsigned int *)mres.p);
+	port->base_clk = *((unsigned int *)vres.p);
 
-	arch_machine_call(fetch_dp, prci, 0, 0, &mres);
+	arch_visor_call(fetch_dp, prci, 0, 0, &vres);
 
-	if(mres.status != success)
+	if(vres.status != success)
 	{
 		sysdbg2("PRCI not found in DP!\n");
-		ret = mres.status;
+		ret = vres.status;
 		goto cleanup_exit;
 	}
 
 	lock_acquire(&sysclk_key);
 	arch_di_save_state(&ist);
 
-	dp = (module_t *) mres.p;
+	dp = (module_t *) vres.p;
 	port->port_id = dp->id;
 	port->baddr = dp->baddr;
 	port->stride = dp->stride;
@@ -187,7 +187,7 @@ static inline void sysclk_set_pll(unsigned int clk)
 	return;
 }
 
-static void sysclk_configure_clk(call_arg_t a0, call_arg_t a1, call_arg_t a2 _UNUSED, mret_t *ret)
+static void sysclk_configure_clk(call_arg_t a0, call_arg_t a1, call_arg_t a2 _UNUSED, vret_t *ret)
 {
 	sysclk_port_t *port = sysclk;
 	istate_t ist;
@@ -231,10 +231,10 @@ static void sysclk_configure_clk(call_arg_t a0, call_arg_t a1, call_arg_t a2 _UN
 	return;
 }
 
-INCLUDE_MCALL(sysclk_set, config_clk, sysclk_configure_clk);
+INCLUDE_VCALL(sysclk_set, config_clk, sysclk_configure_clk);
 
 static void sysclk_get_freq(call_arg_t a0 _UNUSED, call_arg_t a1 _UNUSED, 
-		call_arg_t a2 _UNUSED, mret_t *ret)
+		call_arg_t a2 _UNUSED, vret_t *ret)
 {
 	sysclk_port_t *port = sysclk;
 	istate_t ist;
@@ -276,4 +276,4 @@ static void sysclk_get_freq(call_arg_t a0 _UNUSED, call_arg_t a1 _UNUSED,
 	return;
 }
 
-INCLUDE_MCALL(sysclk_get, fetch_clk, sysclk_get_freq);
+INCLUDE_VCALL(sysclk_get, fetch_clk, sysclk_get_freq);
diff --git a/src/include/driver/sysclk.h b/src/include/driver/sysclk.h
index dc75356a..7adf4064 100644
--- a/src/include/driver/sysclk.h
+++ b/src/include/driver/sysclk.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <resource.h>
 #include <arch.h>
-#include <machine_call.h>
+#include <visor_call.h>
 
 typedef struct sysclk_config_clk_callback
 {
@@ -28,17 +28,17 @@ status_t sysclk_reset(void);
 
 static inline status_t sysclk_set_clk(clock_type_t type, unsigned int clk)
 {
-	mret_t mres;
-	arch_machine_call(config_clk, type, clk, 0, &mres);
-	return mres.status;
+	vret_t vres;
+	arch_visor_call(config_clk, type, clk, 0, &vres);
+	return vres.status;
 }
 
 static inline status_t sysclk_get_clk(unsigned int *clk)
 {
-	mret_t mres;
-	arch_machine_call(fetch_clk, 0, 0, 0, &mres);
-	*clk = (mres.status == success) ? (unsigned int) mres.p : 0;
-	return mres.status;
+	vret_t vres;
+	arch_visor_call(fetch_clk, 0, 0, 0, &vres);
+	*clk = (vres.status == success) ? (unsigned int) vres.p : 0;
+	return vres.status;
 }
 
 status_t sysclk_register_config_clk_callback(sysclk_config_clk_callback_t *);
diff --git a/src/include/linker_macros.h b/src/include/linker_macros.h
index a14f50b1..40fe7546 100644
--- a/src/include/linker_macros.h
+++ b/src/include/linker_macros.h
@@ -15,7 +15,7 @@
 		KEEP(*(.driver))			\
 		PROVIDE(_driver_table_end = .);
 
-#define ECALL_TABLE					\
-		PROVIDE(_ecall_table_start = .);	\
-		KEEP(*(.ecall))				\
-		PROVIDE(_ecall_table_end = .);
+#define VCALL_TABLE					\
+		PROVIDE(_vcall_table_start = .);	\
+		KEEP(*(.vcall))				\
+		PROVIDE(_vcall_table_end = .);
diff --git a/src/include/machine_call.h b/src/include/machine_call.h
deleted file mode 100644
index e39c3fb0..00000000
--- a/src/include/machine_call.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2019-2022, Cyancore Team
- *
- * File Name		: machine_call.h
- * Description		: This file consists of machine call IDs and prototypes
- * Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-#pragma once
-#define _MACHINE_CALL_H_
-
-#include <stdint.h>
-#include <status.h>
-
-// Machine call IDs
-typedef enum mcall_id
-{
-	fetch_sp		= 0x0001,
-	fetch_dp		= 0x0002,
-	set_sleep_mode		= 0x0003,
-	fetch_clk		= 0x0004,
-	config_clk		= 0x0005,
-} mcall_id_t;
-
-typedef struct mret
-{
-	uintptr_t p;
-	size_t size;
-	status_t status;
-} mret_t;
-
-#include <arch.h>
-
-typedef struct mcall
-{
-	mcall_id_t id;
-	void (*callback)(call_arg_t a0, call_arg_t a1, call_arg_t a2, mret_t *ret);
-} mcall_t;
-
-#define INCLUDE_MCALL(_name, _id , _callback)		\
-	const mcall_t _name _SECTION(".ecall") =	\
-	{						\
-		.id		= _id,			\
-		.callback	= _callback		\
-	}
diff --git a/src/include/status.h b/src/include/status.h
index 3970b468..0a334037 100644
--- a/src/include/status.h
+++ b/src/include/status.h
@@ -33,14 +33,9 @@ typedef enum status
 	error_device_id_inval		= -0x0201,
 	error_device_inval		= -0x0202,
 	error_device_busy		= -0x0203,
-/* Machine Call related error */
-	error_mcall			= -0x0300,
-	error_mcall_code_inval		= -0x0301,
-/* hcall related error */
-	error_hcall			= -0x0400,
-/* Syscall related error */
-	error_scall			= -0x0500,
-	error_scall_code_inval		= -0x0501,
+/* Visor Call related error */
+	error_vcall			= -0x0300,
+	error_vcall_code_inval		= -0x0301,
 /* Memory related error */
 	error_memory			= -0x0600,
 	error_memory_low		= -0x0601,
@@ -79,6 +74,11 @@ typedef enum status
 	error_os_deadlock		= -0x0f02,
 	error_os_invalid_op		= -0x0f03,
 	error_os_sem_get		= -0x0f04,
+	error_os_panic_presched_cb_null = -0x0f05,
+	error_os_panic_sched_algo_null	= -0x0f06,
+	error_os_panic_os_start_fail	= -0x0f07,
+	error_os_mutex_lock		= -0x0f08,
+	error_os_mutex_unlock		= -0x0f09,
 /* Mesg related error */
 	error_mesg			= -0x1000,
 	error_mesg_long			= -0x1001,
diff --git a/src/include/supervisor_call.h b/src/include/supervisor_call.h
deleted file mode 100644
index 678a5da6..00000000
--- a/src/include/supervisor_call.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2019, Cyancore Team
- *
- * File Name		: supervisor_call.h
- * Description		: This file consists of supervisor call IDs and prototypes
- * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-#pragma once
-#define _SUPER_CALL_H_
-
-#include <stdint.h>
-#include <status.h>
-#include <arch.h>
-
-// Supervisor call IDs
-typedef enum scall_id
-{
-	scall_id_generic				= 0x0000,
-	scall_id_is_irq,
-/* pthread related */
-	scall_id_pthread_barrier_destroy		= 0x1000,
-	scall_id_pthread_barrier_init,
-	scall_id_pthread_barrier_wait,
-	scall_id_pthread_create,
-	scall_id_pthread_cond_broadcast,
-	scall_id_pthread_cond_destroy,
-	scall_id_pthread_cond_init,
-	scall_id_pthread_cond_signal,
-	scall_id_pthread_cond_timedwait,
-	scall_id_pthread_equal,
-	scall_id_pthread_exit,
-	scall_id_pthread_getschedparam,
-	scall_id_pthread_join,
-	scall_id_pthread_mutex_destroy,
-	scall_id_pthread_mutex_init,
-	scall_id_pthread_mutex_timedlock,
-	scall_id_pthread_mutex_unlock,
-	scall_id_pthread_mutexattr_destroy,
-	scall_id_pthread_mutexattr_gettype,
-	scall_id_pthread_mutexattr_init,
-	scall_id_pthread_mutexattr_settype,
-	scall_id_pthread_self,
-	scall_id_pthread_setschedparam,
-	scall_id_pthread_delay_ticks,
-/* mqueue related */
-	scall_id_mq_close,
-	scall_id_mq_setattr,
-	scall_id_mq_getattr,
-	scall_id_mq_open,
-	scall_id_mq_receive,
-	scall_id_mq_send,
-	scall_id_mq_unlink,
-/* semaphore related */
-	scall_id_sem_init,
-	scall_id_sem_destroy,
-	scall_id_sem_getvalue,
-	scall_id_sem_post,
-	scall_id_sem_wait,
-/* scheduler related */
-	scall_id_sched_get_max_priority,
-	scall_id_sched_get_min_priority,
-	scall_id_sched_yield,
-
-} scall_id_t;
-
-typedef struct sret
-{
-	uintptr_t p;
-	size_t size;
-	status_t status;
-} sret_t;
-
-typedef struct scall
-{
-	scall_id_t id;
-	sret_t (*callback)(call_arg_t a0, call_arg_t a1, call_arg_t a2);
-} scall_t;
-
-#define INCLUDE_SCALL(_name, _id , _callback)		\
-	const scall_t _name _SECTION(".scall") =	\
-	{						\
-		.id		= _id,			\
-		.callback	= _callback		\
-	}
diff --git a/src/include/vcall_id.h b/src/include/vcall_id.h
new file mode 100644
index 00000000..f7fa6c6c
--- /dev/null
+++ b/src/include/vcall_id.h
@@ -0,0 +1,65 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2023, Cyancore Team
+ *
+ * File Name		: vcall_id.h
+ * Description		: This file consists of visor call IDs
+ * Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#pragma once
+#define _VCALL_ID_H_
+
+// Visor call IDs
+typedef enum vcall_id
+{
+	fetch_sp			= 0x0001,
+	fetch_dp			= 0x0002,
+	set_sleep_mode			= 0x0003,
+	fetch_clk			= 0x0004,
+	config_clk			= 0x0005,
+/* pthread related */
+	pthread_barrier_destroy		= 0x1001,
+	pthread_barrier_init,
+	pthread_barrier_wait,
+	pthread_create,
+	pthread_cond_broadcast,
+	pthread_cond_destroy,
+	pthread_cond_init,
+	pthread_cond_signal,
+	pthread_cond_timedwait,
+	pthread_equal,
+	pthread_exit,
+	pthread_getschedparam,
+	pthread_join,
+	pthread_mutex_destroy,
+	pthread_mutex_init,
+	pthread_mutex_timedlock,
+	pthread_mutex_unlock,
+	pthread_mutexattr_destroy,
+	pthread_mutexattr_gettype,
+	pthread_mutexattr_init,
+	pthread_mutexattr_settype,
+	pthread_self,
+	pthread_setschedparam,
+	pthread_delay_ticks,
+/* mqueue related */
+	mq_close			= 0x2001,
+	mq_setattr,
+	mq_getattr,
+	mq_open,
+	mq_receive,
+	mq_send,
+	mq_unlink,
+/* semaphore related */
+	sem_init,
+	sem_destroy,
+	sem_getvalue,
+	sem_post,
+	sem_wait,
+/* scheduler related */
+	sched_get_max_priority,
+	sched_get_min_priority,
+	sched_yield,
+} vcall_id_t;
diff --git a/src/include/visor/supervisor/workers.h b/src/include/visor/supervisor/workers.h
deleted file mode 100644
index e966d14d..00000000
--- a/src/include/visor/supervisor/workers.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2019, Cyancore Team
- *
- * File Name		: worker.h
- * Description		: This file consists of supervisor-workers
- *			  and related prototypes
- * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-#pragma once
-
-#include <supervisor_call.h>
-
-void super_call(scall_id_t id, unsigned int a0, unsigned int a1, unsigned int a2, sret_t *ret);
diff --git a/src/include/visor/terravisor/cc_os/cc_os_config.h b/src/include/visor/terravisor/cc_os/cc_os_config.h
deleted file mode 100644
index 3ffb4fd6..00000000
--- a/src/include/visor/terravisor/cc_os/cc_os_config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2022, Cyancore Team
- *
- * File Name		: cc_os_config.h
- * Description		: CC OS Kernel configurations
- * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-#pragma once
-
-/**
- * @brief	Shall CC_OS use dynamic resource allocation
- * @note	Possible values : 1/0
- */
-#ifndef ccosconfig_CC_OS_USE_DYNAMIC
-#define ccosconfig_CC_OS_USE_DYNAMIC		0
-#endif
-
-/**
- * @brief	Heap size to be allocated to CC_OS
- * @note	Possible values : Depends on available RAM
- */
-#ifndef ccosconfig_CC_OS_HEAP_SIZE
-#define ccosconfig_CC_OS_HEAP_SIZE		1024
-#endif
-
-/**
- * @brief	Maximum number of threads allowed in static resource allocation
- * @note	The number of allowed threads are dependent of available RAM space.
- * 		User may have to keep it optimised so as to use as low BSS section
- * 		to be used as possible for the application being created.
- */
-#ifndef ccosconfig_CC_OS_MAX_THREAD
-#define ccosconfig_CC_OS_MAX_THREAD		10
-#endif
-
-/**
- * @brief	Max number of characters allowed to be used for task name
- */
-#ifndef ccosconfig_CC_OS_TASK_NAME_LEN
-#define ccosconfig_CC_OS_TASK_NAME_LEN		16
-#endif
-
-/**
- * @brief	Task priority of IDLE task
- * @note	Possible values : 1 -> 255
- */
-#ifndef ccosconfig_CC_OS_IDLE_TASK_PRIORITY
-#define ccosconfig_CC_OS_IDLE_TASK_PRIORITY	0x01
-#endif
-
-/**
- * @brief	Stack size used by IDLE task
- * @note	The stack size is either allocated statically or dynamically as
- * 		per the setting of ccosconfig_CC_OS_USE_DYNAMIC
- */
-#ifndef ccosconfig_CC_OS_TASK_STACK_LEN
-#define ccosconfig_CC_OS_TASK_STACK_LEN		255
-#endif
-
-/**
- * @brief	If the Kernel shall enter poer save mode during IDLE
- * 
- */
-#ifndef ccosconfig_CC_OS_POWER_SAVE_EN
-#define ccosconfig_CC_OS_POWER_SAVE_EN		0
-#endif
diff --git a/src/include/visor/terravisor/cc_os/cc_os_tasks.h b/src/include/visor/terravisor/cc_os/cc_os_tasks.h
deleted file mode 100644
index 74938dca..00000000
--- a/src/include/visor/terravisor/cc_os/cc_os_tasks.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2022, Cyancore Team
- *
- * File Name		: cc_os_task.h
- * Description		: CC OS Kernel Tasks declaration
- * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-#pragma once
-/*****************************************************
- *	INCLUDES
- *****************************************************/
-
-#include "status.h"
-#include "stdlib.h"
-#include "stdint.h"
-#include <terravisor/cc_os/cc_os_config.h>
-#include <terravisor/cc_os/utils/cc_os_sched.h>
-
-/*****************************************************
- *	TYPEDEFS
- *****************************************************/
-typedef void *os_args;
-typedef void (*task_fn)(os_args args);
-typedef const char c_char;
-
-/**
- * @brief	TASK infrastructure structure
- *
- */
-typedef struct cc_os_task
-{
-	task_fn task_fn;	      ///>> Task funcion
-	os_args args;		      ///>> Task Args ptr
-	c_char *name;		      ///>> String name of the task
-	size_t priority;	      ///>> For waited tasks
-	size_t *stack_ptr;	      ///>> Stack pointer of the task
-	size_t stack_len;	      ///>> Stack lengths of the task
-	cc_sched_tcb_t *task_tcb_ptr; ///>> For internal use only
-} cc_os_task_t;
-
-/*****************************************************
- *	MACROS
- *****************************************************/
-/**
- * @brief Function to declare a static task with a dedicated stack for the task
- * @brief Usage: CC_TASK_DEF(TASK_Name, task_func_pointer, priority(int), stack_len(int));
- *
- * @note  DO NOT use space in place of TASK_Name as it would result build errors.
- *
- */
-#define CC_TASK_DEF(_NAME, _fn, _args, _PRI, STACK_LEN) \
-	static size_t _NAME##_stack[STACK_LEN];         \
-	static cc_os_task_t _NAME##_task = {            \
-	    .args = _args,                              \
-	    .task_fn = _fn,                             \
-	    .name = #_NAME,                             \
-	    .priority = _PRI,                           \
-	    .stack_ptr = _NAME##_stack,                 \
-	    .stack_len = STACK_LEN}
-
-/**
- * @brief Function to get the instance using its name of already declared task.
- * @brief Usage: cc_os_task_t * task = &(CC_GET_TASK_INST(TASK_Name));
- *
- * @note  DO NOT use space in place of TASK_Name as it would result build errors.
- *
- */
-#define CC_GET_TASK_INST(_NAME) _NAME##_task
-
-/*****************************************************
- *	USER FUNCTION DECLARATIONS
- *****************************************************/
-/**
- * @brief A Function to add a task to the scheduler
- *
- * @param cc_os_task[in_out]	 pointer to the TASK_instance; use CC_GET_TASK_INST(Name) to get the Defined Task
- * @return status_t
- */
-status_t cc_os_add_task(cc_os_task_t *cc_os_task);
-
-/**
- * @brief A function to delete a task from the scheduler by instance
- *
- * @param cc_os_task[in]	pointer to the TASK_instance; use CC_GET_TASK_INST(Name) to get the Defined Task;
- * 				Pass NULL to point to current task
- * @return status_t
- */
-status_t cc_os_del_task(cc_os_task_t *cc_os_task);
-
-/**
- * @brief A Function to pause the task until call resume explicitly using its instance
- *
- * @param cc_os_task[in]	pointer to the TASK_instance; use CC_GET_TASK_INST(Name) to get the Defined Task;
- * 				Pass NULL to point to current task
- * @return status_t
- */
-status_t cc_os_pause_task(cc_os_task_t *cc_os_task);
-
-/**
- *
- * @brief A Function to resume paused task using its instance
- * @note  Calling this function for already non-waiting task has no effect.
- *
- * @param cc_os_task[in]	pointer to the TASK_instance; use CC_GET_TASK_INST(Name) to get the Defined Task;
- * 				Pass NULL to point to current task
- * @return status_t
- */
-status_t cc_os_resume_task(cc_os_task_t *cc_os_task);
-
-/**
- * @brief A Function to pause all the tasks except the current and the IDLE Task
- * @note	To resume all please use cc_os_resume_all_task() call
- *
- * @return status_t
- */
-status_t cc_os_pause_all_task(void);
-
-/**
- * @brief A Function to resume all the tasks
- *
- * @return status_t
- */
-status_t cc_os_resume_all_task(void);
-
-/**
- * @brief A function to set CC OS scheduler algorithm
- *
- * @param sched_algo[in]	The algorithm that needs to be selected to
- * @return status_t
- */
-status_t set_cc_os_sched_algo(cc_sched_algo_t sched_algo);
-
-/**
- * @brief A Function to put the current task to a waiting state and yield
- * @note  To just Yeild set ticks to 0
- *
- * @param ticks[in]		Number of CC_OS Ticks
- * @return None
- */
-void cc_os_task_wait(const size_t ticks);
-
-/**
- * @brief A Function to switch to next available task
- *
- * @return None
- */
-void cc_os_task_yield(void);
-
-/**
- * @brief A Function to invoke the kernel
- *
- * @return status_t
- */
-void cc_os_run(void);
diff --git a/src/include/visor/terravisor/cc_os/utils/cc_os_sched.h b/src/include/visor/terravisor/cc_os/utils/cc_os_sched.h
deleted file mode 100644
index 29330d09..00000000
--- a/src/include/visor/terravisor/cc_os/utils/cc_os_sched.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2022, Cyancore Team
- *
- * File Name		: cc_os_sched.h
- * Description		: CC OS Kernel scheduler declaration
- * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-#pragma once
-
-/*****************************************************
- *	INCLUDES
- *****************************************************/
-#include <stdint.h>
-#include <stdlib.h>
-#include <status.h>
-
-/*****************************************************
- *	DEFINES
- *****************************************************/
-#define CC_OS_FALSE			0
-#define CC_OS_TRUE			1
-#define CC_OS_NULL_PTR			NULL
-#define CC_OS_DELAY_MAX			((size_t) -1)
-
-#define	CC_OS_DYNAMIC 			ccosconfig_CC_OS_USE_DYNAMIC
-
-#define CC_OS_ASSERT_IF_FALSE(con)	RET_ON_FAIL(con, error_func_inval_arg)
-
-/*****************************************************
- *	TYPEDEFS
- *****************************************************/
-typedef struct cc_sched_tcb cc_sched_tcb_t;
-typedef struct cc_sched cc_sched_t;
-
-typedef enum
-{
-	cc_sched_task_status_exit	= 0x00,			///> Initial State
-	cc_sched_task_status_running	= 0x01,			///> Task currently running
-	cc_sched_task_status_ready	= 0x02,			///> Task Ready to despatch
-	cc_sched_task_status_wait	= 0x03,			///> Task in wait state
-	cc_sched_task_status_max 	= 0xff,			///> Do Nt Use
-} cc_sched_task_status_t;
-
-typedef struct link
-{
-	cc_sched_tcb_t * prev;
-	cc_sched_tcb_t * next;
-}link_t;
-
-typedef struct wres
-{
-	uintptr_t wait_on_resource;				///> Resource on hich the task is waiting on
-	size_t 	  task_delay_ticks;				///> Time delay in ticks
-}wres_t;
-
-struct cc_sched_tcb
-{
-	char 	  name [ccosconfig_CC_OS_TASK_NAME_LEN + 1];	///> Name of the Current Task
-	size_t    priority;					///> Priority of the task
-	void    * stack_ptr;					///> Stack Pointer
-	wres_t	  wait_res;					///> Wait Task resource
-	link_t	  ready_link;					///> Ready Linked List Pointers
-	link_t    wait_link;					///> Wait Linked List Pointers
-	cc_sched_task_status_t task_status;			///> Current state of the task
-};
-
-typedef struct cc_sched_ctrl
-{
-	cc_sched_tcb_t 	* ready_list_head;
-	cc_sched_tcb_t 	* curr_task;
-	cc_sched_tcb_t 	* wait_list_head;
-	cc_sched_tcb_t 	* task_max_prio;
-	cc_sched_t 	* selected_sched;
-}cc_sched_ctrl_t;
-
-/**
- * @brief Prototype of scheduler algorithm function
- */
-typedef void (* algo_fn)(cc_sched_ctrl_t * sched_ctrl);
-
-typedef enum
-{
-	cc_sched_algo_round_robin	= 0x00,			///> Round Robin scheduling algorithm
-	cc_sched_algo_priority_driven	= 0x01,			///> Priority driven Scheduling
-	cc_sched_algo_max		= 0xff
-}cc_sched_algo_t;
-
-typedef struct cc_sched
-{
-	cc_sched_algo_t cc_selected_algo;			///> Selected Algorithm ID
-	algo_fn algo_function;					///> Pointer to algorithm function
-}cc_sched_t;
diff --git a/src/include/visor/terravisor/cc_os/cc_os.h b/src/include/visor/terravisor/helios/helios.h
similarity index 55%
rename from src/include/visor/terravisor/cc_os/cc_os.h
rename to src/include/visor/terravisor/helios/helios.h
index aaac3656..ed3b8c21 100644
--- a/src/include/visor/terravisor/cc_os/cc_os.h
+++ b/src/include/visor/terravisor/helios/helios.h
@@ -2,20 +2,21 @@
  * CYANCORE LICENSE
  * Copyrights (C) 2022, Cyancore Team
  *
- * File Name		: cc_os.h
+ * File Name		: helios.h
  * Description		: CC OS Kernel
  * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
  * Organisation		: Cyancore Core-Team
  */
 
-#ifndef __CC_OS__
-#define __CC_OS__
+#ifndef __HELIOS__
+#define __HELIOS__
 
 /*****************************************************
  *	INCLUDES
  *****************************************************/
-#include <terravisor/cc_os/utils/cc_os_heap.h>
-#include <terravisor/cc_os/cc_os_tasks.h>
-#include <terravisor/cc_os/cc_os_sem.h>
+#include <terravisor/helios/utils/helios_heap.h>
+#include <terravisor/helios/helios_tasks.h>
+#include <terravisor/helios/helios_sem.h>
+#include <terravisor/helios/helios_mutex.h>
 
-#endif	/* __CC_OS__ */
+#endif	/* __HELIOS__ */
diff --git a/src/include/visor/terravisor/helios/helios_mutex.h b/src/include/visor/terravisor/helios/helios_mutex.h
new file mode 100644
index 00000000..67ed3fb2
--- /dev/null
+++ b/src/include/visor/terravisor/helios/helios_mutex.h
@@ -0,0 +1,94 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2022, Cyancore Team
+ *
+ * File Name		: helios_mutex.h
+ * Description		: HELIOS mutex declaration
+ * Primary Author	: Dibyajyoti Samal [dibyajyoti.samal@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#pragma once
+/*****************************************************
+ *	DEFINES
+ *****************************************************/
+#include <terravisor/helios/helios.h>
+/*****************************************************
+ *	TYPEDEFS
+ *****************************************************/
+typedef struct helios_mutex
+{
+	int mutex_val;
+	uint8_t	mutex_init;
+	helios_sched_tcb_t * lock_task;
+} helios_mutex_t;
+/*****************************************************
+ *	USER MACROS
+ *****************************************************/
+#define CC_MUTEX_INST(_Name)	_Name##_mutex_inst
+
+#if HELIOS_DYNAMIC == HELIOS_FALSE
+#define CC_MUTEX_DEF(_Name)		\
+static helios_mutex_t _Name##_mutex = {	\
+	.mutex_init = 0,		\
+	.mutex_val = 0,			\
+	.lock_task = HELIOS_NULL_PTR	\
+};					\
+helios_mutex_t * _Name##_mutex_inst = &_Name##_mutex
+#else
+#define CC_MUTEX_DEF(_Name)	helios_mutex_t * _Name##_mutex_inst = HELIOS_NULL_PTR
+#endif
+/*****************************************************
+ *	USER FUNCTION DECLARATIONS
+ *****************************************************/
+/**
+ * @brief 	Create a mutex
+ * @note	The instance needs to be provided using CC_MUTEX_DEF macro. Initialize the mutex struct with current task and initial value. Return error in case memory is low.
+ *
+ * @param mutex_ptr[in_out]	Instance pointer
+ *
+ * @return status_t
+ */
+status_t helios_mutex_create	(helios_mutex_t ** mutex_ptr);
+
+/**
+ * @brief 	Delete a mutex and de-initialise it
+ * @note	Free the mutex struct and clear the mutex_init to de-initialize the mutex.
+ *
+ * @param mutex_ptr[in_out]	Instance pointer
+ *
+ * @return status_t
+ */
+status_t helios_mutex_delete 	(helios_mutex_t ** mutex_ptr);
+
+/**
+ * @brief 	Unlock the mutex
+ * @note	Increment the mutex_val to unlock. Unlock only if called by the current task. If any other task tries to unlock the mutex, return an error.
+ *
+ * @param mutex_ptr[in]		Instance pointer
+ *
+ * @return status_t
+ */
+status_t helios_mutex_unlock 	(helios_mutex_t * mutex_ptr);
+
+/**
+ * @brief 	Lock a mutex
+ * @note	Decrement the mutex_val to lock. If resource already taken by another task, wait for wait_ticks until free. Allow recursive mutex if same task requires the mutex again.
+ *
+ * @param mutex_ptr[in]		Instance pointer
+ * @param wait_ticks[in]	Timeout Wait ticks
+ *
+ * @return status_t
+ */
+status_t helios_mutex_lock 	(helios_mutex_t * mutex_ptr, size_t wait_ticks);
+
+/**
+ * @brief 	Get current mutex value
+ * @note	Read the status and retrieve the value of the current mutex_val.
+ *
+ * @param mutex_ptr[in]		Instance pointer
+ * @param val[out]		Value return
+ *
+ * @return status_t
+ */
+status_t helios_mutex_get_val 	(const helios_mutex_t * mutex_ptr, int * val);
diff --git a/src/include/visor/terravisor/cc_os/cc_os_sem.h b/src/include/visor/terravisor/helios/helios_sem.h
similarity index 69%
rename from src/include/visor/terravisor/cc_os/cc_os_sem.h
rename to src/include/visor/terravisor/helios/helios_sem.h
index e7a3d1e6..0c25d690 100644
--- a/src/include/visor/terravisor/cc_os/cc_os_sem.h
+++ b/src/include/visor/terravisor/helios/helios_sem.h
@@ -2,7 +2,7 @@
  * CYANCORE LICENSE
  * Copyrights (C) 2022, Cyancore Team
  *
- * File Name		: cc_os_sem.h
+ * File Name		: helios_sem.h
  * Description		: CC OS semaphore declaration
  * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
  * Organisation		: Cyancore Core-Team
@@ -12,29 +12,29 @@
 /*****************************************************
  *	DEFINES
  *****************************************************/
-#include <terravisor/cc_os/cc_os.h>
+#include <terravisor/helios/helios.h>
 /*****************************************************
  *	TYPEDEFS
  *****************************************************/
-typedef struct sem
+typedef struct helios_sem
 {
 	size_t	sem_val;
 	uint8_t	sem_init;
-}sem_t;
+}helios_sem_t;
 /*****************************************************
  *	USER MACROS
  *****************************************************/
 #define CC_SEM_INST(_Name)	_Name##_sem_inst
 
-#if CC_OS_DYNAMIC == CC_OS_FALSE
-#define CC_SEM_DEF(_Name)	\
-static sem_t _Name##_sem = {	\
-	.sem_init = 0,		\
-	.sem_val = 0		\
-};				\
-static sem_t * _Name##_sem_inst = &_Name##_sem
+#if HELIOS_DYNAMIC == false
+#define CC_SEM_DEF(_Name)		\
+static helios_sem_t _Name##_sem = {	\
+	.sem_init = 0,			\
+	.sem_val = 0			\
+};					\
+helios_sem_t * _Name##_sem_inst = &_Name##_sem
 #else
-static sem_t * _Name##_sem_inst = CC_OS_NULL_PTR
+#define CC_SEM_DEF(_Name)		helios_sem_t * _Name##_sem_inst = HELIOS_NULL_PTR
 #endif
 /*****************************************************
  *	USER FUNCTION DECLARATIONS
@@ -48,7 +48,7 @@ static sem_t * _Name##_sem_inst = CC_OS_NULL_PTR
  *
  * @return status_t
  */
-status_t cc_os_sem_create	(sem_t ** sem_ptr, size_t init_val);
+status_t helios_sem_create	(helios_sem_t ** sem_ptr, size_t init_val);
 
 /**
  * @brief 	Delete a semaphore and de-initialise it
@@ -57,7 +57,7 @@ status_t cc_os_sem_create	(sem_t ** sem_ptr, size_t init_val);
  *
  * @return status_t
  */
-status_t cc_os_sem_delete 	(sem_t ** sem_ptr);
+status_t helios_sem_delete 	(helios_sem_t ** sem_ptr);
 
 /**
  * @brief 	Decrement a semaphore value
@@ -66,7 +66,7 @@ status_t cc_os_sem_delete 	(sem_t ** sem_ptr);
  *
  * @return status_t
  */
-status_t cc_os_sem_give 	(sem_t * sem_ptr);
+status_t helios_sem_give 	(helios_sem_t * sem_ptr);
 
 /**
  * @brief 	Increment a semaphore value
@@ -76,7 +76,7 @@ status_t cc_os_sem_give 	(sem_t * sem_ptr);
  *
  * @return status_t
  */
-status_t cc_os_sem_take 	(sem_t * sem_ptr, size_t wait_ticks);
+status_t helios_sem_take 	(helios_sem_t * sem_ptr, size_t wait_ticks);
 
 /**
  * @brief 	Get current semaphore value
@@ -87,4 +87,4 @@ status_t cc_os_sem_take 	(sem_t * sem_ptr, size_t wait_ticks);
  * @return status_t
  */
 
-status_t cc_os_sem_get_val 	(const sem_t * sem_ptr, size_t * val);
+status_t helios_sem_get_val 	(const helios_sem_t * sem_ptr, size_t * val);
diff --git a/src/include/visor/terravisor/helios/helios_tasks.h b/src/include/visor/terravisor/helios/helios_tasks.h
new file mode 100644
index 00000000..b848913b
--- /dev/null
+++ b/src/include/visor/terravisor/helios/helios_tasks.h
@@ -0,0 +1,184 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2022, Cyancore Team
+ *
+ * File Name		: helios_task.h
+ * Description		: CC OS Kernel Tasks declaration
+ * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#pragma once
+/*****************************************************
+ *	INCLUDES
+ *****************************************************/
+
+#include "status.h"
+#include "stdlib.h"
+#include "stdint.h"
+#include <terravisor/helios/utils/helios_sched.h>
+
+/*****************************************************
+ *	TYPEDEFS
+ *****************************************************/
+/**
+ * @brief	TASK infrastructure
+ *
+ */
+typedef uint16_t helios_task_t;
+
+/*****************************************************
+ *	MACROS
+ *****************************************************/
+
+/*****************************************************
+ *	USER FUNCTION DECLARATIONS
+ *****************************************************/
+/**
+ * @brief A Function to add a task to the scheduler
+ *
+ *
+ * @param helios_task[out]	Pointer to the TASK_instance
+ * @param name[in]		Conatant Name string provided by the user
+ * @param task_func[in]		Pointer to the task function
+ * @param args[in]		Pointer to the argument variable provided to the task
+ * @param priority[in]		Task Priority: 1->255
+ * @param stack_len[in]		Task stack length
+ * @param stack_ptr[in]		Pointer to static stack for static allocation only.
+ *
+ * @return status_t
+ */
+status_t helios_add_task (
+	helios_task_t * helios_task, const char* name,
+	task_fn_t task_func, helios_args args,
+	uint8_t priority,size_t stack_len,
+	uintptr_t stack_ptr);
+
+/**
+ * @brief	Get the argument pointer set for the current task
+ *
+ * @return	Pointer to the argument as set;
+ */
+helios_args helios_get_args(void);
+/**
+ * @brief A function to delete a task from the scheduler by instance
+ *
+ * @param helios_task[in]	pointer to the TASK_instance;
+ * 				Pass NULL to point to current task
+ * @return status_t
+ */
+status_t helios_del_task(helios_task_t helios_task);
+
+/**
+ * @brief A Function to pause the task until call resume explicitly using its instance
+ *
+ * @param helios_task[in]	pointer to the TASK_instance;
+ * 				Pass NULL to point to current task
+ * @return status_t
+ */
+status_t helios_pause_task(helios_task_t helios_task);
+
+/**
+ *
+ * @brief A Function to resume paused task using its instance
+ * @note  Calling this function for already non-waiting task has no effect.
+ *
+ * @param helios_task[in]	pointer to the TASK_instance;
+ * 				Pass NULL to point to current task
+ * @return status_t
+ */
+status_t helios_resume_task(helios_task_t helios_task);
+
+/**
+ * @brief A Function to pause all the tasks except the current and the IDLE Task
+ * @note	To resume all please use helios_resume_all_task() call
+ *
+ * @return status_t
+ */
+status_t helios_pause_all_task(void);
+
+/**
+ * @brief A Function to resume all the tasks
+ *
+ * @return status_t
+ */
+status_t helios_resume_all_task(void);
+
+/**
+ * @brief A function to set CC OS scheduler algorithm
+ *
+ * @param sched_algo[in]	The algorithm that needs to be selected to
+ * @return status_t
+ */
+status_t helios_set_sched_algo(helios_sched_algo_t sched_algo);
+
+/**
+ * @brief A function to set the functional callback hooks
+ *
+ * @param cb_type[in]	Callback type which user would like to register
+ * @param cb_func[in]	Callback hook function associated to the cb_type
+ * @return status_t
+ */
+status_t helios_set_callback(const helios_sched_cb_t cb_type, const helios_cb_hook_t cb_func);
+
+/**
+ * @brief Get name of current running task
+ *
+ * @param None
+ * @return Pointer to the current task name
+ */
+const char * helios_get_curr_task_name(void);
+
+/**
+ * @brief Get name of any task using task handler
+ *
+ * @param helios_task[in]    Task handler
+ * @return Pointer to the task name
+ */
+const char *helios_get_task_name(helios_task_t helios_task);
+
+/**
+ * @brief A Function to put the current task to a waiting state and yield
+ * @note  To just Yeild set ticks to 0
+ *
+ * @param ticks[in]		Number of HELIOS Ticks
+ * @return None
+ */
+void helios_task_wait(const size_t ticks);
+
+/**
+ * @brief A Function to switch to next available task
+ *
+ * @return None
+ */
+void helios_task_yield(void);
+
+/**
+ * @brief A Function to invoke the kernel
+ *
+ * @return status_t
+ */
+void helios_run(void);
+
+/**
+ * @brief A function to enable anti-deadlock for the task and feed timer value to scheduler. The same shall be used to reset the task watchdog to keep the task alive.
+ * @note  1. For this feature user needs to enable HELIOS_ANTI_DEADLOCK flag.
+ * @note  2. HELIOS does NOT keep the reference of previously set watchdog tick value.
+ * 	     It is the responsibility of the user to feed the required number of ticks for the tasks to be considered alive.
+ * @note  3. User needs to set an user callback of type helios_sched_cb_deadlock_notify using helios_set_callback().
+ * @note  4. This fucntion shall be called from the Task atleast once for the timer to get started.
+ * @note  5. This function is only allowed to be called from within the task.
+ *
+ * @param task_wd_ticks[in]	Watchdog counter reset val.
+ *
+ * @return status_t
+ */
+status_t helios_task_anti_deadlock_enable_and_feed(size_t task_wd_ticks);
+
+/**
+ * @brief A function to disable anti deadlock for the task.
+ * @note  This function shall be called form within the task itself.
+ *
+ * @return status_t
+ */
+status_t helios_task_anti_deadlock_disable(void);
diff --git a/src/include/visor/terravisor/cc_os/utils/cc_os_heap.h b/src/include/visor/terravisor/helios/utils/helios_heap.h
similarity index 67%
rename from src/include/visor/terravisor/cc_os/utils/cc_os_heap.h
rename to src/include/visor/terravisor/helios/utils/helios_heap.h
index 7e0cbb97..14dc7506 100644
--- a/src/include/visor/terravisor/cc_os/utils/cc_os_heap.h
+++ b/src/include/visor/terravisor/helios/utils/helios_heap.h
@@ -2,7 +2,7 @@
  * CYANCORE LICENSE
  * Copyrights (C) 2022, Cyancore Team
  *
- * File Name		: cc_os_heap.h
+ * File Name		: helios_heap.h
  * Description		: CC OS Heap declaration (Placeholder)
  * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
  * Organisation		: Cyancore Core-Team
@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <terravisor/cc_os/cc_os.h>
+#include <terravisor/helios/helios.h>
 
-void * cc_os_malloc(size_t size);
-void * cc_os_free(const void *addr);
+void * helios_malloc(size_t size);
+void helios_free(void *addr);
diff --git a/src/include/visor/terravisor/helios/utils/helios_sched.h b/src/include/visor/terravisor/helios/utils/helios_sched.h
new file mode 100644
index 00000000..1796c1dd
--- /dev/null
+++ b/src/include/visor/terravisor/helios/utils/helios_sched.h
@@ -0,0 +1,161 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2022, Cyancore Team
+ *
+ * File Name		: helios_sched.h
+ * Description		: CC OS Kernel scheduler declaration
+ * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#pragma once
+
+/*****************************************************
+ *	INCLUDES
+ *****************************************************/
+#include <stdint.h>
+#include <stdlib.h>
+#include <status.h>
+#include <syslog.h>
+#include <platform.h>
+
+/*****************************************************
+ *	DEFINES
+ *****************************************************/
+#define HELIOS_NULL_PTR			NULL
+#define HELIOS_DELAY_MAX		SIZE_MAX
+
+#define	HELIOS_DYNAMIC 			HELIOS_USE_DYNAMIC
+
+#ifdef HELIOS_DEBUG
+#define HELIOS_ERR(fmt, ...)		sysdbg2("[HELIOS ERR]: "fmt"\n", ##__VA_ARGS__)
+#define HELIOS_DBG(fmt, ...)		sysdbg3("[HELIOS DBG]: "fmt"\n", ##__VA_ARGS__)
+#else
+#define HELIOS_ERR(fmt,...)
+#define HELIOS_DBG(fmt,...)
+#endif  /* HELIOS_DEBUG */
+
+#define HELIOS_ASSERT_IF_FALSE(con)					\
+	do{								\
+		if(!(con)){						\
+			HELIOS_ERR("(%s) : Invalid ARG\n", __func__);	\
+			return error_func_inval_arg;			\
+		}							\
+	} while (false)
+
+#define HELIOS_SCHED_PANIC(err)					\
+	do{							\
+		syslog(fail, "[HELIOS EXC]: %s\n", #err);	\
+		plat_panic_handler();				\
+	} while (false)
+/*****************************************************
+ *	TYPEDEFS
+ *****************************************************/
+typedef struct helios_sched_tcb helios_sched_tcb_t;
+typedef struct helios_sched helios_sched_t;
+typedef const char c_char;
+typedef uintptr_t helios_args;
+typedef void (*task_fn_t)(void);
+typedef void (*helios_cb_hook_t)(helios_args args);
+typedef enum
+{
+	helios_sched_task_status_exit	= 0x00,			///> Initial State
+	helios_sched_task_status_running	= 0x01,			///> Task currently running
+	helios_sched_task_status_ready	= 0x02,			///> Task Ready to despatch
+	helios_sched_task_status_wait	= 0x03,			///> Task in wait state
+	helios_sched_task_status_pause	= 0x04,			///> Task in pause state
+	helios_sched_task_status_max 	= 0xff,			///> Do Nt Use
+} helios_sched_task_status_t;
+
+/*
+ * @note	All negative callbacks are internally used by the scheduler
+ */
+typedef enum
+{
+	helios_sched_cb_power_pre_sleep		= 0x00,
+	helios_sched_cb_power_post_sleep	= 0x01,
+	helios_sched_cb_power_sleep		= 0x02,
+	helios_sched_cb_deadlock_notify		= 0x03,
+	helios_sched_cb_max			= 0xff
+}helios_sched_cb_t;
+
+typedef enum
+{
+	helios_task_flag_set_anti_deadlock	= (1 << 0)		///> Enable Antideadlock for the task
+}helios_task_flag_t;
+typedef struct link
+{
+	helios_sched_tcb_t * prev;
+	helios_sched_tcb_t * next;
+}link_t;
+
+typedef struct wres
+{
+	uintptr_t wait_on_resource;				///> Resource on hich the task is waiting on
+	size_t 	  task_delay_ticks;				///> Time delay in ticks
+}wres_t;
+
+struct helios_sched_tcb
+{
+
+	c_char  * name;						///> Name of the Current Task
+	uint8_t   priority;					///> Priority of the task
+	uint8_t	  task_flags;					///> Task Flags
+	uintptr_t stack_ptr;					///> Stack Pointer
+	task_fn_t task_func;					///> Task Call Function
+	uintptr_t args_ptr;					///> Task Call argument ptr
+	wres_t	  wait_res;					///> Wait Task resource
+	link_t	  ready_link;					///> Ready Linked List Pointers
+	link_t    wait_link;					///> Wait Linked List Pointers
+	uint16_t  task_id;					///> Task ID assigned
+#if HELIOS_ANTI_DEADLOCK
+	size_t	  task_wd_ticks;				///> Tick down counter for Anti Deadlock system
+#endif /* HELIOS_ANTI_DEADLOCK */
+	helios_sched_task_status_t task_status;			///> Current state of the task
+};
+
+typedef struct helios_sched_func_cb
+{
+	helios_cb_hook_t pre_sched;
+#if HELIOS_POWER_SAVE_EN
+	helios_cb_hook_t pre_sleep_cb;
+	helios_cb_hook_t post_sleep_cb;
+	helios_cb_hook_t sleep_cb;
+#endif /* HELIOS_POWER_SAVE_EN */
+#if HELIOS_ANTI_DEADLOCK
+	helios_cb_hook_t deadlock_notify;
+#endif /* HELIOS_ANTI_DEADLOCK */
+}helios_sched_func_cb_t;
+
+typedef struct helios_sched_ctrl
+{
+	helios_sched_tcb_t 	* ready_list_head;
+	helios_sched_tcb_t 	* curr_task;
+	helios_sched_tcb_t 	* wait_list_head;
+	helios_sched_t 		* selected_sched;
+	helios_sched_func_cb_t cb_hooks_reg;
+}helios_sched_ctrl_t;
+
+/**
+ * @brief Prototype of scheduler algorithm function
+ */
+typedef void (* algo_fn)(helios_sched_ctrl_t * sched_ctrl);
+
+typedef enum
+{
+	helios_sched_algo_round_robin		= 0x00,			///> Round Robin scheduling algorithm
+	helios_sched_algo_priority_driven	= 0x01,			///> Priority driven Scheduling
+	helios_sched_algo_max			= 0xff
+}helios_sched_algo_t;
+
+typedef struct helios_sched
+{
+	helios_sched_algo_t helios_selected_algo;			///> Selected Algorithm ID
+	algo_fn algo_function;						///> Pointer to algorithm function
+}helios_sched_t;
+
+typedef struct helios_sched_anti_deadlock
+{
+	c_char * name;
+	task_fn_t task_func;
+}helios_sched_anti_deadlock_t;
diff --git a/src/include/visor/terravisor/workers.h b/src/include/visor/terravisor/workers.h
deleted file mode 100644
index ab9697ed..00000000
--- a/src/include/visor/terravisor/workers.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2019, Cyancore Team
- *
- * File Name		: worker.h
- * Description		: This file consists of terravisor-workers
- *			  and related prototypes
- * Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-#pragma once
-
-void machine_call(unsigned int, unsigned int, unsigned int, unsigned int, mret_t *);
diff --git a/src/include/visor/visor/workers.h b/src/include/visor/visor/workers.h
new file mode 100644
index 00000000..dfa184b7
--- /dev/null
+++ b/src/include/visor/visor/workers.h
@@ -0,0 +1,13 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2023, Cyancore Team
+ *
+ * File Name		: worker.h
+ * Description		: This file consists of visor workers prototype
+ * Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#pragma once
+
+void vcall_handler(unsigned int, unsigned int, unsigned int, unsigned int, vret_t *);
diff --git a/src/include/visor_call.h b/src/include/visor_call.h
new file mode 100644
index 00000000..300fe539
--- /dev/null
+++ b/src/include/visor_call.h
@@ -0,0 +1,39 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019-2023, Cyancore Team
+ *
+ * File Name		: visor_call.h
+ * Description		: This file consists of visor call utils and 
+ *			  data types
+ * Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#pragma once
+#define _VISOR_CALL_H_
+
+#include <stdint.h>
+#include <status.h>
+#include <vcall_id.h>
+
+typedef struct mret
+{
+	uintptr_t p;
+	size_t size;
+	status_t status;
+} vret_t;
+
+#include <arch.h>
+
+typedef struct vcall
+{
+	vcall_id_t id;
+	void (*callback)(call_arg_t a0, call_arg_t a1, call_arg_t a2, vret_t *ret);
+} vcall_t;
+
+#define INCLUDE_VCALL(_name, _id , _callback)		\
+	const vcall_t _name _SECTION(".vcall") =	\
+	{						\
+		.id		= _id,			\
+		.callback	= _callback		\
+	}
diff --git a/src/lib/libposix/src/posix_mqueue.c b/src/lib/libposix/src/posix_mqueue.c
index caaba26e..af0238d6 100644
--- a/src/lib/libposix/src/posix_mqueue.c
+++ b/src/lib/libposix/src/posix_mqueue.c
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <supervisor/workers.h>
+#include <visor/workers.h>
 #include <posix/pthread.h>
 #include <posix/mqueue.h>
 #include <posix/errno.h>
@@ -44,7 +44,7 @@ static int s_queue_write(mqd_t mqdes, const void * buff, size_t size, unsigned m
 
 	memcpy((void *)p_mqd_section->kernel_buff, buff, size);
 
-	super_call(scall_id_mq_send, p_mqd_section->id, size, msg_prio, &mq_sys_ret);
+	super_call(mq_send, p_mqd_section->id, size, msg_prio, &mq_sys_ret);
 	RET_ERR_IF_FALSE(mq_sys_ret.status == SUCCESS, -EBADF, int);
 
 	return SUCCESS;
@@ -57,7 +57,7 @@ static int s_queue_read(mqd_t mqdes, void * buff, size_t size)
 
 	RET_ERR_IF_FALSE((p_mqd_section->attr.mq_flags & O_WRONLY), -ENOTSUP, int);
 
-	super_call(scall_id_mq_receive, p_mqd_section->id, size, RST_VAL, &mq_sys_ret);
+	super_call(mq_receive, p_mqd_section->id, size, RST_VAL, &mq_sys_ret);
 	RET_ERR_IF_FALSE(mq_sys_ret.status == SUCCESS, -EBADF, int);
 
 	memcpy(buff, (void *) (p_mqd_section->kernel_buff), size);
@@ -131,7 +131,7 @@ mqd_t mq_open( 	const char * name,
 	p_mqd_section->attr.mq_flags = oflag;
 
 	/* Perform super_call */
-	super_call(scall_id_mq_open,
+	super_call(mq_open,
 		(p_mqd_section->attr.mq_maxmsg * p_mqd_section->attr.mq_msgsize),
 		RST_VAL,
 		RST_VAL,
@@ -175,7 +175,7 @@ int mq_close( mqd_t mqdes )
 		memset(&((mqd_section_t *) mqdes)->attr, RST_VAL, sizeof(mq_attr_t));
 
 		/* Perform Super Call */
-		super_call(scall_id_mq_close, ((mqd_section_t *) mqdes)->id, RST_VAL, RST_VAL, &mq_sys_ret);
+		super_call(mq_close, ((mqd_section_t *) mqdes)->id, RST_VAL, RST_VAL, &mq_sys_ret);
 		if (mq_sys_ret.status != SUCCESS)
 		{
 			err = -ENOTSUP;
diff --git a/src/lib/libposix/src/posix_pthread.c b/src/lib/libposix/src/posix_pthread.c
index 2d78dc61..b3f560a6 100644
--- a/src/lib/libposix/src/posix_pthread.c
+++ b/src/lib/libposix/src/posix_pthread.c
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <supervisor/workers.h>
+#include <visor/workers.h>
 #include <posix/pthread.h>
 #include <posix/errno.h>
 #include <posix/utils.h>
@@ -132,7 +132,7 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*startr
 	/* Grab resource access else return EBUSY */
 	RET_ERR_IF_FALSE(s_pthread_acquire_lock() == SUCCESS, -EBUSY, int);
 
-	super_call(scall_id_pthread_create, (call_arg_t) startroutine, (call_arg_t) arg, thread->attr->stacksize, &pthread_sys_ret);
+	super_call(pthread_create, (call_arg_t) startroutine, (call_arg_t) arg, thread->attr->stacksize, &pthread_sys_ret);
 	if (pthread_sys_ret.status != SUCCESS)
 	{
 		err = -EAGAIN;
@@ -166,7 +166,7 @@ void pthread_exit( const void *value_ptr _UNUSED)
 	/* Grab resource access else return EBUSY */
 	s_pthread_acquire_lock();
 
-	super_call(scall_id_pthread_exit, RST_VAL, RST_VAL, RST_VAL, &pthread_sys_ret);
+	super_call(pthread_exit, RST_VAL, RST_VAL, RST_VAL, &pthread_sys_ret);
 
 	/* Release resource access else return EBUSY */
 	s_pthread_release_lock();
diff --git a/src/lib/libposix/src/posix_semaphore.c b/src/lib/libposix/src/posix_semaphore.c
index cc0fd6fc..1b667ca0 100644
--- a/src/lib/libposix/src/posix_semaphore.c
+++ b/src/lib/libposix/src/posix_semaphore.c
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <supervisor/workers.h>
+#include <visor/workers.h>
 #include <posix/semaphore.h>
 #include <posix/errno.h>
 #include <posix/utils.h>
@@ -29,7 +29,7 @@ static int s_sem_wait( const sem_t * sem )
 	ASSERT_IF_FALSE(sem->id != RST_VAL, int);
 
 	/* Perform super_call */
-	super_call(scall_id_sem_wait, sem->id, RST_VAL, RST_VAL, &sem_sys_ret);
+	super_call(sem_wait, sem->id, RST_VAL, RST_VAL, &sem_sys_ret);
 
 	return sem_sys_ret.status;
 }
@@ -48,7 +48,7 @@ int sem_destroy( sem_t * sem )
 	ASSERT_IF_FALSE(sem->id != RST_VAL, int);
 
 	/* Perform super_call */
-	super_call(scall_id_sem_destroy, sem->id, RST_VAL, RST_VAL, &sem_sys_ret);
+	super_call(sem_destroy, sem->id, RST_VAL, RST_VAL, &sem_sys_ret);
 	RET_ERR_IF_FALSE(sem_sys_ret.status == SUCCESS, sem_sys_ret.status, int);
 
 	/* Reset semaphore ID */
@@ -67,7 +67,7 @@ int sem_getvalue( sem_t * sem, int * sval )
 	ASSERT_IF_FALSE(sem != NULL, int);
 
 	/* Perform super_call */
-	super_call(scall_id_sem_getvalue, sem->id, RST_VAL, RST_VAL, &sem_sys_ret);
+	super_call(sem_getvalue, sem->id, RST_VAL, RST_VAL, &sem_sys_ret);
 	RET_ERR_IF_FALSE(sem_sys_ret.status == SUCCESS, sem_sys_ret.status, int);
 
 	/* Copy sem value */
@@ -88,7 +88,7 @@ int sem_init( sem_t * sem, int pshared _UNUSED, unsigned value )
 	ASSERT_IF_FALSE(sem->id == RST_VAL, int);
 
 	/* Perform super_call */
-	super_call(scall_id_sem_init, value, RST_VAL, RST_VAL, &sem_sys_ret);
+	super_call(sem_init, value, RST_VAL, RST_VAL, &sem_sys_ret);
 	if (sem_sys_ret.status != SUCCESS)
 	{
 		return sem_sys_ret.status;
@@ -111,7 +111,7 @@ int sem_post( const sem_t * sem )
 	ASSERT_IF_FALSE(sem->id != RST_VAL, int);
 
 	/* Perform super_call */
-	super_call(scall_id_sem_post, sem->id, RST_VAL, RST_VAL, &sem_sys_ret);
+	super_call(sem_post, sem->id, RST_VAL, RST_VAL, &sem_sys_ret);
 
 	return sem_sys_ret.status;
 }
diff --git a/src/lib/libposix/src/posix_utils.c b/src/lib/libposix/src/posix_utils.c
index f5f71710..5f2932b4 100644
--- a/src/lib/libposix/src/posix_utils.c
+++ b/src/lib/libposix/src/posix_utils.c
@@ -9,7 +9,7 @@
  */
 
 #include <stdint.h>
-#include <supervisor/workers.h>
+#include <visor/workers.h>
 #include <posix/errno.h>
 #include <posix/utils.h>
 #include <posix/time.h>
@@ -336,6 +336,6 @@ void os_delay_ticks( const TickType_t ticks )
 {
 	sret_t sys_ret;
 
-	super_call(scall_id_pthread_delay_ticks, ticks, RST_VAL, RST_VAL, &sys_ret);
+	super_call(pthread_delay_ticks, ticks, RST_VAL, RST_VAL, &sys_ret);
 	RET_ERR_IF_FALSE(sys_ret.status == SUCCESS, EAGAIN, void);
 }
diff --git a/src/platform/mega_avr/atmega2560/include/plat_arch.h b/src/platform/mega_avr/atmega2560/include/plat_arch.h
index 542ab0c8..fe84e736 100644
--- a/src/platform/mega_avr/atmega2560/include/plat_arch.h
+++ b/src/platform/mega_avr/atmega2560/include/plat_arch.h
@@ -34,6 +34,6 @@
 #define PRR1		0x65
 #define OSCCAL		0x66
 
-#ifdef _MACHINE_CALL_H_
-extern void (*mcall)(unsigned int, unsigned int, unsigned int, unsigned int, mret_t *);
+#ifdef _VISOR_CALL_H_
+extern void (*vcall)(unsigned int, unsigned int, unsigned int, unsigned int, vret_t *);
 #endif
diff --git a/src/platform/mega_avr/common/hal/gpio/gpio.c b/src/platform/mega_avr/common/hal/gpio/gpio.c
index 1efedb32..63906a37 100644
--- a/src/platform/mega_avr/common/hal/gpio/gpio.c
+++ b/src/platform/mega_avr/common/hal/gpio/gpio.c
@@ -16,7 +16,7 @@
 #include <assert.h>
 #include <mmio.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <arch.h>
 #include <lock/lock.h>
 #include <hal/gpio.h>
@@ -24,7 +24,7 @@
 
 status_t gpio_pin_alloc(gpio_port_t *port, uint8_t portID, uint8_t pinID)
 {
-	mret_t mres;
+	vret_t vres;
 	gpio_module_t *dp;
 	unsigned char flag;
 
@@ -46,13 +46,13 @@ status_t gpio_pin_alloc(gpio_port_t *port, uint8_t portID, uint8_t pinID)
 
 	port->pin = pinID;
 	port->port = portID;
-	arch_machine_call(fetch_dp, gpio, portID, 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_dp, gpio, portID, 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg4("GPIO Port %d not found in DP\n", portID);
-		return mres.status;
+		return vres.status;
 	}
-	dp = (gpio_module_t *)mres.p;
+	dp = (gpio_module_t *)vres.p;
 	port->pbaddr = dp->baddr;
 	sysdbg4("GPIO engine @ %p\n", dp->baddr);
 	sysdbg4("Using GPIO Pin %d on Port %d\n", port->pin, port->port);
@@ -124,7 +124,7 @@ bool gpio_pin_read(const gpio_port_t *port)
 
 status_t gpio_port_alloc(gpio_port_t *port, uint8_t portID)
 {
-	mret_t mres;
+	vret_t vres;
 	gpio_module_t *dp;
 	unsigned char flag = 0;
 
@@ -145,13 +145,13 @@ status_t gpio_port_alloc(gpio_port_t *port, uint8_t portID)
 
 	port->pin = (uint8_t)((uint16_t)(1 << BIT) - 1);
 	port->port = portID;
-	arch_machine_call(fetch_dp, gpio, portID, 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_dp, gpio, portID, 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg4("GPIO Port %d not found in DP\n", portID);
-		return mres.status;
+		return vres.status;
 	}
-	dp = (gpio_module_t *)mres.p;
+	dp = (gpio_module_t *)vres.p;
 	port->pbaddr = dp->baddr;
 	sysdbg4("GPIO engine @ %p\n", dp->baddr);
 	return success;
diff --git a/src/platform/mega_avr/common/hal/pwm/pwm.c b/src/platform/mega_avr/common/hal/pwm/pwm.c
index dc56e09a..11f18c66 100644
--- a/src/platform/mega_avr/common/hal/pwm/pwm.c
+++ b/src/platform/mega_avr/common/hal/pwm/pwm.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <syslog.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <arch.h>
 #include <hal/timer.h>
 #include <hal/pwm.h>
@@ -31,29 +31,29 @@ static void pwm_to_timer(const pwm_port_t *p, timer_port_t *t)
 
 status_t pwm_get_properties(pwm_port_t *port, sw_devid_t dev)
 {
-	mret_t mres;
+	vret_t vres;
 	swdev_t *sp;
 	module_t *dp;
 	hw_devid_t devid;
 
-	arch_machine_call(fetch_sp, dev, 0, 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_sp, dev, 0, 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("%p - sp node could not be found!\n", dev);
-		return mres.status;
+		return vres.status;
 	}
 
-	sp = (swdev_t *) mres.p;
+	sp = (swdev_t *) vres.p;
 	devid = sp->hwdev_id;
 	port->pmux = sp->pmux;
 
-	arch_machine_call(fetch_dp, (devid & 0xff00), (devid & 0xf0), 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_dp, (devid & 0xff00), (devid & 0xf0), 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("PWM (timer) Device %d not found!\n", devid);
-		return mres.status;
+		return vres.status;
 	}
-	dp = (module_t *) mres.p;
+	dp = (module_t *) vres.p;
 	port->port_id = dp->id;
 	port->clk_id = dp->clk_id;
 	port->baddr = dp->baddr;
diff --git a/src/platform/mega_avr/common/hal/timer/timer.c b/src/platform/mega_avr/common/hal/timer/timer.c
index 6a030ec0..9bf7892c 100644
--- a/src/platform/mega_avr/common/hal/timer/timer.c
+++ b/src/platform/mega_avr/common/hal/timer/timer.c
@@ -18,7 +18,7 @@
 #include <interrupt.h>
 #include <platform.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <arch.h>
 #include <hal/timer.h>
 #include "timer8.h"
diff --git a/src/platform/mega_avr/common/hal/uart/uart.c b/src/platform/mega_avr/common/hal/uart/uart.c
index f92e2f7d..7b734aab 100644
--- a/src/platform/mega_avr/common/hal/uart/uart.c
+++ b/src/platform/mega_avr/common/hal/uart/uart.c
@@ -20,7 +20,7 @@
 #include <platform.h>
 #include <interrupt.h>
 #include <hal/uart.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <arch.h>
 #include "uart_private.h"
 
@@ -30,11 +30,11 @@ status_t uart_setup(uart_port_t *port, direction_t d, parity_t p)
 	assert(port);
 	MMIO8(port->baddr + UCSRA_OFFSET) = 0x00;
 	platform_clk_en(port->clk_id);
-	mret_t mres;
-	arch_machine_call(fetch_dp, clock, 0, 0, &mres);
-	if(mres.status != success)
-		return mres.status;
-	unsigned long *clk = (unsigned long *)mres.p;
+	vret_t vres;
+	arch_visor_call(fetch_dp, clock, 0, 0, &vres);
+	if(vres.status != success)
+		return vres.status;
+	unsigned long *clk = (unsigned long *)vres.p;
 
 
 	// Enable module based on direction
diff --git a/src/platform/mega_avr/common/include/platform.h b/src/platform/mega_avr/common/include/platform.h
index 1d71d867..f6388cf3 100644
--- a/src/platform/mega_avr/common/include/platform.h
+++ b/src/platform/mega_avr/common/include/platform.h
@@ -21,6 +21,6 @@ status_t platform_resources_setup(void);
 status_t platform_clk_reset(void);
 status_t platform_clk_en(unsigned int);
 status_t platform_clk_dis(unsigned int);
-status_t platform_mcall_update(void *);
+status_t platform_vcall_update(void *);
 status_t platform_wdt_reset(void);
 void plat_panic_handler_callback(void);
diff --git a/src/platform/mega_avr/common/platform/platform.c b/src/platform/mega_avr/common/platform/platform.c
index 6fefeae8..6af19823 100644
--- a/src/platform/mega_avr/common/platform/platform.c
+++ b/src/platform/mega_avr/common/platform/platform.c
@@ -13,9 +13,9 @@
 #include <stdlib.h>
 #include <status.h>
 #include <arch.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <terravisor/platform.h>
-#include <terravisor/workers.h>
+#include <visor/workers.h>
 #include <driver.h>
 #include <syslog.h>
 #include <insignia.h>
diff --git a/src/platform/mega_avr/common/platform/platform_resource.c b/src/platform/mega_avr/common/platform/platform_resource.c
index 4fd3d28f..23fb30db 100644
--- a/src/platform/mega_avr/common/platform/platform_resource.c
+++ b/src/platform/mega_avr/common/platform/platform_resource.c
@@ -14,7 +14,7 @@
 #include <status.h>
 #include <syslog.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <platform.h>
 
 /**
@@ -38,7 +38,7 @@ status_t platform_resources_setup()
 }
 
 /**
- * platform_fetch_sp - mcall handler for fetch_sp
+ * platform_fetch_sp - vcall handler for fetch_sp
  *
  * @brief This function is a machine call hander for fetch_sp
  * access code. It is responsible to respond with hardware ID
@@ -51,7 +51,7 @@ status_t platform_resources_setup()
  * @return status: return the function execution status
  */
 static void platform_fetch_sp(call_arg_t a0, call_arg_t a1 _UNUSED,
-		call_arg_t a2 _UNUSED, mret_t *ret)
+		call_arg_t a2 _UNUSED, vret_t *ret)
 {
 	sysdbg2("Fetch SP: Got request for %x\n", a0);
 	ret->p = (uintptr_t) sp_terravisor_dev_info(a0);
@@ -60,10 +60,10 @@ static void platform_fetch_sp(call_arg_t a0, call_arg_t a1 _UNUSED,
 	return;
 }
 
-INCLUDE_MCALL(atmega328p_fetch_sp, fetch_sp, platform_fetch_sp);
+INCLUDE_VCALL(atmega328p_fetch_sp, fetch_sp, platform_fetch_sp);
 
 /**
- * platform_fetch_dp - mcall handler for fetch_dp
+ * platform_fetch_dp - vcall handler for fetch_dp
  *
  * @brief This function is a machine call hander for fetch_dp
  * access code. It is responsible to respond with pointer to
@@ -76,7 +76,7 @@ INCLUDE_MCALL(atmega328p_fetch_sp, fetch_sp, platform_fetch_sp);
  * @return status: return the function execution status
  */
 static void platform_fetch_dp(call_arg_t a0, call_arg_t a1 _UNUSED,
-		call_arg_t a2 _UNUSED, mret_t *ret)
+		call_arg_t a2 _UNUSED, vret_t *ret)
 {
 	sysdbg2("Fetch DP: Got request for %x\n", a0);
 	switch(a0)
@@ -98,4 +98,4 @@ static void platform_fetch_dp(call_arg_t a0, call_arg_t a1 _UNUSED,
 	return;
 }
 
-INCLUDE_MCALL(atmega328p_fetch_dp, fetch_dp, platform_fetch_dp);
+INCLUDE_VCALL(atmega328p_fetch_dp, fetch_dp, platform_fetch_dp);
diff --git a/src/platform/mega_avr/common/platform/platform_timer.c b/src/platform/mega_avr/common/platform/platform_timer.c
index 84391b30..0ed3a228 100644
--- a/src/platform/mega_avr/common/platform/platform_timer.c
+++ b/src/platform/mega_avr/common/platform/platform_timer.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <driver.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <arch.h>
 #include <hal/timer.h>
 #include <terravisor/timer.h>
@@ -76,26 +76,26 @@ static void plat_timer_reg_cb(void *cb)
  */
 static status_t plat_get_timer_prop(void)
 {
-	mret_t mres;
+	vret_t vres;
 	swdev_t *sp;
 	hw_devid_t devid;
 
-	arch_machine_call(fetch_sp, sched_timer, 0, 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_sp, sched_timer, 0, 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("%p - sp node could not be found!\n", sched_timer);
-		return mres.status;
+		return vres.status;
 	}
-	sp = (swdev_t *) mres.p;
+	sp = (swdev_t *) vres.p;
 	devid = sp->hwdev_id;
 
-	arch_machine_call(fetch_dp, (devid & 0xff00), (devid & 0xff), 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_dp, (devid & 0xff00), (devid & 0xff), 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("Timer Device %d not found!\n", devid);
-		return mres.status;
+		return vres.status;
 	}
-	tm = (module_t *) mres.p;
+	tm = (module_t *) vres.p;
 	return success;
 }
 
diff --git a/src/platform/mega_avr/common/platform/platform_wdt.c b/src/platform/mega_avr/common/platform/platform_wdt.c
index c2211611..4136e0bc 100644
--- a/src/platform/mega_avr/common/platform/platform_wdt.c
+++ b/src/platform/mega_avr/common/platform/platform_wdt.c
@@ -16,7 +16,7 @@
 #include <platform.h>
 #include <driver.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <arch.h>
 #include <hal/wdt.h>
 #include <driver/watchdog.h>
@@ -45,16 +45,16 @@ void platform_wdt_handler();
  */
 static status_t platform_wdt_setup()
 {
-	mret_t mres;
+	vret_t vres;
 	module_t *dp;
-	arch_machine_call(fetch_dp, wdt, 0, 0, &mres);
+	arch_visor_call(fetch_dp, wdt, 0, 0, &vres);
 
-	if(mres.status != success)
+	if(vres.status != success)
 	{
 		sysdbg2("WDT not found in DP\n");
-		return mres.status;
+		return vres.status;
 	}
-	dp = (module_t *) mres.p;
+	dp = (module_t *) vres.p;
 	plat_wdt = (wdt_port_t *)malloc(sizeof(wdt_port_t));
 	if(!plat_wdt)
 		return error_memory_low;
diff --git a/src/platform/mega_avr/common/sections.ld.sx b/src/platform/mega_avr/common/sections.ld.sx
index b8177686..7d8b3be5 100644
--- a/src/platform/mega_avr/common/sections.ld.sx
+++ b/src/platform/mega_avr/common/sections.ld.sx
@@ -65,7 +65,7 @@ SECTIONS
 		*(.data.*)
 		KEEP(*(.data))
 		DRIVER_TABLE
-		ECALL_TABLE
+		VCALL_TABLE
 	} > vma_dmem AT > lma_mem
 
 	.heap :
diff --git a/src/platform/pico/common/sections.ld.sx b/src/platform/pico/common/sections.ld.sx
deleted file mode 100644
index 7097b805..00000000
--- a/src/platform/pico/common/sections.ld.sx
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2022, Cyancore Team
- *
- * File Name		: sections.ld.sx
- * Description		: This file contains memory layout for the
- *			  cyancore framework
- * Primary Author	: Mayuri Lokhande [mayurilokhande01@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
- #include <plat_mem.h>
-
-
- #ifndef L_MEM_START
- #define L_MEM_START
- #endif
-
- MEMORY
- {
-	/* VM Addresses */
-	vma_mem		: ORIGIN = V_DMEM_START, LENGTH = DMEM_LENGTH
-
-	/* LM Addresses */
-	lma_mem		: ORIGIN = L_MEM_START, LENGTH = IMEM_LENGTH
-
-	/* Stack Addresses */
-	v_smem		: ORIGIN = V_SMEM_START, LENGTH = SMEM_LENGTH
-
- }
-
- SECTIONS
- {
-	.text :
-	{
-		. = ALIGN(ALIGN_BOUND);
-		*(.archvectors)
-		KEEP(*(.archvectors))
-		*(.platvectors)
-		KEEP(*(.platvectors))
-		. = ALIGN(ALIGN_BOUND);
-		(*.text)
-		(*.text.*)
-		KEEP(*(.text))
-	} > vma_mem AT > lma_mem
-
-	.bss	:
-	{
-		. = ALIGN(ALIGN_BOUND)
-		*(.bss)
-		*(.bss.*)
-		KEEP(*(.bss))
-		*(COMMON)
-	} > vma_mem
-
-	.data	:
-	{
-		. = ALIGN(ALIGN_BOUND)
-		*(.version)
-		KEEP(*(.version))
-		*(.rodata)
-		*(.rodata.*)
-		KEEP(*(.rodata))
-		*(.data)
-		*(.data.*)
-		KEEP(*(.data))
-	} > vma_mem
-
-	.driver_table : {} > vma_mem AT > lma_mem
-	.mcall_table : {} > vma_mem AT > lma_mem
-
-	.stack :
-	{
-		. = ALIGN(ALIGN_BOUND);
-		*(.stack)
-		KEEP(*(.stack))
-		. = . + STACK_SIZE;
-	} > vma_mem
-
-	PROVIDE(_data_start = LOADADDR(.data));
-	PROVIDE(_data_size = SIZEOF(.data) + SIZEOF(.driver_table) + SIZEOF(.mcall_table));
-	PROVIDE(_data_vstart = ADDR(.data));
-	PROVIDE(_data_vend = _data_vstart + _data_size);
-
-	PROVIDE(_bss_start = ADDR(.bss));
-	PROVIDE(_bss_size = SIZEOF(.bss));
-	PROVIDE(_flash_size = _data_size + SIZEOF(.text));
-	PROVIDE(_ram_size = _bss_size + _data_size + SIZEOF(.stack));
-
-	ASSERT((_flash_size < FLASH_SIZE), "< x > Flash size exceeded ...")
-	ASSERT((_ram_size < RAM_SIZE), "< x > RAM size exceeded ...")
-
-	/DISCARD/ : { *(.comment .trampolines) }
-}
-
-
- }
diff --git a/src/platform/rpi/common_rp2/arch/platform_mem.c b/src/platform/rpi/common_rp2/arch/platform_mem.c
new file mode 100644
index 00000000..b16f947f
--- /dev/null
+++ b/src/platform/rpi/common_rp2/arch/platform_mem.c
@@ -0,0 +1,29 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019, Cyancore Team
+ *
+ * File Name		: platform_mem.c
+ * Description		: This file contains implementation of platform early setup APIs.
+ * Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#include <stdint.h>
+#include <status.h>
+#include <string.h>
+#include <platform.h>
+
+extern uintptr_t _bss_start, _bss_size, _data_start, _data_size,
+                 _data_vstart;
+
+status_t platform_bss_clear()
+{
+	memset(&_bss_start, 0, (size_t)&_bss_size);
+	return success;
+}
+
+status_t platform_copy_data()
+{
+	memcpy(&_data_vstart, &_data_start, (size_t)&_data_size);
+	return success;
+}
diff --git a/src/platform/rpi/common_rp2/build.mk b/src/platform/rpi/common_rp2/build.mk
new file mode 100644
index 00000000..abc3f18a
--- /dev/null
+++ b/src/platform/rpi/common_rp2/build.mk
@@ -0,0 +1,26 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2023, Cyancore Team
+#
+# File Name		: build.mk
+# Description		: This file accumulates sources from RP2
+#			  common directory
+# Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+RP2_COMMON_DIR	:= $(GET_PATH)
+
+LD_SCRIPT		:= $(RP2_COMMON_DIR)/sections.ld.sx
+
+PLAT_INCLUDE		+= $(RP2_COMMON_DIR)/include
+
+LINT_FLAGS		+= --platform=unix32
+
+USE_DEFAULT_RESOURCES	?= 1
+LOCAL_INTERRUPT_DEVICE	?= 0
+PLAT_INTERRUPT_DEVICE	?= 0
+
+#include $(RP2_COMMON_DIR)/arch/build.mk
+#include $(RP2_COMMON_DIR)/hal/build.mk
+#include $(RP2_COMMON_DIR)/platform/build.mk
diff --git a/src/platform/rpi/common_rp2/platform/platform.c b/src/platform/rpi/common_rp2/platform/platform.c
new file mode 100644
index 00000000..7cc83467
--- /dev/null
+++ b/src/platform/rpi/common_rp2/platform/platform.c
@@ -0,0 +1,112 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019, Cyancore Team
+ *
+ * File Name		: platform.c
+ * Description		: This file contains sources for platform apis
+ * Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#include <status.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <arch.h>
+#include <syslog.h>
+#include <insignia.h>
+#include <platform.h>
+#include <syslog.h>
+
+uint32_t reset_syndrome;
+
+void platform_early_setup()
+{
+	status_t ret = success;
+
+	/* Setup platform memories*/
+	ret |= platform_copy_data();
+	ret |= platform_bss_clear();
+	ret |= platform_init_heap();
+	ret |= platform_resources_setup();
+
+	/* Setup memory syslogger*/
+	driver_setup("mslog");
+
+	reset_syndrome = MMIO32(CHIP_RESET) & 0x01110100;
+	MMIO32(CHIP_RESET) = 0;
+
+	ret |= platform_clk_reset();
+
+	if(ret != success)
+		exit(EXIT_FAILURE);
+	return;
+}
+
+#if PRINT_MEMORY_LAYOUT
+static void platform_memory_layout()
+{
+	extern uint32_t _text_start, _text_size, _text_end,
+	_data_vstart, _data_size, _data_end,
+	_stack_start, _stack_size, _stack_end,
+	_bss_start, _bss_size, _bss_end,
+	_heap_start, _heap_size, _heap_end,
+	_flash_size, _ram_size;
+
+	syslog(info, "Memory Info >\n");
+	syslog(info, "Flash Size : %u\n", &_flash_size);
+	syslog(info, "RAM Size    : %u\n", &_ram_size);
+	syslog(info, "\n");
+	syslog(info, "Program Memory Layout >\n");
+	syslog(info, "text Region\t: %06p - %06p : Size: %u\n",
+			&_text_start, &_text_end, &_text_size);
+	syslog(info, "bss Region\t: %06p - %06p : Size: %u\n",
+			&_bss_start, &_bss_end, &_bss_size);
+	syslog(info, "data Region\t: %06p - %06p : Size: %u\n",
+			&_data_vstart, &_data_vend, &_data_size);
+	syslog(info, "stack Region\t: %06p - %06p : Size: %u\n",
+			&_stack_start, &_stack_end, &_stack_size);
+	syslog(info, "heap Region\t: %06p - %06p : Size: %u\n",
+			&_heap_start, &_heap_end, &_heap_size);
+	syslog(info, "\n");
+}
+#endif
+
+/**
+ * platform_setup - Executes functions to make platform read to init
+ *
+ * @brief This function performs calls to function which make the
+ * framework ready to execute. This function should be made to run on boot core only.
+ */
+void platform_setup()
+{
+	sysdbg3("In %s\n", __func__);
+	driver_setup("earlycon");
+	bootmsgs_enable();
+	cyancore_insignia_lite();
+#if PRINT_MEMORY_LAYOUT
+	platform_memory_layout();
+#endif
+	return;
+}
+
+/**
+ * platform_cpu_setup - Perform platform setup calls on all cpus
+ *
+ * @brief This function performs calls to functions that should be executed
+ * on all cores to make the cpu ready for the platform drivers.
+ */
+void platform_cpu_setup()
+{
+	sysdbg3("In %s\n", __func__);
+	arch_ei();
+	return;
+}
+
+void _NAKED plat_panic_handler_callback()
+{
+	context_frame_t *frame;
+	sysdbg3("In %s\n", __func__);
+	frame = get_context_frame();
+	syslog(info, "SP=%p \tSREG = %P\n", frame, frame->sreg);
+	exit(EXIT_FAILURE);
+}
diff --git a/src/platform/rpi/common_rp2/platform/platform_reset.c b/src/platform/rpi/common_rp2/platform/platform_reset.c
new file mode 100644
index 00000000..77980f1a
--- /dev/null
+++ b/src/platform/rpi/common_rp2/platform/platform_reset.c
@@ -0,0 +1,64 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019, Cyancore Team
+ *
+ * File Name		: platform_reset.c
+ * Description		: This file contains sources for platform
+ *			  reset apis
+ * Primary Author	: Mayuri Lokhande [mayurilokhande01@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#include <stdint.h>
+#include <status.h>
+#include <syslog.h>
+#include <assert.h>
+#include <reset.h>
+#include <resource.h>
+#include <arch.h>
+#include <driver/watchdog.h>
+#include <platform.h>
+#include <terravisor/platform.h>
+
+extern uint32_t reset_syndrome;
+/**
+ * platform_get_reset_syndrome - returns the cause of reset
+ *
+ * @brief This function returns the infromation related to
+ * the reset sources.
+ *
+ * @return reset_cause : This function returns the reset cause
+ */
+
+reset_t platform_get_reset_syndrome()
+{
+	sysdbg5("Reset Syndrome = %u\n", reset_syndrome);
+	if(reset_syndrome & (1 << 8))
+		return power_on_reset;
+
+	if(reset_syndrome & (1 << 16))
+		return external_reset;
+
+	else
+		return inval_reset;
+}
+
+/**
+ * platform_reset_handler - handles the reset conditions
+ *
+ * @brief This function is responsible to handle the reset
+ * sources like watchdog , brownout, etxernal reset, etc.
+ *
+ * @param[in] rsyn: Reset syndrome
+ *
+ * @return void
+ */
+void platform_reset_handler(reset_t rsyn)
+{
+	if(rsyn == power_on_reset)
+		return;
+	if(rsyn == external_reset)
+		return;
+	else
+		plat_panic_handler();
+}
diff --git a/src/platform/rpi/common_rp2/platform/platform_resource.c b/src/platform/rpi/common_rp2/platform/platform_resource.c
new file mode 100644
index 00000000..5ebce2bf
--- /dev/null
+++ b/src/platform/rpi/common_rp2/platform/platform_resource.c
@@ -0,0 +1,37 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019-2022, Cyancore Team
+ *
+ * File Name		: platform_resource.c
+ * Description		: This file contains sources for platform
+ *			  resource apis
+ * Primary Author	: Mayuri Lokhande [mayurilokhande01@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#include <stdint.h>
+#include <stddef.h>
+#include <status.h>
+#include <syslog.h>
+#include <resource.h>
+#include <visor_call.h>
+#include <platform.h>
+
+/**
+ * platform_resources_setup - Updates platform DP and SP
+ *
+ * @brief This function is responsible to update platform DP
+ * and make it accessible to the system. This function needs to be called
+ * during platform setup.
+ *
+ * @return status: return the function execution status
+ */
+status_t platform_resources_setup()
+{
+	status_t ret = success;
+	extern dp_t device_prop;
+	extern sp_t software_prop;
+	ret = dp_init(&device_prop);
+	ret |= sp_init(&software_prop);
+	return ret;
+}
diff --git a/src/platform/rpi/common_rp2/sections.ld.sx b/src/platform/rpi/common_rp2/sections.ld.sx
new file mode 100644
index 00000000..ae9b4ceb
--- /dev/null
+++ b/src/platform/rpi/common_rp2/sections.ld.sx
@@ -0,0 +1,123 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2023, Cyancore Team
+ *
+ * File Name		: sections.ld.sx
+ * Description		: This file contains memory layout for the
+ *			  cyancore framework
+ * Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#include <plat_mem.h>
+#include <linker_macros.h>
+
+#ifndef L_MEM_START
+#define L_MEM_START	0
+#endif
+
+MEMORY
+{
+	/* VM Addresses */
+	vma_imem (irx!aw)	: ORIGIN = V_IMEM_START, LENGTH = IMEM_LENGTH
+	vma_dmem (arw!xi)	: ORIGIN = V_DMEM_START, LENGTH = DMEM_LENGTH
+
+	/* LM Addresses */
+	lma_mem			: ORIGIN = L_MEM_START, LENGTH = L_MEM_LENGTH
+}
+
+ENTRY(entry)
+
+SECTIONS
+{
+	.text : ALIGN(4)
+	{
+		KEEP(*(.text.entry))
+		*(.text)
+		*(.text.*)
+		. = ALIGN(8);
+	} > vma_imem AT > lma_mem
+
+	.rodata : ALIGN(4)
+	{
+		*(.version)
+		KEEP(*(.version))
+		KEEP(*(.rdata))
+		KEEP(*(.rodata))
+		*(.rodata.*)
+		*(.srodata)
+		*(.srodata.*)
+		KEEP(*(.srodata))
+		. = ALIGN(8);
+	} > vma_imem AT > lma_mem
+
+	.bss : ALIGN(4)
+	{
+		*(.sbss)
+		*(.sbss.*)
+		KEEP(*(.sbss))
+		*(.bss)
+		*(.bss.*)
+		KEEP(*(.bss))
+		*(COMMON)
+	} > vma_dmem
+
+	.data : ALIGN(4)
+	{
+		*(.sdata)
+		*(.sdata.*)
+		KEEP(*(.sdata))
+		*(.data)
+		*(.data.*)
+		KEEP(*(.data))
+		DRIVER_TABLE
+		ECALL_TABLE
+	} > vma_dmem AT > lma_mem
+
+	.heap : ALIGN(HEAP_ALIGN)
+	{
+		*(.heap)
+		KEEP(*(.heap))
+		. = . + HEAP_SIZE;
+	} > vma_dmem
+
+	.stack : ALIGN(4)
+	{
+		*(.stack)
+		KEEP(*(.stack))
+		. = . + STACK_SIZE;
+	} > vma_dmem
+
+	PROVIDE(_text_start = ADDR(.text));
+	PROVIDE(_text_size = SIZEOF(.text));
+	PROVIDE(_text_end = _text_start + _text_size - 1);
+
+	PROVIDE(_rodata_start = ADDR(.rodata));
+	PROVIDE(_rodata_size = SIZEOF(.rodata));
+	PROVIDE(_rodata_end = _rodata_start + _rodata_size - 1);
+
+	PROVIDE(_data_start = LOADADDR(.data));
+	PROVIDE(_data_size = SIZEOF(.data));
+	PROVIDE(_data_vstart = ADDR(.data));
+	PROVIDE(_data_vend = _data_vstart + _data_size - 1);
+
+	PROVIDE(_stack_size = SIZEOF(.stack));
+	PROVIDE(_stack_end = ADDR(.stack));
+	PROVIDE(_stack_start = _stack_end + _stack_size);
+
+	PROVIDE(_bss_start = ADDR(.bss));
+	PROVIDE(_bss_size = SIZEOF(.bss));
+	PROVIDE(_bss_end = _bss_start + _bss_size - 1);
+
+	PROVIDE(_heap_start = ADDR(.heap));
+	PROVIDE(_heap_size = SIZEOF(.heap));
+	PROVIDE(_heap_end = _heap_start + _heap_size - 1);
+
+	PROVIDE(_flash_size = _data_size + SIZEOF(.text) + _itim_size + SIZEOF(.rodata));
+	PROVIDE(_ram_size = _bss_size + _data_size + SIZEOF(.stack) + SIZEOF(.heap));
+
+	ASSERT((_flash_size < FLASH_SIZE), "< x > Flash size exceeded ...")
+	ASSERT((_ram_size < RAM_SIZE), "< x > RAM size exceeded ...")
+
+	/DISCARD/ : { *(.comment .trampolines) }
+}
diff --git a/src/platform/pico/rp2040/build.mk b/src/platform/rpi/rp2040/build.mk
similarity index 68%
rename from src/platform/pico/rp2040/build.mk
rename to src/platform/rpi/rp2040/build.mk
index 1ff98e92..76f19b91 100644
--- a/src/platform/pico/rp2040/build.mk
+++ b/src/platform/rpi/rp2040/build.mk
@@ -14,13 +14,12 @@ RP2040_DIR	:= $(GET_PATH)
 
 ARCH		:= arm-m
 BIT		:= 32
-ARCH_VARIANT	:= v6
-TARGET_FLAGS	+=
+ARCH_VARIANT	:= m0p
+TL_TYPE		:= thumb/v6-m
+TARGET_FLAGS	+= -mcpu=cortex-m0plus -mfloat-abi=softfp
 PLAT_INCLUDE	+= $(RP2040_DIR)/include
-OUTPUT_FORMAT	:=
+OUTPUT_FORMAT	:= elf32-littlearm
 
-#include $(RP2040_DIR)/config.mk
-#include $(RP2040_DIR)/arch/build.mk
-#include $(RP2040_DIR)/platform/build.mk
+include $(RP2040_DIR)/config.mk
 #include $(RP2040_DIR)/resources/build.mk
-#include $(RP2040_DIR)/../common_fe310/build.mk
+include $(RP2040_DIR)/../common_rp2/build.mk
diff --git a/src/platform/rpi/rp2040/config.mk b/src/platform/rpi/rp2040/config.mk
new file mode 100644
index 00000000..020448b2
--- /dev/null
+++ b/src/platform/rpi/rp2040/config.mk
@@ -0,0 +1,79 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2023, Cyancore Team
+#
+# File Name		: config.mk
+# Description		: This file defines configuration for RP2040
+# Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+#======================================================================
+# Configuration file for Platforms
+#======================================================================
+
+#======================================================================
+# Platform Configuration
+# Do not alter below FLAGS unless explicitly mentioned
+#======================================================================
+N_CORES		:= 2
+$(eval $(call add_define,N_CORES))
+
+CCSMP		?= 1
+$(eval $(call add_define,CCSMP))
+
+$(eval $(call add_define,BIT))
+
+BOOT_CORE_ID:= 0
+$(eval $(call add_define,BOOT_CORE_ID))
+
+FLASH_START	:= 0x10000000
+FLASH_SIZE	:= 0x1000000	# 16M
+RAM_START	:= 0x20000000
+RAM_SIZE	:= 0x42000	# 264K
+HEAP_SIZE	?= 16K
+STACK_SIZE	?= 16K
+STACK_SIZE_PCPU	?= 8K
+
+$(eval $(call add_define,HEAP_SIZE))
+$(eval $(call add_define,STACK_SIZE))
+$(eval $(call add_define,STACK_SIZE_PCPU))
+
+# Call this FLAG from Project config file if needed
+XCLK		?= 12000000
+ICLK		?= 12000000
+$(eval $(call add_define,XCLK))
+$(eval $(call add_define,ICLK))
+
+N_EXCEP		:= 15
+$(eval $(call add_define,N_EXCEP))
+
+N_PLAT_IRQS	:= 32
+$(eval $(call add_define,N_PLAT_IRQS))
+
+MAX_INTERRUPTS_PER_DEVICE	:= 1
+$(eval $(call add_define,MAX_INTERRUPTS_PER_DEVICE))
+
+USE_SPINLOCK	?= 1
+$(eval $(call add_define,USE_SPINLOCK))
+
+#======================================================================
+# MEMBUF Configuration
+#======================================================================
+MEMBUF_SIZE	?= 1024
+$(eval $(call add_define,MEMBUF_SIZE))
+#======================================================================
+
+#======================================================================
+# GPIO Configuration
+#======================================================================
+N_PORT		:= 1
+$(eval $(call add_define,N_PORT))
+#======================================================================
+
+#======================================================================
+# Timer: Sched timer/wall clock
+#======================================================================
+USE_TIMER	?= 1
+$(eval $(call add_define,USE_TIMER))
+#======================================================================
diff --git a/src/platform/pico/rp2040/include/plat_mem.h b/src/platform/rpi/rp2040/include/plat_mem.h
similarity index 62%
rename from src/platform/pico/rp2040/include/plat_mem.h
rename to src/platform/rpi/rp2040/include/plat_mem.h
index 3b8d287f..deea16e7 100644
--- a/src/platform/pico/rp2040/include/plat_mem.h
+++ b/src/platform/rpi/rp2040/include/plat_mem.h
@@ -1,10 +1,10 @@
 /*
  * CYANCORE LICENSE
- * Copyrights (C) 2019, Cyancore Team
+ * Copyrights (C) 2023, Cyancore Team
  *
  * File Name		: plat_mem.h
  * Description		: This file contains memory config of fe310-g002
- * Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+ * Primary Author	: Mayuri Lokhande [mayurilokhande01@gmail.com]
  * Organisation		: Cyancore Core-Team
  */
 
@@ -15,16 +15,14 @@
 
 #define V_IMEM_START	0x10000000
 #define V_DMEM_START	0x20000000
-#define V_SMEM_START	0x20040000
 
 #define L_MEM_START	0x10000000
 #define	L_MEM_LENGTH	16M
 
-#define DMEM_LENGTH	256K
-#define SMEM_LENGTH	8K
+#define DMEM_LENGTH	264K
 #define	IMEM_LENGTH	16M
 
 #define ALIGN_BOUND	4
 
-#define STACK_SIZE	0xc00
-#define STACK_SIZE_PCPU	4K
+#define STACK_SIZE	16K
+#define STACK_SIZE_PCPU	8K
diff --git a/src/platform/pico/rp2040/include/platform_sio.h b/src/platform/rpi/rp2040/include/platform_sio.h
similarity index 100%
rename from src/platform/pico/rp2040/include/platform_sio.h
rename to src/platform/rpi/rp2040/include/platform_sio.h
diff --git a/src/platform/sifive/common_fe310/hal/clint/clint.c b/src/platform/sifive/common_fe310/hal/clint/clint.c
index 6ca26ecd..bd1adf56 100644
--- a/src/platform/sifive/common_fe310/hal/clint/clint.c
+++ b/src/platform/sifive/common_fe310/hal/clint/clint.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <arch.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <resource.h>
 #include <hal/clint.h>
 #include <driver.h>
@@ -30,19 +30,19 @@ static clint_port_t *port;
 
 static status_t clint_setup()
 {
-	mret_t mres;
+	vret_t vres;
 	const module_t *dp;
 
-	arch_machine_call(fetch_dp, clint, 0, 0, &mres);
+	arch_visor_call(fetch_dp, clint, 0, 0, &vres);
 
-	if(mres.status != success)
-		return mres.status;
+	if(vres.status != success)
+		return vres.status;
 
 	port = (clint_port_t *)malloc(sizeof(clint_port_t));
 	if(!port)
 		return error_memory_low;
 
-	dp = (module_t *)mres.p;
+	dp = (module_t *)vres.p;
 	port->baddr = dp->baddr;
 	port->stride = dp->stride;
 	port->port_id = clint;
diff --git a/src/platform/sifive/common_fe310/hal/gpio/gpio.c b/src/platform/sifive/common_fe310/hal/gpio/gpio.c
index 70dd8041..f00138ec 100644
--- a/src/platform/sifive/common_fe310/hal/gpio/gpio.c
+++ b/src/platform/sifive/common_fe310/hal/gpio/gpio.c
@@ -22,7 +22,7 @@
 
 status_t gpio_pin_alloc(gpio_port_t *port, uint8_t portID, uint8_t pinID)
 {
-	mret_t mres;
+	vret_t vres;
 	const gpio_module_t *dp;
 	unsigned char flag;
 
@@ -42,13 +42,13 @@ status_t gpio_pin_alloc(gpio_port_t *port, uint8_t portID, uint8_t pinID)
 
 	port->pin = pinID;
 	port->port = portID;
-	arch_machine_call(fetch_dp, gpio, portID, 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_dp, gpio, portID, 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg("GPIO Port %d not found in DP\n", portID);
-		return mres.status;
+		return vres.status;
 	}
-	dp = (gpio_module_t *)mres.p;
+	dp = (gpio_module_t *)vres.p;
 	port->pbaddr = dp->baddr;
 	sysdbg("GPIO engine @ %p\n", dp->baddr);
 	sysdbg("Using GPIO Pin %d on Port %d\n", port->pin, port->port);
diff --git a/src/platform/sifive/common_fe310/hal/uart/uart.c b/src/platform/sifive/common_fe310/hal/uart/uart.c
index ee29c1b0..99089347 100644
--- a/src/platform/sifive/common_fe310/hal/uart/uart.c
+++ b/src/platform/sifive/common_fe310/hal/uart/uart.c
@@ -15,7 +15,7 @@
 #include <status.h>
 #include <syslog.h>
 #include <arch.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <resource.h>
 #include <driver/sysclk.h>
 #include <driver/interrupt_controller.h>
@@ -26,28 +26,28 @@
 
 status_t uart_get_properties(uart_port_t *port, sw_devid_t dev)
 {
-	mret_t mres;
+	vret_t vres;
 	swdev_t *sp;
 	module_t *dp;
 	hw_devid_t devid;
 
-	arch_machine_call(fetch_sp, dev, 0, 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_sp, dev, 0, 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("%p - sp node could not be found!\n", dev);
-		return mres.status;
+		return vres.status;
 	}
-	sp = (swdev_t *) mres.p;
+	sp = (swdev_t *) vres.p;
 	devid = sp->hwdev_id;
 	port->pmux = sp->pmux;
 
-	arch_machine_call(fetch_dp, (devid & 0xff00), (devid & 0xff), 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_dp, (devid & 0xff00), (devid & 0xff), 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("UART Device %d not found!\n", devid);
-		return mres.status;
+		return vres.status;
 	}
-	dp = (module_t *) mres.p;
+	dp = (module_t *) vres.p;
 	port->port_id = dp->id;
 	port->clk_id = dp->clk_id;
 	port->baddr = dp->baddr;
diff --git a/src/platform/sifive/common_fe310/platform/plat_timer.c b/src/platform/sifive/common_fe310/platform/plat_timer.c
index 096a752a..0e6f9ab2 100644
--- a/src/platform/sifive/common_fe310/platform/plat_timer.c
+++ b/src/platform/sifive/common_fe310/platform/plat_timer.c
@@ -17,7 +17,7 @@
 #include <arch.h>
 #include <driver.h>
 #include <interrupt.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <resource.h>
 #include <hal/clint.h>
 #include <terravisor/timer.h>
@@ -72,26 +72,26 @@ static void plat_timer_reg_cb(void *cb)
  */
 static status_t plat_get_timer_prop(void)
 {
-	mret_t mres;
+	vret_t vres;
 	swdev_t *sp;
 	hw_devid_t devid;
 
-	arch_machine_call(fetch_sp, sched_timer, 0, 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_sp, sched_timer, 0, 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("%p - sp node could not be found!\n", sched_timer);
-		return mres.status;
+		return vres.status;
 	}
-	sp = (swdev_t *) mres.p;
+	sp = (swdev_t *) vres.p;
 	devid = sp->hwdev_id;
 
-	arch_machine_call(fetch_dp, (devid & 0xff00), (devid & 0xff), 0, &mres);
-	if(mres.status != success)
+	arch_visor_call(fetch_dp, (devid & 0xff00), (devid & 0xff), 0, &vres);
+	if(vres.status != success)
 	{
 		sysdbg3("Timer Device %d not found!\n", devid);
-		return mres.status;
+		return vres.status;
 	}
-	tm = (module_t *) mres.p;
+	tm = (module_t *) vres.p;
 	return success;
 }
 
diff --git a/src/platform/sifive/common_fe310/platform/platform.c b/src/platform/sifive/common_fe310/platform/platform.c
index b2bd834d..db5f52b6 100644
--- a/src/platform/sifive/common_fe310/platform/platform.c
+++ b/src/platform/sifive/common_fe310/platform/platform.c
@@ -17,7 +17,7 @@
 #include <driver/sysclk.h>
 #include <insignia.h>
 #include <terravisor/platform.h>
-#include <terravisor/workers.h>
+#include <visor/workers.h>
 #include <platform.h>
 
 void platform_early_setup()
diff --git a/src/platform/sifive/common_fe310/platform/platform_reset.c b/src/platform/sifive/common_fe310/platform/platform_reset.c
index 2f676eaa..41e9dd0d 100644
--- a/src/platform/sifive/common_fe310/platform/platform_reset.c
+++ b/src/platform/sifive/common_fe310/platform/platform_reset.c
@@ -31,15 +31,15 @@
  */
 reset_t platform_get_reset_syndrome()
 {
-	mret_t mres;
+	vret_t vres;
 	const module_t *dp;
 	uint32_t pmucause_val;
 	aon_port_t aonport;
 
-	arch_machine_call(fetch_dp, aon, 0, 0, &mres);
-	assert(mres.status == success);
+	arch_visor_call(fetch_dp, aon, 0, 0, &vres);
+	assert(vres.status == success);
 
-	dp = (module_t *)mres.p;
+	dp = (module_t *)vres.p;
 	aonport.baddr = dp->baddr;
 
 	aon_pmucause(&aonport, &pmucause_val);
diff --git a/src/platform/sifive/common_fe310/platform/platform_resource.c b/src/platform/sifive/common_fe310/platform/platform_resource.c
index a8ad09f0..fc89e673 100644
--- a/src/platform/sifive/common_fe310/platform/platform_resource.c
+++ b/src/platform/sifive/common_fe310/platform/platform_resource.c
@@ -14,7 +14,7 @@
 #include <status.h>
 #include <syslog.h>
 #include <resource.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <platform.h>
 
 /**
@@ -37,7 +37,7 @@ status_t platform_resources_setup()
 }
 
 /**
- * platform_fetch_sp - mcall handler for fetch_sp
+ * platform_fetch_sp - vcall handler for fetch_sp
  *
  * @brief This function is a machine call hander for fetch_sp
  * access code. It is responsible to respond with hardware ID
@@ -50,7 +50,7 @@ status_t platform_resources_setup()
  * @return status: return the function execution status
  */
 static void platform_fetch_sp(call_arg_t a0, call_arg_t a1 _UNUSED,
-		call_arg_t a2 _UNUSED, mret_t *ret)
+		call_arg_t a2 _UNUSED, vret_t *ret)
 {
 	sysdbg5("Fetch SP: Got request for %x\n", a0);
 	ret->p = (uintptr_t) sp_terravisor_dev_info(a0);
@@ -59,10 +59,10 @@ static void platform_fetch_sp(call_arg_t a0, call_arg_t a1 _UNUSED,
 	return;
 }
 
-INCLUDE_MCALL(sifive_fe310_fetch_sp, fetch_sp, platform_fetch_sp);
+INCLUDE_VCALL(sifive_fe310_fetch_sp, fetch_sp, platform_fetch_sp);
 
 /**
- * platform_fetch_dp - mcall handler for fetch_dp
+ * platform_fetch_dp - vcall handler for fetch_dp
  *
  * @brief This function is a machine call hander for fetch_dp
  * access code. It is responsible to respond with pointer to
@@ -75,7 +75,7 @@ INCLUDE_MCALL(sifive_fe310_fetch_sp, fetch_sp, platform_fetch_sp);
  * @return status: return the function execution status
  */
 static void platform_fetch_dp(call_arg_t a0, call_arg_t a1 _UNUSED,
-		call_arg_t a2 _UNUSED, mret_t *ret)
+		call_arg_t a2 _UNUSED, vret_t *ret)
 {
 	sysdbg5("Fetch DP: Got request for %x\n", a0);
 	switch(a0)
@@ -97,4 +97,4 @@ static void platform_fetch_dp(call_arg_t a0, call_arg_t a1 _UNUSED,
 	return;
 }
 
-INCLUDE_MCALL(sifive_fe310_fetch_dp, fetch_dp, platform_fetch_dp);
+INCLUDE_VCALL(sifive_fe310_fetch_dp, fetch_dp, platform_fetch_dp);
diff --git a/src/platform/sifive/common_fe310/sections.ld.sx b/src/platform/sifive/common_fe310/sections.ld.sx
index f5650e3a..2c9c75d7 100644
--- a/src/platform/sifive/common_fe310/sections.ld.sx
+++ b/src/platform/sifive/common_fe310/sections.ld.sx
@@ -91,7 +91,7 @@ SECTIONS
 		*(.data.*)
 		KEEP(*(.data))
 		DRIVER_TABLE
-		ECALL_TABLE
+		VCALL_TABLE
 	} > vma_dmem AT > lma_mem
 
 	.tdata : ALIGN(4)
diff --git a/src/visor/build.mk b/src/visor/build.mk
index 47130f58..40820c16 100644
--- a/src/visor/build.mk
+++ b/src/visor/build.mk
@@ -13,6 +13,7 @@ VISOR_DIR	:= $(GET_PATH)
 
 INCLUDE		+= $(SRC)/include/visor/
 
+include $(VISOR_DIR)/common/build.mk
 ifneq ($(EXE_MODE),)
 include $(VISOR_DIR)/$(EXE_MODE)/build.mk
 endif
diff --git a/src/visor/common/build.mk b/src/visor/common/build.mk
new file mode 100644
index 00000000..e47070a4
--- /dev/null
+++ b/src/visor/common/build.mk
@@ -0,0 +1,14 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2023, Cyancore Team
+#
+# File Name		: build.mk
+# Description		: This file accumulates the build scripts
+#			  from terravisor directories
+# Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+V_COM_PATH	:= $(GET_PATH)
+
+include $(V_COM_PATH)/workers/build.mk
diff --git a/src/visor/terravisor/workers/build.mk b/src/visor/common/workers/build.mk
similarity index 63%
rename from src/visor/terravisor/workers/build.mk
rename to src/visor/common/workers/build.mk
index 232b8f52..4029ffdd 100644
--- a/src/visor/terravisor/workers/build.mk
+++ b/src/visor/common/workers/build.mk
@@ -1,6 +1,6 @@
 #
 # CYANCORE LICENSE
-# Copyrights (C) 2019, Cyancore Team
+# Copyrights (C) 2023, Cyancore Team
 #
 # File Name		: build.mk
 # Description		: This file builds worker sources
@@ -8,10 +8,10 @@
 # Organisation		: Cyancore Core-Team
 #
 
-TWORKER_DIR	:= $(GET_PATH)
+VWORKER_DIR	:= $(GET_PATH)
 
-include $(TWORKER_DIR)/mcall/build.mk
+include $(VWORKER_DIR)/vcall/build.mk
 
-DIR		:= $(TWORKER_DIR)
+DIR		:= $(VWORKER_DIR)
 
 include mk/obj.mk
diff --git a/src/visor/terravisor/workers/mcall/build.mk b/src/visor/common/workers/vcall/build.mk
similarity index 72%
rename from src/visor/terravisor/workers/mcall/build.mk
rename to src/visor/common/workers/vcall/build.mk
index 9e20c5e8..7cb37a68 100644
--- a/src/visor/terravisor/workers/mcall/build.mk
+++ b/src/visor/common/workers/vcall/build.mk
@@ -1,6 +1,6 @@
 #
 # CYANCORE LICENSE
-# Copyrights (C) 2019, Cyancore Team
+# Copyrights (C) 2023, Cyancore Team
 #
 # File Name		: build.mk
 # Description		: This file builds worker sources
@@ -8,8 +8,8 @@
 # Organisation		: Cyancore Core-Team
 #
 
-MCALL_DIR	:= $(GET_PATH)
+VCALL_DIR	:= $(GET_PATH)
 
-DIR		:= $(MCALL_DIR)
+DIR		:= $(VCALL_DIR)
 
 include mk/obj.mk
diff --git a/src/visor/terravisor/workers/mcall/machine_call.c b/src/visor/common/workers/vcall/visor_call.c
similarity index 50%
rename from src/visor/terravisor/workers/mcall/machine_call.c
rename to src/visor/common/workers/vcall/visor_call.c
index 4d1572bd..d23ee3c4 100644
--- a/src/visor/terravisor/workers/mcall/machine_call.c
+++ b/src/visor/common/workers/vcall/visor_call.c
@@ -1,6 +1,6 @@
 /*
  * CYANCORE LICENSE
- * Copyrights (C) 2019-2022, Cyancore Team
+ * Copyrights (C) 2019-2023, Cyancore Team
  *
  * File Name		: machine_call.c
  * Description		: This file contains sources of machine call handler
@@ -11,41 +11,41 @@
 #include <stdint.h>
 #include <status.h>
 #include <syslog.h>
-#include <machine_call.h>
+#include <visor_call.h>
 #include <platform.h>
 #include <resource.h>
 
-/* mcall Table start and end  defined in linker script mcall.ld.sx */
-extern mcall_t _ecall_table_start;
-extern mcall_t _ecall_table_end;
+/* vcall Table start and end  defined in linker script using VCALL_TABLE */
+extern vcall_t _vcall_table_start;
+extern vcall_t _vcall_table_end;
 
-typedef void (*mcb_t)(call_arg_t, call_arg_t, call_arg_t, mret_t *);
-static mcb_t get_callback_from_table(const mcall_t *start, const mcall_t *end, mcall_id_t id)
+typedef void (*vcb_t)(call_arg_t, call_arg_t, call_arg_t, vret_t *);
+static vcb_t get_callback_from_table(const vcall_t *start, const vcall_t *end, vcall_id_t id)
 {
-	mcall_t *ptr = (mcall_t *)start;
+	vcall_t *ptr = (vcall_t *)start;
 	while(ptr < end)
 	{
 		if(ptr->id == id)
 			return (ptr->callback != NULL) ? ptr->callback : NULL;
 		ptr++;
 	}
-	return (mcb_t) 0;
+	return (vcb_t) 0;
 }
 
-void machine_call(mcall_id_t id, call_arg_t a0, call_arg_t a1, call_arg_t a2, mret_t *ret)
+void vcall_handler(vcall_id_t id, call_arg_t a0, call_arg_t a1, call_arg_t a2, vret_t *ret)
 {
-	sysdbg4("MCall: id=%p, a0=%p, a1=%p, a2=%p\n", id, a0, a1, a2);
+	sysdbg4("VCall: id=%p, a0=%p, a1=%p, a2=%p\n", id, a0, a1, a2);
 	/* Callback function pointer */
-	mcb_t cb;
+	vcb_t cb;
 
 	/* Assign "ret" parameters to default error case,
 	 * on execution of the call, the ret will updated.
 	 */
 	ret->p = (uintptr_t) 0;
 	ret->size = 0;
-	ret->status = error_mcall_code_inval;
+	ret->status = error_vcall_code_inval;
 
-	cb = get_callback_from_table(&_ecall_table_start, &_ecall_table_end, id);
+	cb = get_callback_from_table(&_vcall_table_start, &_vcall_table_end, id);
 	if(cb != 0)
 		cb(a0, a1, a2, ret);
 	return;
diff --git a/src/visor/supervisor/services/bootstrap/bootstrap.c b/src/visor/supervisor/services/bootstrap/bootstrap.c
new file mode 100644
index 00000000..bbf24dad
--- /dev/null
+++ b/src/visor/supervisor/services/bootstrap/bootstrap.c
@@ -0,0 +1,49 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2019, Cyancore Team
+ *
+ * File Name		: bootstrap.c
+ * Description		: This file contains sources of bootstrap routine
+ * Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+#include <stdint.h>
+#include <status.h>
+#include <syslog.h>
+#include <arch.h>
+#include <terravisor/platform.h>
+#include <terravisor/bootstrap.h>
+
+
+status_t bootstrap()
+{
+	reset_t resetSyndrome;
+
+	arch_early_setup();
+
+	platform_early_setup();
+
+	arch_setup();
+
+	platform_setup();
+
+	resetSyndrome = platform_get_reset_syndrome();
+	platform_reset_handler(resetSyndrome);
+
+	platform_cpu_setup();
+
+	return success;
+}
+
+#if CCSMP
+status_t bootstrap_secondary()
+{
+	arch_early_setup();
+
+	arch_setup2();
+
+	platform_cpu_setup();
+	return success;
+}
+#endif
diff --git a/src/visor/terravisor/services/kernel/build.mk b/src/visor/supervisor/services/bootstrap/build.mk
similarity index 81%
rename from src/visor/terravisor/services/kernel/build.mk
rename to src/visor/supervisor/services/bootstrap/build.mk
index bf5a3d5c..c3dc1b0f 100644
--- a/src/visor/terravisor/services/kernel/build.mk
+++ b/src/visor/supervisor/services/bootstrap/build.mk
@@ -3,7 +3,7 @@
 # Copyrights (C) 2019, Cyancore Team
 #
 # File Name		: build.mk
-# Description		: This file build kernel sources
+# Description		: This file build bootstrap sources
 # Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
 # Organisation		: Cyancore Core-Team
 #
diff --git a/src/visor/supervisor/services/build.mk b/src/visor/supervisor/services/build.mk
new file mode 100644
index 00000000..52a497f9
--- /dev/null
+++ b/src/visor/supervisor/services/build.mk
@@ -0,0 +1,17 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2023, Cyancore Team
+#
+# File Name		: build.mk
+# Description		: This file accumulates the build scripts
+#			  from supervisor services
+# Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+S_SERVICES	:= $(GET_PATH)
+
+include $(S_SERVICES)/bootstrap/build.mk
+
+DIR		:= $(S_SERVICES)
+include mk/obj.mk
diff --git a/src/visor/supervisor/workers/scall/build.mk b/src/visor/supervisor/workers/scall/build.mk
deleted file mode 100644
index c07c5394..00000000
--- a/src/visor/supervisor/workers/scall/build.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# CYANCORE LICENSE
-# Copyrights (C) 2019, Cyancore Team
-#
-# File Name		: build.mk
-# Description		: This file builds worker sources
-# Primary Author	: Akash Kollipara [akashkollipara@gmail.com]
-# Organisation		: Cyancore Core-Team
-#
-
-MCALL_DIR	:= $(GET_PATH)
-
-LD_SUPPLEMENT	+= $(MCALL_DIR)/scall.ld.sx
-
-DIR		:= $(MCALL_DIR)
-
-include mk/obj.mk
diff --git a/src/visor/supervisor/workers/scall/scall.ld.sx b/src/visor/supervisor/workers/scall/scall.ld.sx
deleted file mode 100644
index 8771727f..00000000
--- a/src/visor/supervisor/workers/scall/scall.ld.sx
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2019, Cyancore Team
- *
- * File Name		: scall.ld.sx
- * Description		: This file contains memory layout for the
- *			  cyancore scall framework
- * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-SECTIONS
-{
-	.scall_table :
-	{
-		PROVIDE(_scall_table_start = .);
-		KEEP(*(.scall))
-		PROVIDE(_scall_table_end = .);
-	}
-}
-
-INSERT BEFORE .stack;
diff --git a/src/visor/supervisor/workers/scall/supervisory_call.c b/src/visor/supervisor/workers/scall/supervisory_call.c
deleted file mode 100644
index da6a44ff..00000000
--- a/src/visor/supervisor/workers/scall/supervisory_call.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2019, Cyancore Team
- *
- * File Name		: supervisory_call.c
- * Description		: This file contains sources of supervisory call handler
- * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-#include <stdint.h>
-#include <stddef.h>
-#include <status.h>
-#include <supervisor_call.h>
-#include <platform.h>
-#include <resource.h>
-
-/* mcall Table start and end  defined in linker script mcall.ld.sx */
-extern scall_t _scall_table_start;
-extern scall_t _scall_table_end;
-
-void super_call(scall_id_t id, call_arg_t a0, call_arg_t a1, call_arg_t a2, sret_t *ret)
-{
-	/* mcall Table pointer */
-	scall_t *ptr;
-
-	/* Assign "ret" parameters to default error case,
-	 * on execution of the call, the ret will updated.
-	 */
-	ret->p = (uintptr_t) NULL;
-	ret->size = 0;
-	ret->status = error_scall_code_inval;
-
-	/* Assign the pointer to start of table */
-	ptr = &_scall_table_start;
-
-	/* Run through the table till the end */
-	while(ptr <= & _scall_table_end)
-	{
-		/* Check if the mcall ID matches */
-		if(ptr->id == id)
-		{
-			/* Execute the callback function and update the "ret" */
-			if (ptr->callback != NULL)
-			{
-				*ret = ptr->callback(a0, a1, a2);
-			}
-			/* Stop parsing the table and return */
-			break;
-		}
-		/* Increament location pointer */
-		ptr++;
-	}
-	return;
-}
diff --git a/src/visor/terravisor/build.mk b/src/visor/terravisor/build.mk
index acdb3874..54b1c29f 100644
--- a/src/visor/terravisor/build.mk
+++ b/src/visor/terravisor/build.mk
@@ -15,4 +15,3 @@ TERRAVISOR	:= 1
 $(eval $(call add_define,TERRAVISOR))
 
 include $(TERRA_PATH)/services/build.mk
-include $(TERRA_PATH)/workers/build.mk
diff --git a/src/visor/terravisor/services/build.mk b/src/visor/terravisor/services/build.mk
index c8fd2473..deed033a 100644
--- a/src/visor/terravisor/services/build.mk
+++ b/src/visor/terravisor/services/build.mk
@@ -14,8 +14,8 @@ T_SERVICES	:= $(GET_PATH)
 include $(T_SERVICES)/bootstrap/build.mk
 include $(T_SERVICES)/driver/build.mk
 
-ifeq ($(TERRAKERN),1)
-include $(T_SERVICES)/kernel/build.mk
+ifneq ($(TERRAKERN),0)
+include $(T_SERVICES)/kernel/$(TERRAKERN)/build.mk
 endif
 
 DIR		:= $(T_SERVICES)
diff --git a/src/visor/terravisor/services/kernel/cc_os_sched.c b/src/visor/terravisor/services/kernel/cc_os_sched.c
deleted file mode 100644
index 9513288c..00000000
--- a/src/visor/terravisor/services/kernel/cc_os_sched.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2022, Cyancore Team
- *
- * File Name		: cc_os_sched.c
- * Description		: CC OS Kernel scheduler definations
- * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-/*****************************************************
- *	INCLUDES
- *****************************************************/
-#include <terravisor/cc_os/cc_os_config.h>
-#include <terravisor/cc_os/utils/cc_os_sched.h>
-
-/*****************************************************
- *	DEFINES
- *****************************************************/
-#define CC_SCHED_ALGO(_id, _fn) {	\
-	.cc_selected_algo = _id,	\
-	.algo_function = _fn}
-
-/*****************************************************
- *	STATIC FUNCTION DECLARATION
- *****************************************************/
-static void __cc_sched_algo_round_robin_fn(cc_sched_ctrl_t * sched_ctrl);
-static void __cc_sched_algo_priority_driven_fn(cc_sched_ctrl_t * sched_ctrl);
-
-/*****************************************************
- *	GLOBAL DECLARATIONS
- *****************************************************/
-#if !ccosconfig_CC_OS_USE_DYNAMIC
-cc_sched_tcb_t g_cc_os_tcb_list [ccosconfig_CC_OS_MAX_THREAD];
-#else
-cc_sched_tcb_t * g_cc_os_tcb_list	= CC_OS_NULL_PTR;
-#endif
-
-cc_sched_t g_cc_sched_list [] =
-{
-	CC_SCHED_ALGO(cc_sched_algo_round_robin, 	__cc_sched_algo_round_robin_fn),
-	CC_SCHED_ALGO(cc_sched_algo_priority_driven, 	__cc_sched_algo_priority_driven_fn),
-};
-
-cc_sched_ctrl_t g_sched_ctrl =
-{
-#if !ccosconfig_CC_OS_USE_DYNAMIC
-	.ready_list_head 	= &(g_cc_os_tcb_list[CC_OS_FALSE]),
-	.curr_task 		= &(g_cc_os_tcb_list[CC_OS_FALSE]),
-#else
-	.ready_list_head 	= CC_OS_NULL_PTR,
-	.curr_task 		= CC_OS_NULL_PTR,
-#endif
-	.wait_list_head		= CC_OS_NULL_PTR,
-	.task_max_prio		= CC_OS_NULL_PTR,
-	.selected_sched		= &(g_cc_sched_list[cc_sched_algo_round_robin])
-};
-
-/*****************************************************
- *	INTERNAL USED FUNCTIONS (NON-STATIC)
- *****************************************************/
-status_t _insert_after(cc_sched_tcb_t ** ptr, cc_sched_tcb_t * new_node, uint8_t link_type)
-{
-	CC_OS_ASSERT_IF_FALSE(new_node != CC_OS_NULL_PTR);
-	switch (link_type)
-	{
-		case CC_OS_FALSE:
-			/* Ready Link */
-			if (*ptr == CC_OS_NULL_PTR)
-			{
-				*ptr = new_node;
-				new_node->ready_link.next = new_node;
-				new_node->ready_link.prev = new_node;
-			}
-			else
-			{
-				new_node->ready_link.next = (*ptr)->ready_link.next;
-				new_node->ready_link.prev = *ptr;
-				new_node->ready_link.next->ready_link.prev = new_node;
-				(*ptr)->ready_link.next = new_node;
-			}
-			break;
-		case CC_OS_TRUE:
-			/* Wait Link */
-			if (*ptr == CC_OS_NULL_PTR)
-			{
-				*ptr = new_node;
-				new_node->wait_link.next = new_node;
-				new_node->wait_link.prev = new_node;
-			}
-			else
-			{
-				new_node->wait_link.next = (*ptr)->wait_link.next;
-				new_node->wait_link.prev = *ptr;
-				new_node->wait_link.next->wait_link.prev = new_node;
-				(*ptr)->wait_link.next = new_node;
-			}
-			break;
-		default:
-			return error_os_invalid_op;
-	}
-	return success;
-}
-status_t _insert_before(cc_sched_tcb_t ** ptr, cc_sched_tcb_t * new_node, uint8_t link_type)
-{
-	CC_OS_ASSERT_IF_FALSE(new_node != CC_OS_NULL_PTR);
-	switch (link_type)
-	{
-		case CC_OS_FALSE:
-			/* Ready Link */
-			if (*ptr == CC_OS_NULL_PTR)
-			{
-				*ptr = new_node;
-				new_node->ready_link.next = new_node;
-				new_node->ready_link.prev = new_node;
-			}
-			else
-			{
-				new_node->ready_link.next = *ptr;
-				new_node->ready_link.prev = (*ptr)->ready_link.prev;
-				(*ptr)->ready_link.prev = new_node;
-				new_node->ready_link.prev->ready_link.next = new_node;
-			}
-			break;
-		case CC_OS_TRUE:
-			/* Wait Link */
-			if (*ptr == CC_OS_NULL_PTR)
-			{
-				*ptr = new_node;
-				new_node->wait_link.next = new_node;
-				new_node->wait_link.prev = new_node;
-			}
-			else
-			{
-				new_node->wait_link.next = *ptr;
-				new_node->wait_link.prev = (*ptr)->wait_link.prev;
-				(*ptr)->wait_link.prev = new_node;
-				new_node->wait_link.prev->wait_link.next = new_node;
-			}
-			break;
-		default:
-			return error_os_invalid_op;
-	}
-	return success;
-}
-
-void _cc_sched_send_to_wait(cc_sched_ctrl_t * sched_ctrl, cc_sched_tcb_t * ptr, const size_t ticks)
-{
-	if (ptr->task_status == cc_sched_task_status_wait)
-	{
-		return;
-	}
-	if(_insert_before(&(sched_ctrl->wait_list_head), ptr, CC_OS_TRUE) == success)
-	{
-		ptr->wait_res.task_delay_ticks = ticks;
-		ptr->task_status = cc_sched_task_status_wait;
-	}
-}
-
-void _cc_sched_send_to_resume(cc_sched_ctrl_t * sched_ctrl, cc_sched_tcb_t * ptr)
-{
-	if (ptr->task_status == cc_sched_task_status_ready)
-	{
-		return;
-	}
-
-	if (ptr == sched_ctrl->wait_list_head)
-	{
-		/* First in the list */
-		sched_ctrl->wait_list_head = ptr->wait_link.next;
-		if (ptr->wait_link.next == ptr && ptr->wait_link.prev == ptr)
-		{
-			/* Last Wait task left */
-			sched_ctrl->wait_list_head = CC_OS_NULL_PTR;
-		}
-	}
-	ptr->wait_link.prev->wait_link.next = ptr->wait_link.next;
-	ptr->wait_link.next->wait_link.prev = ptr->wait_link.prev;
-	ptr->wait_link.prev = CC_OS_NULL_PTR;
-	ptr->wait_link.next = CC_OS_NULL_PTR;
-	ptr->wait_res.task_delay_ticks = CC_OS_FALSE;
-	ptr->task_status = cc_sched_task_status_ready;
-}
-
-/*****************************************************
- *	STATIC FUNCTION DEFINATIONS
- *****************************************************/
-static void __cc_sched_context_switch(cc_sched_tcb_t * next_task)
-{
-	next_task->task_status = cc_sched_task_status_running;
-}
-
-static void __cc_sched_wait_list_adjustment(cc_sched_ctrl_t * sched_ctrl)
-{
-	cc_sched_tcb_t * ptr = sched_ctrl->wait_list_head;
-	size_t * wait_res = ptr->wait_res.wait_on_resource;
-	while(ptr != CC_OS_NULL_PTR)
-	{
-		ptr->wait_res.task_delay_ticks--;	/* Tick caliberations required */
-
-		if ((wait_res != CC_OS_NULL_PTR) && (*wait_res == CC_OS_FALSE))
-		{
-			/* The resource is available can can go to ready state */
-			ptr->wait_res.task_delay_ticks = CC_OS_FALSE;
-			ptr->wait_res.wait_on_resource = CC_OS_NULL_PTR;
-		}
-		if(ptr->wait_res.task_delay_ticks == CC_OS_FALSE)
-		{
-			_cc_sched_send_to_resume(sched_ctrl, ptr);
-		}
-		if (ptr->wait_link.next == sched_ctrl->wait_list_head)
-		{
-			break;
-		}
-		else
-		{
-			ptr = ptr->wait_link.next;
-		}
-	}
-}
-
-/*****************************************************
- *	SCHEDULER ALGORITHMS
- *****************************************************/
-static void __cc_sched_algo_round_robin_fn(cc_sched_ctrl_t * sched_ctrl)
-{
-	/* do waitlist adjustment */
-	cc_sched_tcb_t * ptr = sched_ctrl->curr_task->ready_link.next;
-
-	__cc_sched_wait_list_adjustment(sched_ctrl);
-
-	if (ptr == sched_ctrl->ready_list_head)
-	{
-		/* IDLE Task */
-		_cc_sched_send_to_resume(&g_sched_ctrl, ptr);
-	}
-	/* Context switch to next task */
-	if (ptr->task_status == cc_sched_task_status_ready)
-	{
-		__cc_sched_context_switch(ptr->ready_link.next);
-	}
-}
-
-static void __cc_sched_algo_priority_driven_fn(cc_sched_ctrl_t * sched_ctrl)
-{
-	/* do waitlist adjustment */
-	__cc_sched_wait_list_adjustment(sched_ctrl);
-
-	cc_sched_tcb_t * ptr = sched_ctrl->ready_list_head->ready_link.prev;
-	if(ptr != CC_OS_NULL_PTR)
-	{
-		while (ptr->task_status != cc_sched_task_status_ready)
-		{
-			ptr = ptr->wait_link.prev;
-			if (ptr == sched_ctrl->ready_list_head)
-			{
-				/* IDLE Task */
-				_cc_sched_send_to_resume(&g_sched_ctrl, ptr);
-				break;
-			}
-		}
-		__cc_sched_context_switch(ptr);
-	}
-}
diff --git a/src/visor/terravisor/services/kernel/cc_os_sem.c b/src/visor/terravisor/services/kernel/cc_os_sem.c
deleted file mode 100644
index 759fb1b1..00000000
--- a/src/visor/terravisor/services/kernel/cc_os_sem.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2CC_OS_FALSE22, Cyancore Team
- *
- * File Name		: cc_os_sem.h
- * Description		: CC OS Semaphore function definations
- * Primary Author	: Pranjal Chanda [pranjalchandaCC_OS_FALSE8@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-/*****************************************************
- *	INCLUDES
- *****************************************************/
-#include <terravisor/cc_os/cc_os.h>
-
-/*****************************************************
- *	GLOBAL/STATIC VARIABLE DECLARATIONS
- *****************************************************/
-
-/*****************************************************
- *	GLOBAL EXTERNS
- *****************************************************/
-extern cc_sched_ctrl_t g_sched_ctrl;
-/*****************************************************
- *	STATIC FUNCTION DEFINATIONS
- *****************************************************/
-
-/*****************************************************
- *	USER FUNCTION DEFINATIONS
- *****************************************************/
-
-status_t cc_os_sem_create	(sem_t ** sem_ptr, size_t init_val)
-{
-#if CC_OS_DYNAMIC == CC_OS_FALSE
-	CC_OS_ASSERT_IF_FALSE((*sem_ptr != CC_OS_NULL_PTR && (*sem_ptr)->sem_init == CC_OS_FALSE));
-
-	(*sem_ptr)->sem_init = CC_OS_TRUE;
-	(*sem_ptr)->sem_val = init_val;
-#else
-	CC_OS_ASSERT_IF_FALSE(*sem_ptr == CC_OS_NULL_PTR);
-	*sem_ptr = cc_os_malloc(sizeof(sem_t));
-	if (*sem_ptr == CC_OS_NULL_PTR)
-	{
-		return error_memory_low;
-	}
-	else
-	{
-		(*sem_ptr)->sem_val = init_val;
-		(*sem_ptr)->sem_init = CC_OS_TRUE;
-	}
-
-#endif
-	return success;
-}
-status_t cc_os_sem_take 	(sem_t * sem_ptr, size_t wait_ticks)
-{
-	CC_OS_ASSERT_IF_FALSE((sem_ptr != CC_OS_NULL_PTR && sem_ptr->sem_init != CC_OS_FALSE));
-
-	if (sem_ptr->sem_val == CC_OS_FALSE)
-	{
-		if (wait_ticks == CC_OS_FALSE) 	/* ||_IS_ISR */
-		{
-			return error_os_sem_get;
-		}
-		else
-		{	g_sched_ctrl.curr_task->wait_res.wait_on_resource = (uintptr_t) sem_ptr;
-			cc_os_task_wait(wait_ticks);
-		}
-	}
-	else
-	{
-		sem_ptr->sem_val--;
-	}
-	return success;
-}
-status_t cc_os_sem_give (sem_t * sem_ptr)
-{
-	CC_OS_ASSERT_IF_FALSE((sem_ptr != CC_OS_NULL_PTR && sem_ptr->sem_init != CC_OS_FALSE));
-
-	sem_ptr->sem_val++;
-
-	return success;
-}
-status_t cc_os_sem_delete (sem_t ** sem_ptr)
-{
-	CC_OS_ASSERT_IF_FALSE((*sem_ptr != CC_OS_NULL_PTR && (*sem_ptr)->sem_init != CC_OS_FALSE));
-
-	(*sem_ptr)->sem_init = CC_OS_FALSE;
-
-#if CC_OS_DYNAMIC == CC_OS_TRUE
-	cc_os_free(*sem_ptr);
-#endif
-
-	return success;
-}
-status_t cc_os_sem_get_val 	(const sem_t * sem_ptr, size_t * val)
-{
-	CC_OS_ASSERT_IF_FALSE((sem_ptr != CC_OS_NULL_PTR && sem_ptr->sem_init != CC_OS_FALSE));
-	CC_OS_ASSERT_IF_FALSE(val != CC_OS_NULL_PTR);
-
-	*val = sem_ptr->sem_val;
-
-	return success;
-}
diff --git a/src/visor/terravisor/services/kernel/cc_os_task_idle.c b/src/visor/terravisor/services/kernel/cc_os_task_idle.c
deleted file mode 100644
index fe416d28..00000000
--- a/src/visor/terravisor/services/kernel/cc_os_task_idle.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2022, Cyancore Team
- *
- * File Name		: cc_os_task_idle.c
- * Description		: CC OS IDLE Task definitions
- * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-/*****************************************************
- *	INCLUDES
- *****************************************************/
-#include <terravisor/cc_os/cc_os.h>
-
-/*****************************************************
- *	STATIC FUNCTION DECLARATION
- *****************************************************/
-/**
- * @brief	This function cleans up the terminated task form the TCB list
- *
- * @param  ptr[in]		Pointer to the TCB being cleaned
- * @return cc_sched_tcb_t *	Pointer to the next TCB
- */
-static cc_sched_tcb_t * __free_terminated_task(cc_sched_tcb_t * ptr)
-{
-	cc_sched_tcb_t * next_ptr = ptr->ready_link.next;
-	if (ptr->ready_link.next->task_status == cc_sched_task_status_exit)
-	{
-		ptr->ready_link.prev->ready_link.next = ptr->ready_link.next;
-		ptr->ready_link.next->ready_link.prev = ptr->ready_link.prev;
-
-#if CC_OS_DYNAMIC == CC_OS_FALSE
-		ptr->ready_link.next = CC_OS_NULL_PTR;
-		ptr->ready_link.prev = CC_OS_NULL_PTR;
-#else
-		cc_os_free(ptr);
-#endif
-	}
-
-	return next_ptr;
-}
-
-/*****************************************************
- *	USER FUNCTION DEFINATION
- *****************************************************/
-void _cc_os_idle_task_fn(os_args args)
-{
-	cc_sched_ctrl_t * sched_ctrl = (cc_sched_ctrl_t *) args;
-	static cc_sched_tcb_t * ptr = CC_OS_NULL_PTR;
-	ptr = sched_ctrl->ready_list_head;
-	while (CC_OS_TRUE)
-	{
-		/* Clean up task if terminated */
-		ptr = __free_terminated_task(ptr);
-
-#if ccosconfig_CC_OS_POWER_SAVE_EN
-		/* Power Save code */
-
-#endif
-		/* Yield for next available task */
-		cc_os_task_yield();
-	}
-}
diff --git a/src/visor/terravisor/services/kernel/cc_os_tasks.c b/src/visor/terravisor/services/kernel/cc_os_tasks.c
deleted file mode 100644
index aa31b04c..00000000
--- a/src/visor/terravisor/services/kernel/cc_os_tasks.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * CYANCORE LICENSE
- * Copyrights (C) 2022, Cyancore Team
- *
- * File Name		: cc_os_tasks.c
- * Description		: CC OS Kernel tasks related definations definations
- * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
- * Organisation		: Cyancore Core-Team
- */
-
-/*****************************************************
- *	INCLUDES
- *****************************************************/
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <arch.h>
-#include <terravisor/cc_os/cc_os_config.h>
-#include <terravisor/cc_os/cc_os.h>
-
-/*****************************************************
- *	DEFINES
- *****************************************************/
-#define CC_OS_PRIORITY_MAX		255
-
-/*****************************************************
- *	GLOBAL DECLARATIONS
- *****************************************************/
-#if CC_OS_DYNAMIC == CC_OS_FALSE
-extern cc_sched_tcb_t g_cc_os_tcb_list[];
-#else
-extern cc_sched_tcb_t *g_cc_os_tcb_list;
-#endif
-
-/*****************************************************
- *	INTERNAL EXTERNS FUNCTIONS
- *****************************************************/
-extern void _cc_os_idle_task_fn		(void * args);
-extern status_t _insert_after		(cc_sched_tcb_t ** ptr, cc_sched_tcb_t * new_node, uint8_t link_type);
-extern status_t _insert_before		(cc_sched_tcb_t ** ptr, cc_sched_tcb_t * new_node, uint8_t link_type);
-extern void _cc_sched_send_to_wait	(cc_sched_ctrl_t * sched_ctrl, cc_sched_tcb_t * ptr, const size_t ticks);
-extern void _cc_sched_send_to_resume	(cc_sched_ctrl_t * sched_ctrl, cc_sched_tcb_t * ptr);
-
-/*****************************************************
- *	GLOBAL EXTERNS VARIABLES
- *****************************************************/
-extern cc_sched_t *g_cc_sched;
-extern cc_sched_t g_cc_sched_list [];
-extern cc_sched_ctrl_t g_sched_ctrl;
-
-/*****************************************************
- *	STATIC FUNCTION DEFINATIONS
- *****************************************************/
-void __cc_init_scheduler()
-{
-	return;
-}
-/*****************************************************
- *	USER FUNCTION DEFINATIONS
- *****************************************************/
-status_t cc_os_add_task (cc_os_task_t * cc_os_task)
-{
-	CC_OS_ASSERT_IF_FALSE(cc_os_task != CC_OS_NULL_PTR);
-	CC_OS_ASSERT_IF_FALSE(cc_os_task->name != CC_OS_NULL_PTR);
-	CC_OS_ASSERT_IF_FALSE(cc_os_task->stack_ptr != CC_OS_NULL_PTR);
-	CC_OS_ASSERT_IF_FALSE(cc_os_task->task_fn != CC_OS_NULL_PTR);
-	CC_OS_ASSERT_IF_FALSE(cc_os_task->stack_len != CC_OS_FALSE);
-	CC_OS_ASSERT_IF_FALSE(cc_os_task->priority >= ccosconfig_CC_OS_IDLE_TASK_PRIORITY);
-	CC_OS_ASSERT_IF_FALSE(cc_os_task->priority < CC_OS_PRIORITY_MAX);
-
-	cc_os_pause_all_task();
-
-	cc_sched_tcb_t * ptr = g_sched_ctrl.ready_list_head;
-
-#if CC_OS_DYNAMIC == CC_OS_TRUE
-	if (ptr == CC_OS_NULL_PTR)
-	{
-		/* First Dynamic task */
-		ptr = (cc_sched_tcb_t *)cc_os_malloc(sizeof(cc_sched_tcb_t));
-		if (ptr == CC_OS_NULL_PTR)
-		{
-			cc_os_resume_all_task();
-			return error_os_task_overfow;
-		}
-	}
-#endif
-	if ((ptr->ready_link.next == CC_OS_NULL_PTR )&& (ptr->ready_link.prev == CC_OS_NULL_PTR))
-	{
-		ptr->ready_link.next = ptr->ready_link.prev = g_sched_ctrl.ready_list_head;
-	}
-
-	else
-	{
-#if CC_OS_DYNAMIC == CC_OS_FALSE
-		/* Static Task Allocation */
-		for (size_t i = CC_OS_FALSE; i < ccosconfig_CC_OS_MAX_THREAD; i++)
-		{
-			/* Get an available node from global tcb list */
-			if (g_cc_os_tcb_list[i].task_status == cc_sched_task_status_exit)
-			{
-				ptr = &(g_cc_os_tcb_list[i]);
-				break;
-			}
-		}
-		if (ptr != g_sched_ctrl.ready_list_head)
-		{
-#else
-		/* Dynamic Task Declaration */
-		if (ptr != CC_OS_NULL_PTR)
-		ptr = (cc_sched_tcb_t *)cc_os_malloc(sizeof(cc_sched_tcb_t));
-		{
-#endif
-			/* Fill tcb details */
-			strlcpy(ptr->name, cc_os_task->name, ccosconfig_CC_OS_TASK_NAME_LEN);
-			ptr->stack_ptr 	 = cc_os_task->stack_ptr;
-			ptr->priority 	 = cc_os_task->priority;
-		}
-		else
-		{
-			cc_os_resume_all_task();
-			return error_os_task_overfow;
-		}
-	}
-	/* Insert Tasks in assending order of its priority */
-	if (g_sched_ctrl.task_max_prio == CC_OS_NULL_PTR)
-	{
-		g_sched_ctrl.task_max_prio = ptr;
-	}
-	else if(g_sched_ctrl.task_max_prio->priority <= ptr->priority)
-	{
-		if(_insert_after(&(g_sched_ctrl.task_max_prio), ptr, CC_OS_FALSE) == success)
-		{
-			g_sched_ctrl.task_max_prio = ptr;
-		}
-		else
-		{
-			cc_os_resume_all_task();
-			return error_os_task_overfow;
-		}
-	}
-	else
-	{
-		cc_sched_tcb_t * comp_ptr = g_sched_ctrl.task_max_prio->ready_link.next;
-		while (1)
-		{
-			if (comp_ptr->priority <= ptr->priority && (_insert_after(&comp_ptr, ptr, CC_OS_FALSE) == success))
-			{
-				break;
-			}
-			else
-			{
-				comp_ptr = comp_ptr->ready_link.next;
-			}
-		}
-	}
-
-	cc_os_task->task_tcb_ptr = ptr;
-	ptr->task_status = cc_sched_task_status_ready;
-
-	cc_os_resume_all_task();
-	return success;
-}
-
-status_t cc_os_del_task (cc_os_task_t * cc_os_task)
-{
-	CC_OS_ASSERT_IF_FALSE(cc_os_task->task_fn != _cc_os_idle_task_fn);
-
-	cc_sched_tcb_t * ptr = g_sched_ctrl.curr_task;
-
-	if (cc_os_task != CC_OS_NULL_PTR)
-	{
-		ptr = cc_os_task->task_tcb_ptr;
-	}
-	/* Code to handle first node */
-	if (ptr == g_sched_ctrl.ready_list_head)
-	{
-		/* IDLE Task can not be deleted */
-		return error_os_invalid_op;
-	}
-	ptr->task_status   = cc_sched_task_status_exit;
-
-	if (ptr == g_sched_ctrl.curr_task)
-	{
-		cc_os_task_yield();	/* Yeild */
-	}
-
-	return success;
-}
-
-status_t cc_os_pause_task (cc_os_task_t * cc_os_task)
-{
-	cc_sched_tcb_t * ptr = g_sched_ctrl.curr_task;
-	if (cc_os_task != CC_OS_NULL_PTR)
-	{
-		ptr = cc_os_task->task_tcb_ptr;
-	}
-
-	_cc_sched_send_to_wait(&g_sched_ctrl, ptr, CC_OS_DELAY_MAX);
-
-	return success;
-}
-
-status_t cc_os_pause_all_task (void)
-{
-	cc_sched_tcb_t * ptr = g_sched_ctrl.ready_list_head->ready_link.next;
-
-	while (ptr != g_sched_ctrl.ready_list_head)
-	{
-		if (ptr == g_sched_ctrl.curr_task)
-		{
-			continue;
-		}
-
-		_cc_sched_send_to_wait(&g_sched_ctrl, ptr, CC_OS_DELAY_MAX);
-		ptr = ptr->ready_link.next;
-	}
-
-	return success;
-}
-
-status_t cc_os_resume_all_task (void)
-{
-	cc_sched_tcb_t * ptr = g_sched_ctrl.ready_list_head->ready_link.next;
-	if (ptr != CC_OS_NULL_PTR)
-	{
-		while (ptr != g_sched_ctrl.ready_list_head)
-		{
-			if (ptr == g_sched_ctrl.curr_task)
-			{
-				continue;
-			}
-			_cc_sched_send_to_resume(&g_sched_ctrl, ptr);
-			ptr = ptr->ready_link.next;
-		}
-	}
-	else
-	{
-		return error_os_invalid_op;
-	}
-
-	return success;
-}
-
-status_t cc_os_resume_task (cc_os_task_t * cc_os_task)
-{
-	CC_OS_ASSERT_IF_FALSE(cc_os_task != CC_OS_NULL_PTR);
-
-	cc_sched_tcb_t * ptr = cc_os_task->task_tcb_ptr;
-
-	_cc_sched_send_to_resume(&g_sched_ctrl, ptr);
-
-	return success;
-}
-
-status_t set_cc_os_sched_algo(cc_sched_algo_t sched_algo)
-{
-	CC_OS_ASSERT_IF_FALSE(sched_algo != cc_sched_algo_max);
-
-	g_sched_ctrl.selected_sched = &(g_cc_sched_list[sched_algo]);
-
-	return success;
-}
-
-void cc_os_task_wait (const size_t ticks)
-{
-	cc_sched_tcb_t * ptr = g_sched_ctrl.curr_task;
-
-	if (ticks > CC_OS_FALSE)
-	{
-		_cc_sched_send_to_wait(&g_sched_ctrl, ptr, ticks);
-	}
-
-	cc_os_task_yield();
-}
-
-void cc_os_task_yield()
-{
-	return;
-}
-
-void cc_os_run (void)
-{
-	/* OS Init code */
-
-	/* Initialise IDLE Task */
-	CC_TASK_DEF(
-		cc_os_idle,				/* Name of the instance */
-		_cc_os_idle_task_fn,			/* Function pointer */
-		&g_sched_ctrl,				/* Task Args*/
-		ccosconfig_CC_OS_IDLE_TASK_PRIORITY,	/* Task Priority */
-		ccosconfig_CC_OS_TASK_STACK_LEN		/* Stack Length of IDLE Task */
-	);
-	cc_os_add_task(&CC_GET_TASK_INST(cc_os_idle));
-
-	/* Initialise scheduler */
-	__cc_init_scheduler();
-	cc_os_task_yield(); /* Yeild */
-	while (1)
-	{
-		/* Code shall not reach here */
-		arch_wfi();
-	}
-}
diff --git a/src/visor/terravisor/services/kernel/helios/build.mk b/src/visor/terravisor/services/kernel/helios/build.mk
new file mode 100644
index 00000000..9e073d91
--- /dev/null
+++ b/src/visor/terravisor/services/kernel/helios/build.mk
@@ -0,0 +1,33 @@
+#
+# CYANCORE LICENSE
+# Copyrights (C) 2019-2023, Cyancore Team
+#
+# File Name		: build.mk
+# Description		: This file consists of HELIOS kernal configuration
+# Primary Author	: Pranjal Chanda[pranjalchanda08@gmail.com]
+# Organisation		: Cyancore Core-Team
+#
+
+DIR		:= $(GET_PATH)
+
+HELIOS_IDLE_TASK_PRIORITY	:= 1
+HELIOS_USE_DYNAMIC 		?= 1
+HELIOS_HEAP_SIZE 		?= 1024
+HELIOS_MAX_THREAD 		?= 2
+HELIOS_IDLE_TASK_NAME		?= \"HELIOS_IDLE\"
+HELIOS_IDLE_TASK_STACK_LEN 	?= 255
+HELIOS_POWER_SAVE_EN 		?= 0
+HELIOS_ANTI_DEADLOCK		?= 1
+HELIOS_DEBUG			?= 1
+
+$(eval $(call add_define,HELIOS_USE_DYNAMIC))
+$(eval $(call add_define,HELIOS_HEAP_SIZE))
+$(eval $(call add_define,HELIOS_MAX_THREAD))
+$(eval $(call add_define,HELIOS_IDLE_TASK_NAME))
+$(eval $(call add_define,HELIOS_IDLE_TASK_PRIORITY))
+$(eval $(call add_define,HELIOS_IDLE_TASK_STACK_LEN))
+$(eval $(call add_define,HELIOS_POWER_SAVE_EN))
+$(eval $(call add_define,HELIOS_ANTI_DEADLOCK))
+$(eval $(call add_define,HELIOS_DEBUG))
+
+include mk/obj.mk
diff --git a/src/visor/terravisor/services/kernel/cc_os_heap.c b/src/visor/terravisor/services/kernel/helios/helios_heap.c
similarity index 81%
rename from src/visor/terravisor/services/kernel/cc_os_heap.c
rename to src/visor/terravisor/services/kernel/helios/helios_heap.c
index a4683201..6942085e 100644
--- a/src/visor/terravisor/services/kernel/cc_os_heap.c
+++ b/src/visor/terravisor/services/kernel/helios/helios_heap.c
@@ -2,7 +2,7 @@
  * CYANCORE LICENSE
  * Copyrights (C) 2022, Cyancore Team
  *
- * File Name		: cc_os_heap.c
+ * File Name		: helios_heap.c
  * Description		: CC OS Kernel definations
  * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
  * Organisation		: Cyancore Core-Team
@@ -11,7 +11,7 @@
 /*****************************************************
  *	INCLUDES
  *****************************************************/
-#include <terravisor/cc_os/utils/cc_os_heap.h>
+#include <terravisor/helios/utils/helios_heap.h>
 
 /*****************************************************
  *	GLOBAL/STATIC VARIABLE DECLARATIONS
@@ -28,11 +28,11 @@
 /*****************************************************
  *	USER FUNCTION DEFINATIONS
  *****************************************************/
-void * cc_os_malloc(size_t size _UNUSED)
+void * helios_malloc(size_t size)
 {
-	return CC_OS_NULL_PTR;
+	return malloc(size);
 }
-void * cc_os_free(const void *addr _UNUSED )
+void helios_free(void *addr )
 {
-	return CC_OS_NULL_PTR;
+	free(addr);
 }
diff --git a/src/visor/terravisor/services/kernel/helios/helios_mutex.c b/src/visor/terravisor/services/kernel/helios/helios_mutex.c
new file mode 100644
index 00000000..6c22c647
--- /dev/null
+++ b/src/visor/terravisor/services/kernel/helios/helios_mutex.c
@@ -0,0 +1,153 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2022, Cyancore Team
+ *
+ * File Name		: helios_mutex.c
+ * Description		: HELIOS mutex function definitions
+ * Primary Author	: Dibyajyoti Samal [dibyajyoti.samal@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+/*****************************************************
+ *	INCLUDES
+ *****************************************************/
+#include <terravisor/helios/helios.h>
+
+/*****************************************************
+ *	DEFINE
+ *****************************************************/
+#define MUTEX_INIT_VAL 1
+
+/*****************************************************
+ *	GLOBAL EXTERNS
+ *****************************************************/
+extern helios_sched_ctrl_t g_sched_ctrl;
+/*****************************************************
+ *	STATIC FUNCTION DEFINATIONS
+ *****************************************************/
+
+/*****************************************************
+ *	USER FUNCTION DEFINATIONS
+ *****************************************************/
+
+status_t helios_mutex_create	(helios_mutex_t ** mutex_ptr)
+{
+#if HELIOS_DYNAMIC == false
+	HELIOS_ASSERT_IF_FALSE(*mutex_ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE((*mutex_ptr)->mutex_init == false);
+
+	/* Initialize values of the mutex struct */
+	(*mutex_ptr)->mutex_init = true;
+	(*mutex_ptr)->mutex_val = MUTEX_INIT_VAL;
+#else
+	HELIOS_ASSERT_IF_FALSE(*mutex_ptr == HELIOS_NULL_PTR);
+	*mutex_ptr = helios_malloc(sizeof(helios_mutex_t));
+	if (*mutex_ptr == HELIOS_NULL_PTR)
+	{
+		HELIOS_ERR("Memory low for mutex creation");
+		return error_memory_low;
+	}
+	else
+	{
+		/* Initialize values of the mutex struct */
+		(*mutex_ptr)->mutex_val = MUTEX_INIT_VAL;
+		(*mutex_ptr)->mutex_init = true;
+	}
+
+#endif
+	return success;
+}
+
+status_t helios_mutex_lock 	(helios_mutex_t * mutex_ptr, size_t wait_ticks)
+{
+	HELIOS_ASSERT_IF_FALSE(mutex_ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE(mutex_ptr->mutex_init != false);
+
+	bool lock_flag = false;
+
+	if ((mutex_ptr->mutex_val != MUTEX_INIT_VAL) && (mutex_ptr->lock_task != HELIOS_NULL_PTR))
+	{
+		/* If mutex is not free and if the lock task is not NULL. */
+		if (wait_ticks == false) 	/* ||_IS_ISR */
+		{
+			HELIOS_ERR("Mutex already locked");
+			return error_os_mutex_lock;
+		}
+		else
+		{
+			/* If mutex is taken, lock_task must already hold info about the task. */
+			if (mutex_ptr->lock_task != g_sched_ctrl.curr_task)
+			{
+				/* If locking task is not current task, wait for mutex */
+				g_sched_ctrl.curr_task->wait_res.wait_on_resource = (uintptr_t) mutex_ptr;
+				helios_task_wait(wait_ticks);
+			}
+			else
+			{
+				/* If locking task is current task or HELIOS_NULL_PTR, allow locking recursively */
+				lock_flag = true;
+			}
+		}
+	}
+	else
+	{
+		lock_flag = true;
+	}
+
+	if (lock_flag)
+	{
+		/* Set locking task as current task and acquire lock. */
+		mutex_ptr->lock_task = g_sched_ctrl.curr_task;
+		mutex_ptr->mutex_val--;
+	}
+	return success;
+}
+
+status_t helios_mutex_unlock (helios_mutex_t * mutex_ptr)
+{
+	HELIOS_ASSERT_IF_FALSE(mutex_ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE(mutex_ptr->mutex_init != false);
+
+	if (mutex_ptr->lock_task != g_sched_ctrl.curr_task)
+	{
+		HELIOS_ERR("Mutex locked by another task");
+		return error_os_mutex_unlock;
+	}
+	else
+	{
+		/* Unlock mutex only if current task requests it. */
+		mutex_ptr->mutex_val++;
+		if (mutex_ptr->mutex_val == MUTEX_INIT_VAL)
+		{
+			/* When Unlocked set current task to NULL */
+			mutex_ptr->lock_task = HELIOS_NULL_PTR;
+		}
+
+	}
+	return success;
+}
+
+status_t helios_mutex_delete (helios_mutex_t ** mutex_ptr)
+{
+	HELIOS_ASSERT_IF_FALSE(*mutex_ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE((*mutex_ptr)->mutex_init != false);
+
+	(*mutex_ptr)->mutex_init = false;
+
+#if HELIOS_DYNAMIC == true
+	helios_free(*mutex_ptr);
+#endif
+
+	return success;
+}
+
+status_t helios_mutex_get_val 	(const helios_mutex_t * mutex_ptr, int * val)
+{
+	HELIOS_ASSERT_IF_FALSE(mutex_ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE(mutex_ptr->mutex_init != false);
+	HELIOS_ASSERT_IF_FALSE(val != HELIOS_NULL_PTR);
+
+	*val = mutex_ptr->mutex_val;
+
+	return success;
+}
diff --git a/src/visor/terravisor/services/kernel/helios/helios_sched.c b/src/visor/terravisor/services/kernel/helios/helios_sched.c
new file mode 100644
index 00000000..4618948f
--- /dev/null
+++ b/src/visor/terravisor/services/kernel/helios/helios_sched.c
@@ -0,0 +1,499 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2022, Cyancore Team
+ *
+ * File Name		: helios_sched.c
+ * Description		: CC OS Kernel scheduler definations
+ * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+/*****************************************************
+ *	INCLUDES
+ *****************************************************/
+#include <terravisor/helios/utils/helios_sched.h>
+#include <platform.h>
+#include <syslog.h>
+
+/*****************************************************
+ *	DEFINES
+ *****************************************************/
+#define CC_SCHED_ALGO(_id, _fn) {	\
+	.helios_selected_algo = _id,	\
+	.algo_function = _fn}
+
+#define HELIOS_LINK_WAIT		true
+#define HELIOS_LINK_READY		false
+
+/*****************************************************
+ *	STATIC FUNCTION DECLARATION
+ *****************************************************/
+static void __helios_sched_deadlock_adjustment_and_detection(const helios_sched_ctrl_t * sched_ctrl);
+static void __helios_sched_wait_list_adjustment(helios_sched_ctrl_t * sched_ctrl);
+static void __helios_sched_algo_round_robin_fn(helios_sched_ctrl_t * sched_ctrl);
+static void __helios_sched_algo_priority_driven_fn(helios_sched_ctrl_t * sched_ctrl);
+
+/*****************************************************
+ *	GLOBAL DECLARATIONS
+ *****************************************************/
+#if !HELIOS_USE_DYNAMIC
+helios_sched_tcb_t g_helios_tcb_list [HELIOS_MAX_THREAD];
+#else
+helios_sched_tcb_t * g_helios_tcb_list	= HELIOS_NULL_PTR;
+#endif
+
+helios_sched_t g_helios_sched_list [] =
+{
+	CC_SCHED_ALGO(helios_sched_algo_round_robin, __helios_sched_algo_round_robin_fn),
+	CC_SCHED_ALGO(helios_sched_algo_priority_driven, __helios_sched_algo_priority_driven_fn),
+};
+
+helios_sched_ctrl_t g_sched_ctrl =
+{
+#if !HELIOS_USE_DYNAMIC
+	.ready_list_head 	= &(g_helios_tcb_list[false]),
+	.curr_task 		= &(g_helios_tcb_list[false]),
+#else
+	.ready_list_head 	= HELIOS_NULL_PTR,
+	.curr_task 		= HELIOS_NULL_PTR,
+#endif
+	.wait_list_head		= HELIOS_NULL_PTR,
+	.selected_sched		= &(g_helios_sched_list[helios_sched_algo_round_robin])
+};
+
+/*****************************************************
+ *	INTERNAL USED FUNCTIONS (NON-STATIC)
+ *****************************************************/
+/**
+ * @brief	Insert a node after a reference pointer
+ *
+ * @param	ptr[in_out]	Reference pointer address
+ * @param	new_node[in]	Node to be inserted
+ * @param 	link_type[in]	HELIOS_LINK_READY / HELIOS_LINK_WAIT
+ *
+ * @return	None
+*/
+status_t _helios_sched_insert_after(helios_sched_tcb_t ** ptr, helios_sched_tcb_t * new_node, uint8_t link_type)
+{
+	HELIOS_ASSERT_IF_FALSE(new_node != HELIOS_NULL_PTR);
+	if (link_type == HELIOS_LINK_WAIT)
+	{
+		/* Wait Link */
+		if (*ptr == HELIOS_NULL_PTR)
+		{
+			*ptr = new_node;
+			new_node->wait_link.next = new_node;
+			new_node->wait_link.prev = new_node;
+		}
+		else
+		{
+			new_node->wait_link.next = (*ptr)->wait_link.next;
+			new_node->wait_link.prev = *ptr;
+			new_node->wait_link.next->wait_link.prev = new_node;
+			(*ptr)->wait_link.next = new_node;
+		}
+	}
+	else
+	{
+		/* Ready Link */
+		if (*ptr == HELIOS_NULL_PTR)
+		{
+			*ptr = new_node;
+			new_node->ready_link.next = new_node;
+			new_node->ready_link.prev = new_node;
+		}
+		else
+		{
+			new_node->ready_link.next = (*ptr)->ready_link.next;
+			new_node->ready_link.prev = *ptr;
+			new_node->ready_link.next->ready_link.prev = new_node;
+			(*ptr)->ready_link.next = new_node;
+		}
+	}
+	return success;
+}
+
+/**
+ * @brief	Insert a node before a reference pointer
+ *
+ * @param	ptr[in_out]	Reference pointer address
+ * @param	new_node[in]	Node to be inserted
+ * @param 	link_type[in]	HELIOS_LINK_READY / HELIOS_LINK_WAIT
+ *
+ * @return	None
+*/
+status_t _helios_sched_insert_before(helios_sched_tcb_t ** ptr, helios_sched_tcb_t * new_node, uint8_t link_type)
+{
+	HELIOS_ASSERT_IF_FALSE(ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE(new_node != HELIOS_NULL_PTR);
+
+	if (link_type == HELIOS_LINK_WAIT)
+	{
+		/* Wait Link */
+		if (*ptr == HELIOS_NULL_PTR)
+		{
+			*ptr = new_node;
+			new_node->wait_link.next = new_node;
+			new_node->wait_link.prev = new_node;
+		}
+		else
+		{
+			new_node->wait_link.next = *ptr;
+			new_node->wait_link.prev = (*ptr)->wait_link.prev;
+			(*ptr)->wait_link.prev = new_node;
+			new_node->wait_link.prev->wait_link.next = new_node;
+		}
+	}
+	else
+	{
+		/* Ready Link */
+		if (*ptr == HELIOS_NULL_PTR)
+		{
+			*ptr = new_node;
+			new_node->ready_link.next = new_node;
+			new_node->ready_link.prev = new_node;
+		}
+		else
+		{
+			new_node->ready_link.next = *ptr;
+			new_node->ready_link.prev = (*ptr)->ready_link.prev;
+			(*ptr)->ready_link.prev = new_node;
+			new_node->ready_link.prev->ready_link.next = new_node;
+		}
+	}
+	return success;
+}
+
+/**
+ * @brief	A function to detach an existing node from a link
+ *
+ * @param	node_ptr[in_out]	Address of the node to be detached
+ * @param	link_type[in]		HELIOS_LINK_READY / HELIOS_LINK_WAIT
+ *
+ * @return	None
+ */
+status_t _helios_sched_node_detach(helios_sched_tcb_t *node_ptr, uint8_t link_type)
+{
+	HELIOS_ASSERT_IF_FALSE(node_ptr != HELIOS_NULL_PTR);
+
+	if (link_type == HELIOS_LINK_WAIT)
+	{
+		/* Wait Link */
+		if (node_ptr == g_sched_ctrl.wait_list_head)
+		{
+			g_sched_ctrl.wait_list_head = node_ptr->ready_link.next;
+		}
+		node_ptr->wait_link.prev->wait_link.next = node_ptr->wait_link.next;
+		node_ptr->wait_link.next->wait_link.prev = node_ptr->wait_link.prev;
+		node_ptr->wait_link.prev = node_ptr->wait_link.next = HELIOS_NULL_PTR;
+	}
+	else
+	{
+		if (node_ptr == g_sched_ctrl.ready_list_head)
+		{
+			g_sched_ctrl.ready_list_head = node_ptr->ready_link.next;
+		}
+		/* Ready Link */
+		node_ptr->ready_link.prev->ready_link.next = node_ptr->ready_link.next;
+		node_ptr->ready_link.next->ready_link.prev = node_ptr->ready_link.prev;
+		node_ptr->ready_link.prev = node_ptr->ready_link.next = HELIOS_NULL_PTR;
+	}
+	return success;
+}
+
+/**
+ * @brief	Send a task to wait state
+ *
+ * @param	sched_ctrl[in_out]	Current scheduler control
+ * @param	ptr[in_out]		Pointer to task TCB
+ * @param	ticks[in]		Ticks to wait
+ *
+ * @return	None
+ */
+void _helios_sched_send_to_wait(helios_sched_ctrl_t * sched_ctrl, helios_sched_tcb_t * ptr, const size_t ticks)
+{
+	if (ptr->task_status == helios_sched_task_status_wait)
+	{
+		return;
+	}
+	if(_helios_sched_insert_before(&(sched_ctrl->wait_list_head), ptr, HELIOS_LINK_WAIT) == success)
+	{
+		ptr->wait_res.task_delay_ticks = ticks;
+		ptr->task_status = helios_sched_task_status_wait;
+	}
+}
+
+/**
+ * @brief	Send a task to pause state
+ *
+ * @param	sched_ctrl[in_out]	Current scheduler control
+ * @param	ptr[in_out]		Pointer to task TCB
+ *
+ * @return	None
+ */
+void _helios_sched_send_to_pause(helios_sched_ctrl_t * sched_ctrl, helios_sched_tcb_t * ptr)
+{
+	if (ptr->task_status == helios_sched_task_status_pause)
+	{
+		return;
+	}
+	if(_helios_sched_insert_before(&(sched_ctrl->wait_list_head), ptr, HELIOS_LINK_WAIT) == success)
+	{
+		ptr->wait_res.task_delay_ticks = HELIOS_DELAY_MAX;
+		ptr->task_status = helios_sched_task_status_pause;
+	}
+}
+
+/**
+ * @brief	Send a task to ready state
+ *
+ * @param	sched_ctrl[in_out]	Current scheduler control
+ * @param	ptr[in_out]		Pointer to task TCB
+ *
+ * @return	None
+ */
+void _helios_sched_send_to_resume(helios_sched_ctrl_t * sched_ctrl, helios_sched_tcb_t * ptr)
+{
+	if (ptr->task_status < helios_sched_task_status_wait)
+	{
+		return;
+	}
+
+	if (ptr == sched_ctrl->wait_list_head)
+	{
+		/* First in the list */
+		sched_ctrl->wait_list_head = ptr->wait_link.next;
+		if (ptr->wait_link.next == ptr && ptr->wait_link.prev == ptr)
+		{
+			/* Last Wait task left */
+			sched_ctrl->wait_list_head = HELIOS_NULL_PTR;
+		}
+	}
+	_helios_sched_node_detach(ptr, HELIOS_LINK_WAIT);
+	ptr->wait_res.task_delay_ticks = false;
+	ptr->task_status = helios_sched_task_status_ready;
+}
+
+/**
+ * @brief	Send a task to the back of its own priority list
+ *
+ * @param	node_ptr[in_out]	Pointer to task TCB
+ *
+ * @return	None
+ */
+status_t _helios_sched_send_back_of_task_prio(helios_sched_tcb_t *node_ptr)
+{
+	HELIOS_ASSERT_IF_FALSE(node_ptr != HELIOS_NULL_PTR);
+
+	helios_sched_tcb_t * ref_ptr = g_sched_ctrl.ready_list_head;
+	if(ref_ptr != HELIOS_NULL_PTR)
+	{
+		if (node_ptr == ref_ptr)
+		{
+			/* Very first node */
+			return success;
+		}
+
+		bool least_prio = true;
+		/* Find an optimal space */
+		while(node_ptr->priority >= ref_ptr->priority)
+		{
+			least_prio = false;
+			ref_ptr = ref_ptr->ready_link.next;
+			if (ref_ptr == g_sched_ctrl.ready_list_head)
+			{
+				/* traversal complete */
+				break;
+			}
+		}
+		if (least_prio)
+		{
+			/* Set ready list head if least prio detected */
+			g_sched_ctrl.ready_list_head = node_ptr;
+		}
+		if(node_ptr->ready_link.next == node_ptr->ready_link.prev)
+		{
+			/**
+			 * New Node
+			 * Insert it behind the same priority
+			 */
+			_helios_sched_insert_before(&ref_ptr, node_ptr, HELIOS_LINK_READY);
+		}
+		else
+		{
+			/**
+			 * Detach the current node from link and insert it at the end
+			 * of priority
+			 * This would help to round robin over the same priority when
+			 * scheduling
+			 */
+			_helios_sched_node_detach(node_ptr, HELIOS_LINK_READY);
+			_helios_sched_insert_before(&ref_ptr, node_ptr, HELIOS_LINK_READY);
+		}
+	}
+	return success;
+}
+
+/**
+ * @brief	HELIOS pre scheduler callback being called before any task scheduling is done
+ *
+ * @param	args[in]	helios_args (provides scheduler ctrl)
+ *
+ * @return	None
+ */
+void _helios_pre_sched(helios_args args)
+{
+	helios_sched_ctrl_t * sched_ctrl = (helios_sched_ctrl_t *) args;
+	sched_ctrl->curr_task->task_status = helios_sched_task_status_ready;
+	__helios_sched_wait_list_adjustment(sched_ctrl);
+	__helios_sched_deadlock_adjustment_and_detection(sched_ctrl);
+	_helios_sched_send_back_of_task_prio(sched_ctrl->curr_task);
+}
+
+/**
+ * @brief	Despatch a scheduling as per selected algorithm
+ *
+ * @return	None
+ */
+void _helios_scheduler_despatch(void)
+{
+	if (g_sched_ctrl.cb_hooks_reg.pre_sched != NULL)
+	{
+		/* Call Pre_sched Function */
+		g_sched_ctrl.cb_hooks_reg.pre_sched((helios_args) &g_sched_ctrl);
+	}
+	else
+	{
+		/* A System Error case */
+		HELIOS_SCHED_PANIC(error_os_panic_presched_cb_null);
+	}
+
+	if (g_sched_ctrl.selected_sched != NULL)
+	{
+		/* Call the scheduler */
+		g_sched_ctrl.selected_sched->algo_function(&g_sched_ctrl);
+	}
+	else
+	{
+		/* A System Error case */
+		HELIOS_SCHED_PANIC(error_os_panic_sched_algo_null);
+	}
+
+}
+/*****************************************************
+ *	STATIC FUNCTION DEFINATIONS
+ *****************************************************/
+static void __helios_sched_context_switch(helios_sched_tcb_t * next_task)
+{
+	next_task->task_status = helios_sched_task_status_running;
+}
+
+static void __helios_sched_deadlock_adjustment_and_detection(const helios_sched_ctrl_t * sched_ctrl _UNUSED)
+{
+#if HELIOS_ANTI_DEADLOCK
+	helios_sched_tcb_t * ptr = sched_ctrl->ready_list_head;
+	static helios_sched_anti_deadlock_t anti_deadlock_notify;
+	while (ptr != HELIOS_NULL_PTR)
+	{
+		if (ptr->task_status != helios_sched_task_status_pause)
+		{
+			ptr->task_wd_ticks--;
+		}
+		if ((ptr->task_wd_ticks == false) && (sched_ctrl->cb_hooks_reg.deadlock_notify != HELIOS_NULL_PTR))
+		{
+			/* Create notification params */
+			anti_deadlock_notify.name = ptr->name;
+			anti_deadlock_notify.task_func = ptr->task_func;
+
+			if (ptr->task_status != helios_sched_task_status_exit)
+			{
+				ptr->task_status = helios_sched_task_status_exit;
+			}
+			/* Notify the user that the task pointed by ptr is dead and has been terminated */
+			sched_ctrl->cb_hooks_reg.deadlock_notify((helios_args) &anti_deadlock_notify);
+		}
+		if (ptr->ready_link.next == sched_ctrl->ready_list_head)
+		{
+			break;
+		}
+	}
+#else
+	return;
+#endif /* HELIOS_ANTI_DEADLOCK */
+}
+static void __helios_sched_wait_list_adjustment(helios_sched_ctrl_t * sched_ctrl)
+{
+	helios_sched_tcb_t * ptr = sched_ctrl->wait_list_head;
+	if (ptr == HELIOS_NULL_PTR)
+	{
+		return;
+	}
+
+	const int * wait_res = (int *)ptr->wait_res.wait_on_resource;
+	while(ptr != HELIOS_NULL_PTR)
+	{
+		if (ptr->task_status == helios_sched_task_status_wait)
+		{
+			ptr->wait_res.task_delay_ticks--;	/* Tick caliberations required */
+
+			if ((wait_res != HELIOS_NULL_PTR) && *wait_res > false)
+			{
+				/* The resource is available can can go to ready state */
+				ptr->wait_res.task_delay_ticks = false;
+				ptr->wait_res.wait_on_resource = false;
+			}
+			if(ptr->wait_res.task_delay_ticks == false)
+			{
+				_helios_sched_send_to_resume(sched_ctrl, ptr);
+			}
+			if (ptr->wait_link.next == sched_ctrl->wait_list_head)
+			{
+				break;
+			}
+			else
+			{
+				ptr = ptr->wait_link.next;
+			}
+		}
+	}
+}
+
+/*****************************************************
+ *	SCHEDULER ALGORITHMS
+ *****************************************************/
+static void __helios_sched_algo_round_robin_fn(helios_sched_ctrl_t * sched_ctrl)
+{
+	/* do waitlist adjustment */
+	helios_sched_tcb_t * ptr = sched_ctrl->curr_task->ready_link.next;
+
+	if (ptr == sched_ctrl->ready_list_head)
+	{
+		/* IDLE Task */
+		_helios_sched_send_to_resume(&g_sched_ctrl, ptr);
+	}
+	/* Context switch to next task */
+	if (ptr->task_status == helios_sched_task_status_ready)
+	{
+		__helios_sched_context_switch(ptr->ready_link.next);
+	}
+}
+
+static void __helios_sched_algo_priority_driven_fn(helios_sched_ctrl_t * sched_ctrl)
+{
+	/* do waitlist adjustment */
+	helios_sched_tcb_t * ptr = sched_ctrl->ready_list_head->ready_link.prev;
+	if(ptr != HELIOS_NULL_PTR)
+	{
+		while (ptr->task_status != helios_sched_task_status_ready)
+		{
+			ptr = ptr->wait_link.prev;
+			if (ptr == sched_ctrl->ready_list_head)
+			{
+				/* IDLE Task */
+				_helios_sched_send_to_resume(&g_sched_ctrl, ptr);
+				break;
+			}
+		}
+		__helios_sched_context_switch(ptr);
+	}
+}
diff --git a/src/visor/terravisor/services/kernel/helios/helios_sem.c b/src/visor/terravisor/services/kernel/helios/helios_sem.c
new file mode 100644
index 00000000..1f198da8
--- /dev/null
+++ b/src/visor/terravisor/services/kernel/helios/helios_sem.c
@@ -0,0 +1,114 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2022, Cyancore Team
+ *
+ * File Name		: helios_sem.c
+ * Description		: CC OS Semaphore function definations
+ * Primary Author	: Pranjal Chanda [pranjalchandaHELIOS_FALSE8@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+/*****************************************************
+ *	INCLUDES
+ *****************************************************/
+#include <terravisor/helios/helios.h>
+
+/*****************************************************
+ *	GLOBAL/STATIC VARIABLE DECLARATIONS
+ *****************************************************/
+
+/*****************************************************
+ *	GLOBAL EXTERNS
+ *****************************************************/
+extern helios_sched_ctrl_t g_sched_ctrl;
+/*****************************************************
+ *	STATIC FUNCTION DEFINATIONS
+ *****************************************************/
+
+/*****************************************************
+ *	USER FUNCTION DEFINATIONS
+ *****************************************************/
+
+status_t helios_sem_create (helios_sem_t ** sem_ptr, size_t init_val)
+{
+#if HELIOS_DYNAMIC == false
+	HELIOS_ASSERT_IF_FALSE((*sem_ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE((*sem_ptr)->sem_init == false);
+#else
+	HELIOS_ASSERT_IF_FALSE(*sem_ptr == HELIOS_NULL_PTR);
+	/* Create semaphore */
+	*sem_ptr = helios_malloc(sizeof(helios_sem_t));
+	if (*sem_ptr == HELIOS_NULL_PTR)
+	{
+		HELIOS_ERR("Memory low for sem create");
+		return error_memory_low;
+	}
+#endif 	/* HELIOS_DYNAMIC */
+	/* Fill up the init details */
+	(*sem_ptr)->sem_val = init_val;
+	(*sem_ptr)->sem_init = true;
+
+	return success;
+}
+status_t helios_sem_take (helios_sem_t * sem_ptr, size_t wait_ticks)
+{
+	HELIOS_ASSERT_IF_FALSE(sem_ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE(sem_ptr->sem_init != false);
+
+	if (sem_ptr->sem_val == false)
+	{	/* If sem already locked */
+		if (wait_ticks == false) 	/* ||_IS_ISR */
+		{
+			/* If Thread can not wait on resource to get unlocked */
+			HELIOS_ERR("Semaphore already locked");
+			return error_os_sem_get;
+		}
+		else
+		{
+			/* Set the TCB to point to locked resource */
+			g_sched_ctrl.curr_task->wait_res.wait_on_resource = (uintptr_t) sem_ptr;
+			/* Send to wait state */
+			helios_task_wait(wait_ticks);
+		}
+	}
+	else
+	{
+		/* Else Decrement semaphore value */
+		sem_ptr->sem_val--;
+	}
+	return success;
+}
+status_t helios_sem_give (helios_sem_t * sem_ptr)
+{
+	HELIOS_ASSERT_IF_FALSE(sem_ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE(sem_ptr->sem_init != false);
+
+	/* Increment Semaphore value */
+	sem_ptr->sem_val++;
+
+	return success;
+}
+status_t helios_sem_delete (helios_sem_t ** sem_ptr)
+{
+	HELIOS_ASSERT_IF_FALSE(sem_ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE((*sem_ptr)->sem_init != false);
+
+	(*sem_ptr)->sem_init = false;
+
+#if HELIOS_DYNAMIC == true
+	/* Free up allocated space */
+	helios_free(*sem_ptr);
+#endif
+
+	return success;
+}
+status_t helios_sem_get_val (const helios_sem_t * sem_ptr, size_t * val)
+{
+	HELIOS_ASSERT_IF_FALSE(sem_ptr != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE(sem_ptr->sem_init != false);
+	HELIOS_ASSERT_IF_FALSE(val != HELIOS_NULL_PTR);
+
+	*val = sem_ptr->sem_val;
+
+	return success;
+}
diff --git a/src/visor/terravisor/services/kernel/helios/helios_task_idle.c b/src/visor/terravisor/services/kernel/helios/helios_task_idle.c
new file mode 100644
index 00000000..e3ca613d
--- /dev/null
+++ b/src/visor/terravisor/services/kernel/helios/helios_task_idle.c
@@ -0,0 +1,90 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2022, Cyancore Team
+ *
+ * File Name		: helios_task_idle.c
+ * Description		: CC OS IDLE Task definitions
+ * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+/*****************************************************
+ *	INCLUDES
+ *****************************************************/
+#include <terravisor/helios/helios.h>
+#include <arch.h>
+
+/*****************************************************
+ *	EXTERN FUNCTION DECLARATION
+ *****************************************************/
+extern status_t _helios_sched_node_detach(helios_sched_tcb_t *node_ptr, uint8_t link_type);
+
+/*****************************************************
+ *	STATIC FUNCTION DECLARATION
+ *****************************************************/
+/**
+ * @brief	This function cleans up the terminated task form the TCB list
+ *
+ * @param  ptr[in]		Pointer to the TCB being cleaned
+ * @return helios_sched_tcb_t *	Pointer to the next TCB
+ */
+static helios_sched_tcb_t * __free_terminated_task(helios_sched_tcb_t * ptr)
+{
+	helios_sched_tcb_t * next_ptr = ptr->ready_link.next;
+	if (ptr->ready_link.next->task_status == helios_sched_task_status_exit)
+	{
+		_helios_sched_node_detach(ptr, false);
+
+#if HELIOS_DYNAMIC == true
+		helios_free((void *)ptr->stack_ptr);
+		helios_free(ptr);
+#endif
+	}
+
+	return next_ptr;
+}
+
+#if HELIOS_POWER_SAVE_EN
+static void __helios_power_save_callback(void)
+{
+	arch_wfi();
+}
+#endif
+/*****************************************************
+ *	USER FUNCTION DEFINATION
+ *****************************************************/
+_NORETURN void _helios_idle_task_fn(void)
+{
+	static helios_sched_tcb_t * ptr  = HELIOS_NULL_PTR;
+	helios_sched_ctrl_t * sched_ctrl = (helios_sched_ctrl_t *) helios_get_args();
+	ptr = sched_ctrl->ready_list_head;
+#if HELIOS_POWER_SAVE_EN
+	if (sched_ctrl->cb_hooks_reg.sleep_cb == HELIOS_NULL_PTR)
+	{
+		sched_ctrl->cb_hooks_reg.sleep_cb = __helios_power_save_callback;
+	}
+#endif
+	while (true)
+	{
+		/* Clean up task if terminated */
+		ptr = __free_terminated_task(ptr);
+
+#if HELIOS_POWER_SAVE_EN
+		/* Power Save code */
+		if (sched_ctrl->cb_hooks_reg.pre_sleep_cb != HELIOS_NULL_PTR)
+		{
+			sched_ctrl->cb_hooks_reg.pre_sleep_cb();
+		}
+		if (sched_ctrl->cb_hooks_reg.sleep_cb != HELIOS_NULL_PTR)
+		{
+			sched_ctrl->cb_hooks_reg.sleep_cb();
+		}
+		if (sched_ctrl->cb_hooks_reg.post_sleep_cb != HELIOS_NULL_PTR)
+		{
+			sched_ctrl->cb_hooks_reg.post_sleep_cb();
+		}
+#endif
+		/* Yield for next available task */
+		helios_task_yield();
+	}
+}
diff --git a/src/visor/terravisor/services/kernel/helios/helios_tasks.c b/src/visor/terravisor/services/kernel/helios/helios_tasks.c
new file mode 100644
index 00000000..d06fb61a
--- /dev/null
+++ b/src/visor/terravisor/services/kernel/helios/helios_tasks.c
@@ -0,0 +1,474 @@
+/*
+ * CYANCORE LICENSE
+ * Copyrights (C) 2022, Cyancore Team
+ *
+ * File Name		: helios_tasks.c
+ * Description		: CC OS Kernel tasks related definations definations
+ * Primary Author	: Pranjal Chanda [pranjalchanda08@gmail.com]
+ * Organisation		: Cyancore Core-Team
+ */
+
+/*****************************************************
+ *	INCLUDES
+ *****************************************************/
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <arch.h>
+#include <terravisor/helios/helios.h>
+
+/*****************************************************
+ *	DEFINES
+ *****************************************************/
+#define HELIOS_PRIORITY_MAX 255
+
+/*****************************************************
+ *	INTERNAL EXTERNS FUNCTIONS
+ *****************************************************/
+extern status_t _helios_sched_insert_after(helios_sched_tcb_t **ptr, helios_sched_tcb_t *new_node, uint8_t link_type);
+extern status_t _helios_sched_insert_before(helios_sched_tcb_t **ptr, helios_sched_tcb_t *new_node, uint8_t link_type);
+extern void _helios_sched_send_to_wait(helios_sched_ctrl_t *sched_ctrl, helios_sched_tcb_t *ptr, const size_t ticks);
+extern void _helios_sched_send_to_pause(helios_sched_ctrl_t * sched_ctrl, helios_sched_tcb_t * ptr);
+extern void _helios_sched_send_to_resume(helios_sched_ctrl_t *sched_ctrl, helios_sched_tcb_t *ptr);
+extern void _helios_sched_send_back_of_task_prio(helios_sched_tcb_t *node_ptr);
+extern void _helios_pre_sched(helios_args args);
+extern void _helios_scheduler_despatch(void);
+/*****************************************************
+ *	GLOBAL EXTERNS VARIABLES
+ *****************************************************/
+extern void _helios_idle_task_fn(void);
+extern helios_sched_t g_helios_sched_list[];
+extern helios_sched_ctrl_t g_sched_ctrl;
+
+/*****************************************************
+ *	GLOBAL DECLARATIONS
+ *****************************************************/
+#if HELIOS_DYNAMIC == false
+extern helios_sched_tcb_t g_helios_tcb_list[];
+#else
+extern helios_sched_tcb_t *g_helios_tcb_list;
+#endif
+
+#if HELIOS_DYNAMIC == false
+uint8_t _helios_stack[HELIOS_IDLE_TASK_STACK_LEN];
+#else
+uint8_t *_helios_stack = HELIOS_NULL_PTR;
+#endif
+helios_task_t helios_idle_task;
+/*****************************************************
+ *	STATIC VARIABLES
+ *****************************************************/
+static uint16_t __helios_task_id_gen = false;
+/*****************************************************
+ *	STATIC FUNCTION DEFINATIONS
+ *****************************************************/
+static void __helios_init_scheduler(void)
+{
+	g_sched_ctrl.cb_hooks_reg.pre_sched = &_helios_pre_sched;
+	g_sched_ctrl.curr_task = g_sched_ctrl.ready_list_head;
+	return;
+}
+
+static uint16_t __helios_task_id_generate()
+{
+	__helios_task_id_gen++;
+	return __helios_task_id_gen;
+}
+
+static helios_sched_tcb_t * __helios_get_tcb_using_task_id(const uintptr_t task_id)
+{
+	helios_sched_tcb_t * ptr = g_sched_ctrl.ready_list_head;
+	bool _is_id_found = false;
+	while (ptr->ready_link.next != g_sched_ctrl.ready_list_head)
+	{
+		if (ptr->task_id == task_id)
+		{
+			_is_id_found = true;
+			break;
+		}
+		ptr = ptr->ready_link.next;
+	}
+	if (_is_id_found == false)
+	{
+		ptr = HELIOS_NULL_PTR;
+	}
+	return ptr;
+}
+
+static status_t __helios_set_task_flag(helios_sched_tcb_t* helios_task, helios_task_flag_t task_flag, bool en)
+{
+	HELIOS_ASSERT_IF_FALSE( helios_task != HELIOS_NULL_PTR);
+
+	if (en)
+	{
+		helios_task->task_flags |= (uint8_t)task_flag;
+	}
+	else
+	{
+		helios_task->task_flags &= (uint8_t)~task_flag;
+	}
+	return success;
+}
+
+static bool __helios_is_task_flag(const helios_sched_tcb_t *helios_task, helios_task_flag_t task_flag)
+{
+	if (helios_task != HELIOS_NULL_PTR)
+	{
+		return (helios_task->task_flags & task_flag) == false;
+	}
+
+	return false;
+}
+
+/*****************************************************
+ *	USER FUNCTION DEFINATIONS
+ *****************************************************/
+status_t helios_add_task(
+    helios_task_t *helios_task,
+    const char *name,
+    task_fn_t task_func,
+    helios_args args,
+    uint8_t priority,
+    size_t stack_len,
+#if HELIOS_DYNAMIC
+    uintptr_t stack_ptr _UNUSED
+#else
+    uintptr_t stack_ptr
+#endif /* HELIOS_DYNAMIC */
+)
+{
+	HELIOS_ASSERT_IF_FALSE(*helios_task == (uintptr_t)HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE(name != HELIOS_NULL_PTR);
+#if HELIOS_DYNAMIC == false
+	HELIOS_ASSERT_IF_FALSE(stack_ptr != (uintptr_t)HELIOS_NULL_PTR);
+#endif
+	HELIOS_ASSERT_IF_FALSE(task_func != HELIOS_NULL_PTR);
+	HELIOS_ASSERT_IF_FALSE(stack_len != false);
+	HELIOS_ASSERT_IF_FALSE(priority >= HELIOS_IDLE_TASK_PRIORITY);
+	HELIOS_ASSERT_IF_FALSE(priority < HELIOS_PRIORITY_MAX);
+
+	helios_pause_all_task();
+
+	helios_sched_tcb_t *ptr = HELIOS_NULL_PTR;
+
+#if HELIOS_DYNAMIC == false
+	/* Static Task Allocation */
+	for (size_t i = false; i < HELIOS_MAX_THREAD; i++)
+	{
+		/* Get an available node from global tcb list */
+		if (g_helios_tcb_list[i].task_status == helios_sched_task_status_exit)
+		{
+			ptr = &(g_helios_tcb_list[i]);
+			break;
+		}
+	}
+	if (ptr != g_sched_ctrl.ready_list_head)
+	{
+		ptr->stack_ptr = stack_ptr;
+#else
+	/* Dynamic Task Declaration */
+	ptr = (helios_sched_tcb_t *)helios_malloc(sizeof(helios_sched_tcb_t));
+	if (ptr != HELIOS_NULL_PTR)
+	{
+		ptr->stack_ptr = (uintptr_t)helios_malloc(stack_len);
+		if (ptr->stack_ptr == (uintptr_t)HELIOS_NULL_PTR)
+		{
+			helios_resume_all_task();
+			HELIOS_ERR("Memory Low for STACK Pointer");
+			return error_memory_low;
+		}
+#endif /* HELIOS_DYNAMIC */
+	}
+	else
+	{
+		helios_resume_all_task();
+		HELIOS_ERR("Memory Low for Task Creation");
+		return error_memory_low;
+	}
+	/* Fill tcb details */
+	ptr->name = name;
+	ptr->priority = priority;
+	ptr->task_func = task_func;
+	ptr->args_ptr = args;
+#if HELIOS_ANTI_DEADLOCK
+	ptr->task_wd_ticks = SIZE_MAX;
+#endif /* HELIOS_ANTI_DEADLOCK */
+	if (g_sched_ctrl.ready_list_head == HELIOS_NULL_PTR)
+	{
+		ptr->ready_link.next = ptr->ready_link.prev = g_sched_ctrl.ready_list_head = ptr;
+	}
+	/* Insert Tasks in assending order of its priority */
+	_helios_sched_send_back_of_task_prio(ptr);
+	ptr->task_status = helios_sched_task_status_ready;
+	ptr->task_id = __helios_task_id_generate();
+	*helios_task = ptr->task_id;
+	helios_resume_all_task();
+	return success;
+}
+
+helios_args helios_get_args(void)
+{
+	return g_sched_ctrl.curr_task->args_ptr;
+}
+
+status_t helios_del_task(helios_task_t helios_task)
+{
+	helios_sched_tcb_t * ptr = __helios_get_tcb_using_task_id(helios_task);
+
+	if (ptr == HELIOS_NULL_PTR)
+	{
+		ptr = g_sched_ctrl.curr_task;
+	}
+	HELIOS_ASSERT_IF_FALSE(ptr->task_func != &_helios_idle_task_fn);
+	/* Code to handle first node */
+	if (ptr == g_sched_ctrl.ready_list_head)
+	{
+		/* IDLE Task can not be deleted */
+		HELIOS_ERR("Trying to delete IDLE TASK");
+		return error_os_invalid_op;
+	}
+	ptr->task_status = helios_sched_task_status_exit;
+
+	if (ptr == g_sched_ctrl.curr_task)
+	{
+		helios_task_yield(); /* Yeild */
+	}
+
+	return success;
+}
+
+status_t helios_pause_task(helios_task_t helios_task)
+{
+	helios_sched_tcb_t *ptr = __helios_get_tcb_using_task_id(helios_task);
+	if (ptr == HELIOS_NULL_PTR)
+	{
+		ptr = g_sched_ctrl.curr_task;
+	}
+
+	_helios_sched_send_to_pause(&g_sched_ctrl, ptr);
+
+	return success;
+}
+
+status_t helios_pause_all_task(void)
+{
+	helios_sched_tcb_t *ptr = g_sched_ctrl.ready_list_head;
+	if(ptr != HELIOS_NULL_PTR)
+	{
+		while (true)
+		{
+			if (ptr == g_sched_ctrl.curr_task)
+			{
+				/* Do not pause the current task */
+				continue;
+			}
+
+			_helios_sched_send_to_pause(&g_sched_ctrl, ptr);
+			ptr = ptr->ready_link.next;
+
+			if(ptr == g_sched_ctrl.ready_list_head)
+			{
+				break;
+			}
+		}
+	}
+
+	return success;
+}
+
+status_t helios_resume_all_task(void)
+{
+	helios_sched_tcb_t *ptr = g_sched_ctrl.ready_list_head;
+	if (ptr != HELIOS_NULL_PTR)
+	{
+		while (true)
+		{
+			ptr = ptr->ready_link.next;
+			_helios_sched_send_to_resume(&g_sched_ctrl, ptr);
+			if (ptr == g_sched_ctrl.ready_list_head)
+			{
+				break;
+			}
+		}
+	}
+	else
+	{
+		HELIOS_ERR("No Task added");
+		return error_os_invalid_op;
+	}
+
+	return success;
+}
+
+status_t helios_resume_task(helios_task_t helios_task)
+{
+	helios_sched_tcb_t *ptr = __helios_get_tcb_using_task_id(helios_task);
+	HELIOS_ASSERT_IF_FALSE(ptr != HELIOS_NULL_PTR);
+
+	if (ptr->task_status != helios_sched_task_status_pause)
+	{
+		_helios_sched_send_to_resume(&g_sched_ctrl, ptr);
+	}
+	else
+	{
+		HELIOS_ERR("Invalid call for non-paused task");
+		return error_os_invalid_op;
+	}
+	return success;
+}
+
+status_t helios_set_sched_algo(helios_sched_algo_t sched_algo)
+{
+	HELIOS_ASSERT_IF_FALSE(sched_algo != helios_sched_algo_max);
+
+	g_sched_ctrl.selected_sched = &(g_helios_sched_list[sched_algo]);
+
+	return success;
+}
+
+status_t helios_task_anti_deadlock_enable_and_feed(size_t task_wd_ticks _UNUSED)
+{
+#if HELIOS_ANTI_DEADLOCK
+	HELIOS_ASSERT_IF_FALSE((task_wd_ticks > false) && (task_wd_ticks < SIZE_MAX));
+
+	helios_sched_tcb_t *ptr = g_sched_ctrl.curr_task;
+	if (__helios_is_task_flag(ptr, helios_task_flag_set_anti_deadlock))
+	{
+		__helios_set_task_flag(ptr, helios_task_flag_set_anti_deadlock, true);
+	}
+
+	ptr->task_wd_ticks = task_wd_ticks;
+	return success;
+#else
+	helios_sched_tcb_t *ptr = g_sched_ctrl.curr_task;
+	if (__helios_is_task_flag(ptr, helios_task_flag_set_anti_deadlock))
+	{
+		__helios_set_task_flag(ptr, helios_task_flag_set_anti_deadlock, false);
+	}
+	HELIOS_ERR("Enable HELIOS_ANTI_DEADLOCK Flag in build");
+	return error_func_inval;
+#endif /* HELIOS_ANTI_DEADLOCK */
+}
+
+status_t helios_task_anti_deadlock_disable(void)
+{
+	helios_sched_tcb_t *ptr = g_sched_ctrl.curr_task;
+
+	if (__helios_is_task_flag(ptr, helios_task_flag_set_anti_deadlock))
+	{
+		__helios_set_task_flag(ptr, helios_task_flag_set_anti_deadlock, false);
+	}
+
+#if HELIOS_ANTI_DEADLOCK
+	ptr->task_wd_ticks = SIZE_MAX;
+	return success;
+#else
+	HELIOS_ERR("Enable HELIOS_ANTI_DEADLOCK Flag in build");
+	return error_func_inval;
+#endif /* HELIOS_ANTI_DEADLOCK */
+}
+status_t helios_set_callback(const helios_sched_cb_t cb_type, const helios_cb_hook_t cb_func _UNUSED)
+{
+	status_t ret = success;
+	switch (cb_type)
+	{
+	case helios_sched_cb_power_post_sleep:
+#if HELIOS_POWER_SAVE_EN
+		g_sched_ctrl.cb_hooks_reg.post_sleep_cb = cb_func;
+		break;
+#else
+		HELIOS_ERR("Enable HELIOS_POWER_SAVE_EN Flag in build");
+		ret = error_func_inval;
+		break;
+#endif
+	case helios_sched_cb_power_pre_sleep:
+#if HELIOS_POWER_SAVE_EN
+		g_sched_ctrl.cb_hooks_reg.pre_sleep_cb = cb_func;
+		break;
+#else
+		HELIOS_ERR("Enable HELIOS_POWER_SAVE_EN Flag in build");
+		ret = error_func_inval;
+		break;
+#endif
+	case helios_sched_cb_power_sleep:
+#if HELIOS_POWER_SAVE_EN
+		g_sched_ctrl.cb_hooks_reg.power_sleep = cb_func;
+		break;
+#else
+		HELIOS_ERR("Enable HELIOS_POWER_SAVE_EN Flag in build");
+		ret = error_func_inval;
+		break;
+#endif
+	case helios_sched_cb_deadlock_notify:
+#if HELIOS_ANTI_DEADLOCK
+		g_sched_ctrl.cb_hooks_reg.deadlock_notify = cb_func;
+		break;
+#else
+		HELIOS_ERR("Enable HELIOS_ANTI_DEADLOCK Flag in build");
+		ret = error_func_inval;
+		break;
+#endif
+	case helios_sched_cb_max:
+		HELIOS_ERR("Call for invalid callback registration");
+		ret = error_func_inval;
+		break;
+	}
+	return ret;
+}
+
+const char *helios_get_curr_task_name(void)
+{
+	return g_sched_ctrl.curr_task->name;
+}
+
+const char *helios_get_task_name(helios_task_t helios_task)
+{
+	const helios_sched_tcb_t *ptr = __helios_get_tcb_using_task_id(helios_task);
+	if(ptr != HELIOS_NULL_PTR)
+	{
+		return ptr->name;
+	}
+	return HELIOS_NULL_PTR;
+}
+
+void helios_task_wait(const size_t ticks)
+{
+	helios_sched_tcb_t *ptr = g_sched_ctrl.curr_task;
+
+	if (ticks > false)
+	{
+		_helios_sched_send_to_wait(&g_sched_ctrl, ptr, ticks);
+	}
+
+	helios_task_yield();
+}
+
+void helios_task_yield()
+{
+	_helios_scheduler_despatch();
+	return;
+}
+
+ _NORETURN void helios_run(void)
+{
+	/* OS Init code */
+	/* Initialise IDLE Task */
+	helios_add_task(&helios_idle_task,
+		       HELIOS_IDLE_TASK_NAME,
+		       &_helios_idle_task_fn,
+		       (helios_args)&g_sched_ctrl,
+		       HELIOS_IDLE_TASK_PRIORITY,
+		       HELIOS_IDLE_TASK_STACK_LEN,
+		       (uintptr_t)_helios_stack);
+
+	/* Initialise scheduler */
+	__helios_init_scheduler();
+	HELIOS_DBG("Starting HELIOS");
+	helios_task_yield(); /* Yeild */
+	HELIOS_SCHED_PANIC(error_os_panic_os_start_fail);
+	while (true)
+	{
+		/* Code shall not reach here */
+		arch_wfi();
+	}
+}