AbleOS/ableos
2
2
Fork 13
Code Issues Pull requests 1 Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
elfein727 2022-01-01 19:08:42 -08:00
parent 8680e6f470 e95e0a8bc6
commit f6b3168f3b
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ableos/src/wasm/wasm_sys.rs
View file

@ -29,6 +29,7 @@ macro_rules! syscall_enum {
}; };
} }
syscall_enum! { syscall_enum! {
<<<<<<< HEAD
KILL=0, // Provide a PID KILL=0, // Provide a PID
CONSOLE_RESET=1, // Reset the console CONSOLE_RESET=1, // Reset the console
CONSOLE_IN=2, // Console Input CONSOLE_IN=2, // Console Input
@ -43,6 +44,20 @@ syscall_enum! {
// //
GET_HOSTNAME=10, GET_HOSTNAME=10,
SET_HOSTNAME=11, SET_HOSTNAME=11,
=======
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
CONSOLE_GET_BAR=6,
CONSOLE_SET_BAR=7,
//
GET_HOSTNAME=10,
SET_HOSTNAME=11,
>>>>>>> fb851e78c5767d5c0d7f80175d5061fd0746813e
NEW_THREAD=12, NEW_THREAD=12,
@ -85,7 +100,11 @@ syscall_enum! {
SOCKET_RECEIVE=43, SOCKET_RECEIVE=43,
GET_PID=44, // Get the proccess ID
PROCESS_INFO=45, // Get information about the process
//scheduler Related Syscals
GET_PRIORITY=46, // Get scheduler priority
SET_PRIORITY=47, // Set scheduler priority
EXIT=50, EXIT=50,
EMPTY=0xFFFF, EMPTY=0xFFFF,