Skip to content

Commit cdc7693

Browse files
ubiedacarlescufi
authored andcommitted
tests: i2c_ram: rtio: Fix sequence to prepare ops to avoid overwriting
`rtio_sqe_prep_write()` and `rtio_sqe_prep_read()` memset the sqe struct to zeroes, clearing any configuration previously set. This commit changes this sequence in the test, such that the sqe's are prepared, then additional flags/configs applied. Signed-off-by: Luis Ubieda <[email protected]>
1 parent 2ec7a46 commit cdc7693

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tests/drivers/i2c/i2c_ram/src/test_i2c_ram.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ ZTEST(i2c_ram, test_ram_rtio)
185185

186186
TC_PRINT("submitting write from thread %p addr %x\n", k_current_get(), addr);
187187
wr_sqe = rtio_sqe_acquire(&i2c_rtio);
188-
wr_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP;
189188
rtio_sqe_prep_write(wr_sqe, &i2c_iodev, 0, tx_data, ARRAY_SIZE(tx_data), tx_data);
189+
wr_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP;
190190
zassert_ok(rtio_submit(&i2c_rtio, 1), "submit should succeed");
191191

192192
wr_cqe = rtio_cqe_consume(&i2c_rtio);
@@ -201,11 +201,11 @@ ZTEST(i2c_ram, test_ram_rtio)
201201
msgs[1].flags = I2C_MSG_RESTART | I2C_MSG_READ | I2C_MSG_STOP;
202202

203203
wr_sqe = rtio_sqe_acquire(&i2c_rtio);
204-
wr_sqe->flags |= RTIO_SQE_TRANSACTION;
205204
rd_sqe = rtio_sqe_acquire(&i2c_rtio);
206-
rd_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
207205
rtio_sqe_prep_write(wr_sqe, &i2c_iodev, 0, rx_cmd, ARRAY_SIZE(rx_cmd), rx_cmd);
208206
rtio_sqe_prep_read(rd_sqe, &i2c_iodev, 0, rx_data, ARRAY_SIZE(rx_data), rx_data);
207+
wr_sqe->flags |= RTIO_SQE_TRANSACTION;
208+
rd_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
209209
zassert_ok(rtio_submit(&i2c_rtio, 2), "submit should succeed");
210210

211211
wr_cqe = rtio_cqe_consume(&i2c_rtio);
@@ -238,8 +238,8 @@ void ram_rtio_isr(struct k_timer *tid)
238238
case INIT:
239239
TC_PRINT("timer submitting write, addr %x\n", addr);
240240
wr_sqe = rtio_sqe_acquire(&i2c_rtio);
241-
wr_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP;
242241
rtio_sqe_prep_write(wr_sqe, &i2c_iodev, 0, tx_data, ARRAY_SIZE(tx_data), tx_data);
242+
wr_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP;
243243
zassert_ok(rtio_submit(&i2c_rtio, 0), "submit should succeed");
244244
isr_state += 1;
245245
break;
@@ -258,13 +258,13 @@ void ram_rtio_isr(struct k_timer *tid)
258258
msgs[1].flags = I2C_MSG_RESTART | I2C_MSG_READ | I2C_MSG_STOP;
259259

260260
wr_sqe = rtio_sqe_acquire(&i2c_rtio);
261-
wr_sqe->flags |= RTIO_SQE_TRANSACTION;
262261
rd_sqe = rtio_sqe_acquire(&i2c_rtio);
263-
rd_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
264262
rtio_sqe_prep_write(wr_sqe, &i2c_iodev, 0, rx_cmd,
265263
ARRAY_SIZE(rx_cmd), rx_cmd);
266264
rtio_sqe_prep_read(rd_sqe, &i2c_iodev, 0, rx_data,
267265
ARRAY_SIZE(rx_data), rx_data);
266+
wr_sqe->flags |= RTIO_SQE_TRANSACTION;
267+
rd_sqe->iodev_flags |= RTIO_IODEV_I2C_STOP | RTIO_IODEV_I2C_RESTART;
268268
zassert_ok(rtio_submit(&i2c_rtio, 0), "submit should succeed");
269269
isr_state += 1;
270270
}

0 commit comments

Comments
 (0)