[Linux-mips-commits]CVS: linux/drivers/video hpcsfb.c,NONE,1.1 Config.in,1.12,1.13 Makefile,1.11,1.12 fbmem.c,1.16,1.17 sfb.c,1.1,1.2

[Leblanc f. <fle...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv3157/drivers/video

Modified Files:
	Config.in Makefile fbmem.c sfb.c 
Added Files:
	hpcsfb.c 
Log Message:
Adds more VR stuff for Cassiopeia E15 Support.


--- NEW FILE: hpcsfb.c ---
/*
 *  linux/drivers/video/hpcsfb.c
 *
 *  simple framebuffer device w/ HPC device control
 *
 *  For now, this is a crude hack of SFB, which in turn was a crude hack of
 *  virtual frame buffer by Geert Uytterhoeven.  
 *
 *  modified part written by SATO Kazumi.
 *
 *  This file is subject to the terms and conditions of the GNU General Public
 *  License. See the file COPYING in the main directory of this archive for
 *  more details.
 */

#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/string.h>
[...1035 lines suppressed...]
	read:	hpcsfb_contrast_read,
	write:	hpcsfb_contrast_write,
};

static struct proc_dir_entry *proc_root_backlight;
static struct proc_dir_entry *proc_root_contrast;

static int __init hpcsfb_proc_init(void)
{
	proc_root_backlight = create_proc_entry("backlight", 
					S_IWUSR | S_IRUGO, &proc_root);
	proc_root_backlight->proc_fops = &backlight_fops;

	proc_root_contrast = create_proc_entry("contrast", 
					S_IWUSR | S_IRUGO, &proc_root);
	proc_root_contrast->proc_fops = &contrast_fops;
	
	return 0;
}
#endif /* CONFIG_PROC_FS */

Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Config.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Config.in	26 Feb 2002 19:03:29 -0000	1.12
+++ Config.in	7 Mar 2002 09:15:16 -0000	1.13
@@ -153,8 +153,9 @@
 	 fi
       fi
 
-      tristate '  ITE IT8181 framebuffer support' CONFIG_FB_IT8181
-      tristate '  Simple framebuffer support' CONFIG_FB_SIMPLE
+   		# Linux VR devices
+   		tristate '  Simple Frame Buffer support' CONFIG_FB_SIMPLE
+   		tristate '  Simple Frame Buffer with HPC device control (Experimental)' CONFIG_FB_HPCSFB
    fi
    if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then
       bool '  SBUS and UPA framebuffers' CONFIG_FB_SBUS

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	26 Feb 2002 19:03:30 -0000	1.11
+++ Makefile	7 Mar 2002 09:15:16 -0000	1.12
@@ -118,7 +118,9 @@
 obj-$(CONFIG_FB_IT8181)		  += it8181fb.o fbgen.o
 obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
 obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
+# For Linux VR
 obj-$(CONFIG_FB_SIMPLE)           += sfb.o
+obj-$(CONFIG_FB_HPCSFB)           += hpcsfb.o
 
 # Generic Low Level Drivers
 

Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbmem.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- fbmem.c	26 Feb 2002 19:03:31 -0000	1.16
+++ fbmem.c	7 Mar 2002 09:15:17 -0000	1.17
@@ -123,8 +123,6 @@
 extern int pmagbafb_init(void);
 extern int pmagbbfb_init(void);
 extern void maxinefb_init(void);
-extern int sfb_init(void);
-extern int sfb_setup(char*);
 extern int tx3912fb_init(void);
 extern int radeonfb_init(void);
 extern int radeonfb_setup(char*);
@@ -140,6 +138,11 @@
 extern int mq200fb_setup(char*);
 extern int sstfb_init(void);
 extern int sstfb_setup(char*);
+/* For Linux VR */
+extern int sfb_init(void);
+extern int sfb_setup(char*);
+extern int hpcsfb_init(void);
+extern int hpcsfb_setup(char*);
 
 static struct {
 	const char *name;
@@ -316,10 +319,17 @@
 #ifdef CONFIG_FB_MAXINE
 	{ "maxinefb", maxinefb_init, NULL },
 #endif
+	
+	/*
+	 * Linux VR drivers
+	 */
+
 #ifdef CONFIG_FB_SIMPLE
 	{ "sfb", sfb_init, sfb_setup },
 #endif
-
+#ifdef CONFIG_FB_HPCSFB
+	{ "hpcsfb", hpcsfb_init, hpcsfb_setup },
+#endif
 
 	/*
 	 * Generic drivers that don't use resource management (yet)

Index: sfb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/sfb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sfb.c	10 Dec 2001 20:27:17 -0000	1.1
+++ sfb.c	7 Mar 2002 09:15:17 -0000	1.2
@@ -27,7 +27,7 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/tty.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>