1
0
Fork 0

Begin to carve out platform/protocol API - Single main loop (#13843)

* Begin to carve out platform/protocol API

* Fix up after rebase
This commit is contained in:
Joel Challis 2021-08-18 00:11:07 +01:00 committed by GitHub
parent 4c9003b177
commit 96e2b13d1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 235 additions and 119 deletions

View file

@ -338,9 +338,11 @@ ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
endif endif
# project specific files # project specific files
SRC += $(KEYBOARD_SRC) \ SRC += \
$(KEYBOARD_SRC) \
$(KEYMAP_C) \ $(KEYMAP_C) \
$(QUANTUM_SRC) $(QUANTUM_SRC) \
$(QUANTUM_DIR)/main.c \
# Optimize size but this may cause error "relocation truncated to fit" # Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax #EXTRALDFLAGS = -Wl,--relax

41
quantum/main.c Normal file
View file

@ -0,0 +1,41 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "keyboard.h"
void platform_setup(void);
void protocol_setup(void);
void protocol_init(void);
void protocol_task(void);
/** \brief Main
*
* FIXME: Needs doc
*/
int main(void) __attribute__((weak));
int main(void) {
platform_setup();
protocol_setup();
protocol_init();
/* Main loop */
while (true) {
protocol_task();
housekeeping_task();
}
}

View file

@ -12,6 +12,7 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/report.c \ $(COMMON_DIR)/report.c \
$(COMMON_DIR)/sync_timer.c \ $(COMMON_DIR)/sync_timer.c \
$(COMMON_DIR)/usb_util.c \ $(COMMON_DIR)/usb_util.c \
$(PLATFORM_COMMON_DIR)/platform.c \
$(PLATFORM_COMMON_DIR)/suspend.c \ $(PLATFORM_COMMON_DIR)/suspend.c \
$(PLATFORM_COMMON_DIR)/timer.c \ $(PLATFORM_COMMON_DIR)/timer.c \
$(PLATFORM_COMMON_DIR)/bootloader.c \ $(PLATFORM_COMMON_DIR)/bootloader.c \

View file

@ -0,0 +1,21 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "platform_deps.h"
void platform_setup(void) {
// do nothing
}

View file

@ -0,0 +1,21 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "platform_deps.h"
void platform_setup(void) {
// do nothing
}

View file

@ -0,0 +1,22 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "platform_deps.h"
void platform_setup(void) {
halInit();
chSysInit();
}

View file

@ -0,0 +1,21 @@
/* Copyright 2021 QMK
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "platform_deps.h"
void platform_setup(void) {
// do nothing
}

View file

@ -3,7 +3,7 @@ CHIBIOS_DIR = $(PROTOCOL_DIR)/chibios
SRC += $(CHIBIOS_DIR)/usb_main.c SRC += $(CHIBIOS_DIR)/usb_main.c
SRC += $(CHIBIOS_DIR)/main.c SRC += $(CHIBIOS_DIR)/chibios.c
SRC += usb_descriptor.c SRC += usb_descriptor.c
SRC += $(CHIBIOS_DIR)/usb_driver.c SRC += $(CHIBIOS_DIR)/usb_driver.c
SRC += $(CHIBIOS_DIR)/usb_util.c SRC += $(CHIBIOS_DIR)/usb_util.c

View file

@ -138,18 +138,14 @@ void boardInit(void) {
board_init(); board_init();
} }
/* Main thread void protocol_setup(void) {
*/
int main(void) {
/* ChibiOS/RT init */
halInit();
chSysInit();
// TESTING // TESTING
// chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL); // chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
keyboard_setup(); keyboard_setup();
}
void protocol_init(void) {
/* Init USB */ /* Init USB */
usb_event_queue_init(); usb_event_queue_init();
init_usb_driver(&USB_DRIVER); init_usb_driver(&USB_DRIVER);
@ -207,57 +203,53 @@ int main(void) {
#endif #endif
print("Keyboard start.\n"); print("Keyboard start.\n");
}
/* Main loop */ void protocol_task(void) {
while (true) { usb_event_queue_task();
usb_event_queue_task();
#if !defined(NO_USB_STARTUP_CHECK) #if !defined(NO_USB_STARTUP_CHECK)
if (USB_DRIVER.state == USB_SUSPENDED) { if (USB_DRIVER.state == USB_SUSPENDED) {
print("[s]"); print("[s]");
# ifdef VISUALIZER_ENABLE # ifdef VISUALIZER_ENABLE
visualizer_suspend(); visualizer_suspend();
# endif # endif
while (USB_DRIVER.state == USB_SUSPENDED) { while (USB_DRIVER.state == USB_SUSPENDED) {
/* Do this in the suspended state */ /* Do this in the suspended state */
# ifdef SERIAL_LINK_ENABLE # ifdef SERIAL_LINK_ENABLE
serial_link_update(); serial_link_update();
# endif # endif
suspend_power_down(); // on AVR this deep sleeps for 15ms suspend_power_down(); // on AVR this deep sleeps for 15ms
/* Remote wakeup */ /* Remote wakeup */
if (suspend_wakeup_condition()) { if (suspend_wakeup_condition()) {
usbWakeupHost(&USB_DRIVER); usbWakeupHost(&USB_DRIVER);
restart_usb_driver(&USB_DRIVER); restart_usb_driver(&USB_DRIVER);
}
} }
/* Woken up */ }
// variables has been already cleared by the wakeup hook /* Woken up */
send_keyboard_report(); // variables has been already cleared by the wakeup hook
send_keyboard_report();
# ifdef MOUSEKEY_ENABLE # ifdef MOUSEKEY_ENABLE
mousekey_send(); mousekey_send();
# endif /* MOUSEKEY_ENABLE */ # endif /* MOUSEKEY_ENABLE */
# ifdef VISUALIZER_ENABLE # ifdef VISUALIZER_ENABLE
visualizer_resume(); visualizer_resume();
# endif # endif
} }
#endif #endif
keyboard_task(); keyboard_task();
#ifdef CONSOLE_ENABLE #ifdef CONSOLE_ENABLE
console_task(); console_task();
#endif #endif
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
midi_ep_task(); midi_ep_task();
#endif #endif
#ifdef VIRTSER_ENABLE #ifdef VIRTSER_ENABLE
virtser_task(); virtser_task();
#endif #endif
#ifdef RAW_ENABLE #ifdef RAW_ENABLE
raw_hid_task(); raw_hid_task();
#endif #endif
// Run housekeeping
housekeeping_task();
}
} }

View file

@ -1033,18 +1033,16 @@ static void setup_usb(void) {
USB_Device_EnableSOFEvents(); USB_Device_EnableSOFEvents();
} }
/** \brief Main void protocol_setup(void) {
*
* FIXME: Needs doc
*/
int main(void) __attribute__((weak));
int main(void) {
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
setup_midi(); setup_midi();
#endif #endif
setup_mcu(); setup_mcu();
keyboard_setup(); keyboard_setup();
}
void protocol_init(void) {
setup_usb(); setup_usb();
sei(); sei();
@ -1078,57 +1076,55 @@ int main(void) {
#endif #endif
print("Keyboard start.\n"); print("Keyboard start.\n");
while (1) { }
void protocol_task(void) {
#if !defined(NO_USB_STARTUP_CHECK) #if !defined(NO_USB_STARTUP_CHECK)
if (USB_DeviceState == DEVICE_STATE_Suspended) { if (USB_DeviceState == DEVICE_STATE_Suspended) {
print("[s]"); print("[s]");
while (USB_DeviceState == DEVICE_STATE_Suspended) { while (USB_DeviceState == DEVICE_STATE_Suspended) {
suspend_power_down(); suspend_power_down();
if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) { if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
USB_Device_SendRemoteWakeup(); USB_Device_SendRemoteWakeup();
clear_keyboard(); clear_keyboard();
# if USB_SUSPEND_WAKEUP_DELAY > 0 # if USB_SUSPEND_WAKEUP_DELAY > 0
// Some hubs, kvm switches, and monitors do // Some hubs, kvm switches, and monitors do
// weird things, with USB device state bouncing // weird things, with USB device state bouncing
// around wildly on wakeup, yielding race // around wildly on wakeup, yielding race
// conditions that can corrupt the keyboard state. // conditions that can corrupt the keyboard state.
// //
// Pause for a while to let things settle... // Pause for a while to let things settle...
wait_ms(USB_SUSPEND_WAKEUP_DELAY); wait_ms(USB_SUSPEND_WAKEUP_DELAY);
# endif # endif
}
} }
suspend_wakeup_init();
} }
suspend_wakeup_init();
}
#endif #endif
keyboard_task(); keyboard_task();
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE
MIDI_Device_USBTask(&USB_MIDI_Interface); MIDI_Device_USBTask(&USB_MIDI_Interface);
#endif #endif
#ifdef MODULE_ADAFRUIT_BLE #ifdef MODULE_ADAFRUIT_BLE
adafruit_ble_task(); adafruit_ble_task();
#endif #endif
#ifdef VIRTSER_ENABLE #ifdef VIRTSER_ENABLE
virtser_task(); virtser_task();
CDC_Device_USBTask(&cdc_device); CDC_Device_USBTask(&cdc_device);
#endif #endif
#ifdef RAW_ENABLE #ifdef RAW_ENABLE
raw_hid_task(); raw_hid_task();
#endif #endif
#if !defined(INTERRUPT_CONTROL_ENDPOINT) #if !defined(INTERRUPT_CONTROL_ENDPOINT)
USB_USBTask(); USB_USBTask();
#endif #endif
// Run housekeeping
housekeeping_task();
}
} }
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, const void **const DescriptorAddress) { return get_usb_descriptor(wValue, wIndex, DescriptorAddress); } uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, const void **const DescriptorAddress) { return get_usb_descriptor(wValue, wIndex, DescriptorAddress); }

View file

@ -3,7 +3,7 @@ VUSB_DIR = protocol/vusb
# Path to the V-USB library # Path to the V-USB library
VUSB_PATH = $(LIB_PATH)/vusb VUSB_PATH = $(LIB_PATH)/vusb
SRC += $(VUSB_DIR)/main.c \ SRC += $(VUSB_DIR)/protocol.c \
$(VUSB_DIR)/vusb.c \ $(VUSB_DIR)/vusb.c \
$(VUSB_DIR)/usb_util.c \ $(VUSB_DIR)/usb_util.c \
$(VUSB_PATH)/usbdrv/usbdrv.c \ $(VUSB_PATH)/usbdrv/usbdrv.c \

View file

@ -99,14 +99,11 @@ static void vusb_wakeup(void) {
*/ */
static void setup_usb(void) { initForUsbConnectivity(); } static void setup_usb(void) { initForUsbConnectivity(); }
/** \brief Main uint16_t sof_timer = 0;
*
* FIXME: Needs doc void protocol_setup(void) {
*/
int main(void) __attribute__((weak));
int main(void) {
#if USB_COUNT_SOF #if USB_COUNT_SOF
uint16_t sof_timer = timer_read(); sof_timer = timer_read();
#endif #endif
#ifdef CLKPR #ifdef CLKPR
@ -115,9 +112,14 @@ int main(void) {
clock_prescale_set(clock_div_1); clock_prescale_set(clock_div_1);
#endif #endif
keyboard_setup(); keyboard_setup();
}
void protocol_init(void) {
setup_usb(); setup_usb();
sei(); sei();
keyboard_init(); keyboard_init();
host_set_driver(vusb_driver()); host_set_driver(vusb_driver());
wait_ms(50); wait_ms(50);
@ -125,55 +127,52 @@ int main(void) {
#ifdef SLEEP_LED_ENABLE #ifdef SLEEP_LED_ENABLE
sleep_led_init(); sleep_led_init();
#endif #endif
}
while (1) { void protocol_task(void) {
#if USB_COUNT_SOF #if USB_COUNT_SOF
if (usbSofCount != 0) { if (usbSofCount != 0) {
usbSofCount = 0; usbSofCount = 0;
sof_timer = timer_read(); sof_timer = timer_read();
if (vusb_suspended) {
vusb_wakeup();
}
} else {
// Suspend when no SOF in 3ms-10ms(7.1.7.4 Suspending of USB1.1)
if (!vusb_suspended && timer_elapsed(sof_timer) > 5) {
vusb_suspend();
}
}
#endif
if (vusb_suspended) { if (vusb_suspended) {
vusb_wakeup();
}
} else {
// Suspend when no SOF in 3ms-10ms(7.1.7.4 Suspending of USB1.1)
if (!vusb_suspended && timer_elapsed(sof_timer) > 5) {
vusb_suspend(); vusb_suspend();
if (suspend_wakeup_condition()) { }
vusb_send_remote_wakeup(); }
} #endif
} else { if (vusb_suspended) {
usbPoll(); vusb_suspend();
if (suspend_wakeup_condition()) {
vusb_send_remote_wakeup();
}
} else {
usbPoll();
// TODO: configuration process is inconsistent. it sometime fails. // TODO: configuration process is inconsistent. it sometime fails.
// To prevent failing to configure NOT scan keyboard during configuration // To prevent failing to configure NOT scan keyboard during configuration
if (usbConfiguration && usbInterruptIsReady()) { if (usbConfiguration && usbInterruptIsReady()) {
keyboard_task(); keyboard_task();
} }
vusb_transfer_keyboard(); vusb_transfer_keyboard();
#ifdef RAW_ENABLE #ifdef RAW_ENABLE
usbPoll(); usbPoll();
if (usbConfiguration && usbInterruptIsReady3()) { if (usbConfiguration && usbInterruptIsReady3()) {
raw_hid_task(); raw_hid_task();
} }
#endif #endif
#ifdef CONSOLE_ENABLE #ifdef CONSOLE_ENABLE
usbPoll(); usbPoll();
if (usbConfiguration && usbInterruptIsReady3()) { if (usbConfiguration && usbInterruptIsReady3()) {
console_task(); console_task();
}
#endif
// Run housekeeping
housekeeping_task();
} }
#endif
} }
} }