Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-08-20 21:29:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

revert the file

Browse Source
This commit is contained in:
supperthomas
2021-04-08 22:44:45 +08:00
parent 3d72a6a1f5
commit 76838b795e
7 changed files with 376 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bsp/nrf51822/Libraries/CMSIS/Include/core_cm0.h
+3 -3
View File
@@ -138,15 +138,15 @@
#error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
#endif
#elif defined ( __CSMC__ ) /* Cosmic */
#if ( __CSMC__ & 0x400) // FPU present for parser
#elif defined ( __CSMC__ ) /* Cosmic */
#if ( __CSMC__ & 0x400) // FPU present for parser
#error "Compiler generates FPU instructions for a device without an FPU (check __FPU_PRESENT)"
#endif
#endif
#include <stdint.h> /* standard types definitions */
#include <core_cmInstr.h> /* Core Instruction Access */
#include <core_cmFunc.h> /* Core Function Access */
#include <core_cmFunc.h> /* Core Function Access */
#ifdef __cplusplus
}
bsp/nrf51822/Libraries/CMSIS/Include/core_cmInstr.h
+1 -1
View File
@@ -523,7 +523,7 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE int32_t __REVSH(int32_t value
*/
__attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __ROR(uint32_t op1, uint32_t op2)
{
return (op1 >> op2) | (op1 << (32 - op2));
return (op1 >> op2) | (op1 << (32 - op2));
}
bsp/nrf51822/Libraries/nrf51822/Include/compiler_abstraction.h
+4 -4
View File
@@ -74,7 +74,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define NRF_STATIC_ASSERT(cond, msg) \
;enum { NRF_STRING_CONCATENATE(static_assert_on_line_, __LINE__) = 1 / (!!(cond)) }
#endif
#elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
#ifndef __ASM
@@ -148,7 +148,7 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef __UNUSED
#define __UNUSED
#endif
#define GET_SP() __get_SP()
#ifndef NRF_STATIC_ASSERT
@@ -174,7 +174,7 @@ POSSIBILITY OF SUCH DAMAGE.
#endif
#ifndef __PACKED
#define __PACKED __attribute__((packed))
#define __PACKED __attribute__((packed))
#endif
#ifndef __UNUSED
@@ -216,7 +216,7 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef __ALIGN
#define __ALIGN(n) __align(n)
#endif
/* Not defined for TASKING. */
#ifndef __PACKED
#define __PACKED
bsp/nrf51822/Libraries/nrf51822/Include/nrf.h
+5 -5
View File
@@ -34,11 +34,11 @@ POSSIBILITY OF SUCH DAMAGE.
#define NRF_H
/* MDK version */
#define MDK_MAJOR_VERSION 8
#define MDK_MINOR_VERSION 38
#define MDK_MICRO_VERSION 0
#define MDK_MAJOR_VERSION 8
#define MDK_MINOR_VERSION 38
#define MDK_MICRO_VERSION 0
/* Define coprocessor domains */
#if defined (NRF5340_XXAA_APPLICATION) || defined (NRF5340_XXAA_NETWORK)
#ifndef NRF5340_XXAA
@@ -112,7 +112,7 @@ POSSIBILITY OF SUCH DAMAGE.
/* Define NRF91_SERIES for common use in nRF91 series devices. */
#if defined (NRF9160_XXAA)
#ifndef NRF91_SERIES
#ifndef NRF91_SERIES
#define NRF91_SERIES
#endif
#endif
bsp/nrf51822/Libraries/nrf51822/Include/nrf51.h
+8 -8
View File
@@ -8,26 +8,26 @@
* @version V522
* @date 26. August 2014
*
* @note Generated with SVDConv V2.81d
* @note Generated with SVDConv V2.81d
* from CMSIS SVD File 'nRF51.xml' Version 522,
*
* @par Copyright (c) 2013, 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:
*
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
*
* * 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.
*
*
* * Neither the name of Nordic Semiconductor ASA nor the names of its
* contributors 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
@@ -38,7 +38,7 @@
* 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.
*
*
*
*******************************************************************************************************/
@@ -1055,7 +1055,7 @@ typedef struct { /*!< FICR Structure
__I uint32_t PPFC; /*!< Pre-programmed factory code present. */
__I uint32_t RESERVED2;
__I uint32_t NUMRAMBLOCK; /*!< Number of individualy controllable RAM blocks. */
union {
__I uint32_t SIZERAMBLOCK[4]; /*!< Deprecated array of size of RAM block in bytes. This name is
kept for backward compatinility purposes. Use SIZERAMBLOCKS
bsp/nrf51822/Libraries/nrf51822/Include/nrf51_deprecated.h
+351 -351
View File
File diff suppressed because it is too large Load Diff
bsp/nrf51822/Libraries/nrf51822/Include/nrf_gpio.h
+4 -4
View File
@@ -246,16 +246,16 @@ static __INLINE void nrf_gpio_pin_toggle(uint32_t pin_number)
{
const uint32_t pin_bit = 1UL << pin_number;
const uint32_t pin_state = ((NRF_GPIO->OUT >> pin_number) & 1UL);
if (pin_state == 0)
{
// Current state low, set high.
NRF_GPIO->OUTSET = pin_bit;
NRF_GPIO->OUTSET = pin_bit;
}
else
{
// Current state high, set low.
NRF_GPIO->OUTCLR = pin_bit;
// Current state high, set low.
NRF_GPIO->OUTCLR = pin_bit;
}
}