Interrupts: use optional argument for interrupts

Author: alvieboy

hardware/zpuino/zpu20/cores/zpuino/interrupt.h

@@ -5,12 +5,17 @@
 
 static __attribute__((always_inline)) inline void sei()
 {
-	INTRCTL=1;
+    INTRCTL=1;
 }
 
 static __attribute__((always_inline)) inline void cli()
 {
-	INTRCTL=0;
-
+    INTRCTL=0;
 }
+
+extern void attachInterrupt(unsigned int, void (*)(void), int mode=0);
+extern void detachInterrupt(unsigned int);
+extern int attachInterrupt(unsigned int line, void (*function)(void*), void *arg);
+
+
 #endif

hardware/zpuino/zpu20/cores/zpuino/zpuino.cpp

@@ -5,31 +5,40 @@
 
 #define ZPUINO_MAX_INTERRUPTS 16
 
-typedef void(*interrupt_type_t)(void);
+struct interrupt_type_t {
+    void(*func)(void*);
+    void*arg;
+};
 
 static interrupt_type_t itable[ZPUINO_MAX_INTERRUPTS]={0};
 
+int attachInterrupt(unsigned int line, void (*function)(void*), void *arg)
+{
+    if (line>=ZPUINO_MAX_INTERRUPTS)
+        return -1;
+    // cli();
+    itable[line].func = function;
+    itable[line].arg = arg;
+    // sei();
+    return 0;
+}
+
 void attachInterrupt(unsigned int line, void (*function)(void), int mode)
 {
-	if (line>=ZPUINO_MAX_INTERRUPTS)
-		return;
-	// cli();
-	itable[line] = function;
-	// sei();
+    attachInterrupt(line, (void(*)(void*))function, NULL);
 }
+
 void detachInterrupt(unsigned int line)
 {
-	// cli();
-	if (line>=ZPUINO_MAX_INTERRUPTS)
-		return;
-	itable[line] = 0;
-	// sei();
+    if (line>=ZPUINO_MAX_INTERRUPTS)
+        return;
+    itable[line].func = 0;
 }
 
 void _zpu_interrupt(unsigned int line)
 {
-	if (line>=ZPUINO_MAX_INTERRUPTS)
-		return;
-	if (itable[line])
-		itable[line]();
+    if (line>=ZPUINO_MAX_INTERRUPTS)
+        return;
+    if (itable[line].func)
+        itable[line].func(itable[line].arg);
 }

hardware/zpuino/zpu20/cores/zpuino/zpuino.h

@@ -10,9 +10,6 @@
 #define _BV(x) (1<<(x))
 #endif
 
-extern void attachInterrupt(unsigned int, void (*)(void), int mode=0);
-extern void detachInterrupt(unsigned int);
-
 typedef volatile unsigned int* register_t;
 
 extern void itoa(int value, char *dest, int base);