grlib drivers: name union in platformctl_t

JIRA: RTOS-847

dma/grdmac2/grdmac2.c

@@ -102,7 +102,7 @@ grdma_ctx_t *grdma_init(unsigned int instance)
 	platformctl_t pctl = {
 		.action = pctl_get,
 		.type = pctl_ambapp,
-		.ambapp = {
+		.task.ambapp = {
 			.dev = &dev,
 			.instance = &instance,
 		}

multi/grlib-multi/adc.c

@@ -167,8 +167,8 @@ static int adc_cguInit(int dev)
 	platformctl_t pctl = {
 		.action = pctl_set,
 		.type = pctl_cguctrl,
-		.cguctrl = {
-			.state = enable,
+		.task.cguctrl = {
+			.v.state = enable,
 			.cgu = cgu_secondary,
 			.cgudev = cgudev_gradc0 + dev }
 	};
@@ -255,7 +255,7 @@ int adc_init(void)
 		platformctl_t pctl = {
 			.action = pctl_get,
 			.type = pctl_ambapp,
-			.ambapp = {
+			.task.ambapp = {
 				.dev = &dev,
 				.instance = &instance,
 			}

multi/grlib-multi/gpio.c

@@ -218,7 +218,7 @@ int gpio_init(void)
 		platformctl_t pctl = {
 			.action = pctl_get,
 			.type = pctl_ambapp,
-			.ambapp = {
+			.task.ambapp = {
 				.dev = &dev,
 				.instance = &instance,
 			}

multi/grlib-multi/spacewire.c

@@ -648,8 +648,8 @@ static int spw_cguInit(int dev)
 	platformctl_t pctl = {
 		.action = pctl_set,
 		.type = pctl_cguctrl,
-		.cguctrl = {
-			.state = enable,
+		.task.cguctrl = {
+			.v.state = enable,
 			.cgudev = cgudev_spw0 + dev,
 		}
 	};
@@ -658,8 +658,8 @@ static int spw_cguInit(int dev)
 	platformctl_t pctl = {
 		.action = pctl_set,
 		.type = pctl_cguctrl,
-		.cguctrl = {
-			.state = enable,
+		.task.cguctrl = {
+			.v.state = enable,
 			.cgu = cgu_secondary,
 			.cgudev = cgudev_grspw,
 		}
@@ -791,7 +791,7 @@ int spw_init(void)
 		platformctl_t pctl = {
 			.action = pctl_get,
 			.type = pctl_ambapp,
-			.ambapp = {
+			.task.ambapp = {
 				.dev = &dev,
 				.instance = &instance,
 			}

multi/grlib-multi/spi.c

@@ -96,29 +96,29 @@ static int spi_initPins(spi_pins_t *pins)
 	platformctl_t pctl = {
 		.action = pctl_set,
 		.type = pctl_iomux,
-		.iocfg = {
+		.task.iocfg = {
 			.opt = SPI_IOMUX_OPT,
 			.pulldn = 0,
 			.pullup = 0,
 		}
 	};
 
-	pctl.iocfg.pin = pins->sck;
+	pctl.task.iocfg.pin = pins->sck;
 	if (platformctl(&pctl) < 0) {
 		return -1;
 	}
 
-	pctl.iocfg.pin = pins->mosi;
+	pctl.task.iocfg.pin = pins->mosi;
 	if (platformctl(&pctl) < 0) {
 		return -1;
 	}
 
-	pctl.iocfg.pin = pins->miso;
+	pctl.task.iocfg.pin = pins->miso;
 	if (platformctl(&pctl) < 0) {
 		return -1;
 	}
 
-	pctl.iocfg.pin = pins->cs;
+	pctl.task.iocfg.pin = pins->cs;
 	if (platformctl(&pctl) < 0) {
 		return -1;
 	}
@@ -280,13 +280,13 @@ static int spi_cguInit(int dev)
 	platformctl_t pctl = {
 		.action = pctl_set,
 		.type = pctl_cguctrl,
-		.cguctrl = {
-			.state = enable,
+		.task.cguctrl = {
+			.v.state = enable,
 			.cgu = cgu_primary,
 		}
 	};
 
-	pctl.cguctrl.cgudev = cgudev_spictrl0 + dev;
+	pctl.task.cguctrl.cgudev = cgudev_spictrl0 + dev;
 	return platformctl(&pctl);
 #else
 	return 0;
@@ -342,7 +342,7 @@ int spi_init(void)
 		platformctl_t pctl = {
 			.action = pctl_get,
 			.type = pctl_ambapp,
-			.ambapp = {
+			.task.ambapp = {
 				.dev = &dev,
 				.instance = &instance,
 			}

multi/grlib-multi/uart.c

@@ -357,9 +357,9 @@ static int uart_cguInit(unsigned int n)
 	pctl.action = pctl_set;
 	pctl.type = pctl_cguctrl;
 
-	pctl.cguctrl.state = enable;
-	pctl.cguctrl.cgu = cgu_primary;
-	pctl.cguctrl.cgudev = cguinfo[n];
+	pctl.task.cguctrl.v.state = enable;
+	pctl.task.cguctrl.cgu = cgu_primary;
+	pctl.task.cguctrl.cgudev = cguinfo[n];
 
 	return platformctl(&pctl);
 #else
@@ -446,7 +446,7 @@ static int uart_setup(unsigned int n, speed_t baud, int raw)
 	platformctl_t pctl = {
 		.action = pctl_set,
 		.type = pctl_iomux,
-		.iocfg = {
+		.task.iocfg = {
 			.opt = 0x1,
 			.pin = info[n].rxPin,
 			.pullup = 0,
@@ -458,7 +458,7 @@ static int uart_setup(unsigned int n, speed_t baud, int raw)
 		return -1;
 	}
 
-	pctl.iocfg.pin = info[n].txPin;
+	pctl.task.iocfg.pin = info[n].txPin;
 
 	if (platformctl(&pctl) < 0) {
 		return -1;
@@ -623,7 +623,7 @@ int uart_init(void)
 		platformctl_t pctl = {
 			.action = pctl_get,
 			.type = pctl_ambapp,
-			.ambapp = {
+			.task.ambapp = {
 				.dev = &dev,
 				.instance = &instance,
 			}

storage/gr716-flash/spimctrl.c

@@ -146,7 +146,7 @@ int spimctrl_init(spimctrl_t *spimctrl, int instance)
 	platformctl_t pctl = {
 		.action = pctl_get,
 		.type = pctl_cguctrl,
-		.cguctrl = {
+		.task.cguctrl = {
 			.cgu = cgu_primary,
 			.cgudev = cgudev_spimctrl0 + instance,
 		}
@@ -166,9 +166,9 @@ int spimctrl_init(spimctrl_t *spimctrl, int instance)
 	spimctrl->instance = instance;
 
 	/* Enable clock if needed */
-	if (pctl.cguctrl.stateVal == 0) {
+	if (pctl.task.cguctrl.v.stateVal == 0) {
 		pctl.action = pctl_set;
-		pctl.cguctrl.state = enable;
+		pctl.task.cguctrl.v.state = enable;
 		res = platformctl(&pctl);
 		if (res < 0) {
 			return res;

tty/grlib-uart/grlib-uart.c

@@ -321,9 +321,9 @@ static int uart_cguInit(unsigned int n)
 	ctl.action = pctl_set;
 	ctl.type = pctl_cguctrl;
 
-	ctl.cguctrl.state = enable;
-	ctl.cguctrl.cgu = cgu_primary;
-	ctl.cguctrl.cgudev = cguinfo[n];
+	ctl.task.cguctrl.v.state = enable;
+	ctl.task.cguctrl.cgu = cgu_primary;
+	ctl.task.cguctrl.cgudev = cguinfo[n];
 
 	return platformctl(&ctl);
 #else
@@ -339,7 +339,7 @@ static int uart_init(unsigned int n, speed_t baud, int raw)
 	platformctl_t ctl = {
 		.action = pctl_set,
 		.type = pctl_iomux,
-		.iocfg = {
+		.task.iocfg = {
 			.opt = 0x1,
 			.pin = info[n].rxPin,
 			.pullup = 0,
@@ -351,7 +351,7 @@ static int uart_init(unsigned int n, speed_t baud, int raw)
 		return -1;
 	}
 
-	ctl.iocfg.pin = info[n].txPin;
+	ctl.task.iocfg.pin = info[n].txPin;
 
 	if (platformctl(&ctl) < 0) {
 		return -1;
@@ -367,8 +367,8 @@ static int uart_init(unsigned int n, speed_t baud, int raw)
 
 	ctl.action = pctl_get;
 	ctl.type = pctl_ambapp;
-	ctl.ambapp.dev = &dev;
-	ctl.ambapp.instance = &instance;
+	ctl.task.ambapp.dev = &dev;
+	ctl.task.ambapp.instance = &instance;
 
 	if (platformctl(&ctl) < 0) {
 		return -1;