Merge >=NV30-specific EXA code.. hard-disabled pending testing on my C51, and a proper commit message..

1 files changed, 9 insertions, 0 deletions

diff --git a/src/nv_dma.h b/src/nv_dma.h
index a21d404..094b119 100644
--- a/src/nv_dma.h
+++ b/src/nv_dma.h
@@ -97,6 +97,11 @@ enum DMASubchannel {
      NVDEBUG("\tNVDmaNext: 0x%08x\n", (data));           \
 }
 
+#define NVDmaFloat(pNv, data) {         \
+	float f = (data);               \
+	NVDmaNext((pNv), *(CARD32*)&f); \
+}
+
 #define NVDmaStart(pNv, subchannel, tag, size) {                        \
         if((pNv)->dmaFree <= (size))                                    \
             NVDmaWait(pNv, size);                                       \
@@ -105,6 +110,10 @@ enum DMASubchannel {
         (pNv)->dmaFree -= ((size) + 1);                                 \
     }
 
+#define NVDmaStart_NonInc(pNv, subchannel, tag, size) {                 \
+	NVDmaStart((pNv), (subchannel), (tag)|0x40000000, (size));      \
+}
+
 #define NVDmaSetObjectOnSubchannel(pNv, subchannel, object) \
     NVDmaStart(pNv, subchannel, 0, 1);                      \
     NVDmaNext(pNv,object);