Microbug / nRF51822

bugfix for duplicate symbol

Fork of nRF51822 by Nordic Semiconductor

nordic-sdk/components/drivers_nrf/hal/nrf.h@177:7a1917171a20, 2015-05-15 (annotated)

Committer:
finneyj
Date:
Fri May 15 12:12:21 2015 +0000
Revision:
177:7a1917171a20
Parent:
103:138bdc859cc9 
bug fix - redefined symbol

Who changed what in which revision?

UserRevisionLine numberNew contents of line
rgrover1 103:138bdc859cc9 1 /* Copyright (c) 2013, Nordic Semiconductor ASA
rgrover1 103:138bdc859cc9 2 * All rights reserved.
rgrover1 103:138bdc859cc9 3 *
rgrover1 103:138bdc859cc9 4 * Redistribution and use in source and binary forms, with or without
rgrover1 103:138bdc859cc9 5 * modification, are permitted provided that the following conditions are met:
rgrover1 103:138bdc859cc9 6 *
rgrover1 103:138bdc859cc9 7 * * Redistributions of source code must retain the above copyright notice, this
rgrover1 103:138bdc859cc9 8 * list of conditions and the following disclaimer.
rgrover1 103:138bdc859cc9 9 *
rgrover1 103:138bdc859cc9 10 * * Redistributions in binary form must reproduce the above copyright notice,
rgrover1 103:138bdc859cc9 11 * this list of conditions and the following disclaimer in the documentation
rgrover1 103:138bdc859cc9 12 * and/or other materials provided with the distribution.
rgrover1 103:138bdc859cc9 13 *
rgrover1 103:138bdc859cc9 14 * * Neither the name of Nordic Semiconductor ASA nor the names of its
rgrover1 103:138bdc859cc9 15 * contributors may be used to endorse or promote products derived from
rgrover1 103:138bdc859cc9 16 * this software without specific prior written permission.
rgrover1 103:138bdc859cc9 17 *
rgrover1 103:138bdc859cc9 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
rgrover1 103:138bdc859cc9 19 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
rgrover1 103:138bdc859cc9 20 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
rgrover1 103:138bdc859cc9 21 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
rgrover1 103:138bdc859cc9 22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
rgrover1 103:138bdc859cc9 23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
rgrover1 103:138bdc859cc9 24 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
rgrover1 103:138bdc859cc9 25 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
rgrover1 103:138bdc859cc9 26 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
rgrover1 103:138bdc859cc9 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
rgrover1 103:138bdc859cc9 28 *
rgrover1 103:138bdc859cc9 29 */
rgrover1 103:138bdc859cc9 30 #ifndef NRF_H
rgrover1 103:138bdc859cc9 31 #define NRF_H
rgrover1 103:138bdc859cc9 32
rgrover1 103:138bdc859cc9 33 #ifndef _WIN32
rgrover1 103:138bdc859cc9 34
rgrover1 103:138bdc859cc9 35 /* Family selection for main includes. NRF51 must be selected. */
rgrover1 103:138bdc859cc9 36 #ifdef NRF51
rgrover1 103:138bdc859cc9 37 #include "nrf51.h"
rgrover1 103:138bdc859cc9 38 #include "nrf51_bitfields.h"
rgrover1 103:138bdc859cc9 39 #include "nrf51_deprecated.h"
rgrover1 103:138bdc859cc9 40 #else
rgrover1 103:138bdc859cc9 41 #error "Device family must be defined. See nrf.h."
rgrover1 103:138bdc859cc9 42 #endif /* NRF51 */
rgrover1 103:138bdc859cc9 43
rgrover1 103:138bdc859cc9 44 #include "compiler_abstraction.h"
rgrover1 103:138bdc859cc9 45
rgrover1 103:138bdc859cc9 46 #endif /* _WIN32 */
rgrover1 103:138bdc859cc9 47
rgrover1 103:138bdc859cc9 48 #endif /* NRF_H */
rgrover1 103:138bdc859cc9 49