examples/mmc: Add a #define for whether to repeat commands

Signed-off-by: julia <git.ts@trainwit.ch>

Author: midnightveil

examples/mmc/client.c

@@ -20,6 +20,7 @@ blk_req_queue_t *blk_req_queue;
 blk_resp_queue_t *blk_resp_queue;
 uintptr_t blk_data;
 
+#define KEEP_REPEATING_COMMANDS false
 #define NUM_READ_BLOCKS   6
 #define NUM_WRITE_BLOCKS  5
 _Static_assert(NUM_READ_BLOCKS > NUM_WRITE_BLOCKS, "#read must be greater than #write");
@@ -94,9 +95,50 @@ void ensure_data_is_correct()
     sddf_printf("Client read/write data is correct!\n");
 }
 
+void send_commands(void)
+{
+    uint32_t data_address = 0;
+
+    /* Setup a data region with a region to read into from the card, initially zeroed
+        then another region to write to the card with.
+
+        Note: Read region is before the write region, so that we can ensure
+              that reading into it doesn't overwrite our original data we wrote from
+              i.e. a driver bug
+    */
+    volatile uint8_t *block_data = (volatile uint8_t *)blk_data;
+    for (int i = 0; i < NUM_READ_BLOCKS * BLK_TRANSFER_SIZE; i++) {
+        block_data[i] = 0x0;
+    }
+    for (int i = 0; i < NUM_WRITE_BLOCKS * BLK_TRANSFER_SIZE; i++) {
+        // we offset it so it's not 0 at start or end
+        block_data[i + NUM_READ_BLOCKS * BLK_TRANSFER_SIZE] = BYTE_ADJUST(i);
+    }
+
+    /* Request to write data, then read it back */
+
+    // write some zeroed data first; just our zeroed read blocks as a test.
+    int err = blk_enqueue_req(&blk_queue, BLK_REQ_WRITE, 0x0, data_address, NUM_READ_BLOCKS, /* req ID */ 0);
+    assert(!err);
+    err = blk_enqueue_req(&blk_queue, BLK_REQ_WRITE, 0x0 + NUM_READ_BLOCKS * BLK_TRANSFER_SIZE, data_address,
+                          NUM_WRITE_BLOCKS, /* req ID */ 1);
+    assert(!err);
+    err = blk_enqueue_req(&blk_queue, BLK_REQ_BARRIER, 0, 0, 0, /* req ID */ 2);
+    assert(!err);
+    err = blk_enqueue_req(&blk_queue, BLK_REQ_FLUSH, 0, 0, 0, /* req ID */ 3);
+    assert(!err);
+    // read some random stuff
+    err = blk_enqueue_req(&blk_queue, BLK_REQ_READ, 0x0, 0x0, NUM_READ_BLOCKS, /* req ID */ 4);
+    assert(!err);
+    // do a second read test to check this
+    err = blk_enqueue_req(&blk_queue, BLK_REQ_READ, 0x0, data_address, NUM_READ_BLOCKS, /* req ID */ 5);
+    assert(!err);
+
+    microkit_notify(BLK_VIRT_CHANNEL);
+}
+
 void notified(microkit_channel ch)
 {
-    microkit_dbg_puts("client notified!\n");
     if (ch != BLK_VIRT_CHANNEL) {
         assert(!"bad channel?");
     }
@@ -119,8 +161,13 @@ void notified(microkit_channel ch)
 
     }
 
-    print_some_data();
+    if (!KEEP_REPEATING_COMMANDS) {
+        print_some_data();
+    }
     ensure_data_is_correct();
+    if (KEEP_REPEATING_COMMANDS) {
+        send_commands();
+    }
 }
 
 void init(void)
@@ -136,42 +183,5 @@ void init(void)
        so we don't overwrite anything important.
     */
     assert(blk_partition_mapping[0] == 2);
-    uint32_t data_address = 0;
-
-    /* Setup a data region with a region to read into from the card, initially zeroed
-        then another region to write to the card with.
-
-        Note: Read region is before the write region, so that we can ensure
-              that reading into it doesn't overwrite our original data we wrote from
-              i.e. a driver bug
-    */
-    volatile uint8_t *block_data = (volatile uint8_t *)blk_data;
-    for (int i = 0; i < NUM_READ_BLOCKS * BLK_TRANSFER_SIZE; i++) {
-        block_data[i] = 0x0;
-    }
-    for (int i = 0; i < NUM_WRITE_BLOCKS * BLK_TRANSFER_SIZE; i++) {
-        // we offset it so it's not 0 at start or end
-        block_data[i + NUM_READ_BLOCKS * BLK_TRANSFER_SIZE] = BYTE_ADJUST(i);
-    }
-
-    /* Request to write data, then read it back */
-
-    // write some zeroed data first; just our zeroed read blocks as a test.
-    int err = blk_enqueue_req(&blk_queue, BLK_REQ_WRITE, 0x0, data_address, NUM_READ_BLOCKS, /* req ID */ 0);
-    assert(!err);
-    err = blk_enqueue_req(&blk_queue, BLK_REQ_WRITE, 0x0 + NUM_READ_BLOCKS * BLK_TRANSFER_SIZE, data_address,
-                          NUM_WRITE_BLOCKS, /* req ID */ 1);
-    assert(!err);
-    err = blk_enqueue_req(&blk_queue, BLK_REQ_BARRIER, 0, 0, 0, /* req ID */ 2);
-    assert(!err);
-    err = blk_enqueue_req(&blk_queue, BLK_REQ_FLUSH, 0, 0, 0, /* req ID */ 3);
-    assert(!err);
-    // read some random stuff
-    err = blk_enqueue_req(&blk_queue, BLK_REQ_READ, 0x0, 0x0, NUM_READ_BLOCKS, /* req ID */ 4);
-    assert(!err);
-    // do a second read test to check this
-    err = blk_enqueue_req(&blk_queue, BLK_REQ_READ, 0x0, data_address, NUM_READ_BLOCKS, /* req ID */ 5);
-    assert(!err);
-
-    microkit_notify(BLK_VIRT_CHANNEL);
+    send_commands();
 }