[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[avr-libc-commit] [2165] Fix various SVN properties on these files:
From: |
Joerg Wunsch |
Subject: |
[avr-libc-commit] [2165] Fix various SVN properties on these files: |
Date: |
Sun, 13 Jun 2010 13:13:06 +0000 |
Revision: 2165
http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2165
Author: joerg_wunsch
Date: 2010-06-13 13:13:06 +0000 (Sun, 13 Jun 2010)
Log Message:
-----------
Fix various SVN properties on these files:
. some older files still had svn:executable set (from their CVS migration
where they incorrectly went with an x bit)
. the recently added files lacked all peroperties (svn:mime-type,
svn:keywords, svn:eol-style)
Modified Paths:
--------------
trunk/avr-libc/libc/pmstring/strcat_PF.S
Property Changed:
----------------
trunk/avr-libc/libc/pmstring/memcmp_PF.S
trunk/avr-libc/libc/pmstring/memcpy_PF.S
trunk/avr-libc/libc/pmstring/strcasecmp_PF.S
trunk/avr-libc/libc/pmstring/strcat_PF.S
trunk/avr-libc/libc/pmstring/strcmp_PF.S
trunk/avr-libc/libc/pmstring/strcpy_PF.S
trunk/avr-libc/libc/pmstring/strlcat_P.S
trunk/avr-libc/libc/pmstring/strlcat_PF.S
trunk/avr-libc/libc/pmstring/strlcpy_P.S
trunk/avr-libc/libc/pmstring/strlcpy_PF.S
trunk/avr-libc/libc/pmstring/strlen_PF.S
trunk/avr-libc/libc/pmstring/strncasecmp_PF.S
trunk/avr-libc/libc/pmstring/strncat_P.S
trunk/avr-libc/libc/pmstring/strncat_PF.S
trunk/avr-libc/libc/pmstring/strncmp_PF.S
trunk/avr-libc/libc/pmstring/strncpy_PF.S
trunk/avr-libc/libc/pmstring/strnlen_PF.S
trunk/avr-libc/libc/pmstring/strstr_P.S
trunk/avr-libc/libc/pmstring/strstr_PF.S
Property changes on: trunk/avr-libc/libc/pmstring/memcmp_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/memcpy_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strcasecmp_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Modified: trunk/avr-libc/libc/pmstring/strcat_PF.S
===================================================================
--- trunk/avr-libc/libc/pmstring/strcat_PF.S 2010-06-13 12:34:24 UTC (rev
2164)
+++ trunk/avr-libc/libc/pmstring/strcat_PF.S 2010-06-13 13:13:06 UTC (rev
2165)
@@ -1,94 +1,94 @@
-/* Copyright (c) 2006, Carlos Lamas
-
- based on libc/pmstring/strcat_P.S which is
- Copyright (c) 2002, Reiner Patommel
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- * Neither the name of the copyright holders nor the names of
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE. */
-
-
-/* $Id: strcat_PF.S,v 1.0 2006/01/04 12:00:00 ??????? Exp $ */
-
-#include "macros.inc"
-
-#define dest_b1 r25
-#define dest_b0 r24
-#define src_b3 r23
-#define src_b2 r22
-#define src_b1 r21
-#define src_b0 r20
-
-/** \ingroup avr_pgmspace
- \fn char *strcat_PF (char *dst, uint_farptr_t src)
- \brief Concatenates two strings
-
- The strcat_PF() function is similar to strcat() except that the \e src
- string must be located in program space (flash) and is addressed using
- a far pointer
-
- \param dst A pointer to the destination string in SRAM
- \param src A far pointer to the string to be appended in Flash
-
- \returns The strcat_PF() function returns a pointer to the resulting
- string \e dst. The contents of RAMPZ SFR are undefined when the function
- returns */
-
-#if !defined(__DOXYGEN__)
-
- .text
- .global _U(strcat_PF)
- .type _U(strcat_PF), @function
-
-_U(strcat_PF):
-
- X_movw ZL, src_b0
- LPM_R0_ZPLUS_INIT src_b2
- X_movw XL, dest_b0
-
-.L_strcat_PF_skip:
-
- ld __tmp_reg__, X+
- tst __tmp_reg__
- brne .L_strcat_PF_skip
- sbiw XL, 1 ; undo post-increment
-
-.L_strcat_PF_loop:
-
- LPM_R0_ZPLUS_NEXT src_b2
- st X+, r0
- tst r0
- brne .L_strcat_PF_loop
-
-; return dest (unchanged)
-
- ret
-
-.L_strcat_PF_end:
-
- .size _U(strcat_PF), .L_strcat_PF_end - _U(strcat_PF)
-
-#endif /* not __DOXYGEN__ */
+/* Copyright (c) 2006, Carlos Lamas
+
+ based on libc/pmstring/strcat_P.S which is
+ Copyright (c) 2002, Reiner Patommel
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of the copyright holders nor the names of
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE. */
+
+
+/* $Id$ */
+
+#include "macros.inc"
+
+#define dest_b1 r25
+#define dest_b0 r24
+#define src_b3 r23
+#define src_b2 r22
+#define src_b1 r21
+#define src_b0 r20
+
+/** \ingroup avr_pgmspace
+ \fn char *strcat_PF (char *dst, uint_farptr_t src)
+ \brief Concatenates two strings
+
+ The strcat_PF() function is similar to strcat() except that the \e src
+ string must be located in program space (flash) and is addressed using
+ a far pointer
+
+ \param dst A pointer to the destination string in SRAM
+ \param src A far pointer to the string to be appended in Flash
+
+ \returns The strcat_PF() function returns a pointer to the resulting
+ string \e dst. The contents of RAMPZ SFR are undefined when the function
+ returns */
+
+#if !defined(__DOXYGEN__)
+
+ .text
+ .global _U(strcat_PF)
+ .type _U(strcat_PF), @function
+
+_U(strcat_PF):
+
+ X_movw ZL, src_b0
+ LPM_R0_ZPLUS_INIT src_b2
+ X_movw XL, dest_b0
+
+.L_strcat_PF_skip:
+
+ ld __tmp_reg__, X+
+ tst __tmp_reg__
+ brne .L_strcat_PF_skip
+ sbiw XL, 1 ; undo post-increment
+
+.L_strcat_PF_loop:
+
+ LPM_R0_ZPLUS_NEXT src_b2
+ st X+, r0
+ tst r0
+ brne .L_strcat_PF_loop
+
+; return dest (unchanged)
+
+ ret
+
+.L_strcat_PF_end:
+
+ .size _U(strcat_PF), .L_strcat_PF_end - _U(strcat_PF)
+
+#endif /* not __DOXYGEN__ */
Property changes on: trunk/avr-libc/libc/pmstring/strcat_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strcmp_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strcpy_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strlcat_P.S
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/avr-libc/libc/pmstring/strlcat_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strlcpy_P.S
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/avr-libc/libc/pmstring/strlcpy_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strlen_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strncasecmp_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strncat_P.S
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/avr-libc/libc/pmstring/strncat_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strncmp_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strncpy_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strnlen_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
Property changes on: trunk/avr-libc/libc/pmstring/strstr_P.S
___________________________________________________________________
Deleted: svn:executable
- *
Property changes on: trunk/avr-libc/libc/pmstring/strstr_PF.S
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Id Date
Added: svn:eol-style
+ native
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [avr-libc-commit] [2165] Fix various SVN properties on these files:,
Joerg Wunsch <=