<p>HAOUAS Elyes has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20396">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">payloads: Add whitespace around '<<'<br><br>Change-Id: I0659f6ec59fb808b4cedf57d60d737c13c250042<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M payloads/libpayload/drivers/udc/dwc2.c<br>M payloads/libpayload/drivers/usb/ehci_private.h<br>M payloads/libpayload/drivers/usb/ohci.c<br>M payloads/libpayload/drivers/usb/ohci_private.h<br>M payloads/libpayload/drivers/usb/uhci_private.h<br>M payloads/libpayload/drivers/usb/xhci_private.h<br>M payloads/libpayload/drivers/video/corebootfb.c<br>M payloads/libpayload/include/arm64/arch/lib_helpers.h<br>M payloads/libpayload/include/stddef.h<br>M payloads/libpayload/liblz4/lz4.c.inc<br>10 files changed, 117 insertions(+), 117 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/20396/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/payloads/libpayload/drivers/udc/dwc2.c b/payloads/libpayload/drivers/udc/dwc2.c<br>index b67740b..e95eb79 100644<br>--- a/payloads/libpayload/drivers/udc/dwc2.c<br>+++ b/payloads/libpayload/drivers/udc/dwc2.c<br>@@ -317,7 +317,7 @@<br> int i, val;<br> <br> for (i = 1; i < MAX_EPS_CHANNELS - 1; i++) {<br>- if (p->fifo_map & (1<<i))<br>+ if (p->fifo_map & (1 << i))<br> continue;<br> gtxfsiz.d32 = readl(&p->regs->core.dptxfsiz_dieptxf[i]);<br> val = gtxfsiz.txfdep * 4;<br>diff --git a/payloads/libpayload/drivers/usb/ehci_private.h b/payloads/libpayload/drivers/usb/ehci_private.h<br>index 8519c0f..fa8aaac 100644<br>--- a/payloads/libpayload/drivers/usb/ehci_private.h<br>+++ b/payloads/libpayload/drivers/usb/ehci_private.h<br>@@ -101,7 +101,7 @@<br> #define QTD_CPAGE_SHIFT 12<br> #define QTD_CPAGE_MASK (7 << QTD_CPAGE_SHIFT)<br> #define QTD_TOTAL_LEN_SHIFT 16<br>-#define QTD_TOTAL_LEN_MASK (((1<<15)-1) << QTD_TOTAL_LEN_SHIFT)<br>+#define QTD_TOTAL_LEN_MASK (((1 << 15)-1) << QTD_TOTAL_LEN_SHIFT)<br> #define QTD_TOGGLE_SHIFT 31<br> #define QTD_TOGGLE_MASK (1 << 31)<br> #define QTD_TOGGLE_DATA0 0<br>@@ -113,10 +113,10 @@<br> typedef volatile struct {<br> u32 horiz_link_ptr;<br> #define QH_TERMINATE 1<br>-#define QH_iTD (0<<1)<br>-#define QH_QH (1<<1)<br>-#define QH_siTD (2<<1)<br>-#define QH_FSTN (3<<1)<br>+#define QH_iTD (0 << 1)<br>+#define QH_QH (1 << 1)<br>+#define QH_siTD (2 << 1)<br>+#define QH_FSTN (3 << 1)<br> u32 epchar;<br> #define QH_EP_SHIFT 8<br> #define QH_EPS_SHIFT 12<br>diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c<br>index a5388cb..1d7d830 100644<br>--- a/payloads/libpayload/drivers/usb/ohci.c<br>+++ b/payloads/libpayload/drivers/usb/ohci.c<br>@@ -232,8 +232,8 @@<br> OHCI_INST (controller)->opreg->HcControl |= PeriodicListEnable;<br> OHCI_INST (controller)->opreg->HcControl &= ~IsochronousEnable; // unused by this driver<br> // disable everything, contrary to what OHCI spec says in 5.1.1.4, as we don't need IRQs<br>- OHCI_INST (controller)->opreg->HcInterruptEnable = 1<<31;<br>- OHCI_INST (controller)->opreg->HcInterruptDisable = ~(1<<31);<br>+ OHCI_INST (controller)->opreg->HcInterruptEnable = 1 << 31;<br>+ OHCI_INST (controller)->opreg->HcInterruptDisable = ~(1 << 31);<br> OHCI_INST (controller)->opreg->HcInterruptStatus = ~0;<br> OHCI_INST (controller)->opreg->HcPeriodicStart = (((OHCI_INST (controller)->opreg->HcFmInterval & FrameIntervalMask) / 10) * 9);<br> OHCI_INST (controller)->opreg->HcControl = (OHCI_INST (controller)->opreg->HcControl & ~HostControllerFunctionalStateMask) | USBOperational;<br>diff --git a/payloads/libpayload/drivers/usb/ohci_private.h b/payloads/libpayload/drivers/usb/ohci_private.h<br>index 07bb20d..58be5fa 100644<br>--- a/payloads/libpayload/drivers/usb/ohci_private.h<br>+++ b/payloads/libpayload/drivers/usb/ohci_private.h<br>@@ -38,13 +38,13 @@<br> typedef enum { CMD} reg;<br> <br> enum {<br>- NumberDownstreamPorts = 1<<0,<br>- PowerSwitchingMode = 1<<8,<br>- NoPowerSwitching = 1<<9,<br>- DeviceType = 1<<10,<br>- OverCurrentProtectionMode = 1<<11,<br>- NoOverCurrentProtection = 1<<12,<br>- PowerOnToPowerGoodTime = 1<<24<br>+ NumberDownstreamPorts = 1 << 0,<br>+ PowerSwitchingMode = 1 << 8,<br>+ NoPowerSwitching = 1 << 9,<br>+ DeviceType = 1 << 10,<br>+ OverCurrentProtectionMode = 1 << 11,<br>+ NoOverCurrentProtection = 1 << 12,<br>+ PowerOnToPowerGoodTime = 1 << 24<br> } HcRhDescriptorAReg;<br> <br> enum {<br>@@ -53,47 +53,47 @@<br> } HcRhDescriptorAMask;<br> <br> enum {<br>- DeviceRemovable = 1<<0,<br>- PortPowerControlMask = 1<<16<br>+ DeviceRemovable = 1 << 0,<br>+ PortPowerControlMask = 1 << 16<br> } HcRhDescriptorBReg;<br> <br> enum {<br>- CurrentConnectStatus = 1<<0,<br>- PortEnableStatus = 1<<1,<br>- PortSuspendStatus = 1<<2,<br>- PortOverCurrentIndicator = 1<<3,<br>- PortResetStatus = 1<<4,<br>- PortPowerStatus = 1<<8,<br>- LowSpeedDeviceAttached = 1<<9,<br>- ConnectStatusChange = 1<<16,<br>- PortEnableStatusChange = 1<<17,<br>- PortSuspendStatusChange = 1<<18,<br>- PortOverCurrentIndicatorChange = 1<<19,<br>- PortResetStatusChange = 1<<20<br>+ CurrentConnectStatus = 1 << 0,<br>+ PortEnableStatus = 1 << 1,<br>+ PortSuspendStatus = 1 << 2,<br>+ PortOverCurrentIndicator = 1 << 3,<br>+ PortResetStatus = 1 << 4,<br>+ PortPowerStatus = 1 << 8,<br>+ LowSpeedDeviceAttached = 1 << 9,<br>+ ConnectStatusChange = 1 << 16,<br>+ PortEnableStatusChange = 1 << 17,<br>+ PortSuspendStatusChange = 1 << 18,<br>+ PortOverCurrentIndicatorChange = 1 << 19,<br>+ PortResetStatusChange = 1 << 20<br> } HcRhPortStatusRead;<br> enum {<br>- ClearPortEnable = 1<<0,<br>- SetPortEnable = 1<<1,<br>- SetPortSuspend = 1<<2,<br>- ClearSuspendStatus = 1<<3,<br>- SetPortReset = 1<<4,<br>- SetPortPower = 1<<8,<br>- ClearPortPower = 1<<9,<br>+ ClearPortEnable = 1 << 0,<br>+ SetPortEnable = 1 << 1,<br>+ SetPortSuspend = 1 << 2,<br>+ ClearSuspendStatus = 1 << 3,<br>+ SetPortReset = 1 << 4,<br>+ SetPortPower = 1 << 8,<br>+ ClearPortPower = 1 << 9,<br> } HcRhPortStatusSet;<br> <br> enum {<br>- LocalPowerStatus = 1<<0,<br>- OverCurrentIndicator = 1<<1,<br>- DeviceRemoteWakeupEnable = 1<<15,<br>- LocalPowerStatusChange = 1<<16,<br>- OverCurrentIndicatorChange = 1<<17,<br>- ClearRemoteWakeupEnable = 1<<31<br>+ LocalPowerStatus = 1 << 0,<br>+ OverCurrentIndicator = 1 << 1,<br>+ DeviceRemoteWakeupEnable = 1 << 15,<br>+ LocalPowerStatusChange = 1 << 16,<br>+ OverCurrentIndicatorChange = 1 << 17,<br>+ ClearRemoteWakeupEnable = 1 << 31<br> } HcRhStatusReg;<br> <br> enum {<br>- FrameInterval = 1<<0,<br>- FSLargestDataPacket = 1<<16,<br>- FrameIntervalToggle = 1<<31<br>+ FrameInterval = 1 << 0,<br>+ FSLargestDataPacket = 1 << 16,<br>+ FrameIntervalToggle = 1 << 31<br> } HcFmIntervalOffset;<br> enum {<br> FrameIntervalMask = MASK(0, 14),<br>@@ -102,15 +102,15 @@<br> } HcFmIntervalMask;<br> <br> enum {<br>- ControlBulkServiceRatio = 1<<0,<br>- PeriodicListEnable = 1<<2,<br>- IsochronousEnable = 1<<3,<br>- ControlListEnable = 1<<4,<br>- BulkListEnable = 1<<5,<br>- HostControllerFunctionalState = 1<<6,<br>- InterruptRouting = 1<<8,<br>- RemoteWakeupConnected = 1<<9,<br>- RemoteWakeupEnable = 1<<10<br>+ ControlBulkServiceRatio = 1 << 0,<br>+ PeriodicListEnable = 1 << 2,<br>+ IsochronousEnable = 1 << 3,<br>+ ControlListEnable = 1 << 4,<br>+ BulkListEnable = 1 << 5,<br>+ HostControllerFunctionalState = 1 << 6,<br>+ InterruptRouting = 1 << 8,<br>+ RemoteWakeupConnected = 1 << 9,<br>+ RemoteWakeupEnable = 1 << 10<br> } HcControlReg;<br> <br> enum {<br>@@ -126,11 +126,11 @@<br> };<br> <br> enum {<br>- HostControllerReset = 1<<0,<br>- ControlListFilled = 1<<1,<br>- BulkListFilled = 1<<2,<br>- OwnershipChangeRequest = 1<<3,<br>- SchedulingOverrunCount = 1<<16<br>+ HostControllerReset = 1 << 0,<br>+ ControlListFilled = 1 << 1,<br>+ BulkListFilled = 1 << 2,<br>+ OwnershipChangeRequest = 1 << 3,<br>+ SchedulingOverrunCount = 1 << 16<br> } HcCommandStatusReg;<br> <br> enum {<br>@@ -138,19 +138,19 @@<br> } HcCommandStatusMask;<br> <br> enum {<br>- FrameRemaining = 1<<0,<br>- FrameRemainingToggle = 1<<31<br>+ FrameRemaining = 1 << 0,<br>+ FrameRemainingToggle = 1 << 31<br> } HcFmRemainingReg;<br> <br> enum {<br>- SchedulingOverrung = 1<<0,<br>- WritebackDoneHead = 1<<1,<br>- StartofFrame = 1<<2,<br>- ResumeDetected = 1<<3,<br>- UnrecoverableError = 1<<4,<br>- FrameNumberOverflow = 1<<5,<br>- RootHubStatusChange = 1<<6,<br>- OwnershipChange = 1<<30<br>+ SchedulingOverrung = 1 << 0,<br>+ WritebackDoneHead = 1 << 1,<br>+ StartofFrame = 1 << 2,<br>+ ResumeDetected = 1 << 3,<br>+ UnrecoverableError = 1 << 4,<br>+ FrameNumberOverflow = 1 << 5,<br>+ RootHubStatusChange = 1 << 6,<br>+ OwnershipChange = 1 << 30<br> } HcInterruptStatusReg;<br> <br> typedef struct {<br>diff --git a/payloads/libpayload/drivers/usb/uhci_private.h b/payloads/libpayload/drivers/usb/uhci_private.h<br>index f650c4a..3d796cf 100644<br>--- a/payloads/libpayload/drivers/usb/uhci_private.h<br>+++ b/payloads/libpayload/drivers/usb/uhci_private.h<br>@@ -57,7 +57,7 @@<br> u32 token;<br> #define TD_PID_MASK 0xff<br> #define TD_DEVADDR_SHIFT 8<br>-#define TD_DEVADDR_MASK (((1<<7)-1) << TD_DEVADDR_SHIFT)<br>+#define TD_DEVADDR_MASK (((1 << 7)-1) << TD_DEVADDR_SHIFT)<br> #define TD_EP_SHIFT 15<br> #define TD_EP_MASK (0xf << TD_EP_SHIFT)<br> #define TD_TOGGLE_SHIFT 19<br>diff --git a/payloads/libpayload/drivers/usb/xhci_private.h b/payloads/libpayload/drivers/usb/xhci_private.h<br>index 47a464f..6146955 100644<br>--- a/payloads/libpayload/drivers/usb/xhci_private.h<br>+++ b/payloads/libpayload/drivers/usb/xhci_private.h<br>@@ -387,25 +387,25 @@<br> making bitfields unusable for MMIO register blocks. Yay C :-( */<br> volatile struct opreg {<br> u32 usbcmd;<br>-#define USBCMD_RS 1<<0<br>-#define USBCMD_HCRST 1<<1<br>-#define USBCMD_INTE 1<<2<br>+#define USBCMD_RS 1 << 0<br>+#define USBCMD_HCRST 1 << 1<br>+#define USBCMD_INTE 1 << 2<br> u32 usbsts;<br>-#define USBSTS_HCH 1<<0<br>-#define USBSTS_HSE 1<<2<br>-#define USBSTS_EINT 1<<3<br>-#define USBSTS_PCD 1<<4<br>-#define USBSTS_CNR 1<<11<br>+#define USBSTS_HCH 1 << 0<br>+#define USBSTS_HSE 1 << 2<br>+#define USBSTS_EINT 1 << 3<br>+#define USBSTS_PCD 1 << 4<br>+#define USBSTS_CNR 1 << 11<br> #define USBSTS_PRSRV_MASK ((1 << 1) | 0xffffe000)<br> u32 pagesize;<br> u8 res1[0x13-0x0c+1];<br> u32 dnctrl;<br> u32 crcr_lo;<br> u32 crcr_hi;<br>-#define CRCR_RCS 1<<0<br>-#define CRCR_CS 1<<1<br>-#define CRCR_CA 1<<2<br>-#define CRCR_CRR 1<<3<br>+#define CRCR_RCS 1 << 0<br>+#define CRCR_CS 1 << 1<br>+#define CRCR_CA 1 << 2<br>+#define CRCR_CRR 1 << 3<br> u8 res2[0x2f-0x20+1];<br> u32 dcbaap_lo;<br> u32 dcbaap_hi;<br>@@ -414,34 +414,34 @@<br> u8 res3[0x3ff-0x3c+1];<br> struct {<br> u32 portsc;<br>-#define PORTSC_CCS (1<<0)<br>-#define PORTSC_PED (1<<1)<br>+#define PORTSC_CCS (1 << 0)<br>+#define PORTSC_PED (1 << 1)<br> // BIT 2 rsvdZ<br>-#define PORTSC_OCA (1<<3)<br>-#define PORTSC_PR (1<<4)<br>-#define PORTSC_PLS (1<<5)<br>+#define PORTSC_OCA (1 << 3)<br>+#define PORTSC_PR (1 << 4)<br>+#define PORTSC_PLS (1 << 5)<br> #define PORTSC_PLS_MASK MASK(5, 4)<br>-#define PORTSC_PP (1<<9)<br>+#define PORTSC_PP (1 << 9)<br> #define PORTSC_PORT_SPEED_START 10<br>-#define PORTSC_PORT_SPEED (1<<PORTSC_PORT_SPEED_START)<br>+#define PORTSC_PORT_SPEED (1 << PORTSC_PORT_SPEED_START)<br> #define PORTSC_PORT_SPEED_MASK MASK(PORTSC_PORT_SPEED_START, 4)<br>-#define PORTSC_PIC (1<<14)<br>+#define PORTSC_PIC (1 << 14)<br> #define PORTSC_PIC_MASK MASK(14, 2)<br>-#define PORTSC_LWS (1<<16)<br>-#define PORTSC_CSC (1<<17)<br>-#define PORTSC_PEC (1<<18)<br>-#define PORTSC_WRC (1<<19)<br>-#define PORTSC_OCC (1<<20)<br>-#define PORTSC_PRC (1<<21)<br>-#define PORTSC_PLC (1<<22)<br>-#define PORTSC_CEC (1<<23)<br>-#define PORTSC_CAS (1<<24)<br>-#define PORTSC_WCE (1<<25)<br>-#define PORTSC_WDE (1<<26)<br>-#define PORTSC_WOE (1<<27)<br>+#define PORTSC_LWS (1 << 16)<br>+#define PORTSC_CSC (1 << 17)<br>+#define PORTSC_PEC (1 << 18)<br>+#define PORTSC_WRC (1 << 19)<br>+#define PORTSC_OCC (1 << 20)<br>+#define PORTSC_PRC (1 << 21)<br>+#define PORTSC_PLC (1 << 22)<br>+#define PORTSC_CEC (1 << 23)<br>+#define PORTSC_CAS (1 << 24)<br>+#define PORTSC_WCE (1 << 25)<br>+#define PORTSC_WDE (1 << 26)<br>+#define PORTSC_WOE (1 << 27)<br> // BIT 29:28 rsvdZ<br>-#define PORTSC_DR (1<<30)<br>-#define PORTSC_WPR (1<<31)<br>+#define PORTSC_DR (1 << 30)<br>+#define PORTSC_WPR (1 << 31)<br> #define PORTSC_RW_MASK (PORTSC_PR | PORTSC_PLS_MASK | PORTSC_PP | PORTSC_PIC_MASK | PORTSC_LWS | PORTSC_WCE | PORTSC_WDE | PORTSC_WOE)<br> u32 portpmsc;<br> u32 portli;<br>diff --git a/payloads/libpayload/drivers/video/corebootfb.c b/payloads/libpayload/drivers/video/corebootfb.c<br>index 1aeac12..572a02b 100644<br>--- a/payloads/libpayload/drivers/video/corebootfb.c<br>+++ b/payloads/libpayload/drivers/video/corebootfb.c<br>@@ -192,7 +192,7 @@<br> int ch, paint;<br> if(cursor_en) {<br> ch = CHARS[cursor_y * coreboot_video_console.columns + cursor_x];<br>- paint = (ch & 0xff) | ((ch<<4) & 0xf000) | ((ch >> 4) & 0x0f00);<br>+ paint = (ch & 0xff) | ((ch << 4) & 0xf000) | ((ch >> 4) & 0x0f00);<br> } else {<br> paint = CHARS[cursor_y * coreboot_video_console.columns + cursor_x];<br> }<br>diff --git a/payloads/libpayload/include/arm64/arch/lib_helpers.h b/payloads/libpayload/include/arm64/arch/lib_helpers.h<br>index ca68435..2b346c4 100644<br>--- a/payloads/libpayload/include/arm64/arch/lib_helpers.h<br>+++ b/payloads/libpayload/include/arm64/arch/lib_helpers.h<br>@@ -98,10 +98,10 @@<br> <br> #include <stdint.h><br> <br>-#define DAIF_DBG_BIT (1<<3)<br>-#define DAIF_ABT_BIT (1<<2)<br>-#define DAIF_IRQ_BIT (1<<1)<br>-#define DAIF_FIQ_BIT (1<<0)<br>+#define DAIF_DBG_BIT (1 << 3)<br>+#define DAIF_ABT_BIT (1 << 2)<br>+#define DAIF_IRQ_BIT (1 << 1)<br>+#define DAIF_FIQ_BIT (1 << 0)<br> <br> #define SWITCH_CASE_READ(func, var, type, el) do { \<br> type var = -1; \<br>diff --git a/payloads/libpayload/include/stddef.h b/payloads/libpayload/include/stddef.h<br>index fe455b8..3288487 100644<br>--- a/payloads/libpayload/include/stddef.h<br>+++ b/payloads/libpayload/include/stddef.h<br>@@ -21,9 +21,9 @@<br> "`struct " #structure "` offset for `" #member "` is not " #offset)<br> <br> /* Standard units. */<br>-#define KiB (1<<10)<br>-#define MiB (1<<20)<br>-#define GiB (1<<30)<br>+#define KiB (1 << 10)<br>+#define MiB (1 << 20)<br>+#define GiB (1 << 30)<br> <br> #define KHz (1000)<br> #define MHz (1000*KHz)<br>diff --git a/payloads/libpayload/liblz4/lz4.c.inc b/payloads/libpayload/liblz4/lz4.c.inc<br>index b3be4e5..baa9110 100644<br>--- a/payloads/libpayload/liblz4/lz4.c.inc<br>+++ b/payloads/libpayload/liblz4/lz4.c.inc<br>@@ -64,17 +64,17 @@<br> #define MFLIMIT (WILDCOPYLENGTH+MINMATCH)<br> static const int LZ4_minLength = (MFLIMIT+1);<br> <br>-#define KB *(1 <<10)<br>-#define MB *(1 <<20)<br>-#define GB *(1U<<30)<br>+#define KB *(1 << 10)<br>+#define MB *(1 << 20)<br>+#define GB *(1U << 30)<br> <br> #define MAXD_LOG 16<br> #define MAX_DISTANCE ((1 << MAXD_LOG) - 1)<br> <br> #define ML_BITS 4<br>-#define ML_MASK ((1U<<ML_BITS)-1)<br>+#define ML_MASK ((1U << ML_BITS)-1)<br> #define RUN_BITS (8-ML_BITS)<br>-#define RUN_MASK ((1U<<RUN_BITS)-1)<br>+#define RUN_MASK ((1U << RUN_BITS)-1)<br> <br> <br> /**************************************<br></pre><p>To view, visit <a href="https://review.coreboot.org/20396">change 20396</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/20396"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0659f6ec59fb808b4cedf57d60d737c13c250042 </div>
<div style="display:none"> Gerrit-Change-Number: 20396 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: HAOUAS Elyes <ehaouas@noos.fr> </div>