From 53beec60fc922f30f1b2ffb2ede5b240d2961635 Mon Sep 17 00:00:00 2001
From: Fredrik Thulin <fredrik@thulin.net>
Date: Wed, 2 Sep 2015 16:47:41 +0200
Subject: remove CR and trailing whitespace

---
 src/fmc-test/src/main.c | 566 ++++++++++++++++++++++++------------------------
 1 file changed, 283 insertions(+), 283 deletions(-)

diff --git a/src/fmc-test/src/main.c b/src/fmc-test/src/main.c
index 705a04f..ca3ae18 100644
--- a/src/fmc-test/src/main.c
+++ b/src/fmc-test/src/main.c
@@ -1,283 +1,283 @@
-//------------------------------------------------------------------------------
-// main.c
-//------------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------------
-// Headers
-//------------------------------------------------------------------------------
-#include "stm32f4xx_hal.h"
-#include "stm-fmc.h"
-
-
-//------------------------------------------------------------------------------
-// Defines
-//------------------------------------------------------------------------------
-#define GPIO_PORT_LEDS        GPIOJ
-
-#define GPIO_PIN_LED_RED      GPIO_PIN_1
-#define GPIO_PIN_LED_YELLOW		GPIO_PIN_2
-#define GPIO_PIN_LED_GREEN    GPIO_PIN_3
-#define GPIO_PIN_LED_BLUE     GPIO_PIN_4
-
-
-//------------------------------------------------------------------------------
-// Macros
-//------------------------------------------------------------------------------
-#define led_on(pin)			HAL_GPIO_WritePin(GPIO_PORT_LEDS,pin,GPIO_PIN_SET)
-#define led_off(pin)		HAL_GPIO_WritePin(GPIO_PORT_LEDS,pin,GPIO_PIN_RESET)
-#define led_toggle(pin)	HAL_GPIO_TogglePin(GPIO_PORT_LEDS,pin)
-
-
-//------------------------------------------------------------------------------
-// Variables
-//------------------------------------------------------------------------------
-RNG_HandleTypeDef rng_inst;
-
-
-
-//------------------------------------------------------------------------------
-// Prototypes
-//------------------------------------------------------------------------------
-void SystemClock_Config(void);
-
-static void MX_RNG_Init(void);
-static void MX_GPIO_Init(void);
-
-int test_fpga_data_bus(void);
-int test_fpga_address_bus(void);
-
-
-//------------------------------------------------------------------------------
-// Defines
-//------------------------------------------------------------------------------
-#define TEST_NUM_ROUNDS		100000
-
-
-//------------------------------------------------------------------------------
-int main(void)
-//------------------------------------------------------------------------------
-{
-		// initialize hal
-  HAL_Init();
-
-		// configure system clock
-  SystemClock_Config();
-
-		// initialize gpio
-	MX_GPIO_Init();
-	
-		// initialize rng
-	MX_RNG_Init();
-	
-		// prepare fmc interface
-	fmc_init();
-
-		// turn on green led, turn off other leds
-	led_on(GPIO_PIN_LED_GREEN);
-	led_off(GPIO_PIN_LED_YELLOW);
-	led_off(GPIO_PIN_LED_RED);
-	led_off(GPIO_PIN_LED_BLUE);
-	
-		// vars
-	int test_ok;
-
-		// main loop (test, until an error is detected)
-  while (1)
-  {
-			// test data bus
-		test_ok = test_fpga_data_bus();
-		
-			// check for errors (abort testing in case of error)
-		if (test_ok < TEST_NUM_ROUNDS) /*break*/;
-			
-		
-			// test address bus
-		test_ok = test_fpga_address_bus();
-		
-			// check for errors (abort testing in case of error)
-		if (test_ok < TEST_NUM_ROUNDS) /*break*/;
-		
-			// toggle yellow led to indicate, that we are alive
-		led_toggle(GPIO_PIN_LED_YELLOW);
-  }
-
-		// error handler
-	while (1)
-	{
-			// turn on red led, turn off other leds
-		led_on(GPIO_PIN_LED_RED);
-		led_off(GPIO_PIN_LED_GREEN);
-		led_off(GPIO_PIN_LED_YELLOW);
-		led_off(GPIO_PIN_LED_BLUE);		
-	}
-
-		// should never reach this line
-}
-
-
-//------------------------------------------------------------------------------
-int test_fpga_data_bus(void)
-//------------------------------------------------------------------------------
-{
-	int c, ok;
-	uint32_t rnd, buf;
-	HAL_StatusTypeDef hal_result;
-	
-		// run some rounds of data bus test
-	for (c=0; c<TEST_NUM_ROUNDS; c++)
-	{
-			// try to generate "random" number
-		hal_result = HAL_RNG_GenerateRandomNumber(&rng_inst, &rnd);
-		if (hal_result != HAL_OK) break;
-		
-			// write value to fpga at address 0
-		ok = fmc_write_32(0, &rnd);
-		if (ok != 0) break;
-		
-			// read value from fpga
-		ok = fmc_read_32(0, &buf);
-		if (ok != 0) break;
-		
-			// compare (abort testing in case of error)
-		if (buf != rnd)
-		{
-			uint32_t diff = buf;
-			diff ^= rnd;
-			diff = 0;	// place breakpoint here if needed
-			break;
-		}
-	}
-
-		// return number of successful tests
-	return c;
-}
-
-
-//------------------------------------------------------------------------------
-int test_fpga_address_bus(void)
-//------------------------------------------------------------------------------
-{
-	int c, ok;
-  uint32_t rnd, buf;
-  HAL_StatusTypeDef hal_result;
-
-		// run some rounds of address bus test
-  for (c=0; c<TEST_NUM_ROUNDS; c++)
-  {
-			// try to generate "random" number
-    hal_result = HAL_RNG_GenerateRandomNumber(&rng_inst, &rnd);
-    if (hal_result != HAL_OK) break;
-    
-			// we only have 2^22 32-bit words
-		rnd &= 0x00FFFFFC;
-    
-			// don't test zero addresses (fpga will store data, not address)
-    if (rnd == 0) continue;
-    
-			// write dummy value to fpga at some non-zero address
-    ok = fmc_write_32(rnd, &buf);
-    if (ok != 0) break;
-		
-			// read value from fpga
-    ok = fmc_read_32(0, &buf);
-    if (ok != 0) break;
-    
-			// fpga receives address of 32-bit word, while we need
-			// byte address here to compare
-    buf <<= 2;
-    
-			// compare (abort testing in case of error)
-    if (buf != rnd)
-		{
-			uint32_t diff = buf;
-			diff ^= rnd;
-			diff = 0;	// place breakpoint here if needed
-			break;
-		}
-  }
-  
-  return c;
-}
-
-
-//------------------------------------------------------------------------------
-void SystemClock_Config(void)
-//------------------------------------------------------------------------------
-{
-
-  RCC_OscInitTypeDef RCC_OscInitStruct;
-  RCC_ClkInitTypeDef RCC_ClkInitStruct;
-
-  __PWR_CLK_ENABLE();
-
-  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
-
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
-  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-  RCC_OscInitStruct.HSICalibrationValue = 16;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
-  RCC_OscInitStruct.PLL.PLLM = 12;
-  RCC_OscInitStruct.PLL.PLLN = 270;
-  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
-  RCC_OscInitStruct.PLL.PLLQ = 8;
-  HAL_RCC_OscConfig(&RCC_OscInitStruct);
-
-  HAL_PWREx_ActivateOverDrive();
-
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1
-                              |RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
-  HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5);
-
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);
-
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-}
-
-
-//------------------------------------------------------------------------------
-void MX_RNG_Init(void)
-//------------------------------------------------------------------------------
-{
-  rng_inst.Instance = RNG;
-  HAL_RNG_Init(&rng_inst);
-}
-
-
-//------------------------------------------------------------------------------
-void MX_GPIO_Init(void)
-//------------------------------------------------------------------------------
-{
-	GPIO_InitTypeDef GPIO_InitStruct;
-
-  __GPIOJ_CLK_ENABLE();
-
-  GPIO_InitStruct.Pin = GPIO_PIN_1 | GPIO_PIN_2 | GPIO_PIN_3 | GPIO_PIN_4;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-	GPIO_InitStruct.Speed = GPIO_SPEED_LOW;
-  HAL_GPIO_Init(GPIOJ, &GPIO_InitStruct);
-}
-
-
-//------------------------------------------------------------------------------
-#ifdef USE_FULL_ASSERT
-//------------------------------------------------------------------------------
-void assert_failed(uint8_t* file, uint32_t line)
-//------------------------------------------------------------------------------
-{
-}
-//------------------------------------------------------------------------------
-#endif
-//------------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------------
-// EOF
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+// main.c
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+// Headers
+//------------------------------------------------------------------------------
+#include "stm32f4xx_hal.h"
+#include "stm-fmc.h"
+
+
+//------------------------------------------------------------------------------
+// Defines
+//------------------------------------------------------------------------------
+#define GPIO_PORT_LEDS        GPIOJ
+
+#define GPIO_PIN_LED_RED      GPIO_PIN_1
+#define GPIO_PIN_LED_YELLOW		GPIO_PIN_2
+#define GPIO_PIN_LED_GREEN    GPIO_PIN_3
+#define GPIO_PIN_LED_BLUE     GPIO_PIN_4
+
+
+//------------------------------------------------------------------------------
+// Macros
+//------------------------------------------------------------------------------
+#define led_on(pin)			HAL_GPIO_WritePin(GPIO_PORT_LEDS,pin,GPIO_PIN_SET)
+#define led_off(pin)		HAL_GPIO_WritePin(GPIO_PORT_LEDS,pin,GPIO_PIN_RESET)
+#define led_toggle(pin)	HAL_GPIO_TogglePin(GPIO_PORT_LEDS,pin)
+
+
+//------------------------------------------------------------------------------
+// Variables
+//------------------------------------------------------------------------------
+RNG_HandleTypeDef rng_inst;
+
+
+
+//------------------------------------------------------------------------------
+// Prototypes
+//------------------------------------------------------------------------------
+void SystemClock_Config(void);
+
+static void MX_RNG_Init(void);
+static void MX_GPIO_Init(void);
+
+int test_fpga_data_bus(void);
+int test_fpga_address_bus(void);
+
+
+//------------------------------------------------------------------------------
+// Defines
+//------------------------------------------------------------------------------
+#define TEST_NUM_ROUNDS		100000
+
+
+//------------------------------------------------------------------------------
+int main(void)
+//------------------------------------------------------------------------------
+{
+		// initialize hal
+  HAL_Init();
+
+		// configure system clock
+  SystemClock_Config();
+
+		// initialize gpio
+	MX_GPIO_Init();
+
+		// initialize rng
+	MX_RNG_Init();
+
+		// prepare fmc interface
+	fmc_init();
+
+		// turn on green led, turn off other leds
+	led_on(GPIO_PIN_LED_GREEN);
+	led_off(GPIO_PIN_LED_YELLOW);
+	led_off(GPIO_PIN_LED_RED);
+	led_off(GPIO_PIN_LED_BLUE);
+
+		// vars
+	int test_ok;
+
+		// main loop (test, until an error is detected)
+  while (1)
+  {
+			// test data bus
+		test_ok = test_fpga_data_bus();
+
+			// check for errors (abort testing in case of error)
+		if (test_ok < TEST_NUM_ROUNDS) /*break*/;
+
+
+			// test address bus
+		test_ok = test_fpga_address_bus();
+
+			// check for errors (abort testing in case of error)
+		if (test_ok < TEST_NUM_ROUNDS) /*break*/;
+
+			// toggle yellow led to indicate, that we are alive
+		led_toggle(GPIO_PIN_LED_YELLOW);
+  }
+
+		// error handler
+	while (1)
+	{
+			// turn on red led, turn off other leds
+		led_on(GPIO_PIN_LED_RED);
+		led_off(GPIO_PIN_LED_GREEN);
+		led_off(GPIO_PIN_LED_YELLOW);
+		led_off(GPIO_PIN_LED_BLUE);
+	}
+
+		// should never reach this line
+}
+
+
+//------------------------------------------------------------------------------
+int test_fpga_data_bus(void)
+//------------------------------------------------------------------------------
+{
+	int c, ok;
+	uint32_t rnd, buf;
+	HAL_StatusTypeDef hal_result;
+
+		// run some rounds of data bus test
+	for (c=0; c<TEST_NUM_ROUNDS; c++)
+	{
+			// try to generate "random" number
+		hal_result = HAL_RNG_GenerateRandomNumber(&rng_inst, &rnd);
+		if (hal_result != HAL_OK) break;
+
+			// write value to fpga at address 0
+		ok = fmc_write_32(0, &rnd);
+		if (ok != 0) break;
+
+			// read value from fpga
+		ok = fmc_read_32(0, &buf);
+		if (ok != 0) break;
+
+			// compare (abort testing in case of error)
+		if (buf != rnd)
+		{
+			uint32_t diff = buf;
+			diff ^= rnd;
+			diff = 0;	// place breakpoint here if needed
+			break;
+		}
+	}
+
+		// return number of successful tests
+	return c;
+}
+
+
+//------------------------------------------------------------------------------
+int test_fpga_address_bus(void)
+//------------------------------------------------------------------------------
+{
+	int c, ok;
+  uint32_t rnd, buf;
+  HAL_StatusTypeDef hal_result;
+
+		// run some rounds of address bus test
+  for (c=0; c<TEST_NUM_ROUNDS; c++)
+  {
+			// try to generate "random" number
+    hal_result = HAL_RNG_GenerateRandomNumber(&rng_inst, &rnd);
+    if (hal_result != HAL_OK) break;
+
+			// we only have 2^22 32-bit words
+		rnd &= 0x00FFFFFC;
+
+			// don't test zero addresses (fpga will store data, not address)
+    if (rnd == 0) continue;
+
+			// write dummy value to fpga at some non-zero address
+    ok = fmc_write_32(rnd, &buf);
+    if (ok != 0) break;
+
+			// read value from fpga
+    ok = fmc_read_32(0, &buf);
+    if (ok != 0) break;
+
+			// fpga receives address of 32-bit word, while we need
+			// byte address here to compare
+    buf <<= 2;
+
+			// compare (abort testing in case of error)
+    if (buf != rnd)
+		{
+			uint32_t diff = buf;
+			diff ^= rnd;
+			diff = 0;	// place breakpoint here if needed
+			break;
+		}
+  }
+
+  return c;
+}
+
+
+//------------------------------------------------------------------------------
+void SystemClock_Config(void)
+//------------------------------------------------------------------------------
+{
+
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+
+  __PWR_CLK_ENABLE();
+
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.HSICalibrationValue = 16;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLM = 12;
+  RCC_OscInitStruct.PLL.PLLN = 270;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
+  RCC_OscInitStruct.PLL.PLLQ = 8;
+  HAL_RCC_OscConfig(&RCC_OscInitStruct);
+
+  HAL_PWREx_ActivateOverDrive();
+
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1
+                              |RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
+  HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5);
+
+  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);
+
+  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
+
+}
+
+
+//------------------------------------------------------------------------------
+void MX_RNG_Init(void)
+//------------------------------------------------------------------------------
+{
+  rng_inst.Instance = RNG;
+  HAL_RNG_Init(&rng_inst);
+}
+
+
+//------------------------------------------------------------------------------
+void MX_GPIO_Init(void)
+//------------------------------------------------------------------------------
+{
+	GPIO_InitTypeDef GPIO_InitStruct;
+
+  __GPIOJ_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin = GPIO_PIN_1 | GPIO_PIN_2 | GPIO_PIN_3 | GPIO_PIN_4;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+	GPIO_InitStruct.Speed = GPIO_SPEED_LOW;
+  HAL_GPIO_Init(GPIOJ, &GPIO_InitStruct);
+}
+
+
+//------------------------------------------------------------------------------
+#ifdef USE_FULL_ASSERT
+//------------------------------------------------------------------------------
+void assert_failed(uint8_t* file, uint32_t line)
+//------------------------------------------------------------------------------
+{
+}
+//------------------------------------------------------------------------------
+#endif
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+// EOF
+//------------------------------------------------------------------------------
-- 
cgit v1.2.3