From ae7aedcdc34959afc1cf1235d92e328234d7045c Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 1 Apr 2016 21:01:44 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/system/scheduler.h | 2 +- win32_functional_tests/Makefile | 1 - win32_functional_tests/main.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/firmware/controllers/system/scheduler.h b/firmware/controllers/system/scheduler.h index eaa3733e18..1dd3b477f6 100644 --- a/firmware/controllers/system/scheduler.h +++ b/firmware/controllers/system/scheduler.h @@ -16,7 +16,7 @@ public: scheduling_s(); #if EFI_SIGNAL_EXECUTOR_SLEEP || defined(__DOXYGEN__) - VirtualTimer timer; + virtual_timer_t timer; #endif /* EFI_SIGNAL_EXECUTOR_SLEEP */ volatile efitime_t momentX; diff --git a/win32_functional_tests/Makefile b/win32_functional_tests/Makefile index e0369d8c2e..beadfe8828 100644 --- a/win32_functional_tests/Makefile +++ b/win32_functional_tests/Makefile @@ -165,7 +165,6 @@ $(PORTINC) $(KERNINC) $(TESTINC) \ $(PROJECT_DIR)/util \ $(PROJECT_DIR)/console \ $(PROJECT_DIR)/console/binary \ - $(PROJECT_DIR)/console_util \ $(PROJECT_DIR)/config/engines \ $(PROJECT_DIR)/ext_algo \ $(PROJECT_DIR)/controllers \ diff --git a/win32_functional_tests/main.c b/win32_functional_tests/main.c index 9d7adf46b3..492d4f3ec7 100644 --- a/win32_functional_tests/main.c +++ b/win32_functional_tests/main.c @@ -136,8 +136,6 @@ int main(void) { initTestStream(&testStream); - event_listener_t tel; - /* * System initializations. * - HAL initialization, this also initializes the configured device drivers