Re: SPI lpc2xxx patch

[Jonathan Larmour <jifl@eCosCentric.com>]

[-- Attachment #1: Type: text/plain, Size: 803 bytes --]

Sergei Gavrikov wrote:
> 
> Now compiling is okay. But, there is a mixture of {BUS,SPI}._INTPRIO in
> CDL file:
> 
> requires      { is_active(CYGNUM_IO_SPI_ARM_LPC2XXX_SPI1_INTPRIO)
> 	     implies (CYGNUM_IO_SPI_ARM_LPC2XXX_SPI0_INTPRIO !=
> 	     CYGNUM_IO_SPI_ARM_LPC2XXX_SPI1_INTPRIO)
> }
> 
> It seems for me the below must be applied for CDL too
> 
> s/SPI0_INTPRIO/BUS0_INTPRIO/
> s/SPI1_INTPRIO/BUS1_INTPRIO/
> 
> or may be I misunderstand something. Thanks.

Nope, I'm a thickie. Fixed with the attached patch.

Jifl
-- 
eCosCentric Limited      http://www.eCosCentric.com/     The eCos experts
Barnwell House, Barnwell Drive, Cambridge, UK.       Tel: +44 1223 245571
Registered in England and Wales: Reg No 4422071.
------["The best things in life aren't things."]------      Opinions==mine

[-- Attachment #2: lpc2xxx.spi.silly.mistake.fix.patch --]
[-- Type: text/x-patch, Size: 2870 bytes --]

Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/spi/arm/lpc2xxx/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ChangeLog
--- ChangeLog	17 Feb 2009 00:51:30 -0000	1.4
+++ ChangeLog	18 Feb 2009 17:18:14 -0000
@@ -1,5 +1,10 @@
+2009-02-18  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* cdl/spi_lpc2xxx.cdl: Fix my mistake in below change and make
+	CDL requires match option names.
+
 2009-02-17  Jonathan Larmour  <jifl@eCosCentric.com>
 2009-01-27  Sergei Gavrikov  <sergei.gavrikov@gmail.com>
 
 	* cdl/spi_lpc2xxx.cdl: Ensure the SPI interrupts are using different
 	priorities: CYGNUM_IO_SPI_ARM_LPC2XXX_SPI{0,1}_INTPRIO entered.
Index: cdl/spi_lpc2xxx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/spi/arm/lpc2xxx/current/cdl/spi_lpc2xxx.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 spi_lpc2xxx.cdl
--- cdl/spi_lpc2xxx.cdl	17 Feb 2009 00:52:58 -0000	1.4
+++ cdl/spi_lpc2xxx.cdl	18 Feb 2009 17:18:14 -0000
@@ -6,11 +6,11 @@
 #
 # ====================================================================
 ## ####ECOSGPLCOPYRIGHTBEGIN####                                            
 ## -------------------------------------------                              
 ## This file is part of eCos, the Embedded Configurable Operating System.   
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002 ,2009 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     
 ## Software Foundation; either version 2 or (at your option) any later      
 ## version.                                                                 
@@ -68,13 +68,13 @@ cdl_package CYGPKG_DEVS_SPI_ARM_LPC2XXX 
         cdl_option CYGNUM_IO_SPI_ARM_LPC2XXX_BUS0_INTPRIO {
             display       "Interrupt priority of the SPI bus 0 ISR"
             flavor        data
             legal_values  0 to 15
             default_value 12
-            requires      { is_active(CYGNUM_IO_SPI_ARM_LPC2XXX_SPI1_INTPRIO)
-                             implies (CYGNUM_IO_SPI_ARM_LPC2XXX_SPI0_INTPRIO !=
-                             CYGNUM_IO_SPI_ARM_LPC2XXX_SPI1_INTPRIO)
+            requires      { is_active(CYGNUM_IO_SPI_ARM_LPC2XXX_BUS1_INTPRIO)
+                             implies (CYGNUM_IO_SPI_ARM_LPC2XXX_BUS0_INTPRIO !=
+                             CYGNUM_IO_SPI_ARM_LPC2XXX_BUS1_INTPRIO)
             }
             description "
                 This option specifies the interrupt priority of the ISR of
                 the SPI bus 0 interrupt in the VIC. Slot 0 has the highest
                 priority and slot 15 the lowest."