X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Farm.git;a=blobdiff_plain;f=betty%2Finterrupts.c;h=db2061dd433f66c0a378bfe4c76e4672b9f081d7;hp=41945cf30b417bf12ea2f43de0e7c7001bcc8bcb;hb=945d83a31473b984473f571bb92486991d14aa16;hpb=d01b3bb1e7565638e2275e6081dcb106c1fcdb41

diff --git a/betty/interrupts.c b/betty/interrupts.c
index 41945cf..db2061d 100644
--- a/betty/interrupts.c
+++ b/betty/interrupts.c
@@ -6,43 +6,108 @@
  */
 
 #include "interrupts.h"
+#include "functions.h"
+
+// 'module global' interrupt variable
+static t_interrupt interrupt;
 
 /*
  * functions
  */
 
-void interrupt_set_default_callback(void *callback) {
+void interrupt_init(void) {
 
-	VICDefVectAddr=(u32)callback;
-	
+	interrupt.default_soft_callback=0;
+	VICSoftIntClr=0xffffffff;
+	VICIntEnClr=0xffffffff;
+	VICDefVectAddr=0;
+}
+
+void interrupt_set_default_callback(u32 callback_addr) {
+
+	VICDefVectAddr=callback_addr;
+}
+
+void interrupt_set_soft_callback(void (*callback)(void)) {
+
+	interrupt.default_soft_callback=callback;
 }
 
+void interrupt_soft_clear(u8 src_number) {
+
+	VICSoftIntClr=(1<<src_number);
+}
 void interrupt_clear(u8 src_number) {
 
+	int cnt;
+	u32 *addr;
+	u32 *cntl;
+
+	VICIntEnClr=(1<<src_number);
+	VICIntSelect&=~(1<<src_number);
+
+	addr=(u32 *)&VICVectAddr0;
+	cntl=(u32 *)&VICVectCntl0;
+
+	for(cnt=0;cnt<INTERRUPT_MAX_VIC;cnt++) {
+		if((cntl[cnt]&0x1f)==src_number) {
+			*((volatile u32 *)(addr+cnt))=0;
+			*((volatile u32 *)(cntl+cnt))=0;
+		}
+	}
+}
+
+void interrupt_soft_enable(u8 src_number) {
+	
+	VICSoftInt=(1<<src_number);
 }
 
-int interrupt_set(u8 src_number,u8 mode,u8 priority,void *callback) {
+int interrupt_enable(u8 src_number,u8 mode,u8 priority,u32 callback_addr) {
+
+	u32 *addr;
+	u32 *cntl;
+
+	addr=(u32 *)&VICVectAddr0;
+	cntl=(u32 *)&VICVectCntl0;
 
 	/* check whether this ir source is allready assigned */
-	if(VICSoftInt&(1<<src_number))
-		return INTERRUPT_EINUSE;
-	
-	/* force interrupt */
-	VICSoftInt|=(1<<src_number);
-	VICIntEnable|=(1<<src_number);
+	if(VICIntEnable&(1<<src_number))
+		return INTERRUPT_USED;
 
+	/* prepare depending on mode */
 	switch(mode) {
-		case INTERRUPT_FIQ:
+		case INTERRUPT_MODE_FIQ:
 			VICIntSelect|=(1<<src_number);
 			break;
-		case INTERRUPT_VIRQ:
-		case INTERRUPT_IRQ:
-		case default:
+		case INTERRUPT_MODE_VIRQ:
+			if(addr[priority]&0x3f)
+				return INTERRUPT_PRIORITY_USED;
+			*((volatile u32 *)(addr+priority))=callback_addr;
+			*((volatile u32 *)(cntl+priority))=(src_number&0x1f)+0x20;
+		case INTERRUPT_MODE_IRQ:
+		default:
+			break;
 	}
 
+	/* force interrupt */
+	VICIntEnable=(1<<src_number);
+
 	return INTERRUPT_SET;
 }
 
+void interrupt_ext_ir_config(u8 eint,u8 wakeup,u8 mode,u8 polarity) {
+
+	if(eint>3)
+		return;
+
+	if(wakeup)
+		EXTWAKE=(EXTWAKE&0xf)|(1<<eint);
+
+	EXTMODE=(EXTMODE&0xf)|(mode<<eint);
+	EXTPOLAR=(EXTPOLAR&0xf)|(polarity<<eint);
+	EXTINT=(EXTINT&0xf)|(1<<eint);
+}
+
 /*
  * the actual exception handlers (as defined in startup.s)
  */
@@ -57,6 +122,9 @@ void interrupt_handler_undef_instruction(void) {
 
 // software interrupt
 void interrupt_handler_soft_ir(void) {
+	
+	if(interrupt.default_soft_callback)
+		interrupt.default_soft_callback();
 }
 
 // prefetch abort