diff options
| author | hierophect <hierophect@gmail.com> | 2020-07-22 13:59:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 13:59:39 -0400 |
| commit | e232ec10ceb9c78df27cb4b5cee79079efd85d84 (patch) | |
| tree | 132c5bfbc1db02d29a82021be595eec1a1122ae8 /ports/stm/supervisor | |
| parent | 138189bad130569ac9a9b3051543b804db54ec6f (diff) | |
| parent | 05a10f7905bfb77f3d5dff2525c9d10375801329 (diff) | |
Merge branch 'main' into stm32-timer-allocator
Diffstat (limited to 'ports/stm/supervisor')
| -rw-r--r-- | ports/stm/supervisor/internal_flash.c | 2 | ||||
| -rw-r--r-- | ports/stm/supervisor/internal_flash.h | 2 | ||||
| -rw-r--r-- | ports/stm/supervisor/usb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ports/stm/supervisor/internal_flash.c b/ports/stm/supervisor/internal_flash.c index d37a54f60..864403c36 100644 --- a/ports/stm/supervisor/internal_flash.c +++ b/ports/stm/supervisor/internal_flash.c @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2013, 2014 Damien P. George + * SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George * Copyright (c) 2020 Lucian Copeland for Adafruit Industries * * Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/ports/stm/supervisor/internal_flash.h b/ports/stm/supervisor/internal_flash.h index 13ade4e6e..ad5cba62d 100644 --- a/ports/stm/supervisor/internal_flash.h +++ b/ports/stm/supervisor/internal_flash.h @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2013, 2014 Damien P. George + * SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George * Copyright (c) 2020 Lucian Copeland for Adafruit Industries * Copyright (c) 2020 Mark Olsson <mark@markolsson.se> * diff --git a/ports/stm/supervisor/usb.c b/ports/stm/supervisor/usb.c index 3dd0acafd..3d53fa374 100644 --- a/ports/stm/supervisor/usb.c +++ b/ports/stm/supervisor/usb.c @@ -130,5 +130,5 @@ void init_usb_hardware(void) { } void OTG_FS_IRQHandler(void) { - tud_int_handler(0); + usb_irq_handler(); } |