h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb_cdc: Rename usb_request_bootloader() to bootloader_request()

Browse Source 
Rename this board API function to a more generic name.  This is in
preparation for calling the function from the canbus code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2022-07-25 13:17:23 -04:00
parent 48b60a8021
commit 18ff84aa04
14 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/stm32/stm32f0.c
View File

@@ -8,6 +8,7 @@
#include "board/armcm_boot.h" // armcm_main
#include "board/armcm_reset.h" // try_request_canboot
#include "board/irq.h" // irq_disable
#include "board/misc.h" // bootloader_request
#include "command.h" // DECL_CONSTANT_STR
#include "internal.h" // enable_pclock
#include "sched.h" // sched_main
@@ -130,7 +131,7 @@ hsi14_setup(void)
/****************************************************************
* USB bootloader
* Bootloader
****************************************************************/
#define USB_BOOT_FLAG_ADDR (CONFIG_RAM_START + CONFIG_RAM_SIZE - 1024)
@@ -160,9 +161,9 @@ check_usb_dfu_bootloader(void)
: : "r"(sysbase[0]), "r"(sysbase[1]));
}
// Handle USB reboot requests
// Handle reboot requests
void
usb_request_bootloader(void)
bootloader_request(void)
{
try_request_canboot();
usb_reboot_for_dfu_bootloader();

10
src/stm32/stm32f1.c
View File

@@ -1,6 +1,6 @@
// Code to setup clocks and gpio on stm32f1
//
// Copyright (C) 2019-2021 Kevin O'Connor <kevin@koconnor.net>
// Copyright (C) 2019-2022 Kevin O'Connor <kevin@koconnor.net>
//
// This file may be distributed under the terms of the GNU GPLv3 license.
@@ -8,7 +8,7 @@
#include "board/armcm_boot.h" // VectorTable
#include "board/armcm_reset.h" // try_request_canboot
#include "board/irq.h" // irq_disable
#include "board/usb_cdc.h" // usb_request_bootloader
#include "board/misc.h" // bootloader_request
#include "internal.h" // enable_pclock
#include "sched.h" // sched_main
@@ -213,7 +213,7 @@ gpio_peripheral(uint32_t gpio, uint32_t mode, int pullup)
/****************************************************************
* USB bootloader
* Bootloader
****************************************************************/
// Reboot into USB "HID" bootloader
@@ -240,9 +240,9 @@ usb_stm32duino_bootloader(void)
NVIC_SystemReset();
}
// Handle USB reboot requests
// Handle reboot requests
void
usb_request_bootloader(void)
bootloader_request(void)
{
try_request_canboot();
if (CONFIG_STM32_FLASH_START_800)

8
src/stm32/stm32f4.c
View File

@@ -8,7 +8,7 @@
#include "board/armcm_boot.h" // VectorTable
#include "board/armcm_reset.h" // try_request_canboot
#include "board/irq.h" // irq_disable
#include "board/usb_cdc.h" // usb_request_bootloader
#include "board/misc.h" // bootloader_request
#include "command.h" // DECL_CONSTANT_STR
#include "internal.h" // enable_pclock
#include "sched.h" // sched_main
@@ -188,7 +188,7 @@ clock_setup(void)
/****************************************************************
* USB bootloader
* Bootloader
****************************************************************/
// Reboot into USB "HID" bootloader
@@ -228,9 +228,9 @@ check_usb_dfu_bootloader(void)
: : "r"(sysbase[0]), "r"(sysbase[1]));
}
// Handle USB reboot requests
// Handle reboot requests
void
usb_request_bootloader(void)
bootloader_request(void)
{
try_request_canboot();
if (CONFIG_STM32_FLASH_START_4000)

5
src/stm32/stm32g0.c
View File

@@ -8,6 +8,7 @@
#include "board/armcm_boot.h" // armcm_main
#include "board/armcm_reset.h" // try_request_canboot
#include "board/irq.h" // irq_disable
#include "board/misc.h" // bootloader_request
#include "command.h" // DECL_CONSTANT_STR
#include "internal.h" // enable_pclock
#include "sched.h" // sched_main
@@ -103,7 +104,7 @@ clock_setup(void)
/****************************************************************
* USB bootloader
* Bootloader
****************************************************************/
#define USB_BOOT_FLAG_ADDR (CONFIG_RAM_START + CONFIG_RAM_SIZE - 1024)
@@ -132,7 +133,7 @@ check_usb_dfu_bootloader(void)
// Handle USB reboot requests
void
usb_request_bootloader(void)
bootloader_request(void)
{
try_request_canboot();
usb_reboot_for_dfu_bootloader();

9
src/stm32/stm32h7.c
View File

@@ -6,8 +6,9 @@
#include "autoconf.h" // CONFIG_CLOCK_REF_FREQ
#include "board/armcm_boot.h" // VectorTable
#include "board/irq.h" // irq_disable
#include "board/armcm_reset.h" // try_request_canboot
#include "board/irq.h" // irq_disable
#include "board/misc.h" // bootloader_request
#include "command.h" // DECL_CONSTANT_STR
#include "internal.h" // get_pclock_frequency
#include "sched.h" // sched_main
@@ -185,7 +186,7 @@ clock_setup(void)
/****************************************************************
* USB bootloader
* Bootloader
****************************************************************/
#define USB_BOOT_FLAG_ADDR (CONFIG_RAM_START + CONFIG_RAM_SIZE - 1024)
@@ -212,9 +213,9 @@ check_usb_dfu_bootloader(void)
: : "r"(sysbase[0]), "r"(sysbase[1]));
}
// Handle USB reboot requests
// Handle reboot requests
void
usb_request_bootloader(void)
bootloader_request(void)
{
try_request_canboot();
usb_reboot_for_dfu_bootloader();