summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbernard <[email protected]>2014-11-01 16:38:53 +0800
committerbernard <[email protected]>2014-11-01 16:38:53 +0800
commit6281ab2bbe1aea91cc32baf74f512cdea2ce4fb4 (patch)
treeace2fbede354cf006a1298fac824ed16495006cd
parentecbde6bb9d2e9df438264e4c5c1f5eb2f87de1bb (diff)
[DeviceDriver] Remove i2c_core_lock.
-rw-r--r--components/drivers/i2c/i2c_core.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/components/drivers/i2c/i2c_core.c b/components/drivers/i2c/i2c_core.c
index f274f70fcd..09616235d1 100644
--- a/components/drivers/i2c/i2c_core.c
+++ b/components/drivers/i2c/i2c_core.c
@@ -24,8 +24,6 @@
#include <rtdevice.h>
-static struct rt_mutex i2c_core_lock;
-
rt_err_t rt_i2c_bus_device_register(struct rt_i2c_bus_device *bus,
const char *bus_name)
{
@@ -33,17 +31,12 @@ rt_err_t rt_i2c_bus_device_register(struct rt_i2c_bus_device *bus,
rt_mutex_init(&bus->lock, "i2c_bus_lock", RT_IPC_FLAG_FIFO);
- rt_mutex_take(&i2c_core_lock, RT_WAITING_FOREVER);
-
- if (bus->timeout == 0)
- bus->timeout = RT_TICK_PER_SECOND;
+ if (bus->timeout == 0) bus->timeout = RT_TICK_PER_SECOND;
res = rt_i2c_bus_device_device_init(bus, bus_name);
i2c_dbg("I2C bus [%s] registered\n", bus_name);
- rt_mutex_release(&i2c_core_lock);
-
return res;
}
@@ -136,6 +129,6 @@ rt_size_t rt_i2c_master_recv(struct rt_i2c_bus_device *bus,
int rt_i2c_core_init(void)
{
- return rt_mutex_init(&i2c_core_lock, "i2c_core_lock", RT_IPC_FLAG_FIFO);
+ return 0;
}
INIT_COMPONENT_EXPORT(rt_i2c_core_init);