Mirrors/os-tutorial
1
0
Fork 0
mirror of https://github.com/cfenollosa/os-tutorial.git synced 2025-12-17 20:34:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lesson 23, step 4, size_t usage

Browse Source
This commit is contained in:
Carlos
2015-08-18 10:38:09 +02:00
parent de3d442569
commit 6f09492f2b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
23-fixes/libc/mem.c
View File

@@ -18,7 +18,7 @@ void memory_set(uint8_t *dest, uint8_t val, uint32_t len) {
uint32_t free_mem_addr = 0x10000;
/* Implementation is just a pointer to some free memory which
* keeps growing */
uint32_t kmalloc(uint32_t size, int align, uint32_t *phys_addr) {
uint32_t kmalloc(size_t size, int align, uint32_t *phys_addr) {
/* Pages are aligned to 4K, or 0x1000 */
if (align == 1 && (free_mem_addr & 0xFFFFF000)) {
free_mem_addr &= 0xFFFFF000;

3
23-fixes/libc/mem.h
View File

@@ -2,11 +2,12 @@
#define MEM_H
#include <stdint.h>
#include <stddef.h>
void memory_copy(uint8_t *source, uint8_t *dest, int nbytes);
void memory_set(uint8_t *dest, uint8_t val, uint32_t len);
/* At this stage there is no 'free' implemented. */
uint32_t kmalloc(uint32_t size, int align, uint32_t *phys_addr);
uint32_t kmalloc(size_t size, int align, uint32_t *phys_addr);
#endif