From 7021adc50a041bfb69bc4432b712aa07ef710ca3 Mon Sep 17 00:00:00 2001 From: "ajmeyer@mit.edu" Date: Sat, 19 Dec 2009 08:03:54 +0000 Subject: added USB support (TX over virtual com port), the linker modifications to work with the bootloader, a modified libcs-lanchon-stm32.a, and the arduino-required main.cxx and WProgram.h git-svn-id: https://leaflabs.googlecode.com/svn/trunk/library@72 749a229e-a60e-11de-b98f-4500b42dc123 --- .../lanchon-stm32/src/libcs3-lanchon-stm32/lanchon-stm32-isrs.S | 6 +++--- .../lanchon-stm32/src/libcs3-lanchon-stm32/lanchon-stm32-vector.S | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'stm32conf/lanchon-stm32/src/libcs3-lanchon-stm32') diff --git a/stm32conf/lanchon-stm32/src/libcs3-lanchon-stm32/lanchon-stm32-isrs.S b/stm32conf/lanchon-stm32/src/libcs3-lanchon-stm32/lanchon-stm32-isrs.S index b68af59..cda2d73 100644 --- a/stm32conf/lanchon-stm32/src/libcs3-lanchon-stm32/lanchon-stm32-isrs.S +++ b/stm32conf/lanchon-stm32/src/libcs3-lanchon-stm32/lanchon-stm32-isrs.S @@ -114,9 +114,9 @@ __STM32DefaultExceptionHandler: .weak USB_HP_CAN_TX_IRQHandler .globl USB_HP_CAN_TX_IRQHandler .set USB_HP_CAN_TX_IRQHandler, __STM32DefaultExceptionHandler - .weak USB_LP_CAN_RX0_IRQHandler - .globl USB_LP_CAN_RX0_IRQHandler - .set USB_LP_CAN_RX0_IRQHandler, __STM32DefaultExceptionHandler + .weak usb_lpIRQHandler + .globl usb_lpIRQHandler + .set usb_lpIRQHandler, __STM32DefaultExceptionHandler .weak CAN_RX1_IRQHandler .globl CAN_RX1_IRQHandler .set CAN_RX1_IRQHandler, __STM32DefaultExceptionHandler diff --git a/stm32conf/lanchon-stm32/src/libcs3-lanchon-stm32/lanchon-stm32-vector.S b/stm32conf/lanchon-stm32/src/libcs3-lanchon-stm32/lanchon-stm32-vector.S index 17a9c01..a8e1d68 100644 --- a/stm32conf/lanchon-stm32/src/libcs3-lanchon-stm32/lanchon-stm32-vector.S +++ b/stm32conf/lanchon-stm32/src/libcs3-lanchon-stm32/lanchon-stm32-vector.S @@ -42,7 +42,7 @@ __cs3_interrupt_vector_lanchon_stm32: .long DMAChannel7_IRQHandler .long ADC_IRQHandler .long USB_HP_CAN_TX_IRQHandler - .long USB_LP_CAN_RX0_IRQHandler + .long usb_lpIRQHandler .long CAN_RX1_IRQHandler .long CAN_SCE_IRQHandler .long EXTI9_5_IRQHandler -- cgit v1.2.3