projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Document how delay_done is used in ao_pyro.c
[fw/altos]
/
src
/
drivers
/
ao_m25.c
diff --git
a/src/drivers/ao_m25.c
b/src/drivers/ao_m25.c
index 2e4cbedf989d23991c54245b6a6a18d392e2d1b1..accf943a3fbe6e079ad0825b21f53d08823828fb 100644
(file)
--- a/
src/drivers/ao_m25.c
+++ b/
src/drivers/ao_m25.c
@@
-125,7
+125,7
@@
ao_m25_wait_wip(ao_port_t cs)
ao_spi_recv(ao_m25_instruction, 1, AO_M25_SPI_BUS);
} while (ao_m25_instruction[0] & M25_STATUS_WIP);
M25_DESELECT(cs);
ao_spi_recv(ao_m25_instruction, 1, AO_M25_SPI_BUS);
} while (ao_m25_instruction[0] & M25_STATUS_WIP);
M25_DESELECT(cs);
- ao_m25_wip &= ~cs;
+ ao_m25_wip &=
(ao_port_t)
~cs;
}
}
}
}
@@
-192,9
+192,9
@@
ao_m25_set_address(uint32_t pos)
#endif
ao_m25_wait_wip(mask);
#endif
ao_m25_wait_wip(mask);
- ao_m25_instruction[1] =
pos >> 16
;
- ao_m25_instruction[2] =
pos >> 8
;
- ao_m25_instruction[3] =
pos
;
+ ao_m25_instruction[1] =
(uint8_t) (pos >> 16)
;
+ ao_m25_instruction[2] =
(uint8_t) (pos >> 8)
;
+ ao_m25_instruction[3] =
(uint8_t) (pos)
;
return mask;
}
return mask;
}