We now have call tables for ressources.

instead of adding calls to ressource in the constructor.

3 files changed, 35 insertions, 57 deletions

diff --git a/Source/Kernel/SyscallManager/Res.ns.cpp b/Source/Kernel/SyscallManager/Res.ns.cpp
index 1779a00..7902f2d 100644
--- a/Source/Kernel/SyscallManager/Res.ns.cpp
+++ b/Source/Kernel/SyscallManager/Res.ns.cpp
@@ -43,9 +43,9 @@ void unregisterRes(u32int id) {
 
 u32int call(u32int ressource, u8int wat, u32int a, u32int b, u32int c, u32int d, u32int e) {
 	if (ressource == 0xFFFFFE) {	//TODO : return ressource id for some stuff for current process
-		if (a == VT_IFACE_OBJTYPE) return Task::currProcess()->getVirtualTerminal()->resId();
-		if (a == PR_IFACE_OBJTYPE) return Task::currProcess()->resId();
-		if (a == TH_IFACE_OBJTYPE) return Task::currThread()->resId();
+		if (a == VTIF_OBJTYPE) return Task::currProcess()->getVirtualTerminal()->resId();
+		if (a == PRIF_OBJTYPE) return Task::currProcess()->resId();
+		if (a == THIF_OBJTYPE) return Task::currThread()->resId();
 		return 0;
 	} else {
 		if (ressource > size or ressources[ressource] == 0) {
diff --git a/Source/Kernel/SyscallManager/Ressource.class.cpp b/Source/Kernel/SyscallManager/Ressource.class.cpp
index 4e62d79..f2aaccb 100644
--- a/Source/Kernel/SyscallManager/Ressource.class.cpp
+++ b/Source/Kernel/SyscallManager/Ressource.class.cpp
@@ -1,64 +1,40 @@
 #include "Ressource.class.h"
 #include <SyscallManager/Res.ns.h>
 
-Ressource::Ressource(u8int type) {
+Ressource::Ressource(u8int type, call_t* callTable) {
 	m_id = Res::registerRes(this);
 	m_type = type;
-	m_calls = 0;
+	m_callTables = 0;
 
-	addCall0(0, (call0)&Ressource::resType);
+	addCallTable(callTable);
 }
 
 Ressource::~Ressource() {
 	Res::unregisterRes(m_id);
-	delete m_calls;
+	delete m_callTables;
 }
 
-void Ressource::addCall0(u8int id, call0 c) {
-	call_t e = {0, id, {c}};
-	m_calls = m_calls->cons(e);
-}
-
-void Ressource::addCall1(u8int id, call1 c) {
-	call_t e = {1, id, {0}};
-	e.c1 = c;
-	m_calls = m_calls->cons(e);
-}
-
-void Ressource::addCall2(u8int id, call2 c) {
-	call_t e = {2, id, {0}};
-	e.c2 = c;
-	m_calls = m_calls->cons(e);
-}
-
-void Ressource::addCall3(u8int id, call3 c) {
-	call_t e = {3, id, {0}};
-	e.c3 = c;
-	m_calls = m_calls->cons(e);
-}
-
-void Ressource::addCall4(u8int id, call4 c) {
-	call_t e = {4, id, {0}};
-	e.c4 = c;
-	m_calls = m_calls->cons(e);
-}
-
-void Ressource::addCall5(u8int id, call5 c) {
-	call_t e = {5, id, {0}};
-	e.c5 = c;
-	m_calls = m_calls->cons(e);
+void Ressource::addCallTable(call_t* callTable) {
+	if (callTable != 0) m_callTables = m_callTables->cons(callTable);
 }
 
 u32int Ressource::doCall(u8int id, u32int a, u32int b, u32int c, u32int d, u32int e) {
-	for (SimpleList<call_t> *iter = m_calls; iter != 0; iter = iter->next()) {
-		call_t &ce = iter->v();
-		if (ce.id == id) {
-			if (ce.params == 0) return (this->*(ce.c0))();
-			if (ce.params == 1) return (this->*(ce.c1))(a);
-			if (ce.params == 2) return (this->*(ce.c2))(a, b);
-			if (ce.params == 3) return (this->*(ce.c3))(a, b, c);
-			if (ce.params == 4) return (this->*(ce.c4))(a, b, c, d);
-			if (ce.params == 5) return (this->*(ce.c5))(a, b, c, d, e);
+	if (id == 0) return m_type;
+
+	for (SimpleList<call_t*> *iter = m_callTables; iter != 0; iter = iter->next()) {
+		call_t* ct = iter->v();
+		u32int i = 0;
+		while (ct[i].id != 0) {
+			call_t &ce = ct[i];
+			if (ce.id == id) {
+				if (ce.params == 0) return (this->*(ce.c0))();
+				if (ce.params == 1) return (this->*(ce.c1))(a);
+				if (ce.params == 2) return (this->*(ce.c2))(a, b);
+				if (ce.params == 3) return (this->*(ce.c3))(a, b, c);
+				if (ce.params == 4) return (this->*(ce.c4))(a, b, c, d);
+				if (ce.params == 5) return (this->*(ce.c5))(a, b, c, d, e);
+			}
+			i++;
 		}
 	}
 	return (u32int) - 1;
diff --git a/Source/Kernel/SyscallManager/Ressource.class.h b/Source/Kernel/SyscallManager/Ressource.class.h
index 5f4e6bf..f58276b 100644
--- a/Source/Kernel/SyscallManager/Ressource.class.h
+++ b/Source/Kernel/SyscallManager/Ressource.class.h
@@ -12,6 +12,13 @@ typedef u32int (Ressource::*call3)(u32int, u32int, u32int);
 typedef u32int (Ressource::*call4)(u32int, u32int, u32int, u32int);
 typedef u32int (Ressource::*call5)(u32int, u32int, u32int, u32int, u32int);
 
+#define CALL0(id, ptr) {0, id, {(call0)ptr}}
+#define CALL1(id, ptr) {1, id, {c1: (call1)ptr}}
+#define CALL2(id, ptr) {2, id, {c2: (call2)ptr}}
+#define CALL3(id, ptr) {3, id, {c3: (call3)ptr}}
+#define CALL4(id, ptr) {4, id, {c4: (call4)ptr}}
+#define CALL5(id, ptr) {5, id, {c5: (call5)ptr}}
+
 struct call_t {
 	u8int params;
 	u8int id;
@@ -32,18 +39,13 @@ class Ressource {
 	
 	u32int m_id;
 	u32int m_type;
-	SimpleList<call_t> *m_calls;
+	SimpleList<call_t*> *m_callTables;
 
 	protected:
-	Ressource(u8int type);
+	Ressource(u8int type, call_t* callTable = 0);
 	~Ressource();
 
-	void addCall0(u8int id, call0 c);
-	void addCall1(u8int id, call1 c);
-	void addCall2(u8int id, call2 c);
-	void addCall3(u8int id, call3 c);
-	void addCall4(u8int id, call4 c);
-	void addCall5(u8int id, call5 c);
+	void addCallTable(call_t* callTable);
 
 	public:
 	u32int doCall(u8int id, u32int a, u32int b, u32int c, u32int d, u32int e);