update to driver separation

diff --cc common_features.mk
index d499d1f0b7093610deb3d8aa54d5b021fc03f7b7,521bb31615d947f1d8d069fa4eb3d6a3bda136b3..6f29c97c9a47df7a9a4391d7edbf7ad552186897
--- 1/common_features.mk
--- 2/common_features.mk
+++ b/common_features.mk
@@@ -93,10 -87,14 +93,13 @@@ endi
  
  ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
      OPT_DEFS += -DRGBLIGHT_ENABLE
-     SRC += ws2812.c
--    SRC += $(QUANTUM_DIR)/rgblight.c
      CIE1931_CURVE = yes
      LED_BREATHING_TABLE = yes
 -        SRC += $(QUANTUM_DIR)/light_ws2812.c
+     ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes)
+         OPT_DEFS += -DRGBLIGHT_CUSTOM_DRIVER
+     else
++        SRC += ws2812.c
+     endif
  endif
  
  ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)

diff --cc drivers/avr/ws2812.h
index 60924a0fb61d5895fb22bc7dfa1e9ff0027d4467,0000000000000000000000000000000000000000..f7e0c31440ca0ab32ed76dd2281eed642a3995de
mode 100644,000000..100644
--- 1/drivers/avr/ws2812.h
--- /dev/null
+++ b/drivers/avr/ws2812.h
@@@ -1,91 -1,0 +1,75 @@@
- #ifdef RGBW
-   #define LED_TYPE struct cRGBW
- #else
-   #define LED_TYPE struct cRGB
- #endif
- 
- 
- /*
-  *  Structure of the LED array
-  *
-  * cRGB:     RGB  for WS2812S/B/C/D, SK6812, SK6812Mini, SK6812WWA, APA104, APA106
-  * cRGBW:    RGBW for SK6812RGBW
-  */
- 
- struct cRGB  { uint8_t g; uint8_t r; uint8_t b; };
- struct cRGBW { uint8_t g; uint8_t r; uint8_t b; uint8_t w;};
- 
 +/*
 + * light weight WS2812 lib include
 + *
 + * Version 2.3  - Nev 29th 2015
 + * Author: Tim (cpldcpu@gmail.com)
 + *
 + * Please do not change this file! All configuration is handled in "ws2812_config.h"
 + *
 + * 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 2 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/>.
 + */
 +
 +#ifndef LIGHT_WS2812_H_
 +#define LIGHT_WS2812_H_
 +
 +#include <avr/io.h>
 +#include <avr/interrupt.h>
 +//#include "ws2812_config.h"
 +//#include "i2cmaster.h"
 +
++#include "rgblight_types.h"
 +
 +
 +/* User Interface
 + *
 + * Input:
 + *         ledarray:           An array of GRB data describing the LED colors
 + *         number_of_leds:     The number of LEDs to write
 + *         pinmask (optional): Bitmask describing the output bin. e.g. _BV(PB0)
 + *
 + * The functions will perform the following actions:
 + *         - Set the data-out pin as output
 + *         - Send out the LED data
 + *         - Wait 50�s to reset the LEDs
 + */
 +
 +void ws2812_setleds     (LED_TYPE *ledarray, uint16_t number_of_leds);
 +void ws2812_setleds_pin (LED_TYPE *ledarray, uint16_t number_of_leds,uint8_t pinmask);
 +void ws2812_setleds_rgbw(LED_TYPE *ledarray, uint16_t number_of_leds);
 +
 +/*
 + * Old interface / Internal functions
 + *
 + * The functions take a byte-array and send to the data output as WS2812 bitstream.
 + * The length is the number of bytes to send - three per LED.
 + */
 +
 +void ws2812_sendarray     (uint8_t *array,uint16_t length);
 +void ws2812_sendarray_mask(uint8_t *array,uint16_t length, uint8_t pinmask);
 +
 +
 +/*
 + * Internal defines
 + */
 +#ifndef CONCAT
 +#define CONCAT(a, b)            a ## b
 +#endif
 +#ifndef CONCAT_EXP
 +#define CONCAT_EXP(a, b)   CONCAT(a, b)
 +#endif
 +
 +// #define ws2812_PORTREG  CONCAT_EXP(PORT,ws2812_port)
 +// #define ws2812_DDRREG   CONCAT_EXP(DDR,ws2812_port)
 +
 +#endif /* LIGHT_WS2812_H_ */

diff --cc quantum/rgblight.c
Simple merge

diff --cc quantum/rgblight.h
index 7acd5a2577ca5850cf41f3f175019b5255350698,6b609da7fce48a72cb7095c4ac6a4d644c88482f..c1b3378b33524811febc05699b839e92cd7f9fcc
--- 1/quantum/rgblight.h
--- 2/quantum/rgblight.h
+++ b/quantum/rgblight.h
@@@ -62,7 -61,10 +62,10 @@@
  #include <stdint.h>
  #include <stdbool.h>
  #include "eeconfig.h"
 -#include "light_ws2812.h"
+ #ifndef RGBLIGHT_CUSTOM_DRIVER
 +#include "ws2812.h"
+ #endif
+ #include "rgblight_types.h"
  
  extern LED_TYPE led[RGBLED_NUM];