summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
Diffstat (limited to 'payloads')
-rw-r--r--payloads/libpayload/drivers/udc/dwc2.c2
-rw-r--r--payloads/libpayload/drivers/usb/ehci_private.h10
-rw-r--r--payloads/libpayload/drivers/usb/ohci.c4
-rw-r--r--payloads/libpayload/drivers/usb/ohci_private.h122
-rw-r--r--payloads/libpayload/drivers/usb/uhci_private.h2
-rw-r--r--payloads/libpayload/drivers/usb/xhci_private.h44
-rw-r--r--payloads/libpayload/drivers/video/corebootfb.c2
-rw-r--r--payloads/libpayload/include/arm64/arch/lib_helpers.h8
-rw-r--r--payloads/libpayload/include/stddef.h6
-rw-r--r--payloads/libpayload/liblz4/lz4.c.inc10
10 files changed, 105 insertions, 105 deletions
diff --git a/payloads/libpayload/drivers/udc/dwc2.c b/payloads/libpayload/drivers/udc/dwc2.c
index b67740bd65..e95eb7938d 100644
--- a/payloads/libpayload/drivers/udc/dwc2.c
+++ b/payloads/libpayload/drivers/udc/dwc2.c
@@ -317,7 +317,7 @@ static int find_tx_fifo(struct usbdev_ctrl *this, uint32_t mps)
int i, val;
for (i = 1; i < MAX_EPS_CHANNELS - 1; i++) {
- if (p->fifo_map & (1<<i))
+ if (p->fifo_map & (1 << i))
continue;
gtxfsiz.d32 = readl(&p->regs->core.dptxfsiz_dieptxf[i]);
val = gtxfsiz.txfdep * 4;
diff --git a/payloads/libpayload/drivers/usb/ehci_private.h b/payloads/libpayload/drivers/usb/ehci_private.h
index 79809f7fcd..46ad551289 100644
--- a/payloads/libpayload/drivers/usb/ehci_private.h
+++ b/payloads/libpayload/drivers/usb/ehci_private.h
@@ -101,7 +101,7 @@ typedef volatile struct {
#define QTD_CPAGE_SHIFT 12
#define QTD_CPAGE_MASK (7 << QTD_CPAGE_SHIFT)
#define QTD_TOTAL_LEN_SHIFT 16
-#define QTD_TOTAL_LEN_MASK (((1<<15)-1) << QTD_TOTAL_LEN_SHIFT)
+#define QTD_TOTAL_LEN_MASK (((1 << 15)-1) << QTD_TOTAL_LEN_SHIFT)
#define QTD_TOGGLE_SHIFT 31
#define QTD_TOGGLE_MASK (1 << 31)
#define QTD_TOGGLE_DATA0 0
@@ -113,10 +113,10 @@ typedef volatile struct {
typedef volatile struct {
u32 horiz_link_ptr;
#define QH_TERMINATE 1
-#define QH_iTD (0<<1)
-#define QH_QH (1<<1)
-#define QH_siTD (2<<1)
-#define QH_FSTN (3<<1)
+#define QH_iTD (0 << 1)
+#define QH_QH (1 << 1)
+#define QH_siTD (2 << 1)
+#define QH_FSTN (3 << 1)
u32 epchar;
#define QH_EP_SHIFT 8
#define QH_EPS_SHIFT 12
diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c
index a5388cb6f6..1d7d8308c2 100644
--- a/payloads/libpayload/drivers/usb/ohci.c
+++ b/payloads/libpayload/drivers/usb/ohci.c
@@ -232,8 +232,8 @@ ohci_init (unsigned long physical_bar)
OHCI_INST (controller)->opreg->HcControl |= PeriodicListEnable;
OHCI_INST (controller)->opreg->HcControl &= ~IsochronousEnable; // unused by this driver
// disable everything, contrary to what OHCI spec says in 5.1.1.4, as we don't need IRQs
- OHCI_INST (controller)->opreg->HcInterruptEnable = 1<<31;
- OHCI_INST (controller)->opreg->HcInterruptDisable = ~(1<<31);
+ OHCI_INST (controller)->opreg->HcInterruptEnable = 1 << 31;
+ OHCI_INST (controller)->opreg->HcInterruptDisable = ~(1 << 31);
OHCI_INST (controller)->opreg->HcInterruptStatus = ~0;
OHCI_INST (controller)->opreg->HcPeriodicStart = (((OHCI_INST (controller)->opreg->HcFmInterval & FrameIntervalMask) / 10) * 9);
OHCI_INST (controller)->opreg->HcControl = (OHCI_INST (controller)->opreg->HcControl & ~HostControllerFunctionalStateMask) | USBOperational;
diff --git a/payloads/libpayload/drivers/usb/ohci_private.h b/payloads/libpayload/drivers/usb/ohci_private.h
index 07bb20dd51..58be5fa5bb 100644
--- a/payloads/libpayload/drivers/usb/ohci_private.h
+++ b/payloads/libpayload/drivers/usb/ohci_private.h
@@ -38,13 +38,13 @@
typedef enum { CMD} reg;
enum {
- NumberDownstreamPorts = 1<<0,
- PowerSwitchingMode = 1<<8,
- NoPowerSwitching = 1<<9,
- DeviceType = 1<<10,
- OverCurrentProtectionMode = 1<<11,
- NoOverCurrentProtection = 1<<12,
- PowerOnToPowerGoodTime = 1<<24
+ NumberDownstreamPorts = 1 << 0,
+ PowerSwitchingMode = 1 << 8,
+ NoPowerSwitching = 1 << 9,
+ DeviceType = 1 << 10,
+ OverCurrentProtectionMode = 1 << 11,
+ NoOverCurrentProtection = 1 << 12,
+ PowerOnToPowerGoodTime = 1 << 24
} HcRhDescriptorAReg;
enum {
@@ -53,47 +53,47 @@
} HcRhDescriptorAMask;
enum {
- DeviceRemovable = 1<<0,
- PortPowerControlMask = 1<<16
+ DeviceRemovable = 1 << 0,
+ PortPowerControlMask = 1 << 16
} HcRhDescriptorBReg;
enum {
- CurrentConnectStatus = 1<<0,
- PortEnableStatus = 1<<1,
- PortSuspendStatus = 1<<2,
- PortOverCurrentIndicator = 1<<3,
- PortResetStatus = 1<<4,
- PortPowerStatus = 1<<8,
- LowSpeedDeviceAttached = 1<<9,
- ConnectStatusChange = 1<<16,
- PortEnableStatusChange = 1<<17,
- PortSuspendStatusChange = 1<<18,
- PortOverCurrentIndicatorChange = 1<<19,
- PortResetStatusChange = 1<<20
+ CurrentConnectStatus = 1 << 0,
+ PortEnableStatus = 1 << 1,
+ PortSuspendStatus = 1 << 2,
+ PortOverCurrentIndicator = 1 << 3,
+ PortResetStatus = 1 << 4,
+ PortPowerStatus = 1 << 8,
+ LowSpeedDeviceAttached = 1 << 9,
+ ConnectStatusChange = 1 << 16,
+ PortEnableStatusChange = 1 << 17,
+ PortSuspendStatusChange = 1 << 18,
+ PortOverCurrentIndicatorChange = 1 << 19,
+ PortResetStatusChange = 1 << 20
} HcRhPortStatusRead;
enum {
- ClearPortEnable = 1<<0,
- SetPortEnable = 1<<1,
- SetPortSuspend = 1<<2,
- ClearSuspendStatus = 1<<3,
- SetPortReset = 1<<4,
- SetPortPower = 1<<8,
- ClearPortPower = 1<<9,
+ ClearPortEnable = 1 << 0,
+ SetPortEnable = 1 << 1,
+ SetPortSuspend = 1 << 2,
+ ClearSuspendStatus = 1 << 3,
+ SetPortReset = 1 << 4,
+ SetPortPower = 1 << 8,
+ ClearPortPower = 1 << 9,
} HcRhPortStatusSet;
enum {
- LocalPowerStatus = 1<<0,
- OverCurrentIndicator = 1<<1,
- DeviceRemoteWakeupEnable = 1<<15,
- LocalPowerStatusChange = 1<<16,
- OverCurrentIndicatorChange = 1<<17,
- ClearRemoteWakeupEnable = 1<<31
+ LocalPowerStatus = 1 << 0,
+ OverCurrentIndicator = 1 << 1,
+ DeviceRemoteWakeupEnable = 1 << 15,
+ LocalPowerStatusChange = 1 << 16,
+ OverCurrentIndicatorChange = 1 << 17,
+ ClearRemoteWakeupEnable = 1 << 31
} HcRhStatusReg;
enum {
- FrameInterval = 1<<0,
- FSLargestDataPacket = 1<<16,
- FrameIntervalToggle = 1<<31
+ FrameInterval = 1 << 0,
+ FSLargestDataPacket = 1 << 16,
+ FrameIntervalToggle = 1 << 31
} HcFmIntervalOffset;
enum {
FrameIntervalMask = MASK(0, 14),
@@ -102,15 +102,15 @@
} HcFmIntervalMask;
enum {
- ControlBulkServiceRatio = 1<<0,
- PeriodicListEnable = 1<<2,
- IsochronousEnable = 1<<3,
- ControlListEnable = 1<<4,
- BulkListEnable = 1<<5,
- HostControllerFunctionalState = 1<<6,
- InterruptRouting = 1<<8,
- RemoteWakeupConnected = 1<<9,
- RemoteWakeupEnable = 1<<10
+ ControlBulkServiceRatio = 1 << 0,
+ PeriodicListEnable = 1 << 2,
+ IsochronousEnable = 1 << 3,
+ ControlListEnable = 1 << 4,
+ BulkListEnable = 1 << 5,
+ HostControllerFunctionalState = 1 << 6,
+ InterruptRouting = 1 << 8,
+ RemoteWakeupConnected = 1 << 9,
+ RemoteWakeupEnable = 1 << 10
} HcControlReg;
enum {
@@ -126,11 +126,11 @@
};
enum {
- HostControllerReset = 1<<0,
- ControlListFilled = 1<<1,
- BulkListFilled = 1<<2,
- OwnershipChangeRequest = 1<<3,
- SchedulingOverrunCount = 1<<16
+ HostControllerReset = 1 << 0,
+ ControlListFilled = 1 << 1,
+ BulkListFilled = 1 << 2,
+ OwnershipChangeRequest = 1 << 3,
+ SchedulingOverrunCount = 1 << 16
} HcCommandStatusReg;
enum {
@@ -138,19 +138,19 @@
} HcCommandStatusMask;
enum {
- FrameRemaining = 1<<0,
- FrameRemainingToggle = 1<<31
+ FrameRemaining = 1 << 0,
+ FrameRemainingToggle = 1 << 31
} HcFmRemainingReg;
enum {
- SchedulingOverrung = 1<<0,
- WritebackDoneHead = 1<<1,
- StartofFrame = 1<<2,
- ResumeDetected = 1<<3,
- UnrecoverableError = 1<<4,
- FrameNumberOverflow = 1<<5,
- RootHubStatusChange = 1<<6,
- OwnershipChange = 1<<30
+ SchedulingOverrung = 1 << 0,
+ WritebackDoneHead = 1 << 1,
+ StartofFrame = 1 << 2,
+ ResumeDetected = 1 << 3,
+ UnrecoverableError = 1 << 4,
+ FrameNumberOverflow = 1 << 5,
+ RootHubStatusChange = 1 << 6,
+ OwnershipChange = 1 << 30
} HcInterruptStatusReg;
typedef struct {
diff --git a/payloads/libpayload/drivers/usb/uhci_private.h b/payloads/libpayload/drivers/usb/uhci_private.h
index f650c4a468..3d796cfe19 100644
--- a/payloads/libpayload/drivers/usb/uhci_private.h
+++ b/payloads/libpayload/drivers/usb/uhci_private.h
@@ -57,7 +57,7 @@ typedef struct {
u32 token;
#define TD_PID_MASK 0xff
#define TD_DEVADDR_SHIFT 8
-#define TD_DEVADDR_MASK (((1<<7)-1) << TD_DEVADDR_SHIFT)
+#define TD_DEVADDR_MASK (((1 << 7)-1) << TD_DEVADDR_SHIFT)
#define TD_EP_SHIFT 15
#define TD_EP_MASK (0xf << TD_EP_SHIFT)
#define TD_TOGGLE_SHIFT 19
diff --git a/payloads/libpayload/drivers/usb/xhci_private.h b/payloads/libpayload/drivers/usb/xhci_private.h
index 3b4e7bb78b..a6dcc847b0 100644
--- a/payloads/libpayload/drivers/usb/xhci_private.h
+++ b/payloads/libpayload/drivers/usb/xhci_private.h
@@ -414,34 +414,34 @@ typedef struct xhci {
u8 res3[0x3ff-0x3c+1];
struct {
u32 portsc;
-#define PORTSC_CCS (1<<0)
-#define PORTSC_PED (1<<1)
+#define PORTSC_CCS (1 << 0)
+#define PORTSC_PED (1 << 1)
// BIT 2 rsvdZ
-#define PORTSC_OCA (1<<3)
-#define PORTSC_PR (1<<4)
-#define PORTSC_PLS (1<<5)
+#define PORTSC_OCA (1 << 3)
+#define PORTSC_PR (1 << 4)
+#define PORTSC_PLS (1 << 5)
#define PORTSC_PLS_MASK MASK(5, 4)
-#define PORTSC_PP (1<<9)
+#define PORTSC_PP (1 << 9)
#define PORTSC_PORT_SPEED_START 10
-#define PORTSC_PORT_SPEED (1<<PORTSC_PORT_SPEED_START)
+#define PORTSC_PORT_SPEED (1 << PORTSC_PORT_SPEED_START)
#define PORTSC_PORT_SPEED_MASK MASK(PORTSC_PORT_SPEED_START, 4)
-#define PORTSC_PIC (1<<14)
+#define PORTSC_PIC (1 << 14)
#define PORTSC_PIC_MASK MASK(14, 2)
-#define PORTSC_LWS (1<<16)
-#define PORTSC_CSC (1<<17)
-#define PORTSC_PEC (1<<18)
-#define PORTSC_WRC (1<<19)
-#define PORTSC_OCC (1<<20)
-#define PORTSC_PRC (1<<21)
-#define PORTSC_PLC (1<<22)
-#define PORTSC_CEC (1<<23)
-#define PORTSC_CAS (1<<24)
-#define PORTSC_WCE (1<<25)
-#define PORTSC_WDE (1<<26)
-#define PORTSC_WOE (1<<27)
+#define PORTSC_LWS (1 << 16)
+#define PORTSC_CSC (1 << 17)
+#define PORTSC_PEC (1 << 18)
+#define PORTSC_WRC (1 << 19)
+#define PORTSC_OCC (1 << 20)
+#define PORTSC_PRC (1 << 21)
+#define PORTSC_PLC (1 << 22)
+#define PORTSC_CEC (1 << 23)
+#define PORTSC_CAS (1 << 24)
+#define PORTSC_WCE (1 << 25)
+#define PORTSC_WDE (1 << 26)
+#define PORTSC_WOE (1 << 27)
// BIT 29:28 rsvdZ
-#define PORTSC_DR (1<<30)
-#define PORTSC_WPR (1<<31)
+#define PORTSC_DR (1 << 30)
+#define PORTSC_WPR (1 << 31)
#define PORTSC_RW_MASK (PORTSC_PR | PORTSC_PLS_MASK | PORTSC_PP | PORTSC_PIC_MASK | PORTSC_LWS | PORTSC_WCE | PORTSC_WDE | PORTSC_WOE)
u32 portpmsc;
u32 portli;
diff --git a/payloads/libpayload/drivers/video/corebootfb.c b/payloads/libpayload/drivers/video/corebootfb.c
index 1aeac12e8c..572a02bf66 100644
--- a/payloads/libpayload/drivers/video/corebootfb.c
+++ b/payloads/libpayload/drivers/video/corebootfb.c
@@ -192,7 +192,7 @@ static void corebootfb_update_cursor(void)
int ch, paint;
if(cursor_en) {
ch = CHARS[cursor_y * coreboot_video_console.columns + cursor_x];
- paint = (ch & 0xff) | ((ch<<4) & 0xf000) | ((ch >> 4) & 0x0f00);
+ paint = (ch & 0xff) | ((ch << 4) & 0xf000) | ((ch >> 4) & 0x0f00);
} else {
paint = CHARS[cursor_y * coreboot_video_console.columns + cursor_x];
}
diff --git a/payloads/libpayload/include/arm64/arch/lib_helpers.h b/payloads/libpayload/include/arm64/arch/lib_helpers.h
index ca6843587e..2b346c4d41 100644
--- a/payloads/libpayload/include/arm64/arch/lib_helpers.h
+++ b/payloads/libpayload/include/arm64/arch/lib_helpers.h
@@ -98,10 +98,10 @@
#include <stdint.h>
-#define DAIF_DBG_BIT (1<<3)
-#define DAIF_ABT_BIT (1<<2)
-#define DAIF_IRQ_BIT (1<<1)
-#define DAIF_FIQ_BIT (1<<0)
+#define DAIF_DBG_BIT (1 << 3)
+#define DAIF_ABT_BIT (1 << 2)
+#define DAIF_IRQ_BIT (1 << 1)
+#define DAIF_FIQ_BIT (1 << 0)
#define SWITCH_CASE_READ(func, var, type, el) do { \
type var = -1; \
diff --git a/payloads/libpayload/include/stddef.h b/payloads/libpayload/include/stddef.h
index fe455b8a23..3288487fbc 100644
--- a/payloads/libpayload/include/stddef.h
+++ b/payloads/libpayload/include/stddef.h
@@ -21,9 +21,9 @@ typedef __SIZE_TYPE__ ssize_t;
"`struct " #structure "` offset for `" #member "` is not " #offset)
/* Standard units. */
-#define KiB (1<<10)
-#define MiB (1<<20)
-#define GiB (1<<30)
+#define KiB (1 << 10)
+#define MiB (1 << 20)
+#define GiB (1 << 30)
#define KHz (1000)
#define MHz (1000*KHz)
diff --git a/payloads/libpayload/liblz4/lz4.c.inc b/payloads/libpayload/liblz4/lz4.c.inc
index b3be4e5b44..baa911021d 100644
--- a/payloads/libpayload/liblz4/lz4.c.inc
+++ b/payloads/libpayload/liblz4/lz4.c.inc
@@ -64,17 +64,17 @@ static void LZ4_wildCopy(void* dstPtr, const void* srcPtr, void* dstEnd)
#define MFLIMIT (WILDCOPYLENGTH+MINMATCH)
static const int LZ4_minLength = (MFLIMIT+1);
-#define KB *(1 <<10)
-#define MB *(1 <<20)
-#define GB *(1U<<30)
+#define KB *(1 << 10)
+#define MB *(1 << 20)
+#define GB *(1U << 30)
#define MAXD_LOG 16
#define MAX_DISTANCE ((1 << MAXD_LOG) - 1)
#define ML_BITS 4
-#define ML_MASK ((1U<<ML_BITS)-1)
+#define ML_MASK ((1U << ML_BITS)-1)
#define RUN_BITS (8-ML_BITS)
-#define RUN_MASK ((1U<<RUN_BITS)-1)
+#define RUN_MASK ((1U << RUN_BITS)-1)
/**************************************
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 12:16:30 +0000