diff options
| author | Franklin Wei <frankhwei536@gmail.com> | 2015-02-28 20:50:46 -0500 |
|---|---|---|
| committer | Franklin Wei <frankhwei536@gmail.com> | 2015-02-28 20:50:46 -0500 |
| commit | 8304827d1232761764d5e2dfde07fa29b6973c35 (patch) | |
| tree | 9320c0694fc70cfdaba737c9557cb006431cc7d0 | |
| parent | c8345286f72ecef202c4268883ff3fce8c5b8b7c (diff) | |
| download | kappa-8304827d1232761764d5e2dfde07fa29b6973c35.zip kappa-8304827d1232761764d5e2dfde07fa29b6973c35.tar.gz kappa-8304827d1232761764d5e2dfde07fa29b6973c35.tar.bz2 kappa-8304827d1232761764d5e2dfde07fa29b6973c35.tar.xz | |
fix warnings
| -rw-r--r-- | drivers/ps2kbd.c | 1 | ||||
| -rw-r--r-- | kernel/heap.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ps2kbd.c b/drivers/ps2kbd.c index 40b06ac..27faaf4 100644 --- a/drivers/ps2kbd.c +++ b/drivers/ps2kbd.c @@ -134,6 +134,7 @@ static void handle_special_key(uint8_t scancode, int release) static void handle_extended_scancode(void) { uint8_t temp = inb(0x60); + (void) temp; //printf("Extended scancode: 0x%x\n", temp); } diff --git a/kernel/heap.c b/kernel/heap.c index d1f1021..947d0db 100644 --- a/kernel/heap.c +++ b/kernel/heap.c @@ -6,8 +6,8 @@ /* a simple pointer-arithmetic-based malloc */ /* a symbol put there by the linker */ -extern uint32_t link_mem_end; -uint32_t kmalloc_addr = &link_mem_end; +extern char link_mem_end; +uint32_t kmalloc_addr = (uint32_t)&link_mem_end; static void *kmalloc_int(size_t sz, int align, void **phys) { |