Mercurial > ecos

changeset 2856:83eb6becc0ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/pxa2x0_misc.c (hal_interrupt_configure): Use GFER0/GRER0 for GPIO2-GPIO31. Patch from Alfonso Sanchez. [ Bugzilla 1000681 ]
author jld
date Tue, 24 Mar 2009 16:25:15 +0000
parents 83b696d928ed
children 7faaf738e2d0
files packages/hal/arm/xscale/pxa2x0/current/ChangeLog packages/hal/arm/xscale/pxa2x0/current/src/pxa2x0_misc.c
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/arm/xscale/pxa2x0/current/ChangeLog
+++ b/packages/hal/arm/xscale/pxa2x0/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-24  John Dallaway  <john@dallaway.org.uk>
+
+	* src/pxa2x0_misc.c (hal_interrupt_configure): Use GFER0/GRER0 for
+	GPIO2-GPIO31. Patch from Alfonso Sanchez. [ Bugzilla 1000681 ]
+
 2005-12-06  David Vrabel  <dvrabel@arcom.com>
 
 	* cdl/hal_arm_xscale_pxa2x0.cdl: New
--- a/packages/hal/arm/xscale/pxa2x0/current/src/pxa2x0_misc.c
+++ b/packages/hal/arm/xscale/pxa2x0/current/src/pxa2x0_misc.c
@@ -385,13 +385,13 @@ void hal_interrupt_configure(int vector,
             *PXA2X0_GRER1 &= ~(1 << (vector - CYGNUM_HAL_INTERNAL_IRQS - 32));
     } else if (vector >= CYGNUM_HAL_INTERRUPT_GPIO(2)) {
         if (falling)
-            *PXA2X0_GFER1 |=  (1 << (vector - CYGNUM_HAL_INTERNAL_IRQS));
+            *PXA2X0_GFER0 |=  (1 << (vector - CYGNUM_HAL_INTERNAL_IRQS));
         else
-            *PXA2X0_GFER1 &= ~(1 << (vector - CYGNUM_HAL_INTERNAL_IRQS));
+            *PXA2X0_GFER0 &= ~(1 << (vector - CYGNUM_HAL_INTERNAL_IRQS));
         if (rising)
-            *PXA2X0_GRER1 |=  (1 << (vector - CYGNUM_HAL_INTERNAL_IRQS));
+            *PXA2X0_GRER0 |=  (1 << (vector - CYGNUM_HAL_INTERNAL_IRQS));
         else
-            *PXA2X0_GRER1 &= ~(1 << (vector - CYGNUM_HAL_INTERNAL_IRQS));
+            *PXA2X0_GRER0 &= ~(1 << (vector - CYGNUM_HAL_INTERNAL_IRQS));
     } else if (vector == CYGNUM_HAL_INTERRUPT_GPIO0 || vector == CYGNUM_HAL_INTERRUPT_GPIO1) {
         if (falling)
             *PXA2X0_GFER0 |=  (1 << (vector - 8));