Skip to content

Commit

Permalink
Merge branch 'bracz-st-uart-baud' into merge-branch
Browse files Browse the repository at this point in the history
* bracz-st-uart-baud:
  Adds support for the STM32UART to set the baud rate via ioctl. (#549)
  Fix whitespace.
  • Loading branch information
balazsracz committed Jul 10, 2021
2 parents aa29ab9 + 2ad111d commit 95dbd74
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/freertos_drivers/st/Stm32Uart.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ void Stm32Uart::disable()
HAL_UART_DeInit(&uartHandle);
}

int Stm32Uart::ioctl(
File *file, unsigned long int key, unsigned long data) {
int Stm32Uart::ioctl(File *file, unsigned long int key, unsigned long data)
{
switch (key)
{
default:
Expand Down
4 changes: 2 additions & 2 deletions src/freertos_drivers/st/Stm32Uart.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ public:
/** Request an ioctl transaction. Supported ioctl is TCBAUDRATE from
* include/freertos/tc_ioctl.h */
int ioctl(File *file, unsigned long int key, unsigned long data) override;

private:
void enable() override; /**< function to enable device */
void disable() override; /**< function to disable device */

/** @todo (Stuart Baker) this should be made private */
/** handle an interrupt.
*/
Expand Down

0 comments on commit 95dbd74

Please sign in to comment.