sparcv8leon3: name union in platformctl_t

JIRA: RTOS-847
phoenix-rtos · Jun 25, 2024 · d50d1c3 · d50d1c3
1 parent 1508c43
commit d50d1c3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/hal/sparcv8leon3/gaisler/gr712rc/gr712rc.c b/hal/sparcv8leon3/gaisler/gr712rc/gr712rc.c
@@ -141,34 +141,34 @@ int hal_platformctl(void *ptr)
 	switch (data->type) {
 		case pctl_cguctrl:
 			if (data->action == pctl_set) {
-				if (data->cguctrl.state == disable) {
-					_gr712rc_cguClkDisable(data->cguctrl.cgudev);
+				if (data->task.cguctrl.v.state == disable) {
+					_gr712rc_cguClkDisable(data->task.cguctrl.cgudev);
 				}
 				else {
-					_gr712rc_cguClkEnable(data->cguctrl.cgudev);
+					_gr712rc_cguClkEnable(data->task.cguctrl.cgudev);
 				}
 				ret = 0;
 			}
 			else if (data->action == pctl_get) {
-				data->cguctrl.stateVal = _gr712rc_cguClkStatus(data->cguctrl.cgudev);
+				data->task.cguctrl.v.stateVal = _gr712rc_cguClkStatus(data->task.cguctrl.cgudev);
 				ret = 0;
 			}
 			break;
 
 		case pctl_iomux:
 			if (data->action == pctl_set) {
-				ret = gaisler_setIomuxCfg(data->iocfg.pin, data->iocfg.opt, data->iocfg.pullup, data->iocfg.pulldn);
+				ret = gaisler_setIomuxCfg(data->task.iocfg.pin, data->task.iocfg.opt, data->task.iocfg.pullup, data->task.iocfg.pulldn);
 			}
 			break;
 
 		case pctl_ambapp:
 			if (data->action == pctl_get) {
-				ret = ambapp_findSlave(data->ambapp.dev, data->ambapp.instance);
+				ret = ambapp_findSlave(data->task.ambapp.dev, data->task.ambapp.instance);
 			}
 			break;
 
 		case pctl_reboot:
-			if ((data->action == pctl_set) && (data->reboot.magic == PCTL_REBOOT_MAGIC)) {
+			if ((data->action == pctl_set) && (data->task.reboot.magic == PCTL_REBOOT_MAGIC)) {
 				hal_cpuReboot();
 			}
 			break;

diff --git a/hal/sparcv8leon3/gaisler/gr716/gr716.c b/hal/sparcv8leon3/gaisler/gr716/gr716.c
@@ -181,37 +181,37 @@ int hal_platformctl(void *ptr)
 	switch (data->type) {
 		case pctl_cguctrl:
 			if (data->action == pctl_set) {
-				if (data->cguctrl.state == disable) {
-					_gr716_cguClkDisable(data->cguctrl.cgu, data->cguctrl.cgudev);
+				if (data->task.cguctrl.v.state == disable) {
+					_gr716_cguClkDisable(data->task.cguctrl.cgu, data->task.cguctrl.cgudev);
 				}
 				else {
-					_gr716_cguClkEnable(data->cguctrl.cgu, data->cguctrl.cgudev);
+					_gr716_cguClkEnable(data->task.cguctrl.cgu, data->task.cguctrl.cgudev);
 				}
 				ret = 0;
 			}
 			else if (data->action == pctl_get) {
-				data->cguctrl.stateVal = _gr716_cguClkStatus(data->cguctrl.cgu, data->cguctrl.cgudev);
+				data->task.cguctrl.v.stateVal = _gr716_cguClkStatus(data->task.cguctrl.cgu, data->task.cguctrl.cgudev);
 				ret = 0;
 			}
 			break;
 
 		case pctl_iomux:
 			if (data->action == pctl_set) {
-				ret = gaisler_setIomuxCfg(data->iocfg.pin, data->iocfg.opt, data->iocfg.pullup, data->iocfg.pulldn);
+				ret = gaisler_setIomuxCfg(data->task.iocfg.pin, data->task.iocfg.opt, data->task.iocfg.pullup, data->task.iocfg.pulldn);
 			}
 			else if (data->action == pctl_get) {
-				ret = _gr716_getIomuxCfg(data->iocfg.pin, &data->iocfg.opt, &data->iocfg.pullup, &data->iocfg.pulldn);
+				ret = _gr716_getIomuxCfg(data->task.iocfg.pin, &data->task.iocfg.opt, &data->task.iocfg.pullup, &data->task.iocfg.pulldn);
 			}
 			break;
 
 		case pctl_ambapp:
 			if (data->action == pctl_get) {
-				ret = ambapp_findSlave(data->ambapp.dev, data->ambapp.instance);
+				ret = ambapp_findSlave(data->task.ambapp.dev, data->task.ambapp.instance);
 			}
 			break;
 
 		case pctl_reboot:
-			if ((data->action == pctl_set) && (data->reboot.magic == PCTL_REBOOT_MAGIC)) {
+			if ((data->action == pctl_set) && (data->task.reboot.magic == PCTL_REBOOT_MAGIC)) {
 				hal_cpuReboot();
 			}
 			break;

diff --git a/include/arch/sparcv8leon3/gr712rc/gr712rc.h b/include/arch/sparcv8leon3/gr712rc/gr712rc.h
@@ -42,7 +42,7 @@ typedef struct {
 			union {
 				enum { disable = 0, enable } state;
 				int stateVal;
-			};
+			} v;
 			unsigned int cgudev;
 		} cguctrl;
 
@@ -54,7 +54,7 @@ typedef struct {
 		struct {
 			unsigned int magic;
 		} reboot;
-	};
+	} task;
 } __attribute__((packed)) platformctl_t;
 
 /* clang-format on */

diff --git a/include/arch/sparcv8leon3/gr716/gr716.h b/include/arch/sparcv8leon3/gr716/gr716.h
@@ -53,7 +53,7 @@ typedef struct {
 			union {
 				enum { disable = 0, enable } state;
 				int stateVal;
-			};
+			} v;
 			unsigned char cgu;
 			unsigned int cgudev;
 		} cguctrl;
@@ -66,7 +66,7 @@ typedef struct {
 		struct {
 			unsigned int magic;
 		} reboot;
-	};
+	} task;
 } __attribute__((packed)) platformctl_t;
 
 /* clang-format on */