From 957f429c52d54ab24e013fbde4e25c2f2a4df2b1 Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Fri, 8 Apr 2022 16:11:54 +0000 Subject: [PATCH] Mark KataOS components for special CAmkES processing. Mark each component that depends on component.kataos.c features with a "kataos" attribute. Change-Id: I7e2e3f9010a7aa717d4fe3dfc2f088cbd1a66488 GitOrigin-RevId: 2967036cf4e70edc3f96d2ead45ecfe9e42fd7fa --- apps/system/components/DebugConsole/DebugConsole.camkes | 3 +++ apps/system/components/MemoryManager/MemoryManager.camkes | 3 +++ apps/system/components/MlCoordinator/MlCoordinator.camkes | 3 +++ apps/system/components/ProcessManager/ProcessManager.camkes | 3 +++ .../components/SecurityCoordinator/SecurityCoordinator.camkes | 3 +++ apps/system/components/StorageManager/StorageManager.camkes | 3 +++ 6 files changed, 18 insertions(+) diff --git a/apps/system/components/DebugConsole/DebugConsole.camkes b/apps/system/components/DebugConsole/DebugConsole.camkes index ceeaf9d..3281f79 100644 --- a/apps/system/components/DebugConsole/DebugConsole.camkes +++ b/apps/system/components/DebugConsole/DebugConsole.camkes @@ -25,6 +25,9 @@ component DebugConsole { // TODO(b/200707300): for debugging uses StorageInterface storage; + // Enable KataOS CAmkES support. + attribute int kataos = true; + // Add a bunch of free slots for test code to use. attribute int cnode_headroom = 64; } diff --git a/apps/system/components/MemoryManager/MemoryManager.camkes b/apps/system/components/MemoryManager/MemoryManager.camkes index e161072..02e7390 100644 --- a/apps/system/components/MemoryManager/MemoryManager.camkes +++ b/apps/system/components/MemoryManager/MemoryManager.camkes @@ -8,6 +8,9 @@ component MemoryManager { uses LoggerInterface logger; + // Enable KataOS CAmkES support. + attribute int kataos = true; + // Mark the component that should receive the unallocated UntypedMemory // passed to the rootserver from the kernel. In addition to the // capabilities the component also gets a page with Bootinfo data that diff --git a/apps/system/components/MlCoordinator/MlCoordinator.camkes b/apps/system/components/MlCoordinator/MlCoordinator.camkes index fde3143..7d69508 100644 --- a/apps/system/components/MlCoordinator/MlCoordinator.camkes +++ b/apps/system/components/MlCoordinator/MlCoordinator.camkes @@ -17,4 +17,7 @@ component MlCoordinator { uses LoggerInterface logger; uses SecurityCoordinatorInterface security; + + // Enable KataOS CAmkES support. + attribute int kataos = true; } diff --git a/apps/system/components/ProcessManager/ProcessManager.camkes b/apps/system/components/ProcessManager/ProcessManager.camkes index 10ed4fb..1cbcb80 100644 --- a/apps/system/components/ProcessManager/ProcessManager.camkes +++ b/apps/system/components/ProcessManager/ProcessManager.camkes @@ -11,4 +11,7 @@ component ProcessManager { uses LoggerInterface logger; uses SecurityCoordinatorInterface security; + + // Enable KataOS CAmkES support. + attribute int kataos = true; } diff --git a/apps/system/components/SecurityCoordinator/SecurityCoordinator.camkes b/apps/system/components/SecurityCoordinator/SecurityCoordinator.camkes index d5bd882..74c2d36 100644 --- a/apps/system/components/SecurityCoordinator/SecurityCoordinator.camkes +++ b/apps/system/components/SecurityCoordinator/SecurityCoordinator.camkes @@ -7,4 +7,7 @@ component SecurityCoordinator { provides SecurityCoordinatorInterface security; uses LoggerInterface logger; + + // Enable KataOS CAmkES support. + attribute int kataos = true; } diff --git a/apps/system/components/StorageManager/StorageManager.camkes b/apps/system/components/StorageManager/StorageManager.camkes index e379e49..ce4f8e1 100644 --- a/apps/system/components/StorageManager/StorageManager.camkes +++ b/apps/system/components/StorageManager/StorageManager.camkes @@ -9,4 +9,7 @@ component StorageManager { uses LoggerInterface logger; uses SecurityCoordinatorInterface security; + + // Enable KataOS CAmkES support. + attribute int kataos = true; }