Diff: source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init_template.c

Revision:

19:47192cb9def7

Parent:

12:54c9ebc92faa

Child:

20:a90c48eb1d30

--- a/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init_template.c	Thu Apr 07 17:37:35 2016 +0100
+++ b/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init_template.c	Thu Apr 07 17:37:40 2016 +0100
@@ -1,33 +1,13 @@
-/*
- * Copyright (c) Nordic Semiconductor ASA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this
- *   list of conditions and the following disclaimer in the documentation and/or
- *   other materials provided with the distribution.
- *
- *   3. Neither the name of Nordic Semiconductor ASA nor the names of other
- *   contributors to this software may be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN 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 POSSIBILITY OF SUCH DAMAGE.
- *
+/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
  */
 
 /**@file
@@ -137,8 +117,8 @@
     //              error is returned.
     while (i < p_init_packet->softdevice_len)
     {
-        if (p_init_packet->softdevice[i] == DFU_SOFTDEVICE_ANY ||
-            p_init_packet->softdevice[i++] == SOFTDEVICE_INFORMATION->firmware_id)
+        if (p_init_packet->softdevice[i]   == DFU_SOFTDEVICE_ANY ||
+            p_init_packet->softdevice[i++] == SD_FWID_GET(MBR_SIZE))
         {
             return NRF_SUCCESS;
         }
@@ -151,7 +131,6 @@
 
 uint32_t dfu_init_postvalidate(uint8_t * p_image, uint32_t image_len)
 {
-#if NEED_CRC_CHECK /* disabled for now */
     uint16_t image_crc;
     uint16_t received_crc;
     
@@ -170,7 +149,6 @@
     {
         return NRF_ERROR_INVALID_DATA;
     }
-#endif /* NEED_CRC_CHECK */
 
     return NRF_SUCCESS;
 }