Mercurial > nand-ecoscentric

changeset 3110:da8fe69d2ffd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* include/var_intr.h: Fix I2C interrupt definitions issue reported by Pavel Glinskii. Also fix CYGNUM_HAL_INTERRUPT_NVIC_MAX from Ilija Kocho.
author jld
date Fri, 13 May 2011 07:04:38 +0000
parents eb7e5d3caa29
children 46eea1e1d1b0
files packages/hal/cortexm/lpc17xx/var/current/ChangeLog packages/hal/cortexm/lpc17xx/var/current/include/var_intr.h
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/cortexm/lpc17xx/var/current/ChangeLog
+++ b/packages/hal/cortexm/lpc17xx/var/current/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-13  John Dallaway  <john@dallaway.org.uk>
+
+	* include/var_intr.h: Fix I2C interrupt definitions issue reported
+	by Pavel Glinskii. Also fix CYGNUM_HAL_INTERRUPT_NVIC_MAX from Ilija
+	Kocho.
+
 2011-03-14  John Dallaway  <john@dallaway.org.uk>
 
 	* cdl/hal_cortexm_lpc17xx.cdl: Do not implement the
--- a/packages/hal/cortexm/lpc17xx/var/current/include/var_intr.h
+++ b/packages/hal/cortexm/lpc17xx/var/current/include/var_intr.h
@@ -10,7 +10,7 @@
 // ####ECOSGPLCOPYRIGHTBEGIN####                                            
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 2010 Free Software Foundation, Inc.                        
+// Copyright (C) 2010, 2011 Free Software Foundation, Inc.                        
 //
 // eCos is free software; you can redistribute it and/or modify it under    
 // the terms of the GNU General Public License as published by the Free     
@@ -69,9 +69,9 @@
 #define CYGNUM_HAL_INTERRUPT_UART2   (7+CYGNUM_HAL_INTERRUPT_EXTERNAL)
 #define CYGNUM_HAL_INTERRUPT_UART3   (8+CYGNUM_HAL_INTERRUPT_EXTERNAL)
 #define CYGNUM_HAL_INTERRUPT_PWM1    (9+CYGNUM_HAL_INTERRUPT_EXTERNAL)
-#define CYGNUM_HAL_INTERRUPT_I2C0    (9+CYGNUM_HAL_INTERRUPT_EXTERNAL)
-#define CYGNUM_HAL_INTERRUPT_I2C1    (10+CYGNUM_HAL_INTERRUPT_EXTERNAL)
-#define CYGNUM_HAL_INTERRUPT_I2C2    (11+CYGNUM_HAL_INTERRUPT_EXTERNAL)
+#define CYGNUM_HAL_INTERRUPT_I2C0    (10+CYGNUM_HAL_INTERRUPT_EXTERNAL)
+#define CYGNUM_HAL_INTERRUPT_I2C1    (11+CYGNUM_HAL_INTERRUPT_EXTERNAL)
+#define CYGNUM_HAL_INTERRUPT_I2C2    (12+CYGNUM_HAL_INTERRUPT_EXTERNAL)
 
 #define CYGNUM_HAL_INTERRUPT_SPI     (13+CYGNUM_HAL_INTERRUPT_EXTERNAL)
 #define CYGNUM_HAL_INTERRUPT_SSP0    (14+CYGNUM_HAL_INTERRUPT_EXTERNAL)
@@ -98,7 +98,7 @@
 #define CYGNUM_HAL_INTERRUPT_USBAI   (33+CYGNUM_HAL_INTERRUPT_EXTERNAL)
 #define CYGNUM_HAL_INTERRUPT_CANWAKE (34+CYGNUM_HAL_INTERRUPT_EXTERNAL)
 
-#define CYGNUM_HAL_INTERRUPT_NVIC_MAX (CYGNUM_HAL_INTERRUPT_CANWAKE+CYGNUM_HAL_INTERRUPT_EXTERNAL)
+#define CYGNUM_HAL_INTERRUPT_NVIC_MAX (CYGNUM_HAL_INTERRUPT_CANWAKE)
 
 #define CYGNUM_HAL_ISR_MIN            0
 #define CYGNUM_HAL_ISR_MAX            CYGNUM_HAL_INTERRUPT_CANWAKE