Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-06 07:53:43 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/paparazzi/paparazzi

Browse Source
This commit is contained in:
Martin Mueller
2010-12-06 21:07:42 +01:00
parent 6a818650db 208902ae59
commit 1b5a99ce17
17 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/avr/mcu_periph/spi_arch.c
+1 -1
View File
@@ -22,7 +22,7 @@
* *
*/ */
/** \file spi_hw.c /** \file mcu_periph/spi_arch.c
* \brief handling of hardware dependant SPI on AVR architecture * \brief handling of hardware dependant SPI on AVR architecture
*/ */
sw/airborne/arch/avr/mcu_periph/spi_arch.h
+3 -3
View File
@@ -22,8 +22,8 @@
* *
*/ */
#ifndef SPI_HW_H #ifndef SPI_ARCH_H
#define SPI_HW_H #define SPI_ARCH_H
/** Index in SPI buffers: one is enough for full duplex communication */ /** Index in SPI buffers: one is enough for full duplex communication */
extern volatile uint8_t spi_idx_buf; extern volatile uint8_t spi_idx_buf;
@@ -83,4 +83,4 @@ extern volatile uint8_t spi_idx_buf;
#endif /* SPI_MASTER */ #endif /* SPI_MASTER */
#endif /* SPI_HW_H */ #endif /* SPI_ARCH_H */
sw/airborne/arch/lpc21/mcu_periph/spi_arch.h
+3 -3
View File
@@ -25,8 +25,8 @@
* for now only SPI1 ( aka SSP ) * for now only SPI1 ( aka SSP )
*/ */
#ifndef SPI_HW_H #ifndef SPI_ARCH_H
#define SPI_HW_H #define SPI_ARCH_H
#include "std.h" #include "std.h"
#include "LPC21xx.h" #include "LPC21xx.h"
@@ -192,4 +192,4 @@ extern volatile uint8_t spi_rx_idx;
#define SpiClrCPHA() (SSPCR0 &= ~(_BV(7))) #define SpiClrCPHA() (SSPCR0 &= ~(_BV(7)))
#endif /* SPI_HW_H */ #endif /* SPI_ARCH_H */
sw/airborne/csc/csc_baro.c
+1 -1
View File
@@ -10,7 +10,7 @@
#include "csc_booz2_ins.h" #include "csc_booz2_ins.h"
#include "csc_ap_link.h" #include "csc_ap_link.h"
#include "spi_hw.h" #include "mcu_periph/spi_arch.h"
#include "csc_baro.h" #include "csc_baro.h"
sw/airborne/modules/max3100/max3100_hw.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "std.h" #include "std.h"
#include "mcu_periph/spi_hw.h" #include "mcu_periph/spi_arch.h"
#include "led.h" #include "led.h"
/* Pin configuration for max3100 IRQ */ /* Pin configuration for max3100 IRQ */