aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPaul Selkirk <paul@psgd.org>2015-11-17 23:45:17 -0500
committerPaul Selkirk <paul@psgd.org>2015-11-17 23:45:17 -0500
commit03e6a672c964ebaf0e61018b0a7a63edb2748990 (patch)
treefc3ef67bd4a47ea33e95fc9a5e0c8bc03d7dbf3c /tests
parent863f996135a80ff8511360308496056ecee9e47d (diff)
More post-merge cleanup.
- Joachim says always check entropy and csprng for 'valid' before reading. - Harmonize RNG status valid bit with other cores. - Clean up compiler warnings about printf formats.
Diffstat (limited to 'tests')
-rw-r--r--tests/test-bus.c2
-rw-r--r--tests/test-trng.c15
2 files changed, 6 insertions, 11 deletions
diff --git a/tests/test-bus.c b/tests/test-bus.c
index d30f3fc..1c60e5d 100644
--- a/tests/test-bus.c
+++ b/tests/test-bus.c
@@ -68,7 +68,7 @@ static int sanity(const hal_core_t *board_core)
}
if (data != rnd) {
- printf("Data bus fail: expected %08lx, got %08lx, diff %08lx\n", rnd, data, data ^ rnd);
+ printf("Data bus fail: expected %08x, got %08x, diff %08x\n", rnd, data, data ^ rnd);
return 1;
}
diff --git a/tests/test-trng.c b/tests/test-trng.c
index 8ca64e0..ebfe701 100644
--- a/tests/test-trng.c
+++ b/tests/test-trng.c
@@ -46,7 +46,7 @@
#include <verilog_constants.h>
#ifndef WAIT_FOR_CSPRNG_VALID
-#define WAIT_FOR_CSPRNG_VALID 0
+#define WAIT_FOR_CSPRNG_VALID 1
#endif
static void show_core(const hal_core_t *core, const char *whinge)
@@ -71,12 +71,7 @@ static hal_error_t test_random(const char *name)
return HAL_ERROR_CORE_NOT_FOUND;
for (i = 0; i < 8; ++i) {
- /* The entropy sources are faster than the bus speed, so querying
- * the "status_valid" bit always returns true. Also, at the
- * moment, the trng cores use bit 0 for valid, while all the other
- * cores use bit 1, so we query the "status_ready" bit.
- */
- if (WAIT_FOR_CSPRNG_VALID && (err = hal_io_wait_ready(core)) != HAL_OK) {
+ if (WAIT_FOR_CSPRNG_VALID && (err = hal_io_wait_valid(core)) != HAL_OK) {
printf("hal_io_wait_valid: %s\n", hal_error_string(err));
return err;
}
@@ -89,7 +84,7 @@ static hal_error_t test_random(const char *name)
return err;
}
- printf("%08lx ", rnd);
+ printf("%08x ", rnd);
}
printf("\n");
@@ -105,13 +100,13 @@ int main(void)
/* Exercise the API function. This gets random data from the CSPRNG,
* so we end up hitting that twice.
*/
- printf("hal_get_random:\n");
+ printf("hal_get_random\n");
if ((err = hal_get_random(NULL, (void *) &rnd, sizeof(rnd))) != HAL_OK) {
printf("hal_get_random: %s\n", hal_error_string(err));
}
else {
for (i = 0; i < 8; ++i) {
- printf("%08lx ", rnd[i]);
+ printf("%08x ", rnd[i]);
}
printf("\n");
}