[Style] Stylefix sweep over the whole codebase.

9 files changed, 71 insertions, 60 deletions

diff --git a/tests/gadget-zero/main-stm32f072disco.c b/tests/gadget-zero/main-stm32f072disco.c
index f8fc7828..8a7807d8 100644
--- a/tests/gadget-zero/main-stm32f072disco.c
+++ b/tests/gadget-zero/main-stm32f072disco.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include "usb-gadget0.h"
 
-// no trace on cm0 #define ER_DEBUG
+/* no trace on cm0 #define ER_DEBUG */
 #ifdef ER_DEBUG
 #define ER_DPRINTF(fmt, ...) \
     do { printf(fmt, ## __VA_ARGS__); } while (0)
@@ -35,7 +35,8 @@
 #endif
 
 #include "trace.h"
-void trace_send_blocking8(int stimulus_port, char c) {
+void trace_send_blocking8(int stimulus_port, char c)
+{
 	(void)stimulus_port;
 	(void)c;
 }
@@ -52,7 +53,8 @@ int main(void)
 	gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO7);
 	gpio_set(GPIOC, GPIO7);
 
-	usbd_device *usbd_dev = gadget0_init(&st_usbfs_v2_usb_driver, "stm32f072disco");
+	usbd_device *usbd_dev = gadget0_init(&st_usbfs_v2_usb_driver,
+					     "stm32f072disco");
 
 	ER_DPRINTF("bootup complete\n");
 	gpio_clear(GPIOC, GPIO7);
diff --git a/tests/gadget-zero/main-stm32f103-generic.c b/tests/gadget-zero/main-stm32f103-generic.c
index d647341e..7f77dc8d 100644
--- a/tests/gadget-zero/main-stm32f103-generic.c
+++ b/tests/gadget-zero/main-stm32f103-generic.c
@@ -51,13 +51,15 @@ int main(void)
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
 		GPIO_CNF_OUTPUT_PUSHPULL, GPIO12);
 	gpio_clear(GPIOA, GPIO11);
-	for (unsigned int i = 0; i < 800000; i++)
+	for (unsigned int i = 0; i < 800000; i++) {
 		__asm__("nop");
+	}
 
 	rcc_periph_clock_enable(RCC_OTGFS);
 
 
-	usbd_device *usbd_dev = gadget0_init(&st_usbfs_v1_usb_driver, "stm32f103-generic");
+	usbd_device *usbd_dev = gadget0_init(&st_usbfs_v1_usb_driver,
+					     "stm32f103-generic");
 
 	ER_DPRINTF("bootup complete\n");
 	gpio_clear(GPIOC, GPIO13);
diff --git a/tests/gadget-zero/main-stm32f4disco.c b/tests/gadget-zero/main-stm32f4disco.c
index e554cfd0..ab6e42c3 100644
--- a/tests/gadget-zero/main-stm32f4disco.c
+++ b/tests/gadget-zero/main-stm32f4disco.c
@@ -36,17 +36,17 @@
 int main(void)
 {
 	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
-        rcc_periph_clock_enable(RCC_GPIOA);
-        rcc_periph_clock_enable(RCC_OTGFS);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	rcc_periph_clock_enable(RCC_OTGFS);
 
-        gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE,
-                        GPIO9 | GPIO11 | GPIO12);
-        gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12);
+	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE,
+			GPIO9 | GPIO11 | GPIO12);
+	gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12);
 
 	/* LEDS on discovery board */
-        rcc_periph_clock_enable(RCC_GPIOD);
-        gpio_mode_setup(GPIOD, GPIO_MODE_OUTPUT,
-                        GPIO_PUPD_NONE, GPIO12 | GPIO13 | GPIO14 | GPIO15);
+	rcc_periph_clock_enable(RCC_GPIOD);
+	gpio_mode_setup(GPIOD, GPIO_MODE_OUTPUT,
+			GPIO_PUPD_NONE, GPIO12 | GPIO13 | GPIO14 | GPIO15);
 
 	usbd_device *usbd_dev = gadget0_init(&otgfs_usb_driver, "stm32f4disco");
 
diff --git a/tests/gadget-zero/main-stm32l053disco.c b/tests/gadget-zero/main-stm32l053disco.c
index 887e80fe..144318f6 100644
--- a/tests/gadget-zero/main-stm32l053disco.c
+++ b/tests/gadget-zero/main-stm32l053disco.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include "usb-gadget0.h"
 
-// no trace on cm0 #define ER_DEBUG
+/* no trace on cm0 #define ER_DEBUG */
 #ifdef ER_DEBUG
 #define ER_DPRINTF(fmt, ...) \
     do { printf(fmt, ## __VA_ARGS__); } while (0)
@@ -36,7 +36,8 @@
 #endif
 
 #include "trace.h"
-void trace_send_blocking8(int stimulus_port, char c) {
+void trace_send_blocking8(int stimulus_port, char c)
+{
 	(void)stimulus_port;
 	(void)c;
 }
@@ -44,8 +45,8 @@ void trace_send_blocking8(int stimulus_port, char c) {
 int main(void)
 {
 	/* LED for boot progress */
-        rcc_periph_clock_enable(RCC_GPIOA);
-        gpio_mode_setup(GPIOA, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO5);
+	rcc_periph_clock_enable(RCC_GPIOA);
+	gpio_mode_setup(GPIOA, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO5);
 	gpio_set(GPIOA, GPIO5);
 
 	/* jump up to 16mhz, leave PLL setup for later. */
@@ -56,8 +57,8 @@ int main(void)
 	/* HSI48 needs the vrefint turned on */
 	rcc_periph_clock_enable(RCC_SYSCFG);
 	SYSCFG_CFGR3 |= SYSCFG_CFGR3_ENREF_HSI48 | SYSCFG_CFGR3_EN_VREFINT;
-	while(!(SYSCFG_CFGR3 & SYSCFG_CFGR3_REF_HSI48_RDYF));
-	
+	while (!(SYSCFG_CFGR3 & SYSCFG_CFGR3_REF_HSI48_RDYF));
+
 	/* For USB, but can't use HSI48 as a sysclock on L0 */
 	crs_autotrim_usb_enable();
 	rcc_set_hsi48_source_rc48();
@@ -65,7 +66,8 @@ int main(void)
 	rcc_osc_on(HSI48);
 	rcc_wait_for_osc_ready(HSI48);
 
-	usbd_device *usbd_dev = gadget0_init(&st_usbfs_v2_usb_driver, "stm32l053disco");
+	usbd_device *usbd_dev = gadget0_init(&st_usbfs_v2_usb_driver,
+					     "stm32l053disco");
 
 	ER_DPRINTF("bootup complete\n");
 	gpio_clear(GPIOA, GPIO5);
diff --git a/tests/gadget-zero/main-stm32l1-generic.c b/tests/gadget-zero/main-stm32l1-generic.c
index dc28a94a..b22353a1 100644
--- a/tests/gadget-zero/main-stm32l1-generic.c
+++ b/tests/gadget-zero/main-stm32l1-generic.c
@@ -34,19 +34,19 @@
     do { } while (0)
 #endif
 
-const clock_scale_t this_clock_config =
-        { /* 32MHz PLL from 8MHz HSE */
-                .pll_source = RCC_CFGR_PLLSRC_HSE_CLK,
-                .pll_mul = RCC_CFGR_PLLMUL_MUL12,
-                .pll_div = RCC_CFGR_PLLDIV_DIV3,
-                .hpre = RCC_CFGR_HPRE_SYSCLK_NODIV,
-                .ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV,
-                .ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV,
-                .voltage_scale = RANGE1,
-                .flash_config = FLASH_ACR_LATENCY_1WS,
-                .apb1_frequency = 32000000,
-                .apb2_frequency = 32000000,
-        };
+const clock_scale_t this_clock_config = {
+		/* 32MHz PLL from 8MHz HSE */
+		.pll_source = RCC_CFGR_PLLSRC_HSE_CLK,
+		.pll_mul = RCC_CFGR_PLLMUL_MUL12,
+		.pll_div = RCC_CFGR_PLLDIV_DIV3,
+		.hpre = RCC_CFGR_HPRE_SYSCLK_NODIV,
+		.ppre1 = RCC_CFGR_PPRE1_HCLK_NODIV,
+		.ppre2 = RCC_CFGR_PPRE2_HCLK_NODIV,
+		.voltage_scale = RANGE1,
+		.flash_config = FLASH_ACR_LATENCY_1WS,
+		.apb1_frequency = 32000000,
+		.apb2_frequency = 32000000,
+	};
 
 
 int main(void)
@@ -57,7 +57,8 @@ int main(void)
 	gpio_mode_setup(GPIOB, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO1);
 	gpio_set(GPIOB, GPIO1);
 
-	usbd_device *usbd_dev = gadget0_init(&st_usbfs_v1_usb_driver, "stm32l1-generic");
+	usbd_device *usbd_dev = gadget0_init(&st_usbfs_v1_usb_driver,
+					     "stm32l1-generic");
 
 	ER_DPRINTF("bootup complete\n");
 	gpio_clear(GPIOB, GPIO1);
diff --git a/tests/gadget-zero/usb-gadget0.c b/tests/gadget-zero/usb-gadget0.c
index 9c119f9e..5f0aa629 100644
--- a/tests/gadget-zero/usb-gadget0.c
+++ b/tests/gadget-zero/usb-gadget0.c
@@ -111,7 +111,7 @@ static const struct usb_interface_descriptor iface_loopback[] = {
 	{
 		.bLength = USB_DT_INTERFACE_SIZE,
 		.bDescriptorType = USB_DT_INTERFACE,
-		.bInterfaceNumber = 0, // still 0, as it's a different config...?
+		.bInterfaceNumber = 0, /* still 0, as it's a different config...? */
 		.bAlternateSetting = 0,
 		.bNumEndpoints = 2,
 		.bInterfaceClass = USB_CLASS_VENDOR,
@@ -141,7 +141,7 @@ static const struct usb_config_descriptor config[] = {
 		.wTotalLength = 0,
 		.bNumInterfaces = 1,
 		.bConfigurationValue = GZ_CFG_SOURCESINK,
-		.iConfiguration = 4, // string index
+		.iConfiguration = 4, /* string index */
 		.bmAttributes = 0x80,
 		.bMaxPower = 0x32,
 		.interface = ifaces_sourcesink,
@@ -152,7 +152,7 @@ static const struct usb_config_descriptor config[] = {
 		.wTotalLength = 0,
 		.bNumInterfaces = 1,
 		.bConfigurationValue = GZ_CFG_LOOPBACK,
-		.iConfiguration = 5, // string index
+		.iConfiguration = 5, /* string index */
 		.bmAttributes = 0x80,
 		.bMaxPower = 0x32,
 		.interface = ifaces_loopback,
@@ -160,7 +160,7 @@ static const struct usb_config_descriptor config[] = {
 };
 
 static char serial[] = "0123456789.0123456789.0123456789";
-static const char * usb_strings[] = {
+static const char *usb_strings[] = {
 	"libopencm3",
 	"Gadget-Zero",
 	serial,
@@ -184,8 +184,8 @@ static struct {
 static void gadget0_ss_out_cb(usbd_device *usbd_dev, uint8_t ep)
 {
 	(void) ep;
-	// TODO - if you're really keen, perf test this. tiva implies it matters
-	//char buf[64] __attribute__ ((aligned(4)));
+	/* TODO - if you're really keen, perf test this. tiva implies it matters */
+	/* char buf[64] __attribute__ ((aligned(4))); */
 	char buf[64];
 	trace_send_blocking8(0, 'O');
 	uint16_t x = usbd_ep_read_packet(usbd_dev, ep, buf, sizeof(buf));
@@ -214,21 +214,21 @@ static void gadget0_ss_in_cb(usbd_device *usbd_dev, uint8_t ep)
 	if (x != sizeof(buf)) {
 		ER_DPRINTF("failed to write?: %d\n", x);
 	}
-	//assert(x == sizeof(buf));
+	/*assert(x == sizeof(buf));*/
 }
 
 static void gadget0_rx_cb_loopback(usbd_device *usbd_dev, uint8_t ep)
 {
 	(void) usbd_dev;
 	ER_DPRINTF("loop rx %x\n", ep);
-	// TODO - unimplemented - consult linux source on proper behaviour
+	/* TODO - unimplemented - consult linux source on proper behaviour */
 }
 
 static void gadget0_tx_cb_loopback(usbd_device *usbd_dev, uint8_t ep)
 {
 	(void) usbd_dev;
 	ER_DPRINTF("loop tx %x\n", ep);
-	// TODO - unimplemented - consult linux source on proper behaviour
+	/* TODO - unimplemented - consult linux source on proper behaviour */
 }
 
 static int gadget0_control_request(usbd_device *usbd_dev,
@@ -242,9 +242,10 @@ static int gadget0_control_request(usbd_device *usbd_dev,
 	(void) buf;
 	(void) len;
 	ER_DPRINTF("ctrl breq: %x, bmRT: %x, windex :%x, wlen: %x, wval :%x\n",
-		req->bRequest, req->bmRequestType, req->wIndex, req->wLength, req->wValue);
+		req->bRequest, req->bmRequestType, req->wIndex, req->wLength,
+		req->wValue);
 
-	// TODO - what do the return values mean again?
+	/* TODO - what do the return values mean again? */
 	switch (req->bRequest) {
 	case GZ_REQ_SET_PATTERN:
 		state.pattern_counter = 0;
@@ -301,7 +302,7 @@ static void gadget0_set_config(usbd_device *usbd_dev, uint16_t wValue)
 	}
 }
 
-usbd_device* gadget0_init(const usbd_driver *driver, const char *userserial)
+usbd_device *gadget0_init(const usbd_driver *driver, const char *userserial)
 {
 #ifdef ER_DEBUG
 	setbuf(stdout, NULL);
diff --git a/tests/gadget-zero/usb-gadget0.h b/tests/gadget-zero/usb-gadget0.h
index be790cd3..bb05bdf4 100644
--- a/tests/gadget-zero/usb-gadget0.h
+++ b/tests/gadget-zero/usb-gadget0.h
@@ -30,6 +30,6 @@
  *	to the hardware.
  * @return the usbd_device created.
 */
-usbd_device* gadget0_init(const usbd_driver *driver, const char *userserial);
+usbd_device *gadget0_init(const usbd_driver *driver, const char *userserial);
 
 #endif
diff --git a/tests/shared/trace.c b/tests/shared/trace.c
index 9e05d9a0..54bee45d 100644
--- a/tests/shared/trace.c
+++ b/tests/shared/trace.c
@@ -4,32 +4,34 @@
 #include <libopencm3/cm3/itm.h>
 #include "trace.h"
 
-void trace_send_blocking8(int stimulus_port, char c) {
+void trace_send_blocking8(int stimulus_port, char c)
+{
 	if (!(ITM_TER[0] & (1<<stimulus_port))) {
 		return;
 	}
-	while (!(ITM_STIM8(stimulus_port) & ITM_STIM_FIFOREADY))
-		;
+	while (!(ITM_STIM8(stimulus_port) & ITM_STIM_FIFOREADY));
 	ITM_STIM8(stimulus_port) = c;
 }
 
-void trace_send8(int stimulus_port, char val) {
+void trace_send8(int stimulus_port, char val)
+{
 	if (!(ITM_TER[0] & (1<<stimulus_port))) {
 		return;
 	}
 	ITM_STIM8(stimulus_port) = val;
 }
 
-void trace_send_blocking16(int stimulus_port, uint16_t val) {
+void trace_send_blocking16(int stimulus_port, uint16_t val)
+{
 	if (!(ITM_TER[0] & (1<<stimulus_port))) {
 		return;
 	}
-	while (!(ITM_STIM16(stimulus_port) & ITM_STIM_FIFOREADY))
-		;
+	while (!(ITM_STIM16(stimulus_port) & ITM_STIM_FIFOREADY));
 	ITM_STIM16(stimulus_port) = val;
 }
 
-void trace_send16(int stimulus_port, uint16_t val) {
+void trace_send16(int stimulus_port, uint16_t val)
+{
 	if (!(ITM_TER[0] & (1<<stimulus_port))) {
 		return;
 	}
@@ -37,16 +39,17 @@ void trace_send16(int stimulus_port, uint16_t val) {
 }
 
 
-void trace_send_blocking32(int stimulus_port, uint32_t val) {
+void trace_send_blocking32(int stimulus_port, uint32_t val)
+{
 	if (!(ITM_TER[0] & (1<<stimulus_port))) {
 		return;
 	}
-	while (!(ITM_STIM32(stimulus_port) & ITM_STIM_FIFOREADY))
-		;
+	while (!(ITM_STIM32(stimulus_port) & ITM_STIM_FIFOREADY));
 	ITM_STIM32(stimulus_port) = val;
 }
 
-void trace_send32(int stimulus_port, uint32_t val) {
+void trace_send32(int stimulus_port, uint32_t val)
+{
 	if (!(ITM_TER[0] & (1<<stimulus_port))) {
 		return;
 	}
diff --git a/tests/shared/trace.h b/tests/shared/trace.h
index 311512f1..2dd1d509 100644
--- a/tests/shared/trace.h
+++ b/tests/shared/trace.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * File:   trace.h
  * Author: karlp
  *