|
37 | 37 | #define min(a, b) ((a) > (b) ? (b) : (a)) |
38 | 38 | #endif |
39 | 39 |
|
40 | | -#define PAGE_SIZE (dev->params.page_size) |
| 40 | +#define AT25_PAGE_SIZE (dev->params.page_size) |
41 | 41 | #define ADDR_LEN (AT25XXX_PARAM_ADDR_LEN) |
42 | 42 | #define ADDR_MSK ((1UL << ADDR_LEN) - 1) |
43 | 43 |
|
@@ -85,12 +85,12 @@ static inline int _wait_until_eeprom_ready(const at25xxx_t *dev) |
85 | 85 |
|
86 | 86 | static int _at25xxx_write_page(const at25xxx_t *dev, uint32_t page, uint32_t offset, const void *data, size_t len) |
87 | 87 | { |
88 | | - assert(offset < PAGE_SIZE); |
| 88 | + assert(offset < AT25_PAGE_SIZE); |
89 | 89 |
|
90 | 90 | /* write no more than to the end of the current page to prevent wrap-around */ |
91 | | - size_t remaining = PAGE_SIZE - offset; |
| 91 | + size_t remaining = AT25_PAGE_SIZE - offset; |
92 | 92 | len = min(len, remaining); |
93 | | - uint32_t pos = _pos(CMD_WRITE, page * PAGE_SIZE + offset); |
| 93 | + uint32_t pos = _pos(CMD_WRITE, page * AT25_PAGE_SIZE + offset); |
94 | 94 |
|
95 | 95 | /* wait for previous write to finish - may take up to 5 ms */ |
96 | 96 | int res = _wait_until_eeprom_ready(dev); |
@@ -136,8 +136,8 @@ int at25xxx_write(const at25xxx_t *dev, uint32_t pos, const void *data, size_t l |
136 | 136 | } |
137 | 137 |
|
138 | 138 | /* page size is always a power of two */ |
139 | | - const uint32_t page_shift = bitarithm_msb(PAGE_SIZE); |
140 | | - const uint32_t page_mask = PAGE_SIZE - 1; |
| 139 | + const uint32_t page_shift = bitarithm_msb(AT25_PAGE_SIZE); |
| 140 | + const uint32_t page_mask = AT25_PAGE_SIZE - 1; |
141 | 141 |
|
142 | 142 | uint32_t page = pos >> page_shift; |
143 | 143 | uint32_t offset = pos & page_mask; |
@@ -214,8 +214,8 @@ int at25xxx_set(const at25xxx_t *dev, uint32_t pos, uint8_t val, size_t len) |
214 | 214 | memset(data, val, sizeof(data)); |
215 | 215 |
|
216 | 216 | /* page size is always a power of two */ |
217 | | - const uint32_t page_shift = bitarithm_msb(PAGE_SIZE); |
218 | | - const uint32_t page_mask = PAGE_SIZE - 1; |
| 217 | + const uint32_t page_shift = bitarithm_msb(AT25_PAGE_SIZE); |
| 218 | + const uint32_t page_mask = AT25_PAGE_SIZE - 1; |
219 | 219 |
|
220 | 220 | uint32_t page = pos >> page_shift; |
221 | 221 | uint32_t offset = pos & page_mask; |
|
0 commit comments