Explorar el Código

CMSIS-Driver: Updated Flash API V2.2.0 (padding added to ARM_FLASH_INFO)

Vladimir Umek hace 7 años
padre
commit
c1e9d20927
Se han modificado 2 ficheros con 10 adiciones y 5 borrados
  1. 3 1
      ARM.CMSIS.pdsc
  2. 7 4
      CMSIS/Driver/Include/Driver_Flash.h

+ 3 - 1
ARM.CMSIS.pdsc

@@ -13,6 +13,8 @@
       CMSIS-Core(A): 1.1.2 (see revision history for details)
       CMSIS-RTOS2:
         - RTX 5.3.1 (see revision history for details)
+      CMSIS-Driver:
+        - Flash Driver API V2.2.0
     </release>
     <release version="5.3.1-dev0">
       Patch release scheduled for after EW18.
@@ -666,7 +668,7 @@ and 8-bit Java bytecodes in Jazelle state.
         <file category="header" name="CMSIS/Driver/Include/Driver_CAN.h" />
       </files>
     </api>
-    <api Cclass="CMSIS Driver" Cgroup="Flash" Capiversion="2.1.0" exclusive="0">
+    <api Cclass="CMSIS Driver" Cgroup="Flash" Capiversion="2.2.0" exclusive="0">
       <description>Flash Driver API for Cortex-M</description>
       <files>
         <file category="doc" name="CMSIS/Documentation/Driver/html/group__flash__interface__gr.html" />

+ 7 - 4
CMSIS/Driver/Include/Driver_Flash.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017 ARM Limited. All rights reserved.
+ * Copyright (c) 2013-2018 ARM Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -15,13 +15,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * $Date:        2. Feb 2017
- * $Revision:    V2.1
+ * $Date:        19. Apr 2018
+ * $Revision:    V2.2
  *
  * Project:      Flash Driver definitions
  */
 
 /* History:
+ *  Version 2.2
+ *    Padding bytes added to ARM_FLASH_INFO
  *  Version 2.1
  *    ARM_FLASH_STATUS made volatile
  *  Version 2.0
@@ -47,7 +49,7 @@ extern "C"
 
 #include "Driver_Common.h"
 
-#define ARM_FLASH_API_VERSION ARM_DRIVER_VERSION_MAJOR_MINOR(2,1)  /* API version */
+#define ARM_FLASH_API_VERSION ARM_DRIVER_VERSION_MAJOR_MINOR(2,2)  /* API version */
 
 
 #define _ARM_Driver_Flash_(n)      Driver_Flash##n
@@ -74,6 +76,7 @@ typedef struct _ARM_FLASH_INFO {
   uint32_t          page_size;          ///< Optimal programming page size in bytes
   uint32_t          program_unit;       ///< Smallest programmable unit in bytes
   uint8_t           erased_value;       ///< Contents of erased memory (usually 0xFF)
+  uint8_t           reserved[3];        ///< Reserved (must be zero)
 } const ARM_FLASH_INFO;