ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14805 from rkotan/I2C_Multiple_Buses_fix 

i2c: fix issue #14735 with multiple buses
pull/14941/head
Martin Kojtal 2021-07-20 09:44:59 +02:00 committed by GitHub
parent d147abc3e5 4b34f567af
commit a07ec0bfeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/include/drivers/I2C.h
View File

@ -231,12 +231,10 @@ protected:
#if !defined(DOXYGEN_ONLY) #if !defined(DOXYGEN_ONLY)
protected: protected:
void aquire();
i2c_t _i2c; i2c_t _i2c;
static I2C *_owner;
int _hz; int _hz;
static SingletonPtr<PlatformMutex> _mutex; SingletonPtr<PlatformMutex> _mutex;
PinName _sda; PinName _sda;
PinName _scl; PinName _scl;

23
drivers/source/I2C.cpp
View File

@ -27,9 +27,6 @@
namespace mbed { namespace mbed {
I2C *I2C::_owner = NULL;
SingletonPtr<PlatformMutex> I2C::_mutex;
I2C::I2C(PinName sda, PinName scl) : I2C::I2C(PinName sda, PinName scl) :
#if DEVICE_I2C_ASYNCH #if DEVICE_I2C_ASYNCH
_irq(this), _usage(DMA_USAGE_NEVER), _deep_sleep_locked(false), _irq(this), _usage(DMA_USAGE_NEVER), _deep_sleep_locked(false),
@ -42,8 +39,6 @@ I2C::I2C(PinName sda, PinName scl) :
_scl = scl; _scl = scl;
recover(sda, scl); recover(sda, scl);
i2c_init(&_i2c, _sda, _scl); i2c_init(&_i2c, _sda, _scl);
// Used to avoid unnecessary frequency updates
_owner = this;
unlock(); unlock();
} }
@ -59,8 +54,6 @@ I2C::I2C(const i2c_pinmap_t &static_pinmap) :
_scl = static_pinmap.scl_pin; _scl = static_pinmap.scl_pin;
recover(static_pinmap.sda_pin, static_pinmap.scl_pin); recover(static_pinmap.sda_pin, static_pinmap.scl_pin);
i2c_init_direct(&_i2c, &static_pinmap); i2c_init_direct(&_i2c, &static_pinmap);
// Used to avoid unnecessary frequency updates
_owner = this;
unlock(); unlock();
} }
@ -72,18 +65,6 @@ void I2C::frequency(int hz)
// We want to update the frequency even if we are already the bus owners // We want to update the frequency even if we are already the bus owners
i2c_frequency(&_i2c, _hz); i2c_frequency(&_i2c, _hz);
// Updating the frequency of the bus we become the owners of it
_owner = this;
unlock();
}
void I2C::aquire()
{
lock();
if (_owner != this) {
i2c_frequency(&_i2c, _hz);
_owner = this;
}
unlock(); unlock();
} }
@ -91,7 +72,6 @@ void I2C::aquire()
int I2C::write(int address, const char *data, int length, bool repeated) int I2C::write(int address, const char *data, int length, bool repeated)
{ {
lock(); lock();
aquire();
int stop = (repeated) ? 0 : 1; int stop = (repeated) ? 0 : 1;
int written = i2c_write(&_i2c, address, data, length, stop); int written = i2c_write(&_i2c, address, data, length, stop);
@ -112,7 +92,6 @@ int I2C::write(int data)
int I2C::read(int address, char *data, int length, bool repeated) int I2C::read(int address, char *data, int length, bool repeated)
{ {
lock(); lock();
aquire();
int stop = (repeated) ? 0 : 1; int stop = (repeated) ? 0 : 1;
int read = i2c_read(&_i2c, address, data, length, stop); int read = i2c_read(&_i2c, address, data, length, stop);
@ -137,7 +116,6 @@ int I2C::read(int ack)
void I2C::start(void) void I2C::start(void)
{ {
lock(); lock();
aquire();
i2c_start(&_i2c); i2c_start(&_i2c);
unlock(); unlock();
} }
@ -215,7 +193,6 @@ int I2C::transfer(int address, const char *tx_buffer, int tx_length, char *rx_bu
return -1; // transaction ongoing return -1; // transaction ongoing
} }
lock_deep_sleep(); lock_deep_sleep();
aquire();
_callback = callback; _callback = callback;
int stop = (repeated) ? 0 : 1; int stop = (repeated) ? 0 : 1;