Some more file/path restructuring.

All #includes now explicitly use the "<libopencm3/stm32/rcc.h>" format.
If you want to get rid of the "libopencm3" prefix in your local project you
can add a respective -I entry in your Makefile (not recommended though).

All .ld files and .a libs are installed in $(TOOLCHAIN_DIR)/lib
directly (as before), but are now renamed to avoid potential
conflicts now or in the future. Examples:

  libopencm3_lpc13xx.a
  libopencm3_lpc13xx.ld
  libopencm3_stm32.a
  libopencm3_stm32.ld
This commit is contained in:
Uwe Hermann
2010-12-31 18:18:39 +01:00
parent 95793aa6ce
commit 8f251e8a9d
119 changed files with 249 additions and 252 deletions

View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <lpc13xx/gpio.h>
#include <libopencm3/lpc13xx/gpio.h>
void gpio_set(u32 gpioport, u16 gpios)
{

View File

@@ -31,7 +31,7 @@
* reg16 = adc_read(ADC1, ADC_CH_0);
*/
#include <stm32/adc.h>
#include <libopencm3/stm32/adc.h>
void rcc_set_adc_clk(u32 prescaler)
{

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/can.h>
#include <stm32/rcc.h>
#include <libopencm3/stm32/can.h>
#include <libopencm3/stm32/rcc.h>
void can_reset(u32 canport)
{

View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/dma.h>
#include <libopencm3/stm32/dma.h>
void dma_enable_mem2mem_mode(u32 dma, u8 channel)
{

View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/ethernet.h>
#include <libopencm3/stm32/ethernet.h>
void eth_smi_write(u8 phy, u8 reg, u16 data)
{

View File

@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/exti.h>
#include <stm32/gpio.h>
#include <libopencm3/stm32/exti.h>
#include <libopencm3/stm32/gpio.h>
void exti_set_trigger(u32 extis, exti_trigger_type trig)
{

View File

@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/flash.h>
#include <libopencm3/stm32/flash.h>
void flash_prefetch_buffer_enable(void)
{

View File

@@ -34,7 +34,7 @@
* - GPIO remapping support
*/
#include <stm32/gpio.h>
#include <libopencm3/stm32/gpio.h>
void gpio_set_mode(u32 gpioport, u8 mode, u8 cnf, u16 gpios)
{

View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/i2c.h>
#include <libopencm3/stm32/i2c.h>
void i2c_peripheral_enable(u32 i2c)
{

View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/nvic.h>
#include <libopencm3/stm32/nvic.h>
void nvic_enable_irq(u8 irqn)
{

View File

@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/rcc.h>
#include <stm32/flash.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/flash.h>
void rcc_osc_ready_int_clear(osc_t osc)
{

View File

@@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/rcc.h>
#include <stm32/rtc.h>
#include <stm32/pwr.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/rtc.h>
#include <libopencm3/stm32/pwr.h>
void rtc_awake_from_off(osc_t clock_source)
{

View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/scb.h>
#include <libopencm3/stm32/scb.h>
void scb_reset_core(void)
{

View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/spi.h>
#include <libopencm3/stm32/spi.h>
/*
* SPI and I2S code.

View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/systick.h>
#include <libopencm3/stm32/systick.h>
void systick_set_reload(u32 value)
{

View File

@@ -25,7 +25,7 @@
* TIM_CR1_CMS_CENTRE_3, TIM_CR1_DIR_UP);
*/
#include <stm32/timer.h>
#include <libopencm3/stm32/timer.h>
void timer_set_mode(u32 timer_peripheral, u8 clock_div, u8 alignment,
u8 direction)

View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stm32/usart.h>
#include <libopencm3/stm32/usart.h>
void usart_set_baudrate(u32 usart, u32 baud)
{

View File

@@ -18,7 +18,7 @@
*/
#include <string.h>
#include <usb/usbd.h>
#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
struct _usbd_device _usbd_device;

View File

@@ -18,7 +18,7 @@
*/
#include <stdlib.h>
#include <usb/usbd.h>
#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
static struct usb_control_state {

View File

@@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <cm3/common.h>
#include <stm32/tools.h>
#include <stm32/usb.h>
#include <usb/usbd.h>
#include <libopencm3/cm3/common.h>
#include <libopencm3/stm32/tools.h>
#include <libopencm3/stm32/usb.h>
#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
/** Initialize the USB device controller hardware of the STM32. */

View File

@@ -18,7 +18,7 @@
*/
#include <string.h>
#include <usb/usbd.h>
#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
void usbd_register_set_config_callback(void (*callback)(u16 wValue))