STM32: move can_s definition to common_objects.h

This will ease up further changes to the structure.
pull/4932/head
Laurent MEUNIER 2017-08-17 14:52:20 +02:00
parent 5bddd881e9
commit 66162c6b1d
31 changed files with 42 additions and 127 deletions

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -128,6 +128,13 @@ struct dac_s {
};
#endif
#if DEVICE_CAN
struct can_s {
CANName can;
int index;
};
#endif
#ifdef __cplusplus
}
#endif

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -116,6 +116,13 @@ struct analogin_s {
uint8_t channel;
};
#if DEVICE_CAN
struct can_s {
CANName can;
int index;
};
#endif
#include "gpio_object.h"
#ifdef __cplusplus

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -54,13 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
#if defined (DEVICE_CAN)
struct can_s {
CANName can;
int index;
};
#endif
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -124,6 +124,13 @@ struct analogin_s {
uint8_t channel;
};
#if DEVICE_CAN
struct can_s {
CANName can;
int index;
};
#endif
#include "gpio_object.h"
#ifdef __cplusplus

View File

@ -40,11 +40,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -40,11 +40,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -59,11 +59,6 @@ struct trng_s {
};
#include "common_objects.h"
struct can_s {
CANName can;
int index;
};
#include "gpio_object.h"
#ifdef __cplusplus

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
#include "common_objects.h"
#ifdef __cplusplus

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -133,6 +133,13 @@ struct dac_s {
};
#endif
#if DEVICE_CAN
struct can_s {
CANName can;
int index;
};
#endif
#ifdef __cplusplus
}
#endif

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -132,6 +132,13 @@ struct flash_s {
uint32_t dummy;
};
#if DEVICE_CAN
struct can_s {
CANName can;
int index;
};
#endif
#ifdef __cplusplus
}
#endif

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -54,11 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};
struct can_s {
CANName can;
int index;
};
struct trng_s {
RNG_HandleTypeDef handle;
};

View File

@ -135,6 +135,13 @@ struct dac_s {
}
#endif
#if DEVICE_CAN
struct can_s {
CANName can;
int index;
};
#endif
/* STM32L4 HAL doesn't provide this API called in rtc_api.c */
#define __HAL_RCC_RTC_CLKPRESCALER(__RTCCLKSource__)