vserver 1.9.5.x5

[linux-2.6.git] / include / video / newport.h

diff --git a/include/video/newport.h b/include/video/newport.h
index f4d1fd7..812dac5 100644 (file)
--- a/include/video/newport.h
+++ b/include/video/newport.h
@@ -291,8 +291,6 @@ struct newport_regs {
        unsigned int _unused2[0x1ef];
        struct newport_cregs cgo;
 };
-extern struct newport_regs *npregs;
-
 
 typedef struct {
        unsigned int drawmode1;
@@ -450,38 +448,26 @@ static __inline__ void newport_cmap_setrgb(struct newport_regs *regs,
 
 /* Miscellaneous NEWPORT routines. */
 #define BUSY_TIMEOUT 100000
-static __inline__ int newport_wait(void)
+static __inline__ int newport_wait(struct newport_regs *regs)
 {
-       int i = 0;
+       int t = BUSY_TIMEOUT;
 
-       while(i < BUSY_TIMEOUT)
-               if(!(npregs->cset.status & NPORT_STAT_GBUSY))
+       while (t--)
+               if (!(regs->cset.status & NPORT_STAT_GBUSY))
                        break;
-       if(i == BUSY_TIMEOUT)
-               return 1;
-       return 0;
+       return !t;
 }
 
-static __inline__ int newport_bfwait(void)
+static __inline__ int newport_bfwait(struct newport_regs *regs)
 {
-       int i = 0;
+       int t = BUSY_TIMEOUT;
 
-       while(i < BUSY_TIMEOUT)
-               if(!(npregs->cset.status & NPORT_STAT_BBUSY))
+       while (t--)
+               if(!(regs->cset.status & NPORT_STAT_BBUSY))
                        break;
-       if(i == BUSY_TIMEOUT)
-               return 1;
-       return 0;
+       return !t;
 }
 
-/* newport.c and cons_newport.c routines */
-extern struct graphics_ops *newport_probe (int, const char **);
-
-void newport_save    (void *);
-void newport_restore (void *);
-void newport_reset   (void);
-int  newport_ioctl   (int card, int cmd, unsigned long arg);
-
 /*
  * DCBMODE register defines:
  */
@@ -564,7 +550,7 @@ xmap9FIFOWait (struct newport_regs *rex)
 {
         rex->set.dcbmode = DCB_XMAP0 | XM9_CRS_FIFO_AVAIL |
                DCB_DATAWIDTH_1 | R_DCB_XMAP9_PROTOCOL;
-        newport_bfwait ();
+        newport_bfwait (rex);
        
         while ((rex->set.dcbdata0.bybytes.b3 & 3) != XM9_FIFO_EMPTY)
                ;