X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_trng_send.c;h=99994900aadbc3d1f8b7d2c174967fd21a2ef3f6;hb=35407e664886bed21dcef7764843aac03be8490c;hp=34a8a981bb866406e76a690b355c6e7548be5764;hpb=bd18bc5a42fcecfb710477371b9f62610a1ea640;p=fw%2Faltos

diff --git a/src/drivers/ao_trng_send.c b/src/drivers/ao_trng_send.c
index 34a8a981..99994900 100644
--- a/src/drivers/ao_trng_send.c
+++ b/src/drivers/ao_trng_send.c
@@ -19,15 +19,47 @@
 #include <ao_adc_fast.h>
 #include <ao_crc.h>
 #include <ao_trng_send.h>
+#include <ao_exti.h>
+
+static void
+ao_trng_send_raw(uint16_t *buf)
+{
+	uint16_t	i;
+	uint16_t	t;
+	uint16_t	*rnd = (uint16_t *) ao_adc_ring;
+
+	t = ao_adc_get(AO_USB_IN_SIZE>>1);	/* one 16-bit value per two output bytes */
+	for (i = 0; i < AO_USB_IN_SIZE / sizeof (uint16_t); i++) {
+		*buf++ = rnd[t];
+		t = (t + 1) & (AO_ADC_RING_SIZE - 1);
+	}
+}
+
+static void
+ao_trng_send_cooked(uint16_t *buf)
+{
+	uint16_t	i;
+	uint16_t	t;
+	uint32_t	*rnd = (uint32_t *) ao_adc_ring;
+
+	t = ao_adc_get(AO_USB_IN_SIZE) >> 1;	/* one 16-bit value per output byte */
+	for (i = 0; i < AO_USB_IN_SIZE / sizeof (uint16_t); i++) {
+		*buf++ = ao_crc_in_32_out_16(rnd[t]);
+		t = (t + 1) & ((AO_ADC_RING_SIZE>>1) - 1);
+	}
+}
+
+static inline int
+ao_send_raw(void)
+{
+	return !ao_gpio_get(AO_RAW_PORT, AO_RAW_BIT, AO_RAW_PIN);
+}
 
 static void
 ao_trng_send(void)
 {
 	static uint16_t	*buffer[2];
-	int		usb_buf_id;
-	uint16_t	i;
-	uint16_t	*buf;
-	uint32_t	*rnd;
+	int	usb_buf_id;
 
 	if (!buffer[0]) {
 		buffer[0] = ao_usb_alloc();
@@ -40,14 +72,22 @@ ao_trng_send(void)
 
 	ao_crc_reset();
 
+	/* Delay long enough for the HV power supply to stabilize so that the
+	 * first bits we read aren't of poor quality
+	 */
+	ao_delay(AO_MS_TO_TICKS(250));
+
 	for (;;) {
-		ao_led_on(AO_LED_TRNG_ACTIVE);
-		rnd = (uint32_t *) ao_adc_get(AO_USB_IN_SIZE);	/* one 16-bit value per output byte */
-		buf = buffer[usb_buf_id];
-		for (i = 0; i < AO_USB_IN_SIZE / sizeof (uint16_t); i++)
-			*buf++ = ao_crc_in_32_out_16(*rnd++);
+		if (ao_send_raw()) {
+			ao_led_on(AO_LED_TRNG_RAW);
+			ao_trng_send_raw(buffer[usb_buf_id]);
+			ao_led_off(AO_LED_TRNG_RAW);
+		} else {
+			ao_led_on(AO_LED_TRNG_COOKED);
+			ao_trng_send_cooked(buffer[usb_buf_id]);
+			ao_led_off(AO_LED_TRNG_COOKED);
+		}
 		ao_adc_ack(AO_USB_IN_SIZE);
-		ao_led_off(AO_LED_TRNG_ACTIVE);
 		ao_usb_write(buffer[usb_buf_id], AO_USB_IN_SIZE);
 		usb_buf_id = 1-usb_buf_id;
 	}
@@ -58,5 +98,6 @@ static struct ao_task ao_trng_send_task;
 void
 ao_trng_send_init(void)
 {
+	ao_enable_input(AO_RAW_PORT, AO_RAW_BIT, AO_EXTI_MODE_PULL_UP);
 	ao_add_task(&ao_trng_send_task, ao_trng_send, "trng_send");
 }