summaryrefslogtreecommitdiff
path: root/include/memory.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/memory.h')
-rw-r--r--include/memory.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/include/memory.h b/include/memory.h
index cbed363..6ffe122 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -7,46 +7,46 @@
/**
* Initalize system memory allocator
*/
-extern void memory_init(struct memory_map *map);
+void memory_init(struct memory_map *map);
/**
* Disabled cpu interupts to not interfere with
* current memory allocations.
*/
-extern void memory_lock(void);
+void memory_lock(void);
/**
* Reenabled cpu interupts
*/
-extern void memory_unlock(void);
+void memory_unlock(void);
/**
* @returns how much memory the system has
*/
-extern uint64_t memory_total(void);
+uint64_t memory_total(void);
/**
* @returns how much memory is free
*/
-extern uint64_t memory_free(void);
+uint64_t memory_free(void);
/**
* @returns how much memory is used
*/
-extern uint64_t memory_used(void);
+uint64_t memory_used(void);
/**
* Allocates a single page in memory.
* @returns the page if allocated or NULL on failure
*/
-extern void *alloc_page(void);
+void *alloc_page(void);
/**
* Allocats count pages in memory
* @param count - the number of continious pages to allocate
* @returns the pages if allocated or NULL on failure
*/
-extern void *alloc_pages(int count);
+void *alloc_pages(int count);
/**
* Frees a signle page in memory.
@@ -54,7 +54,7 @@ extern void *alloc_pages(int count);
* Freeing in the middle of a block is allowed.
* @param page - the pointer to the page
*/
-extern void free_page(void *page);
+void free_page(void *page);
// TODO: implement free_page
/**
@@ -64,7 +64,7 @@ extern void free_page(void *page);
* free_pages will from *page to end of block allocated.
* @param page - the pointer to the page
*/
-extern void free_pages(void *page);
+void free_pages(void *page);
// TODO: implement freeing in middle of block
/**
@@ -76,21 +76,21 @@ extern void free_pages(void *page);
* @param writable - if this memory should be writable
* @param user - if this memory should be user writable
*/
-extern void *mmap(void *addr, size_t len);
+void *mmap(void *addr, size_t len);
/**
* Unmaps mapped address from the mmap function
* @param addr - the address returned from mmap
* @param len - the length allocated
*/
-extern void unmap(void *addr);
+void unmap(void *addr);
/**
* Allocates size_t bytes in memory
* @param size - the amount of bytes to allocate
* @retruns the address allocated or NULL on failure
*/
-extern void *kalloc(size_t size);
+void *kalloc(size_t size);
/**
* Reallocates a given allocated ptr to a new size of bytes in memory.
@@ -99,10 +99,10 @@ extern void *kalloc(size_t size);
* @param size - the amount of bytes to set the pointer to
* @returns the address allocated or NULL on failure
*/
-extern void *krealloc(void *ptr, size_t size);
+void *krealloc(void *ptr, size_t size);
/**
* Frees a allocated pointer in memory
* @param ptr - the pointer to free
*/
-extern void kfree(void *ptr);
+void kfree(void *ptr);