54,60c54,60
< #define NACKED_LINE 1 << 0
< #define SATISFIED 1 << 1
< #define SHARED_LINE 1 << 2
< #define CACHE_LINE_FILL 1 << 3
< #define COMPRESSED 1 << 4
< #define NO_ALLOCATE 1 << 5
< #define SNOOP_COMMIT 1 << 6
---
> #define NACKED_LINE (1 << 0)
> #define SATISFIED (1 << 1)
> #define SHARED_LINE (1 << 2)
> #define CACHE_LINE_FILL (1 << 3)
> #define COMPRESSED (1 << 4)
> #define NO_ALLOCATE (1 << 5)
> #define SNOOP_COMMIT (1 << 6)
63c63
< #define NUM_MEM_CMDS 1 << 11
---
> #define NUM_MEM_CMDS (1 << 11)
175,181c175,181
< IsRead = 1 << 0,
< IsWrite = 1 << 1,
< IsPrefetch = 1 << 2,
< IsInvalidate = 1 << 3,
< IsRequest = 1 << 4,
< IsResponse = 1 << 5,
< NeedsResponse = 1 << 6,
---
> IsRead = 1 << 0,
> IsWrite = 1 << 1,
> IsPrefetch = 1 << 2,
> IsInvalidate = 1 << 3,
> IsRequest = 1 << 4,
> IsResponse = 1 << 5,
> NeedsResponse = 1 << 6,
185c185
< HasData = 1 << 10
---
> HasData = 1 << 10
193c193
< ReadReq = IsRead | IsRequest | NeedsResponse,
---
> ReadReq = IsRead | IsRequest | NeedsResponse,
195c195
< WriteReqNoAck = IsWrite | IsRequest | HasData,
---
> WriteReqNoAck = IsWrite | IsRequest | HasData,
197c197
< WriteResp = IsWrite | IsResponse | NeedsResponse,
---
> WriteResp = IsWrite | IsResponse | NeedsResponse,
202c202
< | NeedsResponse | HasData,
---
> | NeedsResponse | HasData,
204c204
< | NeedsResponse | HasData,
---
> | NeedsResponse | HasData,
206,209c206,209
< WriteInvalidateReq = IsWrite | IsInvalidate | IsRequest
< | HasData | NeedsResponse,
< WriteInvalidateResp = IsWrite | IsInvalidate | IsRequest | NeedsResponse
< | IsResponse,
---
> WriteInvalidateReq = IsWrite | IsInvalidate | IsRequest
> | HasData | NeedsResponse,
> WriteInvalidateResp = IsWrite | IsInvalidate | IsRequest
> | NeedsResponse | IsResponse,
213c213
< | NeedsResponse | HasData
---
> | NeedsResponse | HasData