changed i2c to mcu_periph/i2c

2026-05-31 20:38:27 +08:00 · 2010-12-05 02:17:38 +01:00
parent 04c355b98a
commit 998abd95aa
87 changed files with 150 additions and 150 deletions
@@ -280,7 +280,7 @@ test_adc.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=$(MODEM_PORT)
 test_adc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT)
 test_adc.srcs   += downlink.c pprz_transport.c

-test_adc.srcs   += $(SRC_ARCH)/adc_hw.c
+test_adc.srcs   += $(SRC_ARCH)/mcu_periph/adc_arch.c
 test_adc.CFLAGS += -DUSE_AD1 -DUSE_AD1_1
 # -DUSE_AD1_2 -DUSE_AD1_3 -DUSE_AD1_4
 test_adc.CFLAGS += -DUSE_ADC1_2_IRQ_HANDLER
@@ -681,4 +681,4 @@ tunnel.CFLAGS += -DUSE_LED
 tunnel.srcs   += $(SRC_ARCH)/led_hw.c
 tunnel.CFLAGS += -DUSE_SYS_TIME -DSYS_TIME_LED=$(SYS_TIME_LED)
 tunnel.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./512.)'
-tunnel.srcs   += sys_time.c $(SRC_ARCH)/sys_time_hw.c
+tunnel.srcs   += sys_time.c $(SRC_ARCH)/sys_time_hw.c
@@ -103,12 +103,12 @@ stm_passthrough.CFLAGS += -DUSE_CAN1 \
    -DCAN_BS1_TQ=CAN_BS1_3tq \
    -DCAN_BS2_TQ=CAN_BS2_4tq \
    -DCAN_ERR_RESUME=DISABLE
-stm_passthrough.srcs += can.c $(SRC_ARCH)/can_hw.c
+stm_passthrough.srcs += mcu_periph/can.c $(SRC_ARCH)/mcu_periph/can_arch.c
 stm_passthrough.srcs += $(SRC_CSC)/csc_protocol.c

 # ADC

-stm_passthrough.srcs += $(SRC_ARCH)/adc_hw.c
+stm_passthrough.srcs += $(SRC_ARCH)/mcu_periph/adc_arch.c
 stm_passthrough.CFLAGS += -DUSE_AD1 \
    -DUSE_AD1_1 \
    -DUSE_AD1_2 \
@@ -138,7 +138,7 @@ ns_srcs 		+= $(SRC_ARCH)/mcu_periph/uart_arch.c

  ns_CFLAGS 		+= -DADC
 #ifeq ($(ARCH), lpc21)
-  ns_srcs 		+= $(SRC_ARCH)/adc_hw.c
+  ns_srcs 		+= $(SRC_ARCH)/mcu_periph/adc_arch.c
 ifeq ($(ARCH), stm32)
  ns_CFLAGS 		+= -DUSE_ADC1_2_IRQ_HANDLER
 endif
@@ -1,3 +1,5 @@
 #generic i2c driver
-ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
-sim.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
+ap.srcs += mcu_periph/i2c.c
+ap.srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c
+sim.srcs += mcu_periph/i2c.c
+sim.srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c
@@ -21,7 +21,7 @@ test_adcs.CFLAGS += -DBOARD_CONFIG=$(CONFIG) -DLED -DTIME_LED=1 -DADC -DUSE_ADC_
 test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 test_adcs.srcs += downlink.c $(SRC_ARCH)/uart_hw.c xbee.c

-test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test/test_adcs.c
+test_adcs.srcs += sys_time.c $(SRC_ARCH)/mcu_periph/adc_arch.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test/test_adcs.c
 # pprz_transport.c


@@ -1,6 +1,7 @@
 # asctec controllers
 ap.srcs += $(SRC_FIRMWARE)/actuators/actuators_asctec.c
-ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
+ap.srcs += mcu_periph/i2c.c 
+ap.srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c

 ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c0
@@ -16,5 +17,6 @@ endif
 # Simulator
 sim.srcs += $(SRC_FIRMWARE)/actuators/actuators_asctec.c
 sim.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10
-sim.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
+sim.srcs += mcu_periph/i2c.c 
+sim.srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c

@@ -19,7 +19,8 @@
 ap.srcs += $(SRC_FIRMWARE)/actuators/supervision.c
 ap.CFLAGS += -DACTUATORS_ASCTEC_V2_PROTOCOL
 ap.srcs += $(SRC_FIRMWARE)/actuators/actuators_asctec.c
-ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
+ap.srcs += mcu_periph/i2c.c
+ap.srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c

 ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c0
@@ -7,4 +7,4 @@ ap.srcs += $(SRC_FIRMWARE)/actuators/actuators_heli.c
 ap.srcs += $(SRC_FIRMWARE)/actuators/arch/$(ARCH)/actuators_pwm_arch.c

 # fixme : this is needed by baro and usualy added by actuators_mkk or actuators_asctec
-ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
+ap.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
@@ -28,7 +28,8 @@
 #
 ap.srcs += $(SRC_FIRMWARE)/actuators/supervision.c
 ap.srcs += $(SRC_FIRMWARE)/actuators/actuators_mkk.c
-ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
+ap.srcs += mcu_periph/i2c.c
+ap.srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c

 ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -DACTUATORS_MKK_DEVICE=i2c0
@@ -42,4 +43,5 @@ endif
 sim.srcs += $(SRC_FIRMWARE)/actuators/supervision.c
 sim.srcs += $(SRC_FIRMWARE)/actuators/actuators_mkk.c
 sim.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10 -DACTUATORS_MKK_DEVICE=i2c1
-sim.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
+sim.srcs += mcu_periph/i2c.c
+sim.srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c
@@ -1,7 +1,7 @@
 #ifndef AGL_VFILTER_H
 #define AGL_VFILTER_H

-#include "adc.h"
+#include "mcu_periph/adc.h"

 #define STATE_SIZE 3

@@ -31,7 +31,7 @@
 #endif
 #include <avr/interrupt.h>
 #include <avr/io.h>
-#include "adc.h"
+#include "mcu_periph/adc.h"
 #include "std.h"


@@ -22,7 +22,7 @@
 *
 */

-#include "adc.h"
+#include "mcu_periph/adc.h"

 #include "LPC21xx.h"
 #include "armVIC.h"
@@ -22,7 +22,7 @@
 *
 */

-#include "i2c.h"
+#include "mcu_periph/i2c.h"

 #include "std.h"
 #include "interrupt_hw.h"
@@ -1,4 +1,4 @@
-#include "adc.h"
+#include "mcu_periph/adc.h"

 void adc_buf_channel(uint8_t adc_channel __attribute__ ((unused)),
             struct adc_buf* s __attribute__ ((unused)),
@@ -1,4 +1,4 @@
-#include "i2c.h"
+#include "mcu_periph/i2c.h"

 void i2c_hw_init ( void ) {}

@@ -1,5 +1,5 @@
-#ifndef I2C_HW_H
-#define I2C_HW_H
+#ifndef SIM_MCU_PERIPH_I2C_ARCH_H
+#define SIM_MCU_PERIPH_I2C_ARCH_H

 #define I2cSendStart() {}

@@ -10,4 +10,4 @@
 #define I2c0SendStart() {}
 #define I2c1SendStart() {}

-#endif /* I2C_HW_H */
+#endif /* SIM_MCU_PERIPH_I2C_ARCH_H */
@@ -83,8 +83,7 @@

 */

-#include "adc.h"
-#include "adc_hw.h"
+#include "mcu_periph/adc.h"
 #include <stm32/rcc.h>
 #include <stm32/misc.h>
 #include <stm32/adc.h>
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <string.h>

-#include "can_hw.h"
+#include "mcu_periph/can.h"

 #include <stm32/rcc.h>
 #include <stm32/gpio.h>
@@ -22,11 +22,11 @@
 *
 */

-#ifndef CAN_HW_H
-#define CAN_HW_H
+#ifndef MCU_PERIPH_STM32_CAN_ARCH_H
+#define MCU_PERIPH_STM32_CAN_ARCH_H

 void can_hw_init(void);
 void usb_lp_can1_rx0_irq_handler(void);
 int can_hw_transmit(uint32_t id, const uint8_t *buf, uint8_t len);

-#endif /* CAN_HW_H */
+#endif /* MCU_PERIPH_STM32_CAN_ARCH_H */
@@ -1,4 +1,4 @@
-#include "i2c.h"
+#include "mcu_periph/i2c.h"

 #include <stm32/rcc.h>
 #include <stm32/gpio.h>
@@ -28,7 +28,7 @@
 #ifndef I2C_HW_H
 #define I2C_HW_H

-#include "i2c.h"
+#include "mcu_periph/i2c.h"
 #include <stm32/i2c.h>


@@ -27,7 +27,7 @@
 #include <stm32/spi.h>
 #include <stm32/exti.h>
 #include <stm32/misc.h>
-#include "i2c.h"
+#include "mcu_periph/i2c.h"

 void exti9_5_irq_handler(void);

@@ -64,7 +64,7 @@


 #ifdef USE_I2C1
-#include "i2c_hw.h"
+#include "mcu_periph/i2c_arch.h"
 #define I2C1_EV_IRQ_HANDLER i2c1_ev_irq_handler
 #define I2C1_ER_IRQ_HANDLER i2c1_er_irq_handler
 #else
@@ -73,7 +73,7 @@
 #endif

 #ifdef USE_I2C2
-#include "i2c_hw.h"
+#include "mcu_periph/i2c_arch.h"
 #define I2C2_EV_IRQ_HANDLER i2c2_ev_irq_handler
 #define I2C2_ER_IRQ_HANDLER i2c2_er_irq_handler
 #else
@@ -7,7 +7,7 @@
 #include <stm32/spi.h>
 #include <stm32/dma.h>

-#include "i2c.h"
+#include "mcu_periph/i2c.h"

 /* gyro int handler */
 void exti15_10_irq_handler(void);
@@ -8,7 +8,7 @@
 #define BOARDS_LISA_L_BARO_H

 #include "std.h"
-#include "i2c.h"
+#include "mcu_periph/i2c.h"

 enum LisaBaroStatus {
  LBS_UNINITIALIZED,
@@ -22,7 +22,7 @@
 */

 #include "mcu_periph/uart.h"
-#include "i2c.h"
+//#include "mcu_periph/i2c.h"

 void uart0_init( void ) {}
 void uart1_init( void ) {}
@@ -23,17 +23,16 @@

 #include <inttypes.h>

-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
-#include "interrupt_hw.h"
-#include "uart.h"
+#include "mcu_periph/uart.h"

 #include "messages.h"
 #include "downlink.h"

 #include "commands.h"
-#include "i2c.h"
+#include "mcu_periph/i2c.h"
 #include "firmwares/rotorcraft/actuators.h"

 static inline void main_init( void );
@@ -53,7 +52,7 @@ int main( void ) {
 }

 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
  sys_time_init();
  led_init();
  uart1_init_tx();
@@ -61,7 +60,7 @@ static inline void main_init( void ) {
  i2c_init();
  actuators_init();

-  int_enable();
+  mcu_int_enable();
 }

 static inline void main_periodic_task( void ) {
@@ -6,7 +6,7 @@

 #include "LPC21xx.h"
 #include "led.h"
-#include "adc.h"
+#include "mcu_periph/adc.h"
 #include ACTUATORS
 #include "csc_servos.h"
 #include "sys_time.h"
@@ -26,7 +26,7 @@
 #include <string.h>

 #include "csc_protocol.h"
-#include "can.h"
+#include "mcu_periph/can.h"
 #include "csc_msg_def.h"

 // #include "init_hw.h"
@@ -8,9 +8,7 @@
 #endif

 #ifdef USE_CAN1
-#include "can.h"
-#include "can_hw.h"
-#include <stm32/can.h>
+#include "mcu_periph/can.h"
 extern uint16_t can_err_flags;
 #endif

@@ -1,5 +1,5 @@
 #include "bench_sensors.h"
-#include "can.h"
+#include "mcu_periph/can.h"
 #include "led.h"

 //uint16_t halfw1,halfw2,halfw3,halfw4;
@@ -1,6 +1,6 @@
 #include BOARD_CONFIG
 #include "init_hw.h"
-#include "can.h"
+#include "mcu_periph/can.h"
 #include "sys_time.h"
 #include "downlink.h"

@@ -24,8 +24,8 @@

 #include BOARD_CONFIG
 #include "std.h"
-#include "init_hw.h"
-#include "can.h"
+#include "mcu.h"
+#include "mcu_periph/can.h"
 #include "sys_time.h"
 #include "downlink.h"
 #include "booz/booz2_commands.h"
@@ -61,7 +61,7 @@ int main(void) {
 }

 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
  sys_time_init();
  actuators_init();
  //radio_control_init();
@@ -36,7 +36,7 @@
 #include "firmwares/fixedwing/main_ap.h"
 #include "mcu.h"

-#include "adc.h"
+#include "mcu_periph/adc.h"
 #include "firmwares/fixedwing/stabilization/stabilization_attitude.h"
 #include "firmwares/fixedwing/guidance/guidance_v.h"
 #include "gps.h"
@@ -38,7 +38,7 @@

 #include "led.h"
 #include "spi.h"
-#include "adc.h"
+#include "mcu_periph/adc.h"

 #ifdef USE_USB_SERIAL
 #include "usb_serial.h"
@@ -31,7 +31,7 @@
 #define FBW_H

 #include "std.h"
-#include "adc.h"
+#include "mcu_periph/adc.h"

 /** Fly by wire modes */
 #define FBW_MODE_MANUAL   0
@@ -1,6 +1,6 @@
 #include "mb_current.h"

-#include "adc.h"
+#include "mcu_periph/adc.h"

 static struct adc_buf mb_current_buf;

@@ -2,7 +2,7 @@

 //#include "mb_static.h"

-#include "adc.h"
+#include "mcu_periph/adc.h"
 #include "sys_time.h"


@@ -1,12 +1,12 @@
 #include "firmwares/rotorcraft/actuators.h"
-#include "actuators_asctec.h"
+#include "firmwares/rotorcraft/actuators/actuators_asctec.h"

 #ifdef ACTUATORS_ASCTEC_V2_PROTOCOL
 #include "firmwares/rotorcraft/actuators/supervision.h"
 #endif

 #include "booz/booz2_commands.h"
-#include "i2c.h"
+#include "mcu_periph/i2c.h"
 #include "sys_time.h"


@@ -24,7 +24,7 @@
 #ifndef ACTUATORS_ASCTEC_H
 #define ACTUATORS_ASCTEC_H

-#include "i2c.h"
+#include "mcu_periph/i2c.h"

 enum actuators_astec_cmd { NONE,
               TEST,
@@ -22,10 +22,10 @@
 */

 #include "firmwares/rotorcraft/actuators.h"
-#include "actuators_mkk.h"
+#include "firmwares/rotorcraft/actuators/actuators_mkk.h"

 #include "booz/booz2_commands.h"
-#include "i2c.h"
+#include "mcu_periph/i2c.h"
 #include "sys_time.h"


@@ -25,7 +25,7 @@
 #define ACTUATORS_MKK_H

 #include "std.h"
-#include "i2c.h"
+#include "mcu_periph/i2c.h"

 #include "generated/airframe.h"

@@ -50,8 +50,8 @@
 #include "booz_gps.h"
 #include "subsystems/ins.h"
 #include "subsystems/ahrs.h"
-
-#include "i2c_hw.h"
+//FIXME: wtf ??!!
+#include "mcu_periph/i2c_arch.h"

 extern uint8_t telemetry_mode_Main_DefaultChannel;

@@ -30,7 +30,7 @@
 #include BOARD_CONFIG
 #include "gyro.h"
 #include "std.h"
-#include "adc.h"
+#include "mcu_periph/adc.h"
 #include "generated/airframe.h"
 #include "estimator.h"

@@ -31,7 +31,7 @@
 #include <stdlib.h>

 #include "infrared.h"
-#include "adc.h"
+#include "mcu_periph/adc.h"
 #include "gps.h"
 #include "firmwares/fixedwing/autopilot.h"
 #include "estimator.h"
@@ -22,7 +22,7 @@
 *
 */

-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "downlink.h"
 #include "booz/booz2_commands.h"
@@ -47,7 +47,7 @@

 #include "firmwares/rotorcraft/baro.h"

-#include "adc.h"
+#include "mcu_periph/adc.h"

 static inline void main_init(void);
 static inline void main_periodic(void);
@@ -103,7 +103,7 @@ int main(void) {

 static inline void main_init(void) {

-	hw_init();
+	mcu_init();
 	sys_time_init();
 	imu_init();
 	baro_init();
@@ -26,11 +26,10 @@
 #include <stm32/misc.h>

 #include BOARD_CONFIG
-#include "init_hw.h"
+#include "mcu.h"
 #include "sys_time.h"
 #include "led.h"
-#include "adc.h"
-#include "adc_hw.h"
+#include "mcu_periph/adc.h"
 #include "downlink.h"

 int main_periodic(void);
@@ -46,7 +45,7 @@ static struct adc_buf adc3_buf;
 extern uint8_t adc_new_data_trigger;

 static inline void main_init( void ) {
-    hw_init();
+    mcu_init();
    sys_time_init();
    adc_init();
    adc_buf_channel(0, &adc0_buf, 8);
@@ -37,7 +37,7 @@
 #include "mcu_periph/uart.h"
 #endif
 #if defined USE_I2C1 || defined USE_I2C2
-#include "i2c.h"
+#include "mcu_periph/i2c.h"
 #endif
 #endif /* PERIPHERALS_AUTO_INIT */

@@ -35,7 +35,7 @@
 #define _ADC_H_

 #include <inttypes.h>
-#include "adc_hw.h"
+#include "mcu_periph/adc_arch.h"

 /* Allow driver implementation to define
 * number of available ADCs implicitly
@@ -24,8 +24,8 @@

 #include <stdint.h>

-#include "can.h"
-#include "can_hw.h"
+#include "mcu_periph/can.h"
+#include "mcu_periph/can_arch.h"

 can_rx_callback_t can_rx_callback;

--- a/Show More
+++ b/Show More