From 7d563f8ad28bc1e312c6a216e267f222f05be30f Mon Sep 17 00:00:00 2001 From: elfein727 Date: Sat, 1 Jan 2022 19:12:39 -0800 Subject: [PATCH] merge again because my dumb butt forgot to fix conflicts --- ableos/src/wasm/wasm_sys.rs | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/ableos/src/wasm/wasm_sys.rs b/ableos/src/wasm/wasm_sys.rs index b243af27c..ff9b77628 100644 --- a/ableos/src/wasm/wasm_sys.rs +++ b/ableos/src/wasm/wasm_sys.rs @@ -29,22 +29,6 @@ macro_rules! syscall_enum { }; } syscall_enum! { -<<<<<<< HEAD - KILL=0, // Provide a PID - CONSOLE_RESET=1, // Reset the console - CONSOLE_IN=2, // Console Input - CONSOLE_OUT=3, // Console output - CONSOLE_GET_TITLE=4, // Get the console title - CONSOLE_SET_TITLE=5, // Set the console title - GET_PID=6, // Get the proccess ID - PROCESS_INFO=7, // Get information about the process - //scheduler Related Syscals - GET_PRIORITY=8, // Get scheduler priority - SET_PRIORITY=9, // Set scheduler priority - // - GET_HOSTNAME=10, - SET_HOSTNAME=11, -======= KILL=0, // Provide a PID CONSOLE_RESET=1, // Reset the console CONSOLE_IN=2, // Console Input @@ -57,7 +41,6 @@ syscall_enum! { // GET_HOSTNAME=10, SET_HOSTNAME=11, ->>>>>>> fb851e78c5767d5c0d7f80175d5061fd0746813e NEW_THREAD=12,