From 85d93ffc0a7b1eb5f24d6b8ec637497c4bdbd090 Mon Sep 17 00:00:00 2001
From: Jacob Garber <jgarber1@ualberta.ca>
Date: Mon, 2 Nov 2020 21:32:08 -0700
Subject: libpayload: Make OHCI enums into types

The OHCI header file declares various enums as follows:

    enum { ... } enum_name;

Since the name is at the end, this is actually declaring a variable
called enum_name and *not* a type, which is causing a multiple
definition error in GCC 10. Move the enum_name before the opening brace
to prevent this.

Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Change-Id: I452c0a1b118990942aa53f1e7e77f5e8378e8975
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47224
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
 payloads/libpayload/drivers/usb/ohci_private.h | 58 +++++++++++++-------------
 1 file changed, 30 insertions(+), 28 deletions(-)

(limited to 'payloads/libpayload/drivers/usb/ohci_private.h')

diff --git a/payloads/libpayload/drivers/usb/ohci_private.h b/payloads/libpayload/drivers/usb/ohci_private.h
index 796be29a01..e29e5901bf 100644
--- a/payloads/libpayload/drivers/usb/ohci_private.h
+++ b/payloads/libpayload/drivers/usb/ohci_private.h
@@ -36,7 +36,7 @@
 	// FIXME: fake
 	typedef enum { CMD} reg;
 
-	enum {
+	enum HcRhDescriptorAReg {
 		NumberDownstreamPorts = 1 << 0,
 		PowerSwitchingMode = 1 << 8,
 		NoPowerSwitching = 1 << 9,
@@ -44,19 +44,19 @@
 		OverCurrentProtectionMode = 1 << 11,
 		NoOverCurrentProtection = 1 << 12,
 		PowerOnToPowerGoodTime = 1 << 24
-	} HcRhDescriptorAReg;
+	};
 
-	enum {
+	enum HcRhDescriptorAMask {
 		NumberDownstreamPortsMask = MASK(0, 8),
 		PowerOnToPowerGoodTimeMask = MASK(24, 8)
-	} HcRhDescriptorAMask;
+	};
 
-	enum {
+	enum HcRhDescriptorBReg {
 		DeviceRemovable = 1 << 0,
 		PortPowerControlMask = 1 << 16
-	} HcRhDescriptorBReg;
+	};
 
-	enum {
+	enum HcRhPortStatusRead {
 		CurrentConnectStatus		= 1 << 0,
 		PortEnableStatus		= 1 << 1,
 		PortSuspendStatus		= 1 << 2,
@@ -69,8 +69,9 @@
 		PortSuspendStatusChange		= 1 << 18,
 		PortOverCurrentIndicatorChange	= 1 << 19,
 		PortResetStatusChange		= 1 << 20
-	} HcRhPortStatusRead;
-	enum {
+	};
+
+	enum HcRhPortStatusSet {
 		ClearPortEnable			= 1 << 0,
 		SetPortEnable			= 1 << 1,
 		SetPortSuspend			= 1 << 2,
@@ -78,29 +79,30 @@
 		SetPortReset			= 1 << 4,
 		SetPortPower			= 1 << 8,
 		ClearPortPower			= 1 << 9,
-	} HcRhPortStatusSet;
+	};
 
-	enum {
+	enum HcRhStatusReg {
 		LocalPowerStatus = 1 << 0,
 		OverCurrentIndicator = 1 << 1,
 		DeviceRemoteWakeupEnable = 1 << 15,
 		LocalPowerStatusChange = 1 << 16,
 		OverCurrentIndicatorChange = 1 << 17,
 		ClearRemoteWakeupEnable = 1 << 31
-	} HcRhStatusReg;
+	};
 
-	enum {
+	enum HcFmIntervalOffset {
 		FrameInterval = 1 << 0,
 		FSLargestDataPacket = 1 << 16,
 		FrameIntervalToggle = 1 << 31
-	} HcFmIntervalOffset;
-	enum {
+	};
+
+	enum HcFmIntervalMask {
 		FrameIntervalMask = MASK(0, 14),
 		FSLargestDataPacketMask = MASK(16, 15),
 		FrameIntervalToggleMask = MASK(31, 1)
-	} HcFmIntervalMask;
+	};
 
-	enum {
+	enum HcControlReg {
 		ControlBulkServiceRatio = 1 << 0,
 		PeriodicListEnable = 1 << 2,
 		IsochronousEnable = 1 << 3,
@@ -110,12 +112,12 @@
 		InterruptRouting = 1 << 8,
 		RemoteWakeupConnected = 1 << 9,
 		RemoteWakeupEnable = 1 << 10
-	} HcControlReg;
+	};
 
-	enum {
+	enum HcControlMask {
 		ControlBulkServiceRatioMask = MASK(0, 2),
 		HostControllerFunctionalStateMask = MASK(6, 2)
-	} HcControlMask;
+	};
 
 	enum {
 		USBReset = 0*HostControllerFunctionalState,
@@ -124,24 +126,24 @@
 		USBSuspend = 3*HostControllerFunctionalState
 	};
 
-	enum {
+	enum HcCommandStatusReg {
 		HostControllerReset = 1 << 0,
 		ControlListFilled = 1 << 1,
 		BulkListFilled = 1 << 2,
 		OwnershipChangeRequest = 1 << 3,
 		SchedulingOverrunCount = 1 << 16
-	} HcCommandStatusReg;
+	};
 
-	enum {
+	enum HcCommandStatusMask {
 		SchedulingOverrunCountMask = MASK(16, 2)
-	} HcCommandStatusMask;
+	};
 
-	enum {
+	enum HcFmRemainingReg {
 		FrameRemaining = 1 << 0,
 		FrameRemainingToggle = 1 << 31
-	} HcFmRemainingReg;
+	};
 
-	enum {
+	enum HcInterruptStatusReg {
 		SchedulingOverrung = 1 << 0,
 		WritebackDoneHead = 1 << 1,
 		StartofFrame = 1 << 2,
@@ -150,7 +152,7 @@
 		FrameNumberOverflow = 1 << 5,
 		RootHubStatusChange = 1 << 6,
 		OwnershipChange = 1 << 30
-	} HcInterruptStatusReg;
+	};
 
      typedef struct {
 	// Control and Status Partition
-- 
cgit v1.2.3