Skip to content

Commit 805af00

Browse files
authored
Merge pull request #3194 from NXPmicro/Update_K64_SDK_Drivers
Update K64 sdk drivers
2 parents baec7b3 + 1c2a7d8 commit 805af00

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+6007
-3580
lines changed

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,8 @@ static void update_read_buffer(uint8_t *buf)
8686
/* Increases the buffer descriptor to the next one. */
8787
if (g_handle.rxBdCurrent->control & ENET_BUFFDESCRIPTOR_RX_WRAP_MASK) {
8888
g_handle.rxBdCurrent = g_handle.rxBdBase;
89-
g_handle.rxBdDirty = g_handle.rxBdBase;
9089
} else {
9190
g_handle.rxBdCurrent++;
92-
g_handle.rxBdDirty++;
9391
}
9492

9593
/* Actives the receive buffer descriptor. */

targets/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_MCU_K64F/device/MK64F12.h

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
** ###################################################################
3-
** Processors: MK64FN1M0VDC12
3+
** Processors: MK64FN1M0CAJ12
4+
** MK64FN1M0VDC12
45
** MK64FN1M0VLL12
56
** MK64FN1M0VLQ12
67
** MK64FN1M0VMD12
@@ -15,13 +16,13 @@
1516
** IAR ANSI C/C++ Compiler for ARM
1617
**
1718
** Reference manual: K64P144M120SF5RM, Rev.2, January 2014
18-
** Version: rev. 2.8, 2015-02-19
19-
** Build: b151218
19+
** Version: rev. 2.9, 2016-03-21
20+
** Build: b160321
2021
**
2122
** Abstract:
2223
** CMSIS Peripheral Access Layer for MK64F12
2324
**
24-
** Copyright (c) 1997 - 2015 Freescale Semiconductor, Inc.
25+
** Copyright (c) 1997 - 2016 Freescale Semiconductor, Inc.
2526
** All rights reserved.
2627
**
2728
** Redistribution and use in source and binary forms, with or without modification,
@@ -84,14 +85,17 @@
8485
** Interrupt INT_LPTimer renamed to INT_LPTMR0, interrupt INT_Watchdog renamed to INT_WDOG_EWM.
8586
** - rev. 2.8 (2015-02-19)
8687
** Renamed interrupt vector LLW to LLWU.
88+
** - rev. 2.9 (2016-03-21)
89+
** Added MK64FN1M0CAJ12 part.
90+
** GPIO - renamed port instances: PTx -> GPIOx.
8791
**
8892
** ###################################################################
8993
*/
9094

9195
/*!
9296
* @file MK64F12.h
93-
* @version 2.8
94-
* @date 2015-02-19
97+
* @version 2.9
98+
* @date 2016-03-21
9599
* @brief CMSIS Peripheral Access Layer for MK64F12
96100
*
97101
* CMSIS Peripheral Access Layer for MK64F12
@@ -104,7 +108,7 @@
104108
* compatible) */
105109
#define MCU_MEM_MAP_VERSION 0x0200U
106110
/** Memory map minor version */
107-
#define MCU_MEM_MAP_VERSION_MINOR 0x0008U
111+
#define MCU_MEM_MAP_VERSION_MINOR 0x0009U
108112

109113
/**
110114
* @brief Macro to calculate address of an aliased word in the peripheral
@@ -6926,30 +6930,30 @@ typedef struct {
69266930

69276931

69286932
/* GPIO - Peripheral instance base addresses */
6929-
/** Peripheral PTA base address */
6930-
#define PTA_BASE (0x400FF000u)
6931-
/** Peripheral PTA base pointer */
6932-
#define PTA ((GPIO_Type *)PTA_BASE)
6933-
/** Peripheral PTB base address */
6934-
#define PTB_BASE (0x400FF040u)
6935-
/** Peripheral PTB base pointer */
6936-
#define PTB ((GPIO_Type *)PTB_BASE)
6937-
/** Peripheral PTC base address */
6938-
#define PTC_BASE (0x400FF080u)
6939-
/** Peripheral PTC base pointer */
6940-
#define PTC ((GPIO_Type *)PTC_BASE)
6941-
/** Peripheral PTD base address */
6942-
#define PTD_BASE (0x400FF0C0u)
6943-
/** Peripheral PTD base pointer */
6944-
#define PTD ((GPIO_Type *)PTD_BASE)
6945-
/** Peripheral PTE base address */
6946-
#define PTE_BASE (0x400FF100u)
6947-
/** Peripheral PTE base pointer */
6948-
#define PTE ((GPIO_Type *)PTE_BASE)
6933+
/** Peripheral GPIOA base address */
6934+
#define GPIOA_BASE (0x400FF000u)
6935+
/** Peripheral GPIOA base pointer */
6936+
#define GPIOA ((GPIO_Type *)GPIOA_BASE)
6937+
/** Peripheral GPIOB base address */
6938+
#define GPIOB_BASE (0x400FF040u)
6939+
/** Peripheral GPIOB base pointer */
6940+
#define GPIOB ((GPIO_Type *)GPIOB_BASE)
6941+
/** Peripheral GPIOC base address */
6942+
#define GPIOC_BASE (0x400FF080u)
6943+
/** Peripheral GPIOC base pointer */
6944+
#define GPIOC ((GPIO_Type *)GPIOC_BASE)
6945+
/** Peripheral GPIOD base address */
6946+
#define GPIOD_BASE (0x400FF0C0u)
6947+
/** Peripheral GPIOD base pointer */
6948+
#define GPIOD ((GPIO_Type *)GPIOD_BASE)
6949+
/** Peripheral GPIOE base address */
6950+
#define GPIOE_BASE (0x400FF100u)
6951+
/** Peripheral GPIOE base pointer */
6952+
#define GPIOE ((GPIO_Type *)GPIOE_BASE)
69496953
/** Array initializer of GPIO peripheral base addresses */
6950-
#define GPIO_BASE_ADDRS { PTA_BASE, PTB_BASE, PTC_BASE, PTD_BASE, PTE_BASE }
6954+
#define GPIO_BASE_ADDRS { GPIOA_BASE, GPIOB_BASE, GPIOC_BASE, GPIOD_BASE, GPIOE_BASE }
69516955
/** Array initializer of GPIO peripheral base pointers */
6952-
#define GPIO_BASE_PTRS { PTA, PTB, PTC, PTD, PTE }
6956+
#define GPIO_BASE_PTRS { GPIOA, GPIOB, GPIOC, GPIOD, GPIOE }
69536957

69546958
/*!
69556959
* @}
@@ -12677,16 +12681,16 @@ typedef struct {
1267712681
#define DSPI1 SPI1
1267812682
#define DSPI2 SPI2
1267912683
#define FLEXCAN0 CAN0
12680-
#define GPIOA_BASE PTA_BASE
12681-
#define GPIOA PTA
12682-
#define GPIOB_BASE PTB_BASE
12683-
#define GPIOB PTB
12684-
#define GPIOC_BASE PTC_BASE
12685-
#define GPIOC PTC
12686-
#define GPIOD_BASE PTD_BASE
12687-
#define GPIOD PTD
12688-
#define GPIOE_BASE PTE_BASE
12689-
#define GPIOE PTE
12684+
#define PTA_BASE GPIOA_BASE
12685+
#define PTA GPIOA
12686+
#define PTB_BASE GPIOB_BASE
12687+
#define PTB GPIOB
12688+
#define PTC_BASE GPIOC_BASE
12689+
#define PTC GPIOC
12690+
#define PTD_BASE GPIOD_BASE
12691+
#define PTD GPIOD
12692+
#define PTE_BASE GPIOE_BASE
12693+
#define PTE GPIOE
1269012694
#define UART_WP7816_T_TYPE0_REG(base) UART_WP7816T0_REG(base)
1269112695
#define UART_WP7816_T_TYPE1_REG(base) UART_WP7816T1_REG(base)
1269212696
#define UART_WP7816_T_TYPE0_WI_MASK UART_WP7816T0_WI_MASK

0 commit comments

Comments
 (0)