summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2009-06-04 17:31:13 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2009-06-04 17:31:13 +0100
commitf77b561646df0b6c282b92a9e8d8af676ae0cb02 (patch)
tree03c4b73f603cf2c1e8b75ad1eef3fd36a356f510
parentc9c7391178ae93a139e35225fa250330eb5dce38 (diff)
downloadstm32-virtcomport-f77b561646df0b6c282b92a9e8d8af676ae0cb02.tar.bz2
Fix broken concatenation by moving to rules file
-rw-r--r--.bzrignore2
-rw-r--r--platform_config.h4
-rw-r--r--virtcomport.s3r5
3 files changed, 8 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore
index 0d4009a..5545e8c 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1 +1,3 @@
virtcomport.s3s
+virtcomport-release
+virtcomport-debug
diff --git a/platform_config.h b/platform_config.h
index da7963b..12e2219 100644
--- a/platform_config.h
+++ b/platform_config.h
@@ -67,11 +67,11 @@
#endif
#ifndef USART_RCC_GPIO
-#define USART_RCC_GPIO RCC_APB2Periph_##USART_GPIO
+#define USART_RCC_GPIO RCC_APB2Periph_GPIOA
#endif
#ifndef USART_IRQHANDLER
-#define USART_IRQHANDLER ACTIVE_USART##_IRQHandler
+#define USART_IRQHANDLER USART1_IRQHandler
#endif
#ifndef USART_TXPIN
diff --git a/virtcomport.s3r b/virtcomport.s3r
index 14492cd..96611fc 100644
--- a/virtcomport.s3r
+++ b/virtcomport.s3r
@@ -1,6 +1,6 @@
# Extra rules for the virtual COM port project
-VCOMP_CFLAGS := -DUSB_DISCONNECT_PIN=GPIO_Pin_$(CONFIG_FLASHER_PIN)
+VCOMP_CFLAGS := -DUSB_DISCONNECT_PIN=GPIO_Pin_$(CONFIG_DISCONNECT_PIN)
GPIOBLOCK := $(patsubst CONFIG_DISCONNECT_BANK_GPIO%,GPIO%,$(filter CONFIG_DISCONNECT_BANK_GPIO%,$(.VARIABLES)))
@@ -25,12 +25,15 @@ VCOMP_CFLAGS += -DACTIVE_USART=$(USART) -DUSART_IRQCHANNEL=$(USART)_IRQChannel
ifeq ($(USART),USART1)
VCOMP_CFLAGS += -DRCC_USART_CMD=RCC_APB2PeriphClockCmd -DRCC_USART_PERIPH=RCC_APB2Periph_USART1
VCOMP_CFLAGS += -DUSART_GPIO=GPIOA -DUSART_TXPIN=GPIO_Pin_9 -DUSART_RXPIN=GPIO_Pin_10
+VCOMP_CFLAGS += -DUSART_RCC_GPIO=RCC_APB2Periph_GPIOA -DUSART_IRQHANDLER=USART1_IRQHandler
else
VCOMP_CFLAGS += -DRCC_USART_CMD=RCC_APB1PeriphClockCmd -DRCC_USART_PERIPH=RCC_APB1Periph_$(USART)
ifeq ($(USART,USART2))
VCOMP_CFLAGS += -DUSART_GPIO=GPIOA -DUSART_TXPIN=GPIO_Pin_2 -DUSART_RXPIN=GPIO_Pin_3
+VCOMP_CFLAGS += -DUSART_RCC_GPIO=RCC_APB2Periph_GPIOA -DUSART_IRQHANDLER=USART2_IRQHandler
else
VCOMP_CFLAGS += -DUSART_GPIO=GPIOB -DUSART_TXPIN=GPIO_Pin_10 -DUSART_RXPIN=GPIO_Pin_11
+VCOMP_CFLAGS += -DUSART_RCC_GPIO=RCC_APB2Periph_GPIOB -DUSART_IRQHANDLER=USART3_IRQHandler
endif
endif