diff --git a/Makefile.common b/Makefile.common index 2d2ab36332..010d63073d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -207,7 +207,6 @@ OBJ += \ input/common/input_hid_common.o \ input/input_mapper.o \ led/led_driver.o \ - led/drivers/led_null.o \ gfx/video_coord_array.o \ gfx/video_display_server.o \ gfx/video_crt_switch.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index c06851ec9d..28a86e2c54 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -799,8 +799,6 @@ LEDS #include "../led/led_driver.c" -#include "../led/drivers/led_null.c" - #if defined(HAVE_RPILED) #include "../led/drivers/led_rpi.c" #endif diff --git a/led/drivers/led_null.c b/led/drivers/led_null.c deleted file mode 100644 index 1d95ce3bc6..0000000000 --- a/led/drivers/led_null.c +++ /dev/null @@ -1,27 +0,0 @@ -/* RetroArch - A frontend for libretro. - * - * RetroArch 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 Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch 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 RetroArch. - * If not, see . - */ - -#include "../led_driver.h" -#include "../../verbosity.h" - -static void null_led_init(void) { } -static void null_led_free(void) { } -static void null_led_set(int led, int state) { } - -const led_driver_t null_led_driver = { - null_led_init, - null_led_free, - null_led_set, - "null" -}; diff --git a/led/led_driver.c b/led/led_driver.c index 54a42d1166..8043e99479 100644 --- a/led/led_driver.c +++ b/led/led_driver.c @@ -21,6 +21,13 @@ static const led_driver_t *current_led_driver = NULL; +static const led_driver_t null_led_driver = { + NULL, /* init */ + NULL, /* free */ + NULL, /* set */ + "null" +}; + bool led_driver_init(void) { settings_t *settings = config_get_ptr(); diff --git a/led/led_driver.h b/led/led_driver.h index d275a1a079..376199bdac 100644 --- a/led/led_driver.h +++ b/led/led_driver.h @@ -41,7 +41,6 @@ void led_driver_free(void); void led_driver_set_led(int led, int value); -extern const led_driver_t null_led_driver; extern const led_driver_t overlay_led_driver; extern const led_driver_t rpi_led_driver;