Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb346f69

Browse files
committed
Updated pgmspace.h
Based on Paul Stoffregen work on Teensy 3 (http://pjrc.com)Fix#163Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>
1 parent9f526fe commitb346f69

File tree

1 file changed

+88
-28
lines changed

1 file changed

+88
-28
lines changed

‎cores/arduino/avr/pgmspace.h‎

Lines changed: 88 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
1-
/*
2-
pgmspace.h - Definitions for compatibility with AVR pgmspace macros
3-
4-
Copyright (c) 2015 Arduino LLC
5-
6-
Based on work of Paul Stoffregen on Teensy 3 (http://pjrc.com)
7-
8-
Permission is hereby granted, free of charge, to any person obtaining a copy
9-
of this software and associated documentation files (the "Software"), to deal
10-
in the Software without restriction, including without limitation the rights
11-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12-
copies of the Software, and to permit persons to whom the Software is
13-
furnished to do so, subject to the following conditions:
14-
15-
The above copyright notice and this permission notice shall be included in
16-
all copies or substantial portions of the Software.
17-
18-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24-
THE SOFTWARE
25-
*/
1+
/* Simple compatibility headers for AVR code used with ARM chips
2+
* Copyright (c) 2015 Paul Stoffregen <paul@pjrc.com>
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy
5+
* of this software and associated documentation files (the "Software"), to deal
6+
* in the Software without restriction, including without limitation the rights
7+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
* copies of the Software, and to permit persons to whom the Software is
9+
* furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+
* THE SOFTWARE.
21+
*/
2622

2723
#ifndef__PGMSPACE_H_
2824
#define__PGMSPACE_H_ 1
@@ -44,27 +40,91 @@ typedef int16_t prog_int16_t;
4440
typedefuint16_tprog_uint16_t;
4541
typedefint32_tprog_int32_t;
4642
typedefuint32_tprog_uint32_t;
43+
typedefint64_tprog_int64_t;
44+
typedefuint64_tprog_uint64_t;
4745

46+
#definememchr_P(str,c,len) memchr((str), (c), (len))
47+
#definememcmp_P(a,b,n) memcmp((a), (b), (n))
4848
#definememcpy_P(dest,src,num) memcpy((dest), (src), (num))
49-
#definestrcpy_P(dest,src) strcpy((dest), (src))
49+
#definememmem_P(a,alen,b,blen) memmem((a), (alen), (b), (blen))
50+
#definememrchr_P(str,val,len) memrchr((str), (val), (len))
5051
#definestrcat_P(dest,src) strcat((dest), (src))
52+
#definestrchr_P(str,c) strchr((str), (c))
53+
#definestrchrnul_P(str,c) strchrnul((str), (c))
5154
#definestrcmp_P(a,b) strcmp((a), (b))
55+
#definestrcpy_P(dest,src) strcpy((dest), (src))
56+
#definestrcasecmp_P(a,b) strcasecmp((a), (b))
57+
#definestrcasestr_P(a,b) strcasestr((a), (b))
58+
#definestrlcat_P(dest,src,len) strlcat((dest), (src), (len))
59+
#definestrlcpy_P(dest,src,len) strlcpy((dest), (src), (len))
60+
#definestrlen_P(s) strlen((const char *)(s))
61+
#definestrnlen_P(str,len) strnlen((str), (len))
62+
#definestrncmp_P(a,b,n) strncmp((a), (b), (n))
63+
#definestrncasecmp_P(a,b,n) strncasecmp((a), (b), (n))
64+
#definestrncat_P(a,b,n) strncat((a), (b), (n))
65+
#definestrncpy_P(a,b,n) strncpy((a), (b), (n))
66+
#definestrpbrk_P(str,chrs) strpbrk((str), (chrs))
67+
#definestrrchr_P(str,c) strrchr((str), (c))
68+
#definestrsep_P(strp,delim) strsep((strp), (delim))
69+
#definestrspn_P(str,chrs) strspn((str), (chrs))
5270
#definestrstr_P(a,b) strstr((a), (b))
53-
#definestrlen_P(a) strlen((a))
54-
#definesprintf_P(s,f, ...) sprintf((s), (f), __VA_ARGS__)
71+
#definesprintf_P(s, ...) sprintf((s), __VA_ARGS__)
72+
#definevfprintf_P(fp,s, ...) vfprintf((fp), (s), __VA_ARGS__)
73+
#defineprintf_P(...) printf(__VA_ARGS__)
74+
#definesnprintf_P(s,n, ...) snprintf((s), (n), __VA_ARGS__)
75+
#definevsprintf_P(s, ...) vsprintf((s), __VA_ARGS__)
76+
#definevsnprintf_P(s,n, ...) vsnprintf((s), (n), __VA_ARGS__)
77+
#definefprintf_P(fp, ...) fprintf((fp), __VA_ARGS__)
78+
#definestrlen_PF(a) strlen((a))
79+
#definestrnlen_PF(src,len) strnlen((src), (len))
80+
#definememcpy_PF(dest,src,len) memcpy((dest), (src), (len))
81+
#definestrcpy_PF(dest,src) strcpy((dest), (src))
82+
#definestrncpy_PF(dest,src,len) strncpy((dest), (src), (len))
83+
#definestrcat_PF(dest,src) strcat((dest), (src))
84+
#definestrlcat_PF(dest,src,len) strlcat((dest), (src), (len))
85+
#definestrncat_PF(dest,src,len) strncat((dest), (src), (len))
86+
#definestrcmp_PF(s1,s2) strcmp((s1), (s2))
87+
#definestrncmp_PF(s1,s2,n) strncmp((s1), (s2), (n))
88+
#definestrcasecmp_PF(s1,s2) strcasecmp((s1), (s2))
89+
#definestrncasecmp_PF(s1,s2,n) strncasecmp((s1), (s2), (n))
90+
#definestrstr_PF(s1,s2) strstr((s1), (s2))
91+
#definestrlcpy_PF(dest,src,n) strlcpy((dest), (src), (n))
92+
#definememcmp_PF(s1,s2,n) memcmp((s1), (s2), (n))
93+
5594

5695
#definepgm_read_byte(addr) (*(const unsigned char *)(addr))
96+
#if0
5797
#definepgm_read_word(addr) (*(const unsigned short *)(addr))
5898
#definepgm_read_dword(addr) (*(const unsigned long *)(addr))
5999
#definepgm_read_float(addr) (*(const float *)(addr))
100+
#else
101+
#definepgm_read_word(addr) ({ \
102+
typeof(addr) _addr = (addr); \
103+
*(const unsigned short *)(_addr); \
104+
})
105+
#definepgm_read_dword(addr) ({ \
106+
typeof(addr) _addr = (addr); \
107+
*(const unsigned long *)(_addr); \
108+
})
109+
#definepgm_read_float(addr) ({ \
110+
typeof(addr) _addr = (addr); \
111+
*(const float *)(_addr); \
112+
})
113+
#definepgm_read_ptr(addr) ({ \
114+
typeof(addr) _addr = (addr); \
115+
*(void * const *)(_addr); \
116+
})
117+
#endif
60118

61119
#definepgm_read_byte_near(addr) pgm_read_byte(addr)
62120
#definepgm_read_word_near(addr) pgm_read_word(addr)
63121
#definepgm_read_dword_near(addr) pgm_read_dword(addr)
64122
#definepgm_read_float_near(addr) pgm_read_float(addr)
123+
#definepgm_read_ptr_near(addr) pgm_read_ptr(addr)
65124
#definepgm_read_byte_far(addr) pgm_read_byte(addr)
66125
#definepgm_read_word_far(addr) pgm_read_word(addr)
67126
#definepgm_read_dword_far(addr) pgm_read_dword(addr)
68127
#definepgm_read_float_far(addr) pgm_read_float(addr)
128+
#definepgm_read_ptr_far(addr) pgm_read_ptr(addr)
69129

70130
#endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp