FreeCalypso > hg > freecalypso-sw

diff nuc-fw/bsp/inth.h @ 109:91460c8957f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nuc-fw/bsp: beginning of reconciliation with the Leonardo semi-src version
author Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date Sat, 19 Oct 2013 18:59:34 +0000
parents 45911ad957fd
children
line wrap: on
line diff
--- a/nuc-fw/bsp/inth.h	Fri Sep 13 17:00:09 2013 +0000
+++ b/nuc-fw/bsp/inth.h	Sat Oct 19 18:59:34 2013 +0000
@@ -16,9 +16,9 @@
 
    Author         	: pmonteil@tif.ti.com  Patrice Monteil.
 
-   Version number	: 1.10
+   Version number   : 1.17
 
-   Date and time	: 01/30/01 10:22:23
+   Date             : 09/02/03
 
    Previous delta 	: 01/22/01 10:32:33
 
@@ -32,9 +32,11 @@
 #include "../include/config.h"
 #include "../include/sys_types.h"
 
+#if (CHIPSET != 12)
+
 /* Adress of the registers */
 
-#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9)|| (CHIPSET == 10) || (CHIPSET == 11) || (CHIPSET == 12))
+#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9)|| (CHIPSET == 10) || (CHIPSET == 11))
   #define INTH_IT_REG1    MEM_INTH_ADDR 		  /* INTH IT register 1 */
   #define INTH_IT_REG2    (MEM_INTH_ADDR + 0x02)  /* INTH IT register 2 */
   #define INTH_MASK_REG1  (MEM_INTH_ADDR + 0x08)  /* INTH mask register 1 */
@@ -65,7 +67,7 @@
 /* Bit definition of INTH interrupt level registers */
 
 #define INTH_FIQ_NIRQ	0x0001
-#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11) || (CHIPSET == 12))
+#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11))
   #define INTH_PRIORITY	  0x007c
   #define INTH_EDGE_NLVL  0x0002
 #else
@@ -76,7 +78,7 @@
 
 /* Bit definition of INTH source binary registers */
 
-#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11) || (CHIPSET == 12))
+#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11))
   #define INTH_SRC_NUM	0x001f
 #else
   #define INTH_SRC_NUM	0x000f
@@ -109,7 +111,7 @@
 /* Return     :	none						*/
 /* Functionality : Unmask one it				*/
 /*--------------------------------------------------------------*/
-#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11) || (CHIPSET == 12))
+#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11))
   #define INTH_ENABLEONEIT(it)( \
     (it < 16) ? (* (volatile unsigned short *) INTH_MASK_REG1 &= ~(1 << it)) : \
                 (* (volatile unsigned short *) INTH_MASK_REG2 &= ~(1 << (it-16))) \
@@ -125,7 +127,7 @@
 /* Return     :	none						*/
 /* Functionality : mask one it					*/
 /*--------------------------------------------------------------*/
-#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11) || (CHIPSET == 12))
+#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11))
   #define INTH_DISABLEONEIT(it)( \
     (it < 16) ? (* (volatile unsigned short *) INTH_MASK_REG1 |= (1 << it)) : \
                 (* (volatile unsigned short *) INTH_MASK_REG2 |= (1 << (it-16))) \
@@ -142,7 +144,7 @@
 /* Functionality : Enable all it				*/
 /*--------------------------------------------------------------*/
 
-#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11) || (CHIPSET == 12))
+#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11))
   #define INTH_ENABLEALLIT { \
     * (volatile unsigned short *) INTH_MASK_REG1 = 0x0000; \
     * (volatile unsigned short *) INTH_MASK_REG2 = 0x0000; \
@@ -174,15 +176,11 @@
   * (volatile unsigned short *) INTH_MASK_REG1 = 0xffff; \
   * (volatile unsigned short *) INTH_MASK_REG2 = 0xffff; \
   }
-#elif (CHIPSET == 12)
-  #define INTH_DISABLEALLIT { \
-  * (volatile unsigned short *) INTH_MASK_REG1 = 0xffff; \
-  * (volatile unsigned short *) INTH_MASK_REG2 = 0xffff; \
-  }
 #else
   #define INTH_DISABLEALLIT (* (volatile unsigned short *) INTH_MASK_REG = 0xffff)
 #endif
 
+
 /*--------------------------------------------------------------*/
 /*  INTH_CLEAR()						*/
 /*--------------------------------------------------------------*/
@@ -191,6 +189,7 @@
 /* Functionality :valid next it					*/
 /*--------------------------------------------------------------*/
 
+
 #define INTH_CLEAR (* (volatile SYS_UWORD16 *) INTH_CTRL_REG = 0x0003)
 
 
@@ -204,12 +203,12 @@
 
 #define INTH_VALIDNEXT (intARM)( * (volatile SYS_UWORD16 *) INTH_CTRL_REG |= (1 << intARM))
 
-#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11) || (CHIPSET == 12))
+#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11))
   /*--------------------------------------------------------------*/
   /*  INTH_RESETALLIT()                                           */
   /*--------------------------------------------------------------*/
-  /* Parameters : None                                            */
-  /* Return     :	none                                          */
+  /* Parameters :  None                                            */
+  /* Return     :  None                                           */
   /* Functionality :Reset the inth it register                    */
   /*--------------------------------------------------------------*/
 
@@ -219,9 +218,26 @@
   }  
 #endif
 
+
+#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11))
+  /*-------------------------------------------------------------*/
+  /*   INTH_RESETONEIT()                                         */
+  /*-------------------------------------------------------------*/
+  /* Parameters : Num of the IT to reset                         */
+  /* Return     : None                                           */
+  /* Functionality : Reset one IT of the inth IT register        */
+  /*-------------------------------------------------------------*/    
+  #define INTH_RESETONEIT(it) ( \
+    (it<16) ? (* (volatile unsigned short *) INTH_IT_REG1 &= ~(1 << it)) : \
+              (* (volatile unsigned short *) INTH_IT_REG2 &= ~(1 << (it-16))) \
+			       )
+#else  // CHIPSET == 2,3
+  #define INTH_RESETONEIT(it) (* (volatile unsigned short *) INTH_IT_REG &= ~(1 << it))
+#endif // CHIPSET
+
 /* Prototypes */
 
-#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11) || (CHIPSET == 12))
+#if ((CHIPSET == 4) || (CHIPSET == 5) || (CHIPSET == 6) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 9) || (CHIPSET == 10) || (CHIPSET == 11))
   unsigned long INTH_GetPending (void);
   unsigned long INTH_ResetIT (void);
 #else
@@ -231,3 +247,7 @@
 
 unsigned short INTH_Ack (int);
 void INTH_InitLevel (int, int, int, int);
+
+
+#endif /* endif chipset != 12 */
+