Browse Source

drivers: remove direct `quantum.h` includes (#21473)

pull/21489/head
Ryan 10 months ago
committed by GitHub
parent
commit
b6d9409d2f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 30 additions and 23 deletions
  1. +1
    -1
      drivers/led/apa102.c
  2. +1
    -1
      drivers/sensors/pmw33xx_common.h
  3. +2
    -1
      platforms/chibios/bootloaders/rp2040.c
  4. +3
    -1
      platforms/chibios/drivers/i2c_master.c
  5. +1
    -1
      platforms/chibios/drivers/serial.c
  6. +0
    -2
      platforms/chibios/drivers/serial_protocol.c
  7. +1
    -0
      platforms/chibios/drivers/serial_usart.c
  8. +0
    -1
      platforms/chibios/drivers/serial_usart.h
  9. +0
    -2
      platforms/chibios/drivers/uart.c
  10. +1
    -0
      platforms/chibios/drivers/uart.h
  11. +1
    -3
      platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c
  12. +2
    -1
      platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c
  13. +9
    -3
      platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
  14. +3
    -3
      platforms/chibios/drivers/ws2812_bitbang.c
  15. +2
    -2
      platforms/chibios/drivers/ws2812_pwm.c
  16. +3
    -1
      platforms/chibios/drivers/ws2812_spi.c

+ 1
- 1
drivers/led/apa102.c View File

@ -16,7 +16,7 @@
*/
#include "apa102.h"
#include "quantum.h"
#include "gpio.h"
#ifndef APA102_NOPS
# if defined(__AVR__)


+ 1
- 1
drivers/sensors/pmw33xx_common.h View File

@ -10,7 +10,7 @@
#pragma once
#include "quantum.h" //to get is_keyboard_left
#include "keyboard.h"
#include <stdint.h>
#include "spi_master.h"
#include "util.h"


+ 2
- 1
platforms/chibios/bootloaders/rp2040.c View File

@ -1,9 +1,10 @@
// Copyright 2022 Stefan Kerkmann
// SPDX-License-Identifier: GPL-2.0-or-later
#include "quantum.h"
#include "hal.h"
#include "bootloader.h"
#include "gpio.h"
#include "wait.h"
#include "pico/bootrom.h"
#if !defined(RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED)


+ 3
- 1
platforms/chibios/drivers/i2c_master.c View File

@ -24,8 +24,10 @@
* STM32_I2C_USE_I2C1 is TRUE in the mcuconf.h file. Pins B6 and B7 are used
* but using any other I2C pins should be trivial.
*/
#include "quantum.h"
#include "i2c_master.h"
#include "gpio.h"
#include "chibios_config.h"
#include <string.h>
#include <ch.h>
#include <hal.h>


+ 1
- 1
platforms/chibios/drivers/serial.c View File

@ -2,8 +2,8 @@
* WARNING: be careful changing this code, it is very timing dependent
*/
#include "quantum.h"
#include "serial.h"
#include "gpio.h"
#include "wait.h"
#include "synchronization_util.h"


+ 0
- 2
platforms/chibios/drivers/serial_protocol.c View File

@ -3,10 +3,8 @@
#include <ch.h>
#include "quantum.h"
#include "serial.h"
#include "serial_protocol.h"
#include "printf.h"
#include "synchronization_util.h"
static inline bool initiate_transaction(uint8_t transaction_id);


+ 1
- 0
platforms/chibios/drivers/serial_usart.c View File

@ -5,6 +5,7 @@
#include "serial_usart.h"
#include "serial_protocol.h"
#include "synchronization_util.h"
#include "chibios_config.h"
#if defined(SERIAL_USART_CONFIG)
static QMKSerialConfig serial_config = SERIAL_USART_CONFIG;


+ 0
- 1
platforms/chibios/drivers/serial_usart.h View File

@ -3,7 +3,6 @@
#pragma once
#include "quantum.h"
#include "serial.h"
#include <hal.h>


+ 0
- 2
platforms/chibios/drivers/uart.c View File

@ -16,8 +16,6 @@
#include "uart.h"
#include "quantum.h"
#if defined(MCU_KINETIS)
static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE};
#elif defined(WB32F3G71xx) || defined(WB32FQ95xx)


+ 1
- 0
platforms/chibios/drivers/uart.h View File

@ -17,6 +17,7 @@
#pragma once
#include <stdint.h>
#include <stdbool.h>
#include <hal.h>


+ 1
- 3
platforms/chibios/drivers/vendor/RP/RP2040/ps2_vendor.c View File

@ -1,12 +1,10 @@
// Copyright 2022 Marek Kraus (@gamelaster)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "quantum.h"
#include "hardware/pio.h"
#include "hardware/clocks.h"
#include "ps2.h"
#include "print.h"
#include "debug.h"
#if !defined(MCU_RP)
# error PIO Driver is only available for Raspberry Pi 2040 MCUs!


+ 2
- 1
platforms/chibios/drivers/vendor/RP/RP2040/serial_vendor.c View File

@ -1,11 +1,12 @@
// Copyright 2022 Stefan Kerkmann
// SPDX-License-Identifier: GPL-2.0-or-later
#include "quantum.h"
#include "serial_usart.h"
#include "serial_protocol.h"
#include "hardware/pio.h"
#include "hardware/clocks.h"
#include "wait.h"
#include "debug.h"
#if !defined(MCU_RP)
# error PIO Driver is only available for Raspberry Pi 2040 MCUs!


+ 9
- 3
platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c View File

@ -2,13 +2,19 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include "ws2812.h"
#include "hardware/timer.h"
#include "hardware/clocks.h"
// Keep this exact include order otherwise we run into naming conflicts between
// pico-sdk and rp2040.h which we don't control.
#include "quantum.h"
#include "hardware/timer.h"
#include "hardware/clocks.h"
#include <hal.h>
#include "hardware/pio.h"
#include "gpio.h"
#include "debug.h"
#include "wait.h"
#include "util.h"
#if !defined(MCU_RP)
# error PIO Driver is only available for Raspberry Pi 2040 MCUs!
#endif


+ 3
- 3
platforms/chibios/drivers/ws2812_bitbang.c View File

@ -1,7 +1,7 @@
#include "quantum.h"
#include "ws2812.h"
#include <ch.h>
#include <hal.h>
#include "gpio.h"
#include "chibios_config.h"
/* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */


+ 2
- 2
platforms/chibios/drivers/ws2812_pwm.c View File

@ -1,6 +1,6 @@
#include "ws2812.h"
#include "quantum.h"
#include <hal.h>
#include "gpio.h"
#include "chibios_config.h"
/* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */


+ 3
- 1
platforms/chibios/drivers/ws2812_spi.c View File

@ -1,5 +1,7 @@
#include "quantum.h"
#include "ws2812.h"
#include "gpio.h"
#include "util.h"
#include "chibios_config.h"
/* Adapted from https://github.com/gamazeps/ws2812b-chibios-SPIDMA/ */


Loading…
Cancel
Save