diff options
author | Benji Dial <benji6283@gmail.com> | 2020-09-06 15:47:06 -0400 |
---|---|---|
committer | Benji Dial <benji6283@gmail.com> | 2020-09-06 15:47:06 -0400 |
commit | b8284137d4e0eec11c78bc14047243fce6a51373 (patch) | |
tree | 5969602dc3d090b536edccbf34d33d46a300c192 /src/user/include | |
parent | 73bb0e48640b842824a0b45fe4854df8ff7faf7b (diff) | |
download | portland-os-b8284137d4e0eec11c78bc14047243fce6a51373.tar.gz |
minor changes, redoing makefile, meminfo program
Diffstat (limited to 'src/user/include')
-rw-r--r-- | src/user/include/knob/format.h | 1 | ||||
-rw-r--r-- | src/user/include/pland/syscall.h | 27 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/user/include/knob/format.h b/src/user/include/knob/format.h index 16d3d83..6c4aa5d 100644 --- a/src/user/include/knob/format.h +++ b/src/user/include/knob/format.h @@ -5,5 +5,6 @@ #include <stdint.h> bool try_sntoi(const char *s, uint32_t n, uint32_t *out); +void itosz(uint32_t i, char *out); #endif
\ No newline at end of file diff --git a/src/user/include/pland/syscall.h b/src/user/include/pland/syscall.h index 5858d16..298fc51 100644 --- a/src/user/include/pland/syscall.h +++ b/src/user/include/pland/syscall.h @@ -7,6 +7,8 @@ typedef uint32_t _file_handle_t; typedef uint32_t _task_handle_t; typedef uint32_t _drive_number_t; +typedef uint32_t _pages_t; + typedef enum { _KEY_BACKSPACE = '\b', _KEY_RETURN = '\n', @@ -40,7 +42,8 @@ enum _scn { _SCN_START_TASK, _SCN_LOG_STRING, _SCN_GET_KEY, - _SCN_ALLOCATE_RAM + _SCN_ALLOCATE_RAM, + _SCN_MEMORY_INFO }; static inline uint32_t _sc0(enum _scn eax) { @@ -133,8 +136,28 @@ static inline _key_code_t _get_key() { return _sc0(_SCN_GET_KEY); } -static inline void *_allocate_ram(uint32_t pages) { +static inline void *_allocate_ram(_pages_t pages) { return (void *)_sc1(_SCN_ALLOCATE_RAM, pages); } +static inline _pages_t _kernel_dynamic_area_size() { + return _sc1(_SCN_MEMORY_INFO, 0x0); +} + +static inline _pages_t _kernel_dynamic_area_left() { + return _sc1(_SCN_MEMORY_INFO, 0x1); +} + +static inline _pages_t _total_userspace_size() { + return _sc1(_SCN_MEMORY_INFO, 0x2); +} + +static inline _pages_t _total_userspace_left() { + return _sc1(_SCN_MEMORY_INFO, 0x3); +} + +static inline _pages_t _this_process_memory_left() { + return _sc1(_SCN_MEMORY_INFO, 0x4); +} + #endif
\ No newline at end of file |