summaryrefslogtreecommitdiff
path: root/tests/i2c-master
diff options
context:
space:
mode:
authorKarl Palsson <karlp@tweak.net.au>2017-03-24 00:13:23 +0000
committerKarl Palsson <karlp@tweak.net.au>2017-03-24 00:13:23 +0000
commit6dfe47b399a35cdffc74db5b6060026b2a83ace9 (patch)
tree4735ba0d47fa95575529cd8c1d858eecaf34e2d8 /tests/i2c-master
parentf34641e25bf5e6bea8581db488239333d2d927da (diff)
downloadolsndot-6dfe47b399a35cdffc74db5b6060026b2a83ace9.tar.gz
olsndot-6dfe47b399a35cdffc74db5b6060026b2a83ace9.tar.bz2
olsndot-6dfe47b399a35cdffc74db5b6060026b2a83ace9.zip
i2c-master: use library form of transfer functions
Diffstat (limited to 'tests/i2c-master')
-rw-r--r--tests/i2c-master/i2c-master.c143
1 files changed, 0 insertions, 143 deletions
diff --git a/tests/i2c-master/i2c-master.c b/tests/i2c-master/i2c-master.c
index 469e66f..3adbbf0 100644
--- a/tests/i2c-master/i2c-master.c
+++ b/tests/i2c-master/i2c-master.c
@@ -25,149 +25,6 @@ enum sht21_cmd_e {
/* 0xfa, 0x0f to read serial */
};
-// ------------------ section proposed to go up to libopencm3
-
-
-static void i2c_write7_v1(uint32_t i2c, int addr, uint8_t *data, size_t n)
-{
-#if defined(I2C_SR1)
- while ((I2C_SR2(i2c) & I2C_SR2_BUSY)) {
- }
-
- i2c_send_start(i2c);
-
- /* Wait for master mode selected */
- while (!((I2C_SR1(i2c) & I2C_SR1_SB)
- & (I2C_SR2(i2c) & (I2C_SR2_MSL | I2C_SR2_BUSY))));
-
- i2c_send_7bit_address(i2c, addr, I2C_WRITE);
-
- /* Waiting for address is transferred. */
- while (!(I2C_SR1(i2c) & I2C_SR1_ADDR));
-
- /* Cleaning ADDR condition sequence. */
- uint32_t reg32 = I2C_SR2(i2c);
- (void) reg32; /* unused */
-
- size_t i;
- for (i = 0; i < n; i++) {
- i2c_send_data(i2c, data[i]);
- while (!(I2C_SR1(i2c) & (I2C_SR1_BTF)));
- }
-#endif
-}
-
-static void i2c_read7_v1(uint32_t i2c, int addr, uint8_t *res, int n)
-{
-#if defined(I2C_SR1)
- i2c_send_start(i2c);
- i2c_enable_ack(i2c);
-
- /* Wait for master mode selected */
- while (!((I2C_SR1(i2c) & I2C_SR1_SB)
- & (I2C_SR2(i2c) & (I2C_SR2_MSL | I2C_SR2_BUSY))));
-
- i2c_send_7bit_address(i2c, addr, I2C_READ);
-
- /* Waiting for address is transferred. */
- while (!(I2C_SR1(i2c) & I2C_SR1_ADDR));
- /* Clearing ADDR condition sequence. */
- uint32_t reg32 = I2C_SR2(i2c);
- (void) reg32; /* unused */
-
- int i = 0;
- for (i = 0; i < n; ++i) {
- if (i == n - 1) {
- i2c_disable_ack(i2c);
- }
- while (!(I2C_SR1(i2c) & I2C_SR1_RxNE));
- res[i] = i2c_get_data(i2c);
- }
- i2c_send_stop(i2c);
-
- return;
-#endif
-}
-
-/* v1 isn't handling stop/start vs repeated start very well yet */
-/* probably good enough to merge, but... maybe not put the v1 in the library.*/
-static
-void i2c_transfer7_v1(uint32_t i2c, uint8_t addr, uint8_t *w, size_t wn, uint8_t *r, size_t rn) {
- if (wn) {
- i2c_write7_v1(i2c, addr, w, wn);
- }
- if (rn) {
- i2c_read7_v1(i2c, addr, r, rn);
- } else {
- i2c_send_stop(i2c);
- }
-}
-
-
-static
-void i2c_transfer7_v2(uint32_t i2c, uint8_t addr, uint8_t *w, size_t wn, uint8_t *r, size_t rn)
-{
- int wait;
- size_t i;
- /* waiting for busy is unnecessary. read the RM */
- if (wn) {
- i2c_set_7bit_address(i2c, addr);
- i2c_set_write_transfer_dir(i2c);
- i2c_set_bytes_to_transfer(i2c, wn);
- if (rn) {
- i2c_disable_autoend(i2c);
- } else {
- i2c_enable_autoend(i2c);
- }
- i2c_send_start(i2c);
-
- while (wn--) {
- wait = true;
- while (wait) {
- if (i2c_transmit_int_status(i2c)) {
- wait = false;
- }
- while (i2c_nack(i2c)); /* FIXME Some error */
- }
- i2c_send_data(i2c, *w++);
- }
- /* not entirely sure this is really necessary.
- * RM implies it will stall until it can write out the later bits
- */
- if (rn) {
- while (!i2c_transfer_complete(i2c));
- }
- }
-
- if (rn) {
- /*Setting transfer properties*/
- i2c_set_7bit_address(i2c, addr);
- i2c_set_read_transfer_dir(i2c);
- i2c_set_bytes_to_transfer(i2c, rn);
- /*start transfer*/
- i2c_send_start(i2c);
- /* important to do it afterwards to do a proper repeated start! */
- i2c_enable_autoend(i2c);
-
- for (i = 0; i < rn; i++) {
- while (i2c_received_data(i2c) == 0);
- r[i] = i2c_get_data(i2c);
- }
- }
-
-}
-
-static
-void i2c_transfer7(uint32_t i2c, uint8_t addr, uint8_t *w, size_t wn, uint8_t *r, size_t rn)
-{
-#if defined I2C_SR2
- i2c_transfer7_v1(i2c, addr, w, wn, r, rn);
-#else
- i2c_transfer7_v2(i2c, addr, w, wn, r, rn);
-#endif
-}
-
-// --------------- end of upstream planned section
void i2cm_init(void)
{