michaelh/zephyr
1
0
Fork 0
Code Releases Activity

gpio, pwm, rgb lcd: Replace polling i2c requests

Browse source 
Now that i2c_transfer/i2c_read/i2c_write are fully synchronous, no need
to use the polling based function.

Change-Id: Ib578cf4a6d72ad0817e1aaeebc7e4dab9f9d293f
Signed-off-by: Dmitriy Korovkin <dmitriy.korovkin@windriver.com>
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Dmitriy Korovkin 2015-11-19 11:23:42 -05:00 • committed by Anas Nashif
commit dcda679c72
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpio/gpio_pcal9535a.c
View file

@ -115,7 +115,7 @@ static int _read_port_regs(struct device *dev, uint8_t reg,
int ret; int ret;
uint8_t cmd[] = { reg }; uint8_t cmd[] = { reg };
ret = i2c_poll_transfer(i2c_master, cmd, 1, buf->byte, 2, i2c_addr, 0); ret = i2c_transfer(i2c_master, cmd, 1, buf->byte, 2, i2c_addr, 0);
if (ret) { if (ret) {
DBG("PCAL9535A[0x%X]: error reading register 0x%X (%d)\n", DBG("PCAL9535A[0x%X]: error reading register 0x%X (%d)\n",
i2c_addr, reg, ret); i2c_addr, reg, ret);
@ -155,7 +155,7 @@ static int _write_port_regs(struct device *dev, uint8_t reg,
DBG("PCAL9535A[0x%X]: Write: REG[0x%X] = 0x%X, REG[0x%X] = 0x%X\n", DBG("PCAL9535A[0x%X]: Write: REG[0x%X] = 0x%X, REG[0x%X] = 0x%X\n",
i2c_addr, reg, buf->byte[0], (reg + 1), buf->byte[1]); i2c_addr, reg, buf->byte[0], (reg + 1), buf->byte[1]);
ret = i2c_polling_write(i2c_master, cmd, sizeof(cmd), i2c_addr); ret = i2c_write(i2c_master, cmd, sizeof(cmd), i2c_addr);
if (ret) { if (ret) {
DBG("PCAL9535A[0x%X]: error writing from register 0x%X (%d)\n", DBG("PCAL9535A[0x%X]: error writing from register 0x%X (%d)\n",
i2c_addr, reg, ret); i2c_addr, reg, ret);

14
drivers/grove/lcd_rgb.c
View file

@ -108,7 +108,7 @@ static void _rgb_reg_set(struct device * const i2c, uint8_t addr, uint8_t dta)
{ {
uint8_t data[2] = { addr, dta }; uint8_t data[2] = { addr, dta };
i2c_polling_write(i2c, data, sizeof(data), GROVE_RGB_BACKLIGHT_ADDR); i2c_write(i2c, data, sizeof(data), GROVE_RGB_BACKLIGHT_ADDR);
} }
@ -131,7 +131,7 @@ void glcd_print(struct device *port, unsigned char *data, uint32_t size)
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
buf[1] = data[i]; buf[1] = data[i];
i2c_polling_write(dev->i2c, buf, sizeof(buf), rom->lcd_addr); i2c_write(dev->i2c, buf, sizeof(buf), rom->lcd_addr);
} }
} }
@ -153,7 +153,7 @@ void glcd_cursor_pos_set(struct device *port, uint8_t col, uint8_t row)
data[0] = GLCD_CMD_SET_DDRAM_ADDR; data[0] = GLCD_CMD_SET_DDRAM_ADDR;
data[1] = col; data[1] = col;
i2c_polling_write(dev->i2c, data, 2, rom->lcd_addr); i2c_write(dev->i2c, data, 2, rom->lcd_addr);
} }
@ -164,7 +164,7 @@ void glcd_clear(struct device *port)
struct glcd_data *dev = port->driver_data; struct glcd_data *dev = port->driver_data;
uint8_t clear[] = { 0, GLCD_CMD_SCREEN_CLEAR }; uint8_t clear[] = { 0, GLCD_CMD_SCREEN_CLEAR };
i2c_polling_write(dev->i2c, clear, sizeof(clear), rom->lcd_addr); i2c_write(dev->i2c, clear, sizeof(clear), rom->lcd_addr);
DBG("Grove LCD: clear, delay 20 ms\n"); DBG("Grove LCD: clear, delay 20 ms\n");
_sleep(20); _sleep(20);
} }
@ -180,7 +180,7 @@ void glcd_display_state_set(struct device *port, uint8_t opt)
dev->display_switch = opt; dev->display_switch = opt;
data[1] = (opt | GLCD_CMD_DISPLAY_SWITCH); data[1] = (opt | GLCD_CMD_DISPLAY_SWITCH);
i2c_polling_write(dev->i2c, data, sizeof(data), rom->lcd_addr); i2c_write(dev->i2c, data, sizeof(data), rom->lcd_addr);
DBG("Grove LCD: set display_state options, delay 5 ms\n"); DBG("Grove LCD: set display_state options, delay 5 ms\n");
_sleep(5); _sleep(5);
@ -204,7 +204,7 @@ void glcd_input_state_set(struct device *port, uint8_t opt)
dev->input_set = opt; dev->input_set = opt;
data[1] = (opt | GLCD_CMD_INPUT_SET); data[1] = (opt | GLCD_CMD_INPUT_SET);
i2c_polling_write(dev->i2c, &dev->input_set, sizeof(dev->input_set), i2c_write(dev->i2c, &dev->input_set, sizeof(dev->input_set),
rom->lcd_addr); rom->lcd_addr);
DBG("Grove LCD: set the input_set, no delay\n"); DBG("Grove LCD: set the input_set, no delay\n");
} }
@ -251,7 +251,7 @@ void glcd_function_set(struct device *port, uint8_t opt)
dev->function = opt; dev->function = opt;
data[1] = (opt | GLCD_CMD_FUNCTION_SET); data[1] = (opt | GLCD_CMD_FUNCTION_SET);
i2c_polling_write(dev->i2c, data, sizeof(data), rom->lcd_addr); i2c_write(dev->i2c, data, sizeof(data), rom->lcd_addr);
DBG("Grove LCD: set function options, delay 5 ms\n"); DBG("Grove LCD: set function options, delay 5 ms\n");
_sleep(5); _sleep(5);

2
drivers/pwm/pwm_pca9685.c
View file

@ -124,7 +124,7 @@ static int pwm_pca9685_set_values(struct device *dev, int access_op,
buf[4] = ((off >> 8) & 0x0F); buf[4] = ((off >> 8) & 0x0F);
} }
return i2c_polling_write(i2c_master, buf, sizeof(buf), i2c_addr); return i2c_write(i2c_master, buf, sizeof(buf), i2c_addr);
} }
/** /**