Skip to content

Commit 93c7190

Browse files
author
Xie,Qi
committed
I2C: add setSpeed and setAddressMode function to support different speed and address mode
1 parent fe844ec commit 93c7190

File tree

7 files changed

+179
-11
lines changed

7 files changed

+179
-11
lines changed

‎cores/arduino/i2c.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ extern "C" {
3737
#define I2C_ERROR_OTHER (-4)
3838

3939
#define I2C_ABRT_7B_ADDR_NOACK (1 << 0)
40+
#define I2C_ABRT_10ADDR1_NOACK (1 << 1)
41+
#define I2C_ABRT_10ADDR2_NOACK (1 << 2)
4042
#define I2C_ABRT_TXDATA_NOACK (1 << 3)
4143

4244
int i2c_openadapter(void);
@@ -47,6 +49,8 @@ int i2c_readbytes(uint8_t *buf, int length, bool no_stop);
4749

4850
int soc_i2c_open_adapter(uint32_t address,int i2c_speed,int i2c_addr_mode);
4951
void soc_i2c_close_adapter(void);
52+
void soc_i2c_set_speed(uint32_t speed);
53+
void soc_i2c_set_address_mode(uint32_t mode);
5054
void soc_i2c_master_set_slave_address(uint32_t addr);
5155
int soc_i2c_master_witebytes(uint8_t *bytes, uint8_t length, bool no_stop);
5256
int soc_i2c_master_readbytes(uint8_t *buf, int length, bool no_stop);

‎cores/arduino/soc_i2c.c‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static int soc_i2c_master_wait_rx_or_err()
8181
uint64_t timeout = TIMEOUT_MS * 200;
8282
while (timeout--) {
8383
if (soc_i2c_err_detect) {
84-
if (soc_i2c_err_source & I2C_ABRT_7B_ADDR_NOACK) {
84+
if (soc_i2c_err_source & (I2C_ABRT_7B_ADDR_NOACK | I2C_ABRT_10ADDR1_NOACK | I2C_ABRT_10ADDR2_NOACK)) {
8585
return I2C_ERROR_ADDRESS_NOACK; // NACK on transmit of address
8686
} else if (soc_i2c_err_source & I2C_ABRT_TXDATA_NOACK) {
8787
return I2C_ERROR_DATA_NOACK; // NACK on transmit of data
@@ -102,7 +102,7 @@ static int soc_i2c_master_wait_tx_or_err()
102102
uint64_t timeout = TIMEOUT_MS * 200;
103103
while (timeout--) {
104104
if (soc_i2c_err_detect) {
105-
if (soc_i2c_err_source & I2C_ABRT_7B_ADDR_NOACK) {
105+
if (soc_i2c_err_source & (I2C_ABRT_7B_ADDR_NOACK | I2C_ABRT_10ADDR1_NOACK | I2C_ABRT_10ADDR2_NOACK)) {
106106
return I2C_ERROR_ADDRESS_NOACK; // NACK on transmit of address
107107
} else if (soc_i2c_err_source & I2C_ABRT_TXDATA_NOACK) {
108108
return I2C_ERROR_DATA_NOACK; // NACK on transmit of data
@@ -187,6 +187,16 @@ void soc_i2c_close_adapter()
187187
return;
188188
}
189189

190+
void soc_i2c_set_speed(uint32_t speed)
191+
{
192+
soc_i2c_set_transfer_speed(SOC_I2C_0, speed);
193+
}
194+
195+
void soc_i2c_set_address_mode(uint32_t mode)
196+
{
197+
soc_i2c_set_transfer_mode(SOC_I2C_0, mode);
198+
}
199+
190200
void soc_i2c_master_set_slave_address(uint32_t addr)
191201
{
192202
soc_i2c_slave_address = addr;

‎libraries/Wire2/src/Wire2.cpp‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,16 @@ void TwoWire2::end()
7575
soc_i2c_close_adapter();
7676
}
7777

78+
void TwoWire2::setSpeed(uint32_t speed)
79+
{
80+
soc_i2c_set_speed(speed);
81+
}
82+
83+
void TwoWire2::setAddressMode(uint32_t mode)
84+
{
85+
soc_i2c_set_address_mode(mode);
86+
}
87+
7888
uint8_t TwoWire2::requestFrom(uint8_t address, uint8_t quantity,
7989
uint8_t sendStop)
8090
{
@@ -100,14 +110,28 @@ uint8_t TwoWire2::requestFrom(uint8_t address, uint8_t quantity)
100110
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t) true);
101111
}
102112

103-
uint8_t TwoWire2::requestFrom(int address, int quantity)
113+
uint8_t TwoWire2::requestFrom(int address, int quantity, int sendStop)
104114
{
105-
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t) true);
115+
int ret;
116+
if (quantity > BUFFER_LENGTH)
117+
quantity = BUFFER_LENGTH;
118+
119+
/* Set slave address via ioctl */
120+
soc_i2c_master_set_slave_address(address);
121+
ret = soc_i2c_master_readbytes(rxBuffer, quantity, !sendStop);
122+
if (ret < 0) {
123+
return 0;
124+
}
125+
// set rx buffer iterator vars
126+
rxBufferIndex = 0;
127+
rxBufferLength = quantity;
128+
129+
return quantity;
106130
}
107131

108-
uint8_t TwoWire2::requestFrom(int address, int quantity, int sendStop)
132+
uint8_t TwoWire2::requestFrom(int address, int quantity)
109133
{
110-
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)sendStop);
134+
return requestFrom((int)address, (int)quantity, (int)true);
111135
}
112136

113137
void TwoWire2::beginTransmission(uint8_t address)
@@ -122,7 +146,12 @@ void TwoWire2::beginTransmission(uint8_t address)
122146

123147
void TwoWire2::beginTransmission(int address)
124148
{
125-
beginTransmission((uint8_t)address);
149+
if (init_status < 0)
150+
return;
151+
// set slave address
152+
soc_i2c_master_set_slave_address(address);
153+
// reset transmit buffer
154+
txBufferLength = 0;
126155
}
127156

128157
//

‎libraries/Wire2/src/Wire2.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ class TwoWire2 : public Stream
4343
void begin(int, int i2c_speed = I2C_SPEED_FAST,
4444
int i2c_addr_mode = I2C_ADDR_7Bit);
4545
void end();
46+
void setSpeed(uint32_t);
47+
void setAddressMode(uint32_t);
4648
void beginTransmission(uint8_t);
4749
void beginTransmission(int);
4850
uint8_t endTransmission(void);

‎system/libarc32_arduino101/drivers/intel_qrk_i2c.c‎

Lines changed: 89 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,7 @@ static void soc_i2c_master_init_transfer(i2c_internal_data_t *dev)
319319
ic_con = MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_CON);
320320

321321
/* Set addressing mode - (initialisation = 7 bit) */
322-
//if (I2C_10_Bit == dev->addr_mode) {
323-
if (dev->slave_addr > 127) {
322+
if (I2C_10_Bit == dev->addr_mode) {
324323
ic_con |= IC_MASTER_ADDR_MODE_BIT;
325324
ic_tar = IC_TAR_10BITADDR_MASTER;
326325
} else {
@@ -357,6 +356,7 @@ static DRIVER_API_RC soc_i2c_init(i2c_internal_data_t *dev)
357356
soc_i2c_enable_device(dev, false);
358357

359358
/* Setup IC_CON */
359+
ic_con = IC_STOP_DET_IFADDRESSED;
360360

361361
/* Set master or slave mode - (initialisation = slave) */
362362
if (I2C_MASTER == dev->mode) {
@@ -532,8 +532,7 @@ DRIVER_API_RC soc_i2c_deconfig(SOC_I2C_CONTROLLER controller_id)
532532
return DRV_RC_FAIL;
533533
}
534534

535-
if (!dev->send_stop)
536-
{
535+
if (!dev->send_stop) {
537536
soc_i2c_abort_transfer(dev);
538537
}
539538

@@ -584,6 +583,92 @@ DRIVER_API_RC soc_i2c_clock_disable(SOC_I2C_CONTROLLER controller_id)
584583
return DRV_RC_OK;
585584
}
586585

586+
DRIVER_API_RC soc_i2c_set_transfer_speed(SOC_I2C_CONTROLLER controller_id,
587+
uint32_t speed)
588+
{
589+
volatile uint32_t ic_con = 0;
590+
i2c_internal_data_t *dev = NULL;
591+
592+
if (controller_id == SOC_I2C_0) {
593+
dev = &devices[0];
594+
} else if (controller_id == SOC_I2C_1) {
595+
dev = &devices[1];
596+
} else {
597+
return DRV_RC_FAIL;
598+
}
599+
600+
dev->speed = speed;
601+
602+
soc_i2c_enable_device(dev, false);
603+
604+
/* Setup IC_CON */
605+
ic_con = MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_CON);
606+
607+
ic_con |= (dev->speed << 1);
608+
609+
MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_CON) = ic_con;
610+
611+
if (I2C_SLOW ==
612+
dev->speed) /* This is setter so prefering readability above speed */
613+
{
614+
/* Set HCNT */
615+
MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_STD_SCL_HCNT) = I2C_STD_HCNT;
616+
/* Set LCNT */
617+
MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_STD_SCL_LCNT) = I2C_STD_LCNT;
618+
} else if (I2C_FAST == dev->speed) {
619+
/* Set HCNT */
620+
MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_FS_SCL_HCNT) = I2C_FS_HCNT;
621+
/* Set LCNT */
622+
MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_FS_SCL_LCNT) = I2C_FS_LCNT;
623+
} else if (I2C_HS == dev->speed) {
624+
/* Set HCNT */
625+
MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_HS_SCL_HCNT) = I2C_HS_HCNT;
626+
/* Set LCNT */
627+
MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_HS_SCL_LCNT) = I2C_HS_LCNT;
628+
} else {
629+
return DRV_RC_FAIL;
630+
}
631+
632+
return DRV_RC_OK;
633+
}
634+
635+
DRIVER_API_RC soc_i2c_set_transfer_mode(SOC_I2C_CONTROLLER controller_id,
636+
uint32_t mode)
637+
{
638+
i2c_internal_data_t *dev = NULL;
639+
640+
if (controller_id == SOC_I2C_0) {
641+
dev = &devices[0];
642+
} else if (controller_id == SOC_I2C_1) {
643+
dev = &devices[1];
644+
} else {
645+
return DRV_RC_FAIL;
646+
}
647+
648+
dev->addr_mode = mode;
649+
650+
if (dev->mode == I2C_SLAVE) {
651+
volatile uint32_t ic_con = 0;
652+
653+
soc_i2c_enable_device(dev, false);
654+
655+
/* Setup IC_CON */
656+
ic_con = MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_CON);
657+
658+
if (I2C_10_Bit == dev->addr_mode) {
659+
ic_con |= IC_SLAVE_ADDR_MODE_BIT;
660+
} else {
661+
ic_con &= ~IC_SLAVE_ADDR_MODE_BIT;
662+
}
663+
664+
MMIO_REG_VAL_FROM_BASE(dev->BASE, IC_CON) = ic_con;
665+
666+
soc_i2c_enable_device(dev, true);
667+
}
668+
669+
return DRV_RC_OK;
670+
}
671+
587672
DRIVER_API_RC soc_i2c_slave_enable_tx(SOC_I2C_CONTROLLER controller_id,
588673
uint8_t *data_write,
589674
uint32_t data_write_len)

‎system/libarc32_arduino101/drivers/soc_i2c.h‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,43 @@ DRIVER_API_RC soc_i2c_slave_enable_rx(SOC_I2C_CONTROLLER controller_id,
239239
DRIVER_API_RC soc_i2c_slave_enable_tx(SOC_I2C_CONTROLLER controller_id,
240240
uint8_t *data_write,
241241
uint32_t data_write_len);
242+
243+
/**
244+
* Function to set I2C address mode
245+
*
246+
* @param controller_id : I2C controller_id identifier
247+
* @param speed : I2C speed
248+
*
249+
* @return
250+
* - DRV_RC_OK on success
251+
* - DRV_RC_FAIL otherwise
252+
*/
253+
DRIVER_API_RC soc_i2c_set_transfer_speed(SOC_I2C_CONTROLLER controller_id,
254+
uint32_t speed);
255+
/**
256+
* Function to set I2C address mode
257+
*
258+
* @param controller_id : I2C controller_id identifier
259+
* @param mode : address mode
260+
*
261+
* @return
262+
* - DRV_RC_OK on success
263+
* - DRV_RC_FAIL otherwise
264+
*/
265+
DRIVER_API_RC soc_i2c_set_transfer_mode(SOC_I2C_CONTROLLER controller_id,
266+
uint32_t mode);
267+
/**
268+
* Function to set I2C address mode
269+
*
270+
* @param controller_id : I2C controller_id identifier
271+
* @param mode : address mode
272+
*
273+
* @return
274+
* - DRV_RC_OK on success
275+
* - DRV_RC_FAIL otherwise
276+
*/
277+
DRIVER_API_RC soc_i2c_set_transfer_mode(SOC_I2C_CONTROLLER controller_id,
278+
uint32_t mode);
242279
/** @} */
243280

244281
#ifdef __cplusplus

‎system/libarc32_arduino101/drivers/soc_i2c_priv.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
#define IC_ENABLE_BIT (1 << 0)
151151
#define IC_ABORT_BIT (1 << 1)
152152
#define IC_SLAVE_DISABLE_BIT (1 << 6)
153+
#define IC_STOP_DET_IFADDRESSED (1 << 7)
153154
#define IC_MASTER_EN_BIT (1 << 0)
154155
#define IC_RESTART_EN_BIT (1 << 5)
155156
#define IC_MASTER_ADDR_MODE_BIT (1 << 4)

0 commit comments

Comments
 (0)