diff options
| -rw-r--r-- | src/tests/test.c | 4 | ||||
| -rw-r--r-- | src/util/mutex.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/tests/test.c b/src/tests/test.c index 2cd830e..d57e1fa 100644 --- a/src/tests/test.c +++ b/src/tests/test.c @@ -252,8 +252,8 @@ void dtest1(void) { draw_cletter(x++, y+2, ' ', 0xFF0000); draw_cletter(x++, y+2, 'S', 0xFF0000); - dead1 = create_mutex(0xDEADBEEF); - dead2 = create_mutex(0x12345678); + dead1 = create_mutex((void*)0xDEADBEEF); + dead2 = create_mutex((void*)0x12345678); draw_cletter(x++, y+2, 'L', 0xFF0000); lock_mutex(dead2); draw_cletter(x++, y+2, 'A', 0xFF0000); diff --git a/src/util/mutex.c b/src/util/mutex.c index 0a47a35..a60cea6 100644 --- a/src/util/mutex.c +++ b/src/util/mutex.c @@ -1,4 +1,5 @@ #include <cpu.h> +#include <drivers/uart.h> #include <util/mutex.h> #include <util/lock.h> #include <globals.h> @@ -59,11 +60,11 @@ void uart_mutexes(void) while (entry->entry_type == VALUE_ENTRY) { struct Mutex* m = entry->value; - uart_hex(m); + uart_hex((unsigned long)m); uart_char(' '); uart_hex(m->pid); uart_char(' '); - uart_hexn(m->addr); + uart_hexn((unsigned long)m->addr); entry = entry->next; } } |