/TARGET_K64F/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/hal/adc/fsl_adc_hal.h substitute line 894 extern } by }

Fork of mbed by mbed official

Committer:
bogdanm
Date:
Fri Aug 15 15:28:31 2014 +0100
Revision:
88:9327015d4013
Parent:
TARGET_NRF51822/TARGET_NORDIC/TARGET_NRF51822/PeripheralNames.h@82:6473597d706e
Release 88 of the mbed library

Main changes:

- changed "error.h" to "mbed_error.h" to avoid conflicts with 3rd party code
- LPC1549 SPI driver fixes
- K64F Ethernet TX buffer reclaim mechanism fix
- STDIO initialization fix
- NUCLEO_F334R8 I2C clock fix
- various other fixes

Who changed what in which revision?

UserRevisionLine numberNew contents of line
bogdanm 82:6473597d706e 1 /* mbed Microcontroller Library
bogdanm 82:6473597d706e 2 * Copyright (c) 2013 Nordic Semiconductor
bogdanm 82:6473597d706e 3 *
bogdanm 82:6473597d706e 4 * Licensed under the Apache License, Version 2.0 (the "License");
bogdanm 82:6473597d706e 5 * you may not use this file except in compliance with the License.
bogdanm 82:6473597d706e 6 * You may obtain a copy of the License at
bogdanm 82:6473597d706e 7 *
bogdanm 82:6473597d706e 8 * http://www.apache.org/licenses/LICENSE-2.0
bogdanm 82:6473597d706e 9 *
bogdanm 82:6473597d706e 10 * Unless required by applicable law or agreed to in writing, software
bogdanm 82:6473597d706e 11 * distributed under the License is distributed on an "AS IS" BASIS,
bogdanm 82:6473597d706e 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
bogdanm 82:6473597d706e 13 * See the License for the specific language governing permissions and
bogdanm 82:6473597d706e 14 * limitations under the License.
bogdanm 82:6473597d706e 15 */
bogdanm 82:6473597d706e 16 #ifndef MBED_PERIPHERALNAMES_H
bogdanm 82:6473597d706e 17 #define MBED_PERIPHERALNAMES_H
bogdanm 82:6473597d706e 18
bogdanm 82:6473597d706e 19 #include "cmsis.h"
bogdanm 82:6473597d706e 20
bogdanm 82:6473597d706e 21 #ifdef __cplusplus
bogdanm 82:6473597d706e 22 extern "C" {
bogdanm 82:6473597d706e 23 #endif
bogdanm 82:6473597d706e 24
bogdanm 82:6473597d706e 25 #define STDIO_UART_TX TX_PIN_NUMBER
bogdanm 82:6473597d706e 26 #define STDIO_UART_RX RX_PIN_NUMBER
bogdanm 82:6473597d706e 27 #define STDIO_UART UART_0
bogdanm 82:6473597d706e 28
bogdanm 82:6473597d706e 29 typedef enum {
bogdanm 82:6473597d706e 30 UART_0 = (int)NRF_UART0_BASE
bogdanm 82:6473597d706e 31 } UARTName;
bogdanm 82:6473597d706e 32
bogdanm 82:6473597d706e 33
bogdanm 82:6473597d706e 34 typedef enum {
bogdanm 82:6473597d706e 35 SPI_0 = (int)NRF_SPI0_BASE,
bogdanm 82:6473597d706e 36 SPI_1 = (int)NRF_SPI1_BASE,
bogdanm 82:6473597d706e 37 SPIS = (int)NRF_SPIS1_BASE
bogdanm 82:6473597d706e 38 } SPIName;
bogdanm 82:6473597d706e 39
bogdanm 82:6473597d706e 40 typedef enum {
bogdanm 82:6473597d706e 41 PWM_1 = 0,
bogdanm 82:6473597d706e 42 PWM_2
bogdanm 82:6473597d706e 43 } PWMName;
bogdanm 82:6473597d706e 44
bogdanm 82:6473597d706e 45 typedef enum {
bogdanm 82:6473597d706e 46 I2C_0 = (int)NRF_TWI0_BASE,
bogdanm 82:6473597d706e 47 I2C_1 = (int)NRF_TWI1_BASE
bogdanm 82:6473597d706e 48 } I2CName;
bogdanm 82:6473597d706e 49
bogdanm 82:6473597d706e 50 typedef enum {
bogdanm 82:6473597d706e 51 ADC0_0 = (int)NRF_ADC_BASE
bogdanm 82:6473597d706e 52 } ADCName;
bogdanm 82:6473597d706e 53
bogdanm 82:6473597d706e 54 #ifdef __cplusplus
bogdanm 82:6473597d706e 55 }
bogdanm 82:6473597d706e 56 #endif
bogdanm 82:6473597d706e 57
bogdanm 82:6473597d706e 58 #endif