diff options
| author | Ben Skeggs <darktama@iinet.net.au> | 2006-11-03 04:00:09 +1100 |
|---|---|---|
| committer | Ben Skeggs <darktama@iinet.net.au> | 2006-11-03 04:00:09 +1100 |
| commit | 87463666ab23e047f355cfcd7016aa9c7cd8ad76 (patch) | |
| tree | 2f11119453643b021165ac824c2d8bfd9ea80b56 /src/nv_dma.h | |
| parent | 68682238b36292409ce7f41ed90bd3be860e77f3 (diff) | |
| download | xorg-driver-xf86-video-nouveau-87463666ab23e047f355cfcd7016aa9c7cd8ad76.tar.gz | |
Use "do { blah; } while(0)" instead of just braces. (suggestion from megari on irc)
Diffstat (limited to 'src/nv_dma.h')
| -rw-r--r-- | src/nv_dma.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/nv_dma.h b/src/nv_dma.h index 4ee641c..b508289 100644 --- a/src/nv_dma.h +++ b/src/nv_dma.h @@ -92,32 +92,32 @@ enum DMASubchannel { NvSubSolidLine = 7, }; -#define NVDmaNext(pNv, data) { \ +#define NVDmaNext(pNv, data) do { \ (pNv)->dmaBase[(pNv)->dmaCurrent++] = (data); \ NVDEBUG("\tNVDmaNext: 0x%08x\n", (data)); \ -} +} while(0) -#define NVDmaFloat(pNv, data) { \ +#define NVDmaFloat(pNv, data) do { \ float f = (data); \ NVDmaNext((pNv), *(CARD32*)&f); \ -} +} while(0) -#define NVDmaStart(pNv, subchannel, tag, size) { \ +#define NVDmaStart(pNv, subchannel, tag, size) do { \ if((pNv)->dmaFree <= (size)) \ NVDmaWait(pNv, size); \ NVDEBUG("NVDmaStart: subc=%d, cmd=%x, num=%d\n", (subchannel), (tag), (size)); \ NVDmaNext(pNv, ((size) << 18) | ((subchannel) << 13) | (tag)); \ (pNv)->dmaFree -= ((size) + 1); \ - } +} while(0) -#define NVDmaStart_NonInc(pNv, subchannel, tag, size) { \ +#define NVDmaStart_NonInc(pNv, subchannel, tag, size) do { \ NVDmaStart((pNv), (subchannel), (tag)|0x40000000, (size)); \ -} +} while(0) -#define NVDmaSetObjectOnSubchannel(pNv, subchannel, object) { \ - NVDmaStart(pNv, subchannel, 0, 1); \ - NVDmaNext(pNv,object); \ -} +#define NVDmaSetObjectOnSubchannel(pNv, subchannel, object) do { \ + NVDmaStart(pNv, subchannel, 0, 1); \ + NVDmaNext(pNv,object); \ +} while(0) #define SURFACE_FORMAT 0x00000300 #define SURFACE_FORMAT_Y8 0x00000001 |