diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-11 02:46:19 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-11 02:46:19 +0000 |
| commit | fdfcce57e1c46765e0aebf37ad3d9611a7384241 (patch) | |
| tree | 9524405fef6cc3b16965517735dc0ef315f67ab1 /quantum/serial_link | |
| parent | ed76f4394fd95413f7da11e2342b0965182ccb95 (diff) | |
| parent | 501f2fdef115314713e94428d409e5c3b5bfc1c2 (diff) | |
| download | qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.tar.gz qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/serial_link')
| -rw-r--r-- | quantum/serial_link/system/serial_link.c | 2 | ||||
| -rw-r--r-- | quantum/serial_link/system/serial_link.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/quantum/serial_link/system/serial_link.c b/quantum/serial_link/system/serial_link.c index c59c06894..f77483ad8 100644 --- a/quantum/serial_link/system/serial_link.c +++ b/quantum/serial_link/system/serial_link.c | |||
| @@ -24,7 +24,7 @@ SOFTWARE. | |||
| 24 | #include "report.h" | 24 | #include "report.h" |
| 25 | #include "host_driver.h" | 25 | #include "host_driver.h" |
| 26 | #include "serial_link/system/serial_link.h" | 26 | #include "serial_link/system/serial_link.h" |
| 27 | #include "hal.h" | 27 | #include <hal.h> |
| 28 | #include "serial_link/protocol/byte_stuffer.h" | 28 | #include "serial_link/protocol/byte_stuffer.h" |
| 29 | #include "serial_link/protocol/transport.h" | 29 | #include "serial_link/protocol/transport.h" |
| 30 | #include "serial_link/protocol/frame_router.h" | 30 | #include "serial_link/protocol/frame_router.h" |
diff --git a/quantum/serial_link/system/serial_link.h b/quantum/serial_link/system/serial_link.h index f48fbe9ea..b6a473957 100644 --- a/quantum/serial_link/system/serial_link.h +++ b/quantum/serial_link/system/serial_link.h | |||
| @@ -36,7 +36,7 @@ host_driver_t* get_serial_link_driver(void); | |||
| 36 | void serial_link_update(void); | 36 | void serial_link_update(void); |
| 37 | 37 | ||
| 38 | #if defined(PROTOCOL_CHIBIOS) | 38 | #if defined(PROTOCOL_CHIBIOS) |
| 39 | # include "ch.h" | 39 | # include <ch.h> |
| 40 | 40 | ||
| 41 | static inline void serial_link_lock(void) { chSysLock(); } | 41 | static inline void serial_link_lock(void) { chSysLock(); } |
| 42 | 42 | ||