ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

K64F - d14 and d15 swapped

pull/245/head
0xc0170 2014-04-02 20:19:27 +02:00
parent 03b3a4e895
commit 9cc0f2513a
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/PinNames.h
View File

@ -224,11 +224,11 @@ typedef enum {
D11 = PTD2, D11 = PTD2,
D12 = PTD3, D12 = PTD3,
D13 = PTD1, D13 = PTD1,
D14 = PTE24, D14 = PTE25,
D15 = PTE25, D15 = PTE24,
I2C_SCL = D14, I2C_SCL = D15,
I2C_SDA = D15, I2C_SDA = D14,
A0 = PTB2, A0 = PTB2,
A1 = PTB3, A1 = PTB3,

20
libraries/rtos/rtx/RTX_CM_lib.h
View File

@ -15,19 +15,19 @@
* - Redistributions in binary form must reproduce the above copyright * - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* - Neither the name of ARM nor the names of its contributors may be used * - Neither the name of ARM nor the names of its contributors may be used
* to endorse or promote products derived from this software without * to endorse or promote products derived from this software without
* specific prior written permission. * specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS AND CONTRIBUTORS BE * ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS AND CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * 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 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
@ -214,7 +214,7 @@ osThreadDef_t os_thread_def_main = {(os_pthread)main, osPriorityNormal, 0, NULL}
#elif defined(TARGET_LPC812) #elif defined(TARGET_LPC812)
#define INITIAL_SP (0x10001000UL) #define INITIAL_SP (0x10001000UL)
#elif TARGET_KL25Z || TARGET_K64F #elif defined(TARGET_KL25Z) || defined(TARGET_K64F)
#define INITIAL_SP (0x20003000UL) #define INITIAL_SP (0x20003000UL)
#elif defined(TARGET_KL46Z) #elif defined(TARGET_KL46Z)
@ -336,7 +336,7 @@ __attribute ((noreturn)) void __cs3_start_c (void){
if (src != dst) if (src != dst)
for (count = 0; count != limit; count += sizeof (long long)) for (count = 0; count != limit; count += sizeof (long long))
*dst++ = *src++; *dst++ = *src++;
else else
dst = (long long *)((char *)dst + limit); dst = (long long *)((char *)dst + limit);
limit = rptr->zero_size; limit = rptr->zero_size;
for (count = 0; count != limit; count += sizeof (long long)) for (count = 0; count != limit; count += sizeof (long long))