Skip to contentSkip to conversation

2.6.1 fb.h patch for userland application

PATCH Dirk Behme 3 participants 3 messages Feb 9, 2004 Framebuffer layer

lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

Hello,

I had problems to use linux/fb.h from 2.6.1 to compile userland application microwindows. I made some changes to get microwindows 0.90 to compile, please see patch below.

The include files atomic.h and spinlock.h are necessary for spinlock_t and atomic_t. workqueue.h doesn't compile for userspace application and doesn't seem to be necessary at all (?). u8 is undefined while compiling for userspace, use __u8 instead.

Is this patch OK?

Dirk

include/linux/fb.h 2004-02-04 10:11:59.000000000 +0100 renamed from include/linux/fb.h_orig 2003-12-30 19:58:12.000000000 +0100 +2 -1
@@ -2,8 +2,9 @@
 #define _LINUX_FB_H
 
 #include <linux/tty.h>
-#include <linux/workqueue.h>
+#include <linux/spinlock.h>
 #include <asm/types.h>
+#include <asm/atomic.h>
 #include <asm/io.h>
 
 /* Definitions of frame buffers 
         */
@@ -339,8 +340,8 @@ struct fb_pixmap {
        __u32 scan_align;                 /* alignment per scanline 
    */
        __u32 flags;                      /* see FB_PIXMAP_* 
    */
                                          /* access methods 
    */
-       void (*outbuf)(u8 *dst, u8 *addr, unsigned int size);
-       u8   (*inbuf) (u8 *addr);
+       void (*outbuf)(__u8 *dst, __u8 *addr, __u32 size);
+       __u8 (*inbuf) (__u8 *addr);
        spinlock_t lock;                  /* spinlock 
    */
        atomic_t count;

};

-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn

#1 lore raw
Quoted 3 lines · Dirk Behme

I had problems to use linux/fb.h from 2.6.1 to compile userland application microwindows. I made some changes to get microwindows 0.90 to compile, please see patch below.

Should be fixed in 2.6.3-rc1.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn

#2 lore raw
In reply to Dirk Behme

Its already included in 2.6.3-rc1. Grab this kernel and give it a try.

Quoted 43 lines · Dirk Behme

Hello,

I had problems to use linux/fb.h from 2.6.1 to compile userland application microwindows. I made some changes to get microwindows 0.90 to compile, please see patch below.

The include files atomic.h and spinlock.h are necessary for spinlock_t and atomic_t. workqueue.h doesn't compile for userspace application and doesn't seem to be necessary at all (?). u8 is undefined while compiling for userspace, use __u8 instead.

Is this patch OK?

Dirk

include/linux/fb.h 2004-02-04 10:11:59.000000000 +0100 renamed from include/linux/fb.h_orig 2003-12-30 19:58:12.000000000 +0100 +2 -1
@@ -2,8 +2,9 @@
  #define _LINUX_FB_H
 
  #include <linux/tty.h>
-#include <linux/workqueue.h>
+#include <linux/spinlock.h>
  #include <asm/types.h>
+#include <asm/atomic.h>
  #include <asm/io.h>
 
  /* Definitions of frame buffers 
          */
include/linux/fb.h 2004-02-04 10:11:59.000000000 +0100 renamed from include/linux/fb.h_orig 2003-12-30 19:58:12.000000000 +0100 +2 -2
@@ -339,8 +340,8 @@ struct fb_pixmap {
         __u32 scan_align;                 /* alignment per scanline 
     */
         __u32 flags;                      /* see FB_PIXMAP_* 
     */
                                           /* access methods 
     */
-       void (*outbuf)(u8 *dst, u8 *addr, unsigned int size);
-       u8   (*inbuf) (u8 *addr);
+       void (*outbuf)(__u8 *dst, __u8 *addr, __u32 size);
+       __u8 (*inbuf) (__u8 *addr);
         spinlock_t lock;                  /* spinlock 
     */
         atomic_t count;
Quoted 2 lines

};

-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn