aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/globals.h3
-rw-r--r--include/util/lock.h2
-rw-r--r--include/util/mutex.h5
3 files changed, 8 insertions, 2 deletions
diff --git a/include/globals.h b/include/globals.h
index 7bda83c..249ffe7 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,6 +1,7 @@
#ifndef GLOBALS_H
#define GLOBALS_H
#include <sys/schedule.h>
+#include <util/mutex.h>
#ifndef GLOBALS_C
extern unsigned long irqlr;
@@ -16,6 +17,8 @@ extern struct Thread usrloopthread;
extern unsigned int gwidth, gheight, gpitch, gisrgb;
extern unsigned char thread_table[MAX_THREADS];
extern struct Thread threads[MAX_THREADS];
+extern unsigned long mutex_table[MAX_MUTEXS];
+extern struct Mutex mutexs[MAX_MUTEXS];
#endif
#endif
diff --git a/include/util/lock.h b/include/util/lock.h
index c5b2f7e..da18f81 100644
--- a/include/util/lock.h
+++ b/include/util/lock.h
@@ -1,8 +1,6 @@
#ifndef UTIL_LOCK_H
#define UTIL_LOCK_H
-#include <util/mutex.h>
-
struct Lock {
unsigned long pid;
} __attribute__((packed, aligned(4)));
diff --git a/include/util/mutex.h b/include/util/mutex.h
index ab318b4..c0dd17b 100644
--- a/include/util/mutex.h
+++ b/include/util/mutex.h
@@ -8,6 +8,8 @@
#define CORE3_PID 4
#define FIRST_AVAIL_PID CORE3_PID+1
+#define MAX_MUTEXS 0x100
+
// PID field is first so that it can be treated
// as a lock
struct Mutex {
@@ -15,4 +17,7 @@ struct Mutex {
void* addr;
} __attribute__((packed, aligned(4)));
+struct Mutex* create_mutex(void* addr);
+unsigned char delete_mutex(struct Mutex* m);
+
#endif