Move objects.h to LPC11XX_11CXX common

Use #if DEVICE_CAN for can_s definition
pull/79/head
Joris Aerts 2013-09-27 18:53:19 -07:00
parent f580c008b1
commit 3fe31ad50e
2 changed files with 2 additions and 68 deletions

View File

@ -1,68 +0,0 @@
/* mbed Microcontroller Library
* Copyright (c) 2006-2013 ARM Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef MBED_OBJECTS_H
#define MBED_OBJECTS_H
#include "cmsis.h"
#include "PortNames.h"
#include "PeripheralNames.h"
#include "PinNames.h"
#ifdef __cplusplus
extern "C" {
#endif
struct gpio_irq_s {
uint32_t ch;
PinName pin;
__I uint32_t *reg_mask_read;
};
struct port_s {
__IO uint32_t *reg_dir;
__IO uint32_t *reg_data;
PortName port;
uint32_t mask;
};
struct pwmout_s {
PWMName pwm;
};
struct serial_s {
LPC_UART_TypeDef *uart;
int index;
};
struct analogin_s {
ADCName adc;
};
struct i2c_s {
LPC_I2C_TypeDef *i2c;
};
struct spi_s {
LPC_SSP_TypeDef *spi;
};
#include "gpio_object.h"
#ifdef __cplusplus
}
#endif
#endif

View File

@ -59,9 +59,11 @@ struct spi_s {
LPC_SSP_TypeDef *spi;
};
#if DEVICE_CAN
struct can_s {
int index;
};
#endif
#include "gpio_object.h"