audiohda: fix syntax error

[plan9front.git] / sys / src / 9 / omap / screen.h

diff --git a/sys/src/9/omap/screen.h b/sys/src/9/omap/screen.h
index ba9b36bd33082daa8e68b86851cb0cdf8886ffe4..287e2ff8c435427efc5c20301f50c7e131b9fa84 100644 (file)
--- a/sys/src/9/omap/screen.h
+++ b/sys/src/9/omap/screen.h
@@ -1,53 +1,45 @@
 typedef struct Cursor Cursor;
-typedef struct Cursorinfo      Cursorinfo;
 typedef struct OScreen OScreen;
 typedef struct Omap3fb Omap3fb;
 typedef struct Settings Settings;
 
-struct Cursorinfo
-{
-       Cursor;
-       Lock;
-};
-
-extern Cursor  arrow;
-extern Cursorinfo cursor;
-
 /* devmouse.c */
-extern void mousetrack(int, int, int, int);
-extern Point mousexy(void);
+extern Cursor  cursor;
+extern void    mousetrack(int, int, int, ulong);
+extern void    absmousetrack(int, int, int, ulong);
+extern Point   mousexy(void);
 
 extern void    mouseaccelerate(int);
 extern void    mouseresize(void);
+extern void    mouseredraw(void);
 
 /* screen.c */
-extern uchar* attachscreen(Rectangle*, ulong*, int*, int*, int*);
+extern Memdata* attachscreen(Rectangle*, ulong*, int*, int*, int*);
 extern void    flushmemscreen(Rectangle);
-extern int     cursoron(int);
-extern void    cursoroff(int);
+extern void    cursoron(void);
+extern void    cursoroff(void);
 extern void    setcursor(Cursor*);
 extern int     screensize(int, int, int, ulong);
 extern int     screenaperture(int, int);
 extern Rectangle physgscreenr; /* actual monitor size */
 extern void    blankscreen(int);
 
-extern void swcursorinit(void);
-extern void swcursorhide(void);
-extern void swcursoravoid(Rectangle);
-extern void swcursorunhide(void);
-
 /* devdraw.c */
 extern void    deletescreenimage(void);
 extern void    resetscreenimage(void);
-extern int             drawhasclients(void);
-extern ulong   blanktime;
 extern void    setscreenimageclipr(Rectangle);
 extern void    drawflush(void);
-extern int drawidletime(void);
 extern QLock   drawlock;
 
 #define ishwimage(i)   0               /* for ../port/devdraw.c */
 
+/* swcursor.c */
+void           swcursorhide(int);
+void           swcursoravoid(Rectangle);
+void           swcursordraw(Point);
+void           swcursorload(Cursor *);
+void           swcursorinit(void);
+
 /* for communication between devdss.c and screen.c */
 
 enum {
@@ -92,7 +84,6 @@ struct Settings {
 };
 
 struct OScreen {
-       Lock;
        Cursor;
        Settings *settings;
        int     open;