feat(driver): Don't need to use ICACHE_FLASH_ATTR

This commit is contained in:
Wu Jian Gang
2018-05-19 22:59:46 +08:00
parent a08d0711a4
commit 84781e3d37
2 changed files with 26 additions and 39 deletions

View File

@@ -31,8 +31,7 @@ LOCAL uint8 m_nLastSCL;
* uint8 SCL * uint8 SCL
* Returns : NONE * Returns : NONE
*******************************************************************************/ *******************************************************************************/
LOCAL void ICACHE_FLASH_ATTR LOCAL void i2c_master_setDC(uint8 SDA, uint8 SCL)
i2c_master_setDC(uint8 SDA, uint8 SCL)
{ {
SDA &= 0x01; SDA &= 0x01;
SCL &= 0x01; SCL &= 0x01;
@@ -60,8 +59,7 @@ i2c_master_setDC(uint8 SDA, uint8 SCL)
* Parameters : NONE * Parameters : NONE
* Returns : uint8 - SDA bit value * Returns : uint8 - SDA bit value
*******************************************************************************/ *******************************************************************************/
LOCAL uint8 ICACHE_FLASH_ATTR LOCAL uint8 i2c_master_getDC(void)
i2c_master_getDC(void)
{ {
uint8 sda_out; uint8 sda_out;
ETS_INTR_LOCK(); ETS_INTR_LOCK();
@@ -76,8 +74,7 @@ i2c_master_getDC(void)
* Parameters : NONE * Parameters : NONE
* Returns : NONE * Returns : NONE
*******************************************************************************/ *******************************************************************************/
void ICACHE_FLASH_ATTR void i2c_master_init(void)
i2c_master_init(void)
{ {
uint8 i; uint8 i;
@@ -110,8 +107,7 @@ i2c_master_init(void)
* Parameters : NONE * Parameters : NONE
* Returns : NONE * Returns : NONE
*******************************************************************************/ *******************************************************************************/
void ICACHE_FLASH_ATTR void i2c_master_gpio_init(void)
i2c_master_gpio_init(void)
{ {
ETS_GPIO_INTR_DISABLE() ; ETS_GPIO_INTR_DISABLE() ;
// ETS_INTR_LOCK(); // ETS_INTR_LOCK();
@@ -138,8 +134,7 @@ i2c_master_gpio_init(void)
* Parameters : NONE * Parameters : NONE
* Returns : NONE * Returns : NONE
*******************************************************************************/ *******************************************************************************/
void ICACHE_FLASH_ATTR void i2c_master_start(void)
i2c_master_start(void)
{ {
i2c_master_setDC(1, m_nLastSCL); i2c_master_setDC(1, m_nLastSCL);
i2c_master_wait(5); i2c_master_wait(5);
@@ -155,8 +150,7 @@ i2c_master_start(void)
* Parameters : NONE * Parameters : NONE
* Returns : NONE * Returns : NONE
*******************************************************************************/ *******************************************************************************/
void ICACHE_FLASH_ATTR void i2c_master_stop(void)
i2c_master_stop(void)
{ {
i2c_master_wait(5); i2c_master_wait(5);
@@ -174,8 +168,7 @@ i2c_master_stop(void)
* Parameters : uint8 level - 0 or 1 * Parameters : uint8 level - 0 or 1
* Returns : NONE * Returns : NONE
*******************************************************************************/ *******************************************************************************/
void ICACHE_FLASH_ATTR void i2c_master_setAck(uint8 level)
i2c_master_setAck(uint8 level)
{ {
i2c_master_setDC(m_nLastSDA, 0); i2c_master_setDC(m_nLastSDA, 0);
i2c_master_wait(5); i2c_master_wait(5);
@@ -195,8 +188,7 @@ i2c_master_setAck(uint8 level)
* Parameters : NONE * Parameters : NONE
* Returns : uint8 - ack value, 0 or 1 * Returns : uint8 - ack value, 0 or 1
*******************************************************************************/ *******************************************************************************/
uint8 ICACHE_FLASH_ATTR uint8 i2c_master_getAck(void)
i2c_master_getAck(void)
{ {
uint8 retVal; uint8 retVal;
i2c_master_setDC(m_nLastSDA, 0); i2c_master_setDC(m_nLastSDA, 0);
@@ -220,8 +212,7 @@ i2c_master_getAck(void)
* Parameters : NONE * Parameters : NONE
* Returns : true : get ack ; false : get nack * Returns : true : get ack ; false : get nack
*******************************************************************************/ *******************************************************************************/
bool ICACHE_FLASH_ATTR bool i2c_master_checkAck(void)
i2c_master_checkAck(void)
{ {
if (i2c_master_getAck()) { if (i2c_master_getAck()) {
return FALSE; return FALSE;
@@ -236,8 +227,7 @@ i2c_master_checkAck(void)
* Parameters : NONE * Parameters : NONE
* Returns : NONE * Returns : NONE
*******************************************************************************/ *******************************************************************************/
void ICACHE_FLASH_ATTR void i2c_master_send_ack(void)
i2c_master_send_ack(void)
{ {
i2c_master_setAck(0x0); i2c_master_setAck(0x0);
} }
@@ -248,8 +238,7 @@ i2c_master_send_ack(void)
* Parameters : NONE * Parameters : NONE
* Returns : NONE * Returns : NONE
*******************************************************************************/ *******************************************************************************/
void ICACHE_FLASH_ATTR void i2c_master_send_nack(void)
i2c_master_send_nack(void)
{ {
i2c_master_setAck(0x1); i2c_master_setAck(0x1);
} }
@@ -260,8 +249,7 @@ i2c_master_send_nack(void)
* Parameters : NONE * Parameters : NONE
* Returns : uint8 - readed value * Returns : uint8 - readed value
*******************************************************************************/ *******************************************************************************/
uint8 ICACHE_FLASH_ATTR uint8 i2c_master_readByte(void)
i2c_master_readByte(void)
{ {
uint8 retVal = 0; uint8 retVal = 0;
uint8 k, i; uint8 k, i;
@@ -300,8 +288,7 @@ i2c_master_readByte(void)
* Parameters : uint8 wrdata - write value * Parameters : uint8 wrdata - write value
* Returns : NONE * Returns : NONE
*******************************************************************************/ *******************************************************************************/
void ICACHE_FLASH_ATTR void i2c_master_writeByte(uint8 wrdata)
i2c_master_writeByte(uint8 wrdata)
{ {
uint8 dat; uint8 dat;
sint8 i; sint8 i;

View File

@@ -72,7 +72,7 @@ void __ShowRegValue(const char* func, uint32_t line)
* @brief Based on pAttr initialize SPI module. * @brief Based on pAttr initialize SPI module.
* *
*/ */
void ICACHE_FLASH_ATTR SPIInit(SpiNum spiNum, SpiAttr* pAttr) void SPIInit(SpiNum spiNum, SpiAttr* pAttr)
{ {
if ((spiNum > SpiNum_HSPI) if ((spiNum > SpiNum_HSPI)
|| (NULL == pAttr)) { || (NULL == pAttr)) {
@@ -189,7 +189,7 @@ void ICACHE_FLASH_ATTR SPIInit(SpiNum spiNum, SpiAttr* pAttr)
* @brief Set address value by master mode. * @brief Set address value by master mode.
* *
*/ */
void ICACHE_FLASH_ATTR SPIMasterCfgAddr(SpiNum spiNum, uint32_t addr) void SPIMasterCfgAddr(SpiNum spiNum, uint32_t addr)
{ {
if (spiNum > SpiNum_HSPI) { if (spiNum > SpiNum_HSPI) {
return; return;
@@ -203,7 +203,7 @@ void ICACHE_FLASH_ATTR SPIMasterCfgAddr(SpiNum spiNum, uint32_t addr)
* @brief Set command value by master mode. * @brief Set command value by master mode.
* *
*/ */
void ICACHE_FLASH_ATTR SPIMasterCfgCmd(SpiNum spiNum, uint32_t cmd) void SPIMasterCfgCmd(SpiNum spiNum, uint32_t cmd)
{ {
if (spiNum > SpiNum_HSPI) { if (spiNum > SpiNum_HSPI) {
return; return;
@@ -218,7 +218,7 @@ void ICACHE_FLASH_ATTR SPIMasterCfgCmd(SpiNum spiNum, uint32_t cmd)
* @brief Send data to slave. * @brief Send data to slave.
* *
*/ */
int ICACHE_FLASH_ATTR SPIMasterSendData(SpiNum spiNum, SpiData* pInData) int SPIMasterSendData(SpiNum spiNum, SpiData* pInData)
{ {
char idx = 0; char idx = 0;
@@ -300,7 +300,7 @@ int ICACHE_FLASH_ATTR SPIMasterSendData(SpiNum spiNum, SpiData* pInData)
* @brief Receive data from slave. * @brief Receive data from slave.
* *
*/ */
int ICACHE_FLASH_ATTR SPIMasterRecvData(SpiNum spiNum, SpiData* pOutData) int SPIMasterRecvData(SpiNum spiNum, SpiData* pOutData)
{ {
char idx = 0; char idx = 0;
@@ -390,7 +390,7 @@ int ICACHE_FLASH_ATTR SPIMasterRecvData(SpiNum spiNum, SpiData* pOutData)
* @brief Load data to send buffer by slave mode. * @brief Load data to send buffer by slave mode.
* *
*/ */
int ICACHE_FLASH_ATTR SPISlaveSendData(SpiNum spiNum, uint32_t* pInData, uint8_t outLen) int SPISlaveSendData(SpiNum spiNum, uint32_t* pInData, uint8_t outLen)
{ {
if (NULL == pInData) { if (NULL == pInData) {
return -1; return -1;
@@ -409,7 +409,7 @@ int ICACHE_FLASH_ATTR SPISlaveSendData(SpiNum spiNum, uint32_t* pInData, uint8_t
* @brief Configurate slave prepare for receive data. * @brief Configurate slave prepare for receive data.
* *
*/ */
int ICACHE_FLASH_ATTR SPISlaveRecvData(SpiNum spiNum, void(*isrFunc)(void*)) int SPISlaveRecvData(SpiNum spiNum, void(*isrFunc)(void*))
{ {
if ((spiNum > SpiNum_HSPI)) { if ((spiNum > SpiNum_HSPI)) {
return -1; return -1;
@@ -437,7 +437,7 @@ int ICACHE_FLASH_ATTR SPISlaveRecvData(SpiNum spiNum, void(*isrFunc)(void*))
* @brief Send data to slave(ESP8266 register of RD_STATUS or WR_STATUS). * @brief Send data to slave(ESP8266 register of RD_STATUS or WR_STATUS).
* *
*/ */
void ICACHE_FLASH_ATTR SPIMasterSendStatus(SpiNum spiNum, uint8_t data) void SPIMasterSendStatus(SpiNum spiNum, uint8_t data)
{ {
if (spiNum > SpiNum_HSPI) { if (spiNum > SpiNum_HSPI) {
return; return;
@@ -468,7 +468,7 @@ void ICACHE_FLASH_ATTR SPIMasterSendStatus(SpiNum spiNum, uint8_t data)
* @brief Receive status register from slave(ESP8266). * @brief Receive status register from slave(ESP8266).
* *
*/ */
int ICACHE_FLASH_ATTR SPIMasterRecvStatus(SpiNum spiNum) int SPIMasterRecvStatus(SpiNum spiNum)
{ {
if (spiNum > SpiNum_HSPI) { if (spiNum > SpiNum_HSPI) {
return -1; return -1;
@@ -503,7 +503,7 @@ int ICACHE_FLASH_ATTR SPIMasterRecvStatus(SpiNum spiNum)
* @brief Select SPI CS pin. * @brief Select SPI CS pin.
* *
*/ */
void ICACHE_FLASH_ATTR SPICsPinSelect(SpiNum spiNum, SpiPinCS pinCs) void SPICsPinSelect(SpiNum spiNum, SpiPinCS pinCs)
{ {
if (spiNum > SpiNum_HSPI) { if (spiNum > SpiNum_HSPI) {
return; return;
@@ -518,7 +518,7 @@ void ICACHE_FLASH_ATTR SPICsPinSelect(SpiNum spiNum, SpiPinCS pinCs)
* @brief Enable SPI interrupt source. * @brief Enable SPI interrupt source.
* *
*/ */
void ICACHE_FLASH_ATTR SPIIntEnable(SpiNum spiNum, SpiIntSrc intSrc) void SPIIntEnable(SpiNum spiNum, SpiIntSrc intSrc)
{ {
if (spiNum > SpiNum_HSPI) { if (spiNum > SpiNum_HSPI) {
return; return;
@@ -531,7 +531,7 @@ void ICACHE_FLASH_ATTR SPIIntEnable(SpiNum spiNum, SpiIntSrc intSrc)
* @brief Disable SPI interrupt source. * @brief Disable SPI interrupt source.
* *
*/ */
void ICACHE_FLASH_ATTR SPIIntDisable(SpiNum spiNum, SpiIntSrc intSrc) void SPIIntDisable(SpiNum spiNum, SpiIntSrc intSrc)
{ {
if (spiNum > SpiNum_HSPI) { if (spiNum > SpiNum_HSPI) {
return; return;
@@ -544,7 +544,7 @@ void ICACHE_FLASH_ATTR SPIIntDisable(SpiNum spiNum, SpiIntSrc intSrc)
* @brief Clear all of SPI interrupt source. * @brief Clear all of SPI interrupt source.
* *
*/ */
void ICACHE_FLASH_ATTR SPIIntClear(SpiNum spiNum) void SPIIntClear(SpiNum spiNum)
{ {
if (spiNum > SpiNum_HSPI) { if (spiNum > SpiNum_HSPI) {
return; return;