Merge pull request esp8266#379 from me-no-dev/esp8266-sdk-1.0

Fix redefinition of SPI_BUSY and pwm

Author: igrr

hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_wiring_pwm.c

@@ -82,8 +82,8 @@ void prep_pwm_steps(){
 	}
 	ETS_FRC1_INTR_DISABLE();
 	pwm_steps_len = pwm_temp_steps_len;
-	os_memcpy(pwm_steps, pwm_temp_steps, (pwm_temp_steps_len + 1) * 2);
-	os_memcpy(pwm_steps_mask, pwm_temp_masks, pwm_temp_steps_len * 4);
+	ets_memcpy(pwm_steps, pwm_temp_steps, (pwm_temp_steps_len + 1) * 2);
+	ets_memcpy(pwm_steps_mask, pwm_temp_masks, pwm_temp_steps_len * 4);
 	pwm_multiplier = ESP8266_CLOCK/(pwm_range * pwm_freq);
 	ETS_FRC1_INTR_ENABLE();
 }

hardware/esp8266com/esp8266/cores/esp8266/esp8266_peri.h

@@ -278,7 +278,7 @@ static uint8_t esp8266_gpioToFn[16] = {0x34, 0x18, 0x38, 0x14, 0x3C, 0x40, 0x1C,
 
 //SPI_READY
 #define SPIRDY    ESP8266_DREG(0x0C)
-#define SPIBUSY   9 //wait SPI idle
+#define SPI_BUSY   9 //wait SPI idle
 
 //SPI0 Registers (SPI0 is used for the flash)
 #define SPI0CMD		ESP8266_REG(0x200)