diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-12-30 05:21:58 +1100 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-12-29 10:21:58 -0800 |
| commit | 8af1501328711ba806785861b183786cb5cbb80a (patch) | |
| tree | f31c64951d5c750038d30a2955911425d4cf6058 /drivers/issi/is31fl3731.c | |
| parent | 25aaeb4f401fedee00e90e9fe27bdea5fed778d6 (diff) | |
| download | firmware-8af1501328711ba806785861b183786cb5cbb80a.tar.gz firmware-8af1501328711ba806785861b183786cb5cbb80a.tar.bz2 firmware-8af1501328711ba806785861b183786cb5cbb80a.zip | |
Clean up ISSI driver includes (#7734)
* Clean up ISSI driver includes
* Missed an endif
Diffstat (limited to 'drivers/issi/is31fl3731.c')
| -rw-r--r-- | drivers/issi/is31fl3731.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/issi/is31fl3731.c b/drivers/issi/is31fl3731.c index 0b6f3e985..9f006b817 100644 --- a/drivers/issi/is31fl3731.c +++ b/drivers/issi/is31fl3731.c @@ -15,18 +15,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef __AVR__ -# include <avr/interrupt.h> -# include <avr/io.h> -# include <util/delay.h> -#else -# include "wait.h" -#endif - #include "is31fl3731.h" -#include <string.h> #include "i2c_master.h" -#include "progmem.h" +#include "wait.h" // This is a 7-bit address, that gets left-shifted and bit 0 // set to 0 for write, 1 for read (as per I2C protocol) @@ -141,12 +132,9 @@ void IS31FL3731_init(uint8_t addr) { // enable software shutdown IS31FL3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x00); -// this delay was copied from other drivers, might not be needed -#ifdef __AVR__ - _delay_ms(10); -#else + + // this delay was copied from other drivers, might not be needed wait_ms(10); -#endif // picture mode IS31FL3731_write_register(addr, ISSI_REG_CONFIG, ISSI_REG_CONFIG_PICTUREMODE); |