aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32/stm32-h103
diff options
context:
space:
mode:
authorGareth McMullin2011-03-13 14:50:53 +1300
committerGareth McMullin2011-03-13 14:50:53 +1300
commit95286a22f0bb6a822b4d2a62611bcc7b2c2daa8b (patch)
tree8aa7847736ac65a5d6e7e9f0e1bf6d0715994484 /examples/stm32/stm32-h103
parent08990e5243de216a599add8d5c2b4b5740cf6a7b (diff)
More build improvements and fixed broken examples.
Diffstat (limited to 'examples/stm32/stm32-h103')
-rw-r--r--examples/stm32/stm32-h103/Makefile108
-rw-r--r--examples/stm32/stm32-h103/usb_dfu/usbdfu.c64
-rw-r--r--examples/stm32/stm32-h103/usb_iap/Makefile2
-rw-r--r--examples/stm32/stm32-h103/usb_iap/usbiap.c64
4 files changed, 41 insertions, 197 deletions
diff --git a/examples/stm32/stm32-h103/Makefile b/examples/stm32/stm32-h103/Makefile
deleted file mode 100644
index 85d0c45..0000000
--- a/examples/stm32/stm32-h103/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-##
-## This file is part of the libopencm3 project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see <http://www.gnu.org/licenses/>.
-##
-
-# Be silent per default, but 'make V=1' will show all compiler calls.
-ifneq ($(V),1)
-Q := @
-# Do not print "Entering directory ...".
-MAKEFLAGS += --no-print-directory
-endif
-
-all: miniblink fancyblink usart usart_irq usart_printf usart_irq_printf timer usb_cdcacm usb_hid button exti_both traceswo
-
-miniblink:
- @printf " BUILD examples/stm32/stm32-h103/miniblink\n"
- $(Q)$(MAKE) -C miniblink
-
-fancyblink:
- @printf " BUILD examples/stm32/stm32-h103/fancyblink\n"
- $(Q)$(MAKE) -C fancyblink
-
-usart:
- @printf " BUILD examples/stm32/stm32-h103/usart\n"
- $(Q)$(MAKE) -C usart
-
-usart_irq:
- @printf " BUILD examples/stm32/stm32-h103/usart_irq\n"
- $(Q)$(MAKE) -C usart_irq
-
-usart_printf:
- @printf " BUILD examples/stm32/stm32-h103/usart_printf\n"
- $(Q)$(MAKE) -C usart_printf
-
-usart_irq_printf:
- @printf " BUILD examples/stm32/stm32-h103/usart_irq_printf\n"
- $(Q)$(MAKE) -C usart_irq_printf
-
-timer:
- @printf " BUILD examples/stm32/stm32-h103/timer\n"
- $(Q)$(MAKE) -C timer
-
-spi:
- @printf " BUILD examples/stm32/stm32-h103/spi\n"
- $(Q)$(MAKE) -C spi
-
-usb_cdcacm:
- @printf " BUILD examples/stm32/stm32-h103/usb_cdcacm\n"
- $(Q)$(MAKE) -C usb_cdcacm
-
-usb_hid:
- @printf " BUILD examples/stm32/stm32-h103/usb_hid\n"
- $(Q)$(MAKE) -C usb_hid
-
-button:
- @printf " BUILD examples/stm32/stm32-h103/button\n"
- $(Q)$(MAKE) -C button
-
-exti_both:
- @printf " BUILD examples/stm32/stm32-h103/exti_both\n"
- $(Q)$(MAKE) -C exti_both
-
-traceswo:
- @printf " BUILD examples/stm32/stm32-h103/traceswo\n"
- $(Q)$(MAKE) -C traceswo
-
-clean:
- @printf " CLEAN examples/stm32/stm32-h103/miniblink\n"
- $(Q)$(MAKE) -C miniblink clean
- @printf " CLEAN examples/stm32/stm32-h103/fancyblink\n"
- $(Q)$(MAKE) -C fancyblink clean
- @printf " CLEAN examples/stm32/stm32-h103/usart\n"
- $(Q)$(MAKE) -C usart clean
- @printf " CLEAN examples/stm32/stm32-h103/usart_irq\n"
- $(Q)$(MAKE) -C usart_irq clean
- @printf " CLEAN examples/stm32/stm32-h103/usart_printf\n"
- $(Q)$(MAKE) -C usart_printf clean
- @printf " CLEAN examples/stm32/stm32-h103/usart_irq_printf\n"
- $(Q)$(MAKE) -C usart_irq_printf clean
- @printf " CLEAN examples/stm32/stm32-h103/spi\n"
- $(Q)$(MAKE) -C spi clean
- @printf " CLEAN examples/stm32/stm32-h103/usb_cdcacm\n"
- $(Q)$(MAKE) -C usb_cdcacm clean
- @printf " CLEAN examples/stm32/stm32-h103/usb_hid\n"
- $(Q)$(MAKE) -C usb_hid clean
- @printf " CLEAN examples/stm32/stm32-h103/button\n"
- $(Q)$(MAKE) -C button clean
- @printf " CLEAN examples/stm32/stm32-h103/exti_both\n"
- $(Q)$(MAKE) -C exti_both clean
- @printf " CLEAN examples/stm32/stm32-h103/traceswo\n"
- $(Q)$(MAKE) -C traceswo clean
-
-.PHONY: miniblink fancyblink usart usart_irq usart_printf usart_irq_printf timer spi usb_cdcacm usb_hid button exti_both traceswo clean
-
diff --git a/examples/stm32/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32/stm32-h103/usb_dfu/usbdfu.c
index 2ae8374..4e83ce0 100644
--- a/examples/stm32/stm32-h103/usb_dfu/usbdfu.c
+++ b/examples/stm32/stm32-h103/usb_dfu/usbdfu.c
@@ -173,18 +173,26 @@ static void usbdfu_getstatus_complete(struct usb_setup_data *req)
}
}
-static int usbdfu_control_command(struct usb_setup_data *req,
- void (**complete)(struct usb_setup_data *req))
+static int usbdfu_control_request(struct usb_setup_data *req, u8 **buf,
+ u16 *len, void (**complete)(struct usb_setup_data *req))
{
- (void)complete;
- if(req->bmRequestType != 0x21)
+ if((req->bmRequestType & 0x7F) != 0x21)
return 0; /* Only accept class request */
-
+
switch(req->bRequest) {
case DFU_DNLOAD:
- usbdfu_state = STATE_DFU_MANIFEST_SYNC;
- return 1;
+ if((len == NULL) || (*len == 0)) {
+ usbdfu_state = STATE_DFU_MANIFEST_SYNC;
+ return 1;
+ } else {
+ /* Copy download data for use on GET_STATUS */
+ prog.blocknum = req->wValue;
+ prog.len = *len;
+ memcpy(prog.buf, *buf, *len);
+ usbdfu_state = STATE_DFU_DNLOAD_SYNC;
+ return 1;
+ }
case DFU_CLRSTATUS:
/* Clear error and return to dfuIDLE */
if(usbdfu_state == STATE_DFU_ERROR)
@@ -194,19 +202,6 @@ static int usbdfu_control_command(struct usb_setup_data *req,
/* Abort returns to dfuIDLE state */
usbdfu_state = STATE_DFU_IDLE;
return 1;
- }
-
- return 0;
-}
-
-static int usbdfu_control_read(struct usb_setup_data *req, u8 **buf, u16 *len,
- void (**complete)(struct usb_setup_data *req))
-{
-
- if(req->bmRequestType != 0xA1)
- return 0; /* Only accept class request */
-
- switch(req->bRequest) {
case DFU_UPLOAD:
/* Upload not supported for now */
return 0;
@@ -235,26 +230,6 @@ static int usbdfu_control_read(struct usb_setup_data *req, u8 **buf, u16 *len,
return 0;
}
-static int usbdfu_control_write(struct usb_setup_data *req, u8 *buf, u16 len,
- void (**complete)(struct usb_setup_data *req))
-{
- (void)complete;
-
- if(req->bmRequestType != 0x21)
- return 0; /* Only accept class request */
-
- if(req->bRequest != DFU_DNLOAD)
- return 0;
-
- /* Copy download data for use on GET_STATUS */
- prog.blocknum = req->wValue;
- prog.len = len;
- memcpy(prog.buf, buf, len);
- usbdfu_state = STATE_DFU_DNLOAD_SYNC;
-
- return 1;
-}
-
int main(void)
{
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
@@ -280,11 +255,12 @@ int main(void)
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
- usbd_init(&dev, &config, usb_strings);
+ usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings);
usbd_set_control_buffer_size(sizeof(usbd_control_buffer));
- usbd_register_control_command_callback(usbdfu_control_command);
- usbd_register_control_write_callback(usbdfu_control_write);
- usbd_register_control_read_callback(usbdfu_control_read);
+ usbd_register_control_callback(
+ USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,
+ USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT,
+ usbdfu_control_request);
gpio_set(GPIOA, GPIO15);
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
diff --git a/examples/stm32/stm32-h103/usb_iap/Makefile b/examples/stm32/stm32-h103/usb_iap/Makefile
index 0b51782..bed9908 100644
--- a/examples/stm32/stm32-h103/usb_iap/Makefile
+++ b/examples/stm32/stm32-h103/usb_iap/Makefile
@@ -19,5 +19,5 @@
BINARY = usbiap
-include ../../Makefile.includes
+include ../../Makefile.include
diff --git a/examples/stm32/stm32-h103/usb_iap/usbiap.c b/examples/stm32/stm32-h103/usb_iap/usbiap.c
index 2ae8374..4e83ce0 100644
--- a/examples/stm32/stm32-h103/usb_iap/usbiap.c
+++ b/examples/stm32/stm32-h103/usb_iap/usbiap.c
@@ -173,18 +173,26 @@ static void usbdfu_getstatus_complete(struct usb_setup_data *req)
}
}
-static int usbdfu_control_command(struct usb_setup_data *req,
- void (**complete)(struct usb_setup_data *req))
+static int usbdfu_control_request(struct usb_setup_data *req, u8 **buf,
+ u16 *len, void (**complete)(struct usb_setup_data *req))
{
- (void)complete;
- if(req->bmRequestType != 0x21)
+ if((req->bmRequestType & 0x7F) != 0x21)
return 0; /* Only accept class request */
-
+
switch(req->bRequest) {
case DFU_DNLOAD:
- usbdfu_state = STATE_DFU_MANIFEST_SYNC;
- return 1;
+ if((len == NULL) || (*len == 0)) {
+ usbdfu_state = STATE_DFU_MANIFEST_SYNC;
+ return 1;
+ } else {
+ /* Copy download data for use on GET_STATUS */
+ prog.blocknum = req->wValue;
+ prog.len = *len;
+ memcpy(prog.buf, *buf, *len);
+ usbdfu_state = STATE_DFU_DNLOAD_SYNC;
+ return 1;
+ }
case DFU_CLRSTATUS:
/* Clear error and return to dfuIDLE */
if(usbdfu_state == STATE_DFU_ERROR)
@@ -194,19 +202,6 @@ static int usbdfu_control_command(struct usb_setup_data *req,
/* Abort returns to dfuIDLE state */
usbdfu_state = STATE_DFU_IDLE;
return 1;
- }
-
- return 0;
-}
-
-static int usbdfu_control_read(struct usb_setup_data *req, u8 **buf, u16 *len,
- void (**complete)(struct usb_setup_data *req))
-{
-
- if(req->bmRequestType != 0xA1)
- return 0; /* Only accept class request */
-
- switch(req->bRequest) {
case DFU_UPLOAD:
/* Upload not supported for now */
return 0;
@@ -235,26 +230,6 @@ static int usbdfu_control_read(struct usb_setup_data *req, u8 **buf, u16 *len,
return 0;
}
-static int usbdfu_control_write(struct usb_setup_data *req, u8 *buf, u16 len,
- void (**complete)(struct usb_setup_data *req))
-{
- (void)complete;
-
- if(req->bmRequestType != 0x21)
- return 0; /* Only accept class request */
-
- if(req->bRequest != DFU_DNLOAD)
- return 0;
-
- /* Copy download data for use on GET_STATUS */
- prog.blocknum = req->wValue;
- prog.len = len;
- memcpy(prog.buf, buf, len);
- usbdfu_state = STATE_DFU_DNLOAD_SYNC;
-
- return 1;
-}
-
int main(void)
{
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
@@ -280,11 +255,12 @@ int main(void)
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
- usbd_init(&dev, &config, usb_strings);
+ usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings);
usbd_set_control_buffer_size(sizeof(usbd_control_buffer));
- usbd_register_control_command_callback(usbdfu_control_command);
- usbd_register_control_write_callback(usbdfu_control_write);
- usbd_register_control_read_callback(usbdfu_control_read);
+ usbd_register_control_callback(
+ USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,
+ USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT,
+ usbdfu_control_request);
gpio_set(GPIOA, GPIO15);
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,