From: hackbard <hackbard@sage.physik.uni-augsburg.de>
Date: Thu, 20 Sep 2007 12:57:57 +0000 (+0200)
Subject: basic interrupt functions implemented
X-Git-Url: https://hackdaworld.org/gitweb/?a=commitdiff_plain;h=26e5d8a9fcb9ff98019259619d7256a50220b8e9;p=my-code%2Farm.git

basic interrupt functions implemented
---

diff --git a/betty/interrupts.c b/betty/interrupts.c
index 5327588..a96cc2f 100644
--- a/betty/interrupts.c
+++ b/betty/interrupts.c
@@ -7,27 +7,74 @@
 
 #include "interrupts.h"
 
+/*
+ * module static interrupt variable
+ */
+
+static t_interrupt interrupt;
+
 /*
  * functions
  */
 
+void interrupt_init(void) {
+
+	memset(&interrupt,0,sizeof(t_interrupt));
+	VICSoftIntClear=0xff;
+	VICIntEnClear=0xff;
+	VICDefVectAddr=0;
+}
+
 void interrupt_set_default_callback(void *callback) {
 
 	VICDefVectAddr=(u32)callback;
-	
 }
 
+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;
+		}
+	}
 }
 
-int interrupt_enable(u8 src_number,u8 mode,u8 priority,void *callback) {
+void interrupt_soft_enable(u8 src_number) {
+	
+	VICSoftInt=(1<<src_number);
+}
+
+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(VICIntEnable&(1<<src_number))
-		return INTERRUPT_EINUSE;
+		return INTERRUPT_USED;
 
 	/* force interrupt */
 	VICIntEnable=(1<<src_number);
@@ -37,7 +84,10 @@ int interrupt_enable(u8 src_number,u8 mode,u8 priority,void *callback) {
 			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:
 	}
@@ -59,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
diff --git a/betty/interrupts.h b/betty/interrupts.h
index ab93f8f..4ddee8f 100644
--- a/betty/interrupts.h
+++ b/betty/interrupts.h
@@ -44,15 +44,13 @@
 #define INTERRUPT_EXT_POLAR_HIGH	1
 
 #define INTERRUPT_SET			0x00
-#define INTERRUPT_EINUSE		0x01
+#define INTERRUPT_USED			0x01
+#define INTERRUPT_PRIORITY_USED		0x02
 
 /* type definitions */
 
 typedef struct s_interrupt {
-	void *default_callback;
-	u8 default_mode;
-	void *callback[INTERRUPT_MAX_VIC];
-	u8 mode[INTERRUPT_MAX_VIC];
+	void (*default_soft_callback)(void);
 } t_interrupt;
 
 /* function prototypes */