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

diff --git a/betty/interrupts.c b/betty/interrupts.c
index 41945cf..bb2344c 100644
--- a/betty/interrupts.c
+++ b/betty/interrupts.c
@@ -7,35 +7,87 @@
 
 #include "interrupts.h"
 
+/*
+ * module static interrupt variable
+ */
+
+static t_interrupt interrupt;
+
 /*
  * functions
  */
 
-void interrupt_set_default_callback(void *callback) {
+void interrupt_init(void) {
 
-	VICDefVectAddr=(u32)callback;
-	
+	memset(&interrupt,0,sizeof(t_interrupt));
+	VICSoftIntClear=0xff;
+	VICIntEnClear=0xff;
+	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) {
+
+	VICSoftIntClear=(1<<src_number);
+}
 void interrupt_clear(u8 src_number) {
 
+	int cnt;
+	u32 *addr;
+	u32 *cntl;
+
+	VICIntEnClear=(1<<src_number);
+	VICIntSelect&=~(1<<src_number);
+
+	addr=&VICVectAddr0;
+	cntl=&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=&VICVectAddr0;
+	cntl=&VICVectCntl0;
 
 	/* check whether this ir source is allready assigned */
-	if(VICSoftInt&(1<<src_number))
-		return INTERRUPT_EINUSE;
-	
+	if(VICIntEnable&(1<<src_number))
+		return INTERRUPT_USED;
+
 	/* force interrupt */
-	VICSoftInt|=(1<<src_number);
-	VICIntEnable|=(1<<src_number);
+	VICIntEnable=(1<<src_number);
 
 	switch(mode) {
 		case INTERRUPT_FIQ:
 			VICIntSelect|=(1<<src_number);
 			break;
 		case INTERRUPT_VIRQ:
+			if(addr[p]&0x3f)
+				return INTERRUP_PRIORITY_USED;
+			*((volatile u32 *)(addr+p))=callback_addr;
+			*((volatile u32 *)(cntl+p))=src_number&0x1f+(1<<5);
 		case INTERRUPT_IRQ:
 		case default:
 	}
@@ -57,6 +109,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