proto: separate mos_rpc.proto

moodyhunter · Jan 1, 2024 · d4aa4c0 · d4aa4c0
1 parent 1664177
commit d4aa4c0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -104,7 +104,7 @@ target_compile_definitions(mos_kernel PRIVATE MOS_KERNEL_VERSION="${CMAKE_PROJEC
 # nanopb
 include(nanopb)
 add_subdirectory(libs/nanopb/nanopb)
-generate_nanopb_proto(FILESYSTEM_PROTO_SRCS FILESYSTEM_PROTO_HEADERS proto/filesystem.proto)
+generate_nanopb_proto(FILESYSTEM_PROTO_SRCS FILESYSTEM_PROTO_HEADERS proto/mos_rpc.proto proto/filesystem.proto)
 target_sources(mos_kernel PRIVATE ${FILESYSTEM_PROTO_SRCS} ${FILESYSTEM_PROTO_HEADERS})
 
 # Libraries

diff --git a/proto/filesystem.proto b/proto/filesystem.proto
@@ -1,16 +1,11 @@
 syntax = "proto3";
 import "nanopb.proto";
+import "mos_rpc.proto";
 
 option (nanopb_fileopt).fallback_type = FT_POINTER;
 option (nanopb_fileopt).enum_to_string = true;
 option (nanopb_fileopt).proto3_singular_msgs = true;
 
-message mos_rpc_result
-{
-    bool success = 1;
-    optional string error = 2;
-}
-
 enum pb_file_type_t
 {
     FILE_TYPE_REGULAR = 0;
@@ -67,7 +62,7 @@ message mos_rpc_fs_register_request
 
 message mos_rpc_fs_register_response
 {
-    mos_rpc_result result = 1;
+    mos_rpc.result result = 1;
 }
 
 message mos_rpc_fs_mount_request
@@ -79,7 +74,7 @@ message mos_rpc_fs_mount_request
 
 message mos_rpc_fs_mount_response
 {
-    mos_rpc_result result = 1;
+    mos_rpc.result result = 1;
     pb_inode root_i = 2; // the root inode of the mounted root
 }
 
@@ -97,7 +92,7 @@ message mos_rpc_fs_readdir_request
 
 message mos_rpc_fs_readdir_response
 {
-    mos_rpc_result result = 1;
+    mos_rpc.result result = 1;
     repeated pb_dirent entries = 2;
 }
 
@@ -109,7 +104,7 @@ message mos_rpc_fs_lookup_request
 
 message mos_rpc_fs_lookup_response
 {
-    mos_rpc_result result = 1;
+    mos_rpc.result result = 1;
     pb_inode inode = 2; // the inode of the file
 }
 
@@ -120,7 +115,7 @@ message mos_rpc_fs_readlink_request
 
 message mos_rpc_fs_readlink_response
 {
-    mos_rpc_result result = 1;
+    mos_rpc.result result = 1;
     string target = 2; // the target of the symlink
 }
 
@@ -132,7 +127,7 @@ message mos_rpc_fs_getpage_request
 
 message mos_rpc_fs_getpage_response
 {
-    mos_rpc_result result = 1;
+    mos_rpc.result result = 1;
 
     // the data of the page, this is currently a raw byte array, which costs a lot of memory
     // we could use a page manager to reference a page and only pass a page uuid here

diff --git a/proto/mos_rpc.proto b/proto/mos_rpc.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+import "nanopb.proto";
+
+package mos_rpc;
+
+option (nanopb_fileopt).fallback_type = FT_POINTER;
+option (nanopb_fileopt).enum_to_string = true;
+option (nanopb_fileopt).proto3_singular_msgs = true;
+
+message result
+{
+    bool success = 1;
+    optional string error = 2;
+}