GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix whitespace leaked into tree 

Clean whitespace errors that have gotten past lint-stable-003-whitespace
and gerrit review.

Change-Id: Id76fc68e9d32d1b2b672d519b75cdc80cc4f1ad9
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3920
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Bruce Griffith <Bruce.Griffith@se-eng.com>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Kyösti Mälkki 2013-09-13 07:57:49 +03:00 committed by Patrick Georgi
parent 370ff4af11
commit ecd8424919
20 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Kconfig
View File

@ -334,7 +334,7 @@ config TIMER_QUEUE
def_bool n def_bool n
depends on HAVE_MONOTONIC_TIMER depends on HAVE_MONOTONIC_TIMER
help help
Provide a timer queue for performing time-based callbacks. Provide a timer queue for performing time-based callbacks.
config COOP_MULTITASKING config COOP_MULTITASKING
def_bool n def_bool n

2
src/drivers/Makefile.inc
View File

@ -30,7 +30,7 @@ subdirs-y += sil
subdirs-y += trident subdirs-y += trident
subdirs-y += ics subdirs-y += ics
subdirs-y += spi subdirs-y += spi
subdirs-y += ti subdirs-y += ti
subdirs-y += ipmi subdirs-y += ipmi
subdirs-y += elog subdirs-y += elog
subdirs-$(CONFIG_ARCH_X86) += pc80 subdirs-$(CONFIG_ARCH_X86) += pc80

2
src/lib/libgcov.c
View File

@ -334,7 +334,7 @@ gcov_exit (void)
{ {
crc32 = crc32_unsigned (crc32, gi_ptr->stamp); crc32 = crc32_unsigned (crc32, gi_ptr->stamp);
crc32 = crc32_unsigned (crc32, gi_ptr->n_functions); crc32 = crc32_unsigned (crc32, gi_ptr->n_functions);
for (f_ix = 0; (unsigned)f_ix != gi_ptr->n_functions; f_ix++) for (f_ix = 0; (unsigned)f_ix != gi_ptr->n_functions; f_ix++)
{ {
gfi_ptr = gi_ptr->functions[f_ix]; gfi_ptr = gi_ptr->functions[f_ix];

4
src/mainboard/amd/inagua/dsdt.asl
View File

@ -28,13 +28,13 @@ DefinitionBlock (
) )
{ /* Start of ASL file */ { /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */ /* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"
#include <cpu/amd/agesa/family14/acpi/cpu.asl> #include <cpu/amd/agesa/family14/acpi/cpu.asl>
#include "acpi/routing.asl" #include "acpi/routing.asl"
Scope(\_SB) { Scope(\_SB) {
/* global utility methods expected within the \_SB scope */ /* global utility methods expected within the \_SB scope */
#include <arch/x86/acpi/globutil.asl> #include <arch/x86/acpi/globutil.asl>

2
src/mainboard/amd/olivehill/dsdt.asl
View File

@ -29,7 +29,7 @@ DefinitionBlock (
) )
{ /* Start of ASL file */ { /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */ /* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
/* Globals for the platform */ /* Globals for the platform */
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"

2
src/mainboard/amd/persimmon/dsdt.asl
View File

@ -28,7 +28,7 @@ DefinitionBlock (
) )
{ /* Start of ASL file */ { /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */ /* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"
#include <cpu/amd/agesa/family14/acpi/cpu.asl> #include <cpu/amd/agesa/family14/acpi/cpu.asl>

4
src/mainboard/amd/south_station/dsdt.asl
View File

@ -28,13 +28,13 @@ DefinitionBlock (
) )
{ /* Start of ASL file */ { /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */ /* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"
#include <cpu/amd/agesa/family14/acpi/cpu.asl> #include <cpu/amd/agesa/family14/acpi/cpu.asl>
#include "acpi/routing.asl" #include "acpi/routing.asl"
Scope(\_SB) { Scope(\_SB) {
/* global utility methods expected within the \_SB scope */ /* global utility methods expected within the \_SB scope */
#include <arch/x86/acpi/globutil.asl> #include <arch/x86/acpi/globutil.asl>

4
src/mainboard/amd/union_station/dsdt.asl
View File

@ -28,13 +28,13 @@ DefinitionBlock (
) )
{ /* Start of ASL file */ { /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */ /* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"
#include <cpu/amd/agesa/family14/acpi/cpu.asl> #include <cpu/amd/agesa/family14/acpi/cpu.asl>
#include "acpi/routing.asl" #include "acpi/routing.asl"
Scope(\_SB) { Scope(\_SB) {
/* global utility methods expected within the \_SB scope */ /* global utility methods expected within the \_SB scope */
#include <arch/x86/acpi/globutil.asl> #include <arch/x86/acpi/globutil.asl>

4
src/mainboard/asrock/e350m1/dsdt.asl
View File

@ -28,13 +28,13 @@ DefinitionBlock (
) )
{ /* Start of ASL file */ { /* Start of ASL file */
/* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */ /* #include <arch/x86/acpi/debug.asl> */ /* Include global debug methods if needed */
#include "acpi/mainboard.asl" #include "acpi/mainboard.asl"
#include <cpu/amd/agesa/family14/acpi/cpu.asl> #include <cpu/amd/agesa/family14/acpi/cpu.asl>
#include "acpi/routing.asl" #include "acpi/routing.asl"
Scope(\_SB) { Scope(\_SB) {
/* global utility methods expected within the \_SB scope */ /* global utility methods expected within the \_SB scope */
#include <arch/x86/acpi/globutil.asl> #include <arch/x86/acpi/globutil.asl>

2
src/mainboard/google/snow/memory.c
View File

@ -509,7 +509,7 @@ struct mem_timings *get_mem_timings(void)
unsigned int frequency_mhz; unsigned int frequency_mhz;
enum mem_manuf mem_manuf; enum mem_manuf mem_manuf;
const struct mem_timings *mem; const struct mem_timings *mem;
config = board_get_config(); config = board_get_config();
switch (config) { switch (config) {
case SNOW_CONFIG_ELPIDA_EVT: case SNOW_CONFIG_ELPIDA_EVT:

2
src/mainboard/lenovo/x60/i915.c
View File

@ -375,7 +375,7 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
setgtt(0, 800 , physbase, 4096); setgtt(0, 800 , physbase, 4096);
temp = READ32(PGETLB_CTL); temp = READ32(PGETLB_CTL);
printk(BIOS_INFO, "GTT PGETLB_CTL register: 0x%lx\n", temp); printk(BIOS_INFO, "GTT PGETLB_CTL register: 0x%lx\n", temp);
if (temp & 1) if (temp & 1)

2
src/mainboard/supermicro/h8qgi/devicetree.cb
View File

@ -111,7 +111,7 @@ chip northbridge/amd/agesa/family15/root_complex
end end
end #drivers/i2c/w83795 end #drivers/i2c/w83795
end # LPC end # LPC
device pci 14.4 on device pci 14.4 on
device pci 4.0 on end # onboard VGA device pci 4.0 on end # onboard VGA
end # PCI 0x4384 end # PCI 0x4384
device pci 14.5 on end # USB 3 device pci 14.5 on end # USB 3

2
src/southbridge/amd/cs5536/smbus.c
View File

@ -193,4 +193,4 @@ err:
outb(0x0, smbus_io_base + SMB_STS); outb(0x0, smbus_io_base + SMB_STS);
return 0xFF; return 0xFF;
} }

4
util/cbfstool/lzma/C/LzFind.c
View File

@ -512,7 +512,7 @@ static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
delta2 = p->pos - p->hash[hash2Value]; delta2 = p->pos - p->hash[hash2Value];
curMatch = p->hash[kFix3HashSize + hashValue]; curMatch = p->hash[kFix3HashSize + hashValue];
p->hash[hash2Value] = p->hash[hash2Value] =
p->hash[kFix3HashSize + hashValue] = p->pos; p->hash[kFix3HashSize + hashValue] = p->pos;
@ -546,7 +546,7 @@ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
delta2 = p->pos - p->hash[ hash2Value]; delta2 = p->pos - p->hash[ hash2Value];
delta3 = p->pos - p->hash[kFix3HashSize + hash3Value]; delta3 = p->pos - p->hash[kFix3HashSize + hash3Value];
curMatch = p->hash[kFix4HashSize + hashValue]; curMatch = p->hash[kFix4HashSize + hashValue];
p->hash[ hash2Value] = p->hash[ hash2Value] =
p->hash[kFix3HashSize + hash3Value] = p->hash[kFix3HashSize + hash3Value] =
p->hash[kFix4HashSize + hashValue] = p->pos; p->hash[kFix4HashSize + hashValue] = p->pos;

14
util/cbfstool/lzma/C/LzmaDec.c
View File

@ -141,7 +141,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit_parm, const
Byte *dic = p->dic; Byte *dic = p->dic;
SizeT dicBufSize = p->dicBufSize; SizeT dicBufSize = p->dicBufSize;
SizeT dicPos = p->dicPos; SizeT dicPos = p->dicPos;
UInt32 processedPos = p->processedPos; UInt32 processedPos = p->processedPos;
UInt32 checkDicSize = p->checkDicSize; UInt32 checkDicSize = p->checkDicSize;
unsigned len = 0; unsigned len = 0;
@ -324,7 +324,7 @@ static int MY_FAST_CALL LzmaDec_DecodeReal(CLzmaDec *p, SizeT limit_parm, const
{ {
NORMALIZE NORMALIZE
range >>= 1; range >>= 1;
{ {
UInt32 t; UInt32 t;
code -= range; code -= range;
@ -722,7 +722,7 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
SizeT inSize = *srcLen; SizeT inSize = *srcLen;
(*srcLen) = 0; (*srcLen) = 0;
LzmaDec_WriteRem(p, dicLimit); LzmaDec_WriteRem(p, dicLimit);
*status = LZMA_STATUS_NOT_SPECIFIED; *status = LZMA_STATUS_NOT_SPECIFIED;
while (p->remainLen != kMatchSpecLenStart) while (p->remainLen != kMatchSpecLenStart)
@ -768,7 +768,7 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
if (p->needInitState) if (p->needInitState)
LzmaDec_InitStateReal(p); LzmaDec_InitStateReal(p);
if (p->tempBufSize == 0) if (p->tempBufSize == 0)
{ {
SizeT processed; SizeT processed;
@ -899,12 +899,12 @@ SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size)
{ {
UInt32 dicSize; UInt32 dicSize;
Byte d; Byte d;
if (size < LZMA_PROPS_SIZE) if (size < LZMA_PROPS_SIZE)
return SZ_ERROR_UNSUPPORTED; return SZ_ERROR_UNSUPPORTED;
else else
dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24); dicSize = data[1] | ((UInt32)data[2] << 8) | ((UInt32)data[3] << 16) | ((UInt32)data[4] << 24);
if (dicSize < LZMA_DIC_MIN) if (dicSize < LZMA_DIC_MIN)
dicSize = LZMA_DIC_MIN; dicSize = LZMA_DIC_MIN;
p->dicSize = dicSize; p->dicSize = dicSize;
@ -986,7 +986,7 @@ SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
p.dicBufSize = outSize; p.dicBufSize = outSize;
LzmaDec_Init(&p); LzmaDec_Init(&p);
*srcLen = inSize; *srcLen = inSize;
res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status); res = LzmaDec_DecodeToDic(&p, outSize, src, srcLen, finishMode, status);

4
util/cbfstool/lzma/C/LzmaDec.h
View File

@ -130,7 +130,7 @@ LzmaDec_Allocate* can return:
SZ_ERROR_MEM - Memory allocation error SZ_ERROR_MEM - Memory allocation error
SZ_ERROR_UNSUPPORTED - Unsupported properties SZ_ERROR_UNSUPPORTED - Unsupported properties
*/ */
SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc); SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc); void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
@ -159,7 +159,7 @@ void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
*/ */
/* LzmaDec_DecodeToDic /* LzmaDec_DecodeToDic
The decoding to internal dictionary buffer (CLzmaDec::dic). The decoding to internal dictionary buffer (CLzmaDec::dic).
You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!! You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!

40
util/cbfstool/lzma/C/LzmaEnc.c
View File

@ -109,7 +109,7 @@ static void LzmaEnc_FastPosInit(Byte *g_FastPos)
int c = 2, slotFast; int c = 2, slotFast;
g_FastPos[0] = 0; g_FastPos[0] = 0;
g_FastPos[1] = 1; g_FastPos[1] = 1;
for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++) for (slotFast = 2; slotFast < kNumLogBits * 2; slotFast++)
{ {
UInt32 k = (1 << ((slotFast >> 1) - 1)); UInt32 k = (1 << ((slotFast >> 1) - 1));
@ -246,7 +246,7 @@ typedef struct
CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits]; CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex]; CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
CLzmaProb posAlignEncoder[1 << kNumAlignBits]; CLzmaProb posAlignEncoder[1 << kNumAlignBits];
CLenPriceEnc lenEnc; CLenPriceEnc lenEnc;
CLenPriceEnc repLenEnc; CLenPriceEnc repLenEnc;
@ -269,7 +269,7 @@ typedef struct
#ifndef _7ZIP_ST #ifndef _7ZIP_ST
Byte pad[128]; Byte pad[128];
#endif #endif
UInt32 optimumEndIndex; UInt32 optimumEndIndex;
UInt32 optimumCurrentIndex; UInt32 optimumCurrentIndex;
@ -277,7 +277,7 @@ typedef struct
UInt32 numPairs; UInt32 numPairs;
UInt32 numAvail; UInt32 numAvail;
COptimal opt[kNumOpts]; COptimal opt[kNumOpts];
#ifndef LZMA_LOG_BSR #ifndef LZMA_LOG_BSR
Byte g_FastPos[1 << kNumLogBits]; Byte g_FastPos[1 << kNumLogBits];
#endif #endif
@ -311,14 +311,14 @@ typedef struct
CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits]; CLzmaProb posSlotEncoder[kNumLenToPosStates][1 << kNumPosSlotBits];
CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex]; CLzmaProb posEncoders[kNumFullDistances - kEndPosModelIndex];
CLzmaProb posAlignEncoder[1 << kNumAlignBits]; CLzmaProb posAlignEncoder[1 << kNumAlignBits];
CLenPriceEnc lenEnc; CLenPriceEnc lenEnc;
CLenPriceEnc repLenEnc; CLenPriceEnc repLenEnc;
unsigned lclp; unsigned lclp;
Bool fastMode; Bool fastMode;
CRangeEnc rc; CRangeEnc rc;
Bool writeEndMark; Bool writeEndMark;
@ -909,10 +909,10 @@ static UInt32 Backward(CLzmaEnc *p, UInt32 *backRes, UInt32 cur)
{ {
UInt32 posPrev = posMem; UInt32 posPrev = posMem;
UInt32 backCur = backMem; UInt32 backCur = backMem;
backMem = p->opt[posPrev].backPrev; backMem = p->opt[posPrev].backPrev;
posMem = p->opt[posPrev].posPrev; posMem = p->opt[posPrev].posPrev;
p->opt[posPrev].backPrev = backCur; p->opt[posPrev].backPrev = backCur;
p->opt[posPrev].posPrev = cur; p->opt[posPrev].posPrev = cur;
cur = posPrev; cur = posPrev;
@ -943,7 +943,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
return lenRes; return lenRes;
} }
p->optimumCurrentIndex = p->optimumEndIndex = 0; p->optimumCurrentIndex = p->optimumEndIndex = 0;
if (p->additionalOffset == 0) if (p->additionalOffset == 0)
mainLen = ReadMatchDistances(p, &numPairs); mainLen = ReadMatchDistances(p, &numPairs);
else else
@ -1241,7 +1241,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]); matchPrice = curPrice + GET_PRICE_1(p->isMatch[state][posState]);
repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]); repMatchPrice = matchPrice + GET_PRICE_1(p->isRep[state]);
if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0)) if (matchByte == curByte && !(nextOpt->posPrev < cur && nextOpt->backPrev == 0))
{ {
UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState); UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(p, state, posState);
@ -1303,7 +1303,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
} }
} }
} }
startLen = 2; /* speed optimization */ startLen = 2; /* speed optimization */
{ {
UInt32 repIndex; UInt32 repIndex;
@ -1334,10 +1334,10 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
} }
while (--lenTest >= 2); while (--lenTest >= 2);
lenTest = lenTestTemp; lenTest = lenTestTemp;
if (repIndex == 0) if (repIndex == 0)
startLen = lenTest + 1; startLen = lenTest + 1;
/* if (_maxMode) */ /* if (_maxMode) */
{ {
UInt32 lenTest2 = lenTest + 1; UInt32 lenTest2 = lenTest + 1;
@ -1361,7 +1361,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
nextRepMatchPrice = curAndLenCharPrice + nextRepMatchPrice = curAndLenCharPrice +
GET_PRICE_1(p->isMatch[state2][posStateNext]) + GET_PRICE_1(p->isMatch[state2][posStateNext]) +
GET_PRICE_1(p->isRep[state2]); GET_PRICE_1(p->isRep[state2]);
/* for (; lenTest2 >= 2; lenTest2--) */ /* for (; lenTest2 >= 2; lenTest2--) */
{ {
UInt32 curAndLenPrice; UInt32 curAndLenPrice;
@ -1416,7 +1416,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
curAndLenPrice += p->distancesPrices[lenToPosState][curBack]; curAndLenPrice += p->distancesPrices[lenToPosState][curBack];
else else
curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask]; curAndLenPrice += p->posSlotPrices[lenToPosState][posSlot] + p->alignPrices[curBack & kAlignMask];
opt = &p->opt[cur + lenTest]; opt = &p->opt[cur + lenTest];
if (curAndLenPrice < opt->price) if (curAndLenPrice < opt->price)
{ {
@ -1450,7 +1450,7 @@ static UInt32 GetOptimum(CLzmaEnc *p, UInt32 position, UInt32 *backRes)
nextRepMatchPrice = curAndLenCharPrice + nextRepMatchPrice = curAndLenCharPrice +
GET_PRICE_1(p->isMatch[state2][posStateNext]) + GET_PRICE_1(p->isMatch[state2][posStateNext]) +
GET_PRICE_1(p->isRep[state2]); GET_PRICE_1(p->isRep[state2]);
/* for (; lenTest2 >= 2; lenTest2--) */ /* for (; lenTest2 >= 2; lenTest2--) */
{ {
UInt32 offset = cur + lenTest + 1 + lenTest2; UInt32 offset = cur + lenTest + 1 + lenTest2;
@ -1562,7 +1562,7 @@ static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
MovePos(p, repLen - 1); MovePos(p, repLen - 1);
return repLen; return repLen;
} }
if (mainLen < 2 || numAvail <= 2) if (mainLen < 2 || numAvail <= 2)
return 1; return 1;
@ -1576,7 +1576,7 @@ static UInt32 GetOptimumFast(CLzmaEnc *p, UInt32 *backRes)
(p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist))) (p->longestMatchLength + 1 >= mainLen && mainLen >= 3 && ChangePair(newDistance, mainDist)))
return 1; return 1;
} }
data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1; data = p->matchFinder.GetPointerToCurrentPos(p->matchFinderObj) - 1;
for (i = 0; i < LZMA_NUM_REPS; i++) for (i = 0; i < LZMA_NUM_REPS; i++)
{ {
@ -1837,7 +1837,7 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
pos -= LZMA_NUM_REPS; pos -= LZMA_NUM_REPS;
GetPosSlot(pos, posSlot); GetPosSlot(pos, posSlot);
RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot); RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot);
if (posSlot >= kStartPosModelIndex) if (posSlot >= kStartPosModelIndex)
{ {
UInt32 footerBits = ((posSlot >> 1) - 1); UInt32 footerBits = ((posSlot >> 1) - 1);
@ -2144,7 +2144,7 @@ static size_t MyWrite(void *pp, const void *data, size_t size)
p->rc.outStream = &outStream.funcTable; p->rc.outStream = &outStream.funcTable;
res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize); res = LzmaEnc_CodeOneBlock(p, True, desiredPackSize, *unpackSize);
*unpackSize = (UInt32)(p->nowPos64 - nowPos64); *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
*destLen -= outStream.rem; *destLen -= outStream.rem;
if (outStream.overflow) if (outStream.overflow)

12
util/i915tool/spatches/fixcalls.cocci
View File

@ -46,7 +46,7 @@ type T;
@@ @@
T f(...){<... T f(...){<...
-DRM_DEBUG_KMS( -DRM_DEBUG_KMS(
+fprintf(stderr, +fprintf(stderr,
...); ...);
...>} ...>}
@@ @@
@ -55,7 +55,7 @@ type T;
@@ @@
T f(...){<... T f(...){<...
-DRM_ERROR( -DRM_ERROR(
+fprintf(stderr, +fprintf(stderr,
...); ...);
...>} ...>}
@@ @@
@ -64,7 +64,7 @@ type T;
@@ @@
T f(...){<... T f(...){<...
-DRM_DEBUG( -DRM_DEBUG(
+fprintf(stderr, +fprintf(stderr,
...); ...);
...>} ...>}
@@ @@
@ -73,7 +73,7 @@ type T;
@@ @@
T f(...){<... T f(...){<...
-DRM_DEBUG_DRIVER( -DRM_DEBUG_DRIVER(
+fprintf(stderr, +fprintf(stderr,
...); ...);
...>} ...>}
@@ @@
@ -104,7 +104,7 @@ expression E1, E2;
@@ @@
identifier d; identifier d;
@@ @@
-static -static
const struct pci_device_id d[] = {...}; const struct pci_device_id d[] = {...};
@@ @@
expression E1; expression E1;
@ -113,7 +113,7 @@ expression E1;
+if ( +if (
E1 E1
-, -,
+) fprintf(stderr, +) fprintf(stderr,
...); ...);
@@ @@
expression E1; expression E1;

2
util/i915tool/spatches/fx.cocci
View File

@ -4,7 +4,7 @@ type T;
@@ @@
T f(...){... T f(...){...
-\(DRM_DEBUG_KMS|DRM_ERRRO\)( -\(DRM_DEBUG_KMS|DRM_ERRRO\)(
+fprintf(stderr, +fprintf(stderr,
...); ...);
...} ...}

2
util/i915tool/spatches/intel_display.c.cocci
View File

@ -6,7 +6,7 @@ identifier d;
@@ @@
- intel_limit_t d = {...}; - intel_limit_t d = {...};
@@ @@
@@ @@
- intel_connector_attach_encoder(...){...} - intel_connector_attach_encoder(...){...}
@@ @@
@@ @@