Re: ecos/packages/hal/arm/at91/at91sam7s/current

[Jürgen Lambrecht <J dot Lambrecht at televic dot com>]

Andrew Lunn wrote:
> > I created the 2 patches in the same directories as where the files are.
> >     
>
> Thanks. Nornally patches are made from the packages directory and all
> in one file. If you have an anoncvs checkout all you need to do is
> cvs diff -u > mypatch.diff.
>   
thanks; it works on cygwin; see attach
>   
> >  #define AT91_SPI_RPR  0x100 // Receive Pointer Register
> >  #define AT91_SPI_RCR  0x104 // Receive Counter Register
> >  #define AT91_SPI_TPR  0x108 // Transmit Pointer Register
> >  #define AT91_SPI_TCR  0x10C // Transmit Counter Register
> >  #define AT91_SPI_NRPR 0x110 // Next Receive Pointer Register
> >  #define AT91_SPI_NRCR 0x114 // Next Receive Counter Register
> >  #define AT91_SPI_NTPR 0x118 // Next Transmit Pointer Register
> > -#define AT91_SPI_NTCR 0x11C // Next Trsnsmit Counter Register
> > +#define AT91_SPI_NTCR 0x11C // Next Transmit Counter Register
> >     
I just fixed a typo in the comment: "Transmit" instead of "Trsnsmit"
> >  #define AT91_SPI_PTCR 0x120 // PDC Transfer Control Register
> >  #define AT91_SPI_PTSR 0x124 // PDC Transfer Status Register
> >     
>
> Can you explain this bit? It looks like you are on a M$ system. Has
>   
indeed; i have dual boot, but then i need to do some effort to install 
the ecos tools, the xilinx tools, ..
> your text editor corrupted the line ending? Please use the same line
>   
I use XEmacs; my cygwin is installed I think with the unix line endings 
option.
I checked the at91sam7s files in my cvs, and they have DOS line endings 
(0xD, 0xA) (e.g. hal_platform_setup.h).
OK, I just discovered that WinCVS has this checkout option: "Checkout 
text files with teh Unix LF (0xa)".
(and as M$ using company the option is not checked)
So after deleting hal_platform_setup.h and checking it again out, I 
indeed only have Unix line endings.
> endings as the file already has. I also prefer that new files use unix
> line endings. Any decent text editor should be able to handle this...
>   
I did the easiest: I typed this in cygwin terminal: 'dos2unix 
mypatch.diff', and I attached it. I hope it is OK.
>      Andrew
>   
Kind regards,
Jürgen

? mypatch.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/at91/at91sam7s/current/ChangeLog,v
retrieving revision 1.15
diff -u -r1.15 ChangeLog
--- ChangeLog	11 May 2008 12:57:43 -0000	1.15
+++ ChangeLog	14 Aug 2008 07:32:46 -0000
@@ -1,3 +1,8 @@
+2008-08-14  Jürgen Lambrecht <J.Lambrecht@televic.com>
+
+	* include/plf_io.h: removed AT91_SPI_MR_MODFDIS, AT91_WSTC
+	(AT91_WDTC), AT91_AIC because already in var_io.h. Fixed typo.
+
 2008-05-11  James G. Smith <jsmith@rallysmith.co.uk
             Andrew Lunn  <andrew@lunn.ch>
 
Index: include/plf_io.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/arm/at91/at91sam7s/current/include/plf_io.h,v
retrieving revision 1.7
diff -u -r1.7 plf_io.h
--- include/plf_io.h	5 Mar 2007 19:09:02 -0000	1.7
+++ include/plf_io.h	14 Aug 2008 07:33:04 -0000
@@ -62,9 +62,6 @@
 
 #define AT91_SPI AT91_SPI0
 
-//Extra SPI control bits
-#define AT91_SPI_MR_MODFDIS (1<<4)
-
 // DMA registers 
 #define AT91_SPI_RPR  0x100 // Receive Pointer Register
 #define AT91_SPI_RCR  0x104 // Receive Counter Register
@@ -73,7 +70,7 @@
 #define AT91_SPI_NRPR 0x110 // Next Receive Pointer Register
 #define AT91_SPI_NRCR 0x114 // Next Receive Counter Register
 #define AT91_SPI_NTPR 0x118 // Next Transmit Pointer Register
-#define AT91_SPI_NTCR 0x11C // Next Trsnsmit Counter Register
+#define AT91_SPI_NTCR 0x11C // Next Transmit Counter Register
 #define AT91_SPI_PTCR 0x120 // PDC Transfer Control Register
 #define AT91_SPI_PTSR 0x124 // PDC Transfer Status Register
 
@@ -83,8 +80,6 @@
 #define AT91_PIOB   0xFFFFF600
 #endif
 
-#define AT91_WSTC   0xFFFFFD40
-
 // USART
 
 #define AT91_USART0 0xFFFC0000
@@ -110,7 +105,7 @@
 #define AT91_US_NRPR 0x110 // Next Receive Pointer Register
 #define AT91_US_NRCR 0x114 // Next Receive Counter Register
 #define AT91_US_NTPR 0x118 // Next Transmit Pointer Register 
-#define AT91_US_NTCR 0x11C // Next Trsnsmit Counter Register
+#define AT91_US_NTCR 0x11C // Next Transmit Counter Register
 #define AT91_US_PTCR 0x120 // PDC Transfer Control Register
 #define AT91_US_PTSR 0x124 // PDC Transfer Status Register
 
@@ -118,10 +113,6 @@
 
 #define AT91_PIO    AT91_PIOA
 
-// AIC - Advanced Interrupt Controller
-
-#define AT91_AIC    0xFFFFF000
-
 // TC - Timer Counter
 
 #define AT91_TC     0xFFFA0000