theatre: fix all -Wall warnings in theatre*

This fixes all the warnings, it doesn't clean up the horrible mess that is
theatre*.[ch].

1 files changed, 9 insertions, 9 deletions

diff --git a/src/theatre_detect.c b/src/theatre_detect.c
index 7d299848..4836db88 100644
--- a/src/theatre_detect.c
+++ b/src/theatre_detect.c
@@ -39,29 +39,29 @@
 #include "config.h"
 #endif
 
+#include <string.h>
 #include "xf86.h"
 #include "generic_bus.h"
 #include "theatre.h"
 #include "theatre_reg.h"
 
-#undef read
-#undef write
-#undef ioctl
-
 static Bool theatre_read(TheatrePtr t,CARD32 reg, CARD32 *data)
 {
    if(t->theatre_num<0)return FALSE;
    return t->VIP->read(t->VIP, ((t->theatre_num & 0x3)<<14) | reg,4, (CARD8 *) data);
 }
 
+/* Unused code - reference */
+#if 0
 static Bool theatre_write(TheatrePtr t,CARD32 reg, CARD32 data)
 {
    if(t->theatre_num<0)return FALSE;
    return t->VIP->write(t->VIP,((t->theatre_num & 0x03)<<14) | reg,4, (CARD8 *) &data);
 }
+#define RT_regw(reg,data)	theatre_write(t,(reg),(data))
+#endif
 
 #define RT_regr(reg,data)	theatre_read(t,(reg),(data))
-#define RT_regw(reg,data)	theatre_write(t,(reg),(data))
 #define VIP_TYPE      "ATI VIP BUS"
 
 
@@ -89,7 +89,7 @@ TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b)
    {
 	if(b->read(b, ((i & 0x03)<<14) | VIP_VIP_VENDOR_DEVICE_ID, 4, (CARD8 *)&val))
         {
-	  if(val)xf86DrvMsg(b->scrnIndex, X_INFO, "Device %d on VIP bus ids as 0x%08x\n",i,val);
+	  if(val)xf86DrvMsg(b->scrnIndex, X_INFO, "Device %ld on VIP bus ids as 0x%08lx\n",i,val);
 	  if(t->theatre_num>=0)continue; /* already found one instance */
 	  switch(val){
 	  	case RT100_ATI_ID:
@@ -102,10 +102,10 @@ TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b)
 		   break;
                 }
 	} else {
-	  xf86DrvMsg(b->scrnIndex, X_INFO, "No response from device %d on VIP bus\n",i);	
+	  xf86DrvMsg(b->scrnIndex, X_INFO, "No response from device %ld on VIP bus\n",i);	
 	}
    }
-   if(t->theatre_num>=0)xf86DrvMsg(b->scrnIndex, X_INFO, "Detected Rage Theatre as device %d on VIP bus with id 0x%08x\n",t->theatre_num,t->theatre_id);
+   if(t->theatre_num>=0)xf86DrvMsg(b->scrnIndex, X_INFO, "Detected Rage Theatre as device %d on VIP bus with id 0x%08lx\n",t->theatre_num,t->theatre_id);
 
    if(t->theatre_num < 0)
    {
@@ -114,7 +114,7 @@ TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b)
    }
 
    RT_regr(VIP_VIP_REVISION_ID, &val);
-   xf86DrvMsg(b->scrnIndex, X_INFO, "Detected Rage Theatre revision %8.8X\n", val);
+   xf86DrvMsg(b->scrnIndex, X_INFO, "Detected Rage Theatre revision %8.8lX\n", val);
 
 #if 0
 DumpRageTheatreRegsByName(t);