@@ -34,12 +34,6 @@ static const char *TAG = "sccb-ng";
34
34
35
35
#define TIMEOUT_MS 1000 /*!< I2C timeout duration */
36
36
#define SCCB_FREQ CONFIG_SCCB_CLK_FREQ /*!< I2C master frequency */
37
- #define WRITE_BIT I2C_MASTER_WRITE /*!< I2C master write */
38
- #define READ_BIT I2C_MASTER_READ /*!< I2C master read */
39
- #define ACK_CHECK_EN 0x1 /*!< I2C master will check ack from slave */
40
- #define ACK_CHECK_DIS 0x0 /*!< I2C master will not check ack from slave */
41
- #define ACK_VAL 0x0 /*!< I2C ack value */
42
- #define NACK_VAL 0x1 /*!< I2C nack value */
43
37
#if CONFIG_SCCB_HARDWARE_I2C_PORT1
44
38
const int SCCB_I2C_PORT_DEFAULT = 1 ;
45
39
#else
@@ -299,11 +293,9 @@ int SCCB_Write16(uint8_t slv_addr, uint16_t reg, uint8_t data)
299
293
{
300
294
i2c_master_dev_handle_t dev_handle = * (get_handle_from_address (slv_addr ));
301
295
302
- uint16_t reg_htons = LITTLETOBIG (reg );
303
-
304
296
uint8_t tx_buffer [3 ];
305
- tx_buffer [0 ] = reg_htons >> 8 ;
306
- tx_buffer [1 ] = reg_htons & 0x00ff ;
297
+ tx_buffer [0 ] = reg >> 8 ;
298
+ tx_buffer [1 ] = reg & 0x00ff ;
307
299
tx_buffer [2 ] = data ;
308
300
309
301
esp_err_t ret = i2c_master_transmit (dev_handle , tx_buffer , 3 , TIMEOUT_MS );
@@ -339,11 +331,9 @@ int SCCB_Write_Addr16_Val16(uint8_t slv_addr, uint16_t reg, uint16_t data)
339
331
{
340
332
i2c_master_dev_handle_t dev_handle = * (get_handle_from_address (slv_addr ));
341
333
342
- uint16_t reg_htons = LITTLETOBIG (reg );
343
-
344
334
uint8_t tx_buffer [4 ];
345
- tx_buffer [0 ] = reg_htons >> 8 ;
346
- tx_buffer [1 ] = reg_htons & 0x00ff ;
335
+ tx_buffer [0 ] = reg >> 8 ;
336
+ tx_buffer [1 ] = reg & 0x00ff ;
347
337
tx_buffer [2 ] = data >> 8 ;
348
338
tx_buffer [3 ] = data & 0x00ff ;
349
339
@@ -354,5 +344,4 @@ int SCCB_Write_Addr16_Val16(uint8_t slv_addr, uint16_t reg, uint16_t data)
354
344
ESP_LOGE (TAG , "W [%04x]=%02x fail\n" , reg , data );
355
345
}
356
346
return ret == ESP_OK ? 0 : -1 ;
357
- return 0 ;
358
347
}
0 commit comments