Skip to content

Commit

Permalink
Revert "mcp23018: add return status to init (#18178)" (#18709)
Browse files Browse the repository at this point in the history
This reverts commit 3fffa51.
  • Loading branch information
zvecr authored Oct 29, 2022
1 parent c78dc85 commit c63e2e3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
14 changes: 4 additions & 10 deletions drivers/gpio/mcp23018.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,14 @@ enum {
CMD_GPIOB = 0x13,
};

bool mcp23018_init(uint8_t slave_addr) {
void mcp23018_init(uint8_t addr) {
static uint8_t s_init = 0;
uint8_t addr = SLAVE_TO_ADDR(slave_addr);
if (0 == s_init) {
if (!s_init) {
i2c_init();
wait_ms(100);
wait_ms(1000);

// probe that the expander is actually connected by reading from it
uint8_t data = 0;
if (I2C_STATUS_SUCCESS == i2c_readReg(addr, 0, &data, sizeof(data), 150)) {
s_init = 1;
}
s_init = 1;
}
return (s_init > 0);
}

bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/mcp23018.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ enum {
/**
* Init expander and any other dependent drivers
*/
bool mcp23018_init(uint8_t slave_addr);
void mcp23018_init(uint8_t slave_addr);

/**
* Configure input/output to a given port
Expand Down

0 comments on commit c63e2e3

Please sign in to comment.