projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct exception for toolchains that don't have the right attributes
[bertos.git]
/
bertos
/
drv
/
eeprom.c
diff --git
a/bertos/drv/eeprom.c
b/bertos/drv/eeprom.c
index 83688b782c6216dbd64eaaf6f3412c8b119b0a24..f92091487ae0cc9daeb2fb7cf7bcbd210a2f8d1a 100644
(file)
--- a/
bertos/drv/eeprom.c
+++ b/
bertos/drv/eeprom.c
@@
-48,7
+48,7
@@
#include <cfg/module.h> // MOD_CHECK()
#include <cpu/attr.h>
#include <cfg/module.h> // MOD_CHECK()
#include <cpu/attr.h>
-#include
CPU_HEADER(twi)
+#include
<drv/i2c.h>
#include <drv/wdt.h>
#include <drv/wdt.h>
@@
-147,15
+147,15
@@
static size_t eeprom_writeRaw(struct KFile *_fd, const void *buf, size_t size)
}
}
- if (!(
twi
_start_w(EEPROM_ADDR(dev_addr))
- &&
twi
_send(addr_buf, addr_len)
- &&
twi
_send(buf, count)))
+ if (!(
i2c
_start_w(EEPROM_ADDR(dev_addr))
+ &&
i2c
_send(addr_buf, addr_len)
+ &&
i2c
_send(buf, count)))
{
{
-
twi
_stop();
+
i2c
_stop();
return wr_len;
}
return wr_len;
}
-
twi
_stop();
+
i2c
_stop();
/* Update count and addr for next operation */
size -= count;
/* Update count and addr for next operation */
size -= count;
@@
-232,11
+232,11
@@
static size_t eeprom_read(struct KFile *_fd, void *_buf, size_t size)
}
}
- if (!(
twi
_start_w(EEPROM_ADDR(dev_addr))
- &&
twi
_send(addr_buf, addr_len)
- &&
twi
_start_r(EEPROM_ADDR(dev_addr))))
+ if (!(
i2c
_start_w(EEPROM_ADDR(dev_addr))
+ &&
i2c
_send(addr_buf, addr_len)
+ &&
i2c
_start_r(EEPROM_ADDR(dev_addr))))
{
{
-
twi
_stop();
+
i2c
_stop();
return 0;
}
return 0;
}
@@
-246,7
+246,7
@@
static size_t eeprom_read(struct KFile *_fd, void *_buf, size_t size)
* The last byte read does not have an ACK
* to stop communication.
*/
* The last byte read does not have an ACK
* to stop communication.
*/
- int c =
twi
_get(size);
+ int c =
i2c
_get(size);
if (c == EOF)
break;
if (c == EOF)
break;
@@
-368,7
+368,7
@@
bool eeprom_erase(Eeprom *fd, e2addr_t addr, e2_size_t count)
*/
void eeprom_init(Eeprom *fd, EepromType type, e2dev_addr_t addr, bool verify)
{
*/
void eeprom_init(Eeprom *fd, EepromType type, e2dev_addr_t addr, bool verify)
{
- MOD_CHECK(
twi
);
+ MOD_CHECK(
i2c
);
ASSERT(type < EEPROM_CNT);
memset(fd, 0, sizeof(*fd));
ASSERT(type < EEPROM_CNT);
memset(fd, 0, sizeof(*fd));