Skip to content

Commit 9cc0f25

Browse files
committed
K64F - d14 and d15 swapped
1 parent 03b3a4e commit 9cc0f25

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/PinNames.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,11 @@ typedef enum {
224224
D11 = PTD2,
225225
D12 = PTD3,
226226
D13 = PTD1,
227-
D14 = PTE24,
228-
D15 = PTE25,
227+
D14 = PTE25,
228+
D15 = PTE24,
229229

230-
I2C_SCL = D14,
231-
I2C_SDA = D15,
230+
I2C_SCL = D15,
231+
I2C_SDA = D14,
232232

233233
A0 = PTB2,
234234
A1 = PTB3,

libraries/rtos/rtx/RTX_CM_lib.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
* - Redistributions in binary form must reproduce the above copyright
1616
* notice, this list of conditions and the following disclaimer in the
1717
* documentation and/or other materials provided with the distribution.
18-
* - Neither the name of ARM nor the names of its contributors may be used
19-
* to endorse or promote products derived from this software without
18+
* - Neither the name of ARM nor the names of its contributors may be used
19+
* to endorse or promote products derived from this software without
2020
* specific prior written permission.
2121
*
22-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
23-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
23+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2424
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
2525
* ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS AND CONTRIBUTORS BE
2626
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
27-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
28-
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
29-
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
30-
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
28+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
29+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
30+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
3131
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3232
* POSSIBILITY OF SUCH DAMAGE.
3333
*---------------------------------------------------------------------------*/
@@ -214,7 +214,7 @@ osThreadDef_t os_thread_def_main = {(os_pthread)main, osPriorityNormal, 0, NULL}
214214
#elif defined(TARGET_LPC812)
215215
#define INITIAL_SP (0x10001000UL)
216216

217-
#elif TARGET_KL25Z || TARGET_K64F
217+
#elif defined(TARGET_KL25Z) || defined(TARGET_K64F)
218218
#define INITIAL_SP (0x20003000UL)
219219

220220
#elif defined(TARGET_KL46Z)
@@ -336,7 +336,7 @@ __attribute ((noreturn)) void __cs3_start_c (void){
336336
if (src != dst)
337337
for (count = 0; count != limit; count += sizeof (long long))
338338
*dst++ = *src++;
339-
else
339+
else
340340
dst = (long long *)((char *)dst + limit);
341341
limit = rptr->zero_size;
342342
for (count = 0; count != limit; count += sizeof (long long))

0 commit comments

Comments
 (0)