libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3359 from wendal/master 

fix: 为W60x添加rt_hw_us_delay
This commit is contained in:
Bernard Xiong 2020-02-06 22:01:18 +08:00 committed by GitHub
parent bad4f92451 c677f88eee
commit e5aafd2aa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bsp/w60x/drivers/board.c
View File

@ -213,6 +213,42 @@ void rt_hw_cpu_reset(void)
tls_sys_reset(); tls_sys_reset();
} }
/**
* The time delay function.
*
* @param microseconds.
*/
#include "wm_regs.h"
void rt_hw_us_delay(rt_uint32_t us)
{
rt_uint32_t ticks;
rt_uint32_t told, tnow, tcnt = 0;
rt_uint32_t reload = SysTick->LOAD;
ticks = us * reload / (1000000 / RT_TICK_PER_SECOND);
told = SysTick->VAL;
while (1)
{
tnow = SysTick->VAL;
if (tnow != told)
{
if (tnow < told)
{
tcnt += told - tnow;
}
else
{
tcnt += reload - tnow + told;
}
told = tnow;
if (tcnt >= ticks)
{
break;
}
}
}
}
#ifdef RT_USING_FINSH #ifdef RT_USING_FINSH
#include <finsh.h> #include <finsh.h>
static void reboot(uint8_t argc, char **argv) static void reboot(uint8_t argc, char **argv)

39
bsp/w60x/drivers/drv_soft_i2c.c
View File

@ -138,40 +138,7 @@ static rt_int32_t w60x_get_scl(void *data)
return tls_gpio_read((enum tls_io_name)scl); return tls_gpio_read((enum tls_io_name)scl);
} }
/**
* The time delay function.
*
* @param microseconds.
*/
static void w60x_udelay(rt_uint32_t us)
{
rt_uint32_t ticks;
rt_uint32_t told, tnow, tcnt = 0;
rt_uint32_t reload = SysTick->LOAD;
ticks = us * reload / (1000000 / RT_TICK_PER_SECOND);
told = SysTick->VAL;
while (1)
{
tnow = SysTick->VAL;
if (tnow != told)
{
if (tnow < told)
{
tcnt += told - tnow;
}
else
{
tcnt += reload - tnow + told;
}
told = tnow;
if (tcnt >= ticks)
{
break;
}
}
}
}
static const struct rt_i2c_bit_ops w60x_bit_ops_default = static const struct rt_i2c_bit_ops w60x_bit_ops_default =
{ {
@ -180,7 +147,7 @@ static const struct rt_i2c_bit_ops w60x_bit_ops_default =
.set_scl = w60x_set_scl, .set_scl = w60x_set_scl,
.get_sda = w60x_get_sda, .get_sda = w60x_get_sda,
.get_scl = w60x_get_scl, .get_scl = w60x_get_scl,
.udelay = w60x_udelay, .udelay = rt_hw_us_delay,
.delay_us = 1, .delay_us = 1,
.timeout = 100 .timeout = 100
}; };
@ -201,9 +168,9 @@ static rt_err_t w60x_i2c_bus_unlock(const struct w60x_soft_i2c_config *cfg)
while (i++ < 9) while (i++ < 9)
{ {
rt_pin_write(cfg->scl, PIN_HIGH); rt_pin_write(cfg->scl, PIN_HIGH);
w60x_udelay(100); rt_hw_us_delay(100);
rt_pin_write(cfg->scl, PIN_LOW); rt_pin_write(cfg->scl, PIN_LOW);
w60x_udelay(100); rt_hw_us_delay(100);
} }
} }
if (PIN_LOW == rt_pin_read(cfg->sda)) if (PIN_LOW == rt_pin_read(cfg->sda))