Linux on the Nintendo GameCube and Wii

Update of /cvsroot/gc-linux/linux/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8046/include/linux

Modified Files:
	fb.h 
Log Message:
Do not ifdef FBIO* related gc-linux definitions.
Otherwise userspace needs to be aware of kernel CONFIG_* stuff.


Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- fb.h	24 Mar 2006 22:20:16 -0000	1.18
+++ fb.h	26 Mar 2006 21:22:53 -0000	1.19
@@ -36,16 +36,11 @@
 #define FBIOPUT_MODEINFO        0x4617
 #define FBIOGET_DISPINFO        0x4618
 
-#ifdef CONFIG_FB_GAMECUBE
 #define FBIOWAITRETRACE         0x4619
-#define FBIOFLIPHACK            0x4623
-#endif /* CONFIG_FB_GAMECUBE */
-
-#ifdef CONFIG_FB_GAMECUBE_GX
-#define FBIOWAITPEFINISH        0x4620
+#define FBIOWAITPEFINISH        0x4620 
 #define FBIOVIRTTOPHYS          0x4621
 #define FBIOFLIP                0x4622
-#endif /* CONFIG_FB_GAMECUBE_GX */
+#define FBIOFLIPHACK            0x4623 /* libsdl */
 
 #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
 #define FB_TYPE_PLANES			1	/* Non interleaved planes */

Update of /cvsroot/gc-linux/linux/drivers/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22880/drivers/video

Modified Files:
	Kconfig gcnfb.c gcngx.c gcngx.h 
Log Message:
Rewrote the framebuffer driver.
Made the GX stuff optional (also saves GX reserved mem if not compiled in).


Index: gcngx.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gcngx.h	24 Mar 2006 21:45:18 -0000	1.2
+++ gcngx.h	24 Mar 2006 22:20:15 -0000	1.3
@@ -1,12 +1,17 @@
 #ifndef __GCGX__
 #define __GCGX__
 
+#ifdef CONFIG_FB_GAMECUBE_GX
+
 int gcngx_mmap(struct fb_info *info, struct vm_area_struct *vma);
 int gcngx_ioctl(struct fb_info *info, unsigned int cmd,unsigned long arg);
 
 int gcngx_init(struct fb_info *info);
 void gcngx_exit(struct fb_info *info);
 
-void gcngx_vtrace(void);
+struct vi_ctl;
+void gcngx_vtrace(struct vi_ctl *ctl);
+
+#endif
 
 #endif

Index: gcnfb.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gcnfb.c	24 Mar 2006 21:45:18 -0000	1.13
+++ gcnfb.c	24 Mar 2006 22:20:15 -0000	1.14
@@ -2,9 +2,10 @@
  * drivers/video/gcnfb.c
  *
  * Nintendo GameCube "Flipper" chipset frame buffer driver
- * Copyright (C) 2004-2005 The GameCube Linux Team
+ * Copyright (C) 2004-2006 The GameCube Linux Team
  * Copyright (C) 2004 Michael Steil <mist@...>
  * Copyright (C) 2004,2005 Todd Jeffreys <todd@...>
+ * Copyright (C) 2006 Albert Herranz
  *
  * Based on vesafb (c) 1998 Gerd Knorr <kraxel@...>
  *
[...1316 lines suppressed...]
+	}
+	return ret;
+}
+
+/*
+ *
+ */
+static void __exit gcnfb_exit_module(void)
+{
+	platform_device_unregister(&gcnfb_device);
+	platform_driver_unregister(&gcnfb_driver);
+}
+
+module_init(gcnfb_init_module);
+module_exit(gcnfb_exit_module);
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_AUTHOR(DRV_AUTHOR);
+MODULE_LICENSE("GPL");
+

Index: gcngx.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gcngx.c	24 Mar 2006 21:45:18 -0000	1.8
+++ gcngx.c	24 Mar 2006 22:20:15 -0000	1.9
@@ -14,6 +14,9 @@
  * of the License, or (at your option) any later version.
  *
  */
+
+#ifdef CONFIG_FB_GAMECUBE_GX
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -36,8 +39,9 @@
 static void gcngx_free_munmap(struct vm_area_struct *vma);
 static void gcngx_destroy_fifo(void);
 static void gcngx_init_fifo(void);
+
+extern void vi_set_framebuffer(struct vi_ctl *ctl, u32 addr);
 extern int gcnfb_restorefb(struct fb_info *info);
-extern void gcnfb_set_framebuffer(u32 addr);
 
 extern struct fb_ops gcnfb_ops;
 
@@ -155,7 +159,7 @@
 	return IRQ_NONE;
 }
 
-void gcngx_vtrace(void)
+void gcngx_vtrace(struct vi_ctl *ctl)
 {
 	struct siginfo sig;
 	/* ok flip the image if we have a flip request.
@@ -168,7 +172,7 @@
 		currentFB = currentFB ? 0 : 1;
 		sig.si_errno  = xfb[currentFB];
 		/* inform the hardware */
-		gcnfb_set_framebuffer(xfb[currentFB]);
+		vi_set_framebuffer(ctl, xfb[currentFB]);
 		/* notify the process */
 		sig.si_signo = SIG_VTRACE_COMPLETE;
 		sig.si_code  = 0;
@@ -213,13 +217,61 @@
 	return IRQ_HANDLED;
 }
 
+/**
+ *
+ */
+static u32 gcngx_uvirt_to_phys(u32 virt)
+{
+	pgd_t *dir;
+	pmd_t *pmd;
+	pte_t *pte;
+	u32 ret = 0;
+	struct mm_struct *mm = get_task_mm(current);
+	u32 offset = virt & (PAGE_SIZE - 1);
+	virt &= PAGE_MASK;
+
+	if (!mm) {
+		return 0;
+	}
+	down_read(&mm->mmap_sem);
+	/* convert to kernel address */
+	if ((dir = pgd_offset(mm, virt)) && pgd_present(*dir)) {
+		if ((pmd = pmd_offset(dir, virt)) && pmd_present(*pmd)) {
+			pte = pte_offset_kernel(pmd, virt);
+			if (pte && pte_present(*pte)) {
+				ret =
+				    (u32) page_address(pte_page(*pte)) + offset;
+				/* ok now we have the kern addr, map to phys */
+				ret = virt_to_phys((void *)ret);
+			}
+		}
+	}
+
+	up_read(&mm->mmap_sem);
+	mmput(mm);
+	return ret;
+}
+
 int gcngx_ioctl(struct fb_info *info,
-                unsigned int cmd, unsigned long arg)
+		unsigned int cmd, unsigned long arg)
 {
+	u32 phys;
+	void __user *argp;
+
 	if (cmd == FBIOFLIP)
 	{
 		flipRequest = 1;
 		return 0;
+	} else if (cmd == FBIOVIRTTOPHYS) {
+		argp = (void __user *)arg;
+		if (copy_from_user(&phys, argp, sizeof(void *)))
+			return -EFAULT;
+
+		phys = gcngx_uvirt_to_phys(phys);
+
+		if (copy_to_user(argp, &phys, sizeof(void *)))
+			return -EFAULT;
+		return 0;
 	}
 	return -EINVAL;
 }
@@ -289,10 +341,11 @@
 {
 	struct file *file = vma->vm_file;
 	int ret;
-	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
+//	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
 	u32 phys;
 	u32 len;
 
+
 	len = vma->vm_end - vma->vm_start;
 	
 	if (vma->vm_pgoff == (VIDEO_MMAP_BASE >> PAGE_SHIFT) &&
@@ -349,13 +402,13 @@
 		 * This seems to be broken.
 		 * fb_mmap might sleep and we're getting a lock here.
 		 */
-		spin_lock(&lock);
+//		spin_lock(&lock);
 		/* reset our mmap since the fb driver will call it */
 		gcnfb_ops.fb_mmap = NULL;
 		ret = file->f_op->mmap(file,vma);
 		/* reset our mmap */
 		gcnfb_ops.fb_mmap = gcngx_mmap;
-		spin_unlock(&lock);
+//		spin_unlock(&lock);
 		return ret;
 	}
 	return -EINVAL;
@@ -624,3 +677,6 @@
 	iounmap(mmap_fifo_base);
 	release_mem_region((u32)phys_fifo_base,fifo_len);
 }
+
+#endif /* CONFIG_FB_GAMECUBE_GX */
+

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Kconfig	24 Mar 2006 21:45:18 -0000	1.17
+++ Kconfig	24 Mar 2006 22:20:15 -0000	1.18
@@ -1209,6 +1209,12 @@
 	help
 	  This is the frame buffer device driver for the Nintendo GameCube.
 
+config FB_GAMECUBE_GX
+	bool "Nintendo GameCube hardware accelerated graphics support"
+	depends on FB_GAMECUBE
+	help
+	  Say Y here to support the 3D hardware found in the Nintendo GameCube.
+
 config FB_AU1100
 	bool "Au1100 LCD Driver"
 	depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y

Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22880/arch/ppc/platforms

Modified Files:
	gamecube.h 
Log Message:
Rewrote the framebuffer driver.
Made the GX stuff optional (also saves GX reserved mem if not compiled in).


Index: gamecube.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gamecube.h	6 Jan 2005 19:57:53 -0000	1.12
+++ gamecube.h	24 Mar 2006 22:20:15 -0000	1.13
@@ -84,9 +84,13 @@
  */
 #ifdef CONFIG_FB_GAMECUBE
   #define GCN_XFB_SIZE		(2*640*GCN_VIDEO_LINES*2) /* framebuffer */
-  #define GCN_GX_FIFO_SIZE	(256*1024)
 #else
   #define GCN_XFB_SIZE		(0)
+#endif
+
+#ifdef CONFIG_FB_GAMECUBE_GX
+  #define GCN_GX_FIFO_SIZE	(256*1024)
+#else
   #define GCN_GX_FIFO_SIZE	(0)
 #endif

Update of /cvsroot/gc-linux/linux/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22880/include/linux

Modified Files:
	fb.h 
Log Message:
Rewrote the framebuffer driver.
Made the GX stuff optional (also saves GX reserved mem if not compiled in).


Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- fb.h	24 Mar 2006 21:45:19 -0000	1.17
+++ fb.h	24 Mar 2006 22:20:16 -0000	1.18
@@ -35,10 +35,17 @@
 #define FBIOGET_HWCINFO         0x4616
 #define FBIOPUT_MODEINFO        0x4617
 #define FBIOGET_DISPINFO        0x4618
+
+#ifdef CONFIG_FB_GAMECUBE
 #define FBIOWAITRETRACE         0x4619
+#define FBIOFLIPHACK            0x4623
+#endif /* CONFIG_FB_GAMECUBE */
+
+#ifdef CONFIG_FB_GAMECUBE_GX
 #define FBIOWAITPEFINISH        0x4620
 #define FBIOVIRTTOPHYS          0x4621
 #define FBIOFLIP                0x4622
+#endif /* CONFIG_FB_GAMECUBE_GX */
 
 #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
 #define FB_TYPE_PLANES			1	/* Non interleaved planes */

Update of /cvsroot/gc-linux/linux/drivers/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20503/drivers/net

Modified Files:
	gcn-bba.c 
Log Message:
Make some symbols static.
Get interrupt status after the exi glue masking.
Mark some functions __dev{init,exit}.


Index: gcn-bba.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/gcn-bba.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gcn-bba.c	7 Nov 2005 21:36:42 -0000	1.9
+++ gcn-bba.c	24 Mar 2006 22:15:34 -0000	1.10
@@ -45,7 +45,7 @@
 #define DRV_AUTHOR	"Albert Herranz, " \
 			"Todd Jeffreys"
 
-char bba_driver_version[] = "1.4-isobel";
+static char bba_driver_version[] = "1.4-isobel";
 
 
 #define bba_printk(level, format, arg...) \
@@ -935,7 +935,8 @@
 /*
  * Calculates a response for a given challenge.
  */
-unsigned long bba_calc_response(unsigned long val, struct bba_private *priv)
+static unsigned long bba_calc_response(unsigned long val,
+				       struct bba_private *priv)
 {
 	u8 revid_0, revid_eth_0, revid_eth_1;
 	revid_0 = priv->revid;
@@ -971,12 +972,12 @@
 	struct bba_private *priv = (struct bba_private *)dev->priv;
 	register u8 status, mask;
 
-	/* get interrupt status from EXI glue */
-	status = bba_cmd_in8(0x03);
-
 	/* XXX mask all EXI glue interrupts */
 	bba_cmd_out8(0x02, BBA_CMD_IR_MASKALL);
 
+	/* get interrupt status from EXI glue */
+	status = bba_cmd_in8(0x03);
+
 	/* start with the usual case */
 	mask = (1<<7);
 
@@ -1142,7 +1143,7 @@
 /*
  * Removes a BroadBand Adapter device from the system.
  */
-static void bba_remove(struct exi_device *exi_device)
+static void __devexit bba_remove(struct exi_device *exi_device)
 {
 	struct net_device *dev = (struct net_device *)
 				 exi_get_drvdata(exi_device);
@@ -1165,7 +1166,7 @@
  * Probes for a BroadBand Adapter device.
  * Actually, the exi layer has already probed for us.
  */
-static int bba_probe(struct exi_device *exi_device)
+static int __devinit bba_probe(struct exi_device *exi_device)
 {
 	int ret = -ENODEV;

Update of /cvsroot/gc-linux/linux/drivers/input/si
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20099/drivers/input/si

Modified Files:
	gcn-si.c 
Log Message:
Make some symbols static.


Index: gcn-si.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/input/si/gcn-si.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gcn-si.c	18 Jan 2006 23:41:53 -0000	1.3
+++ gcn-si.c	24 Mar 2006 22:12:52 -0000	1.4
@@ -117,7 +117,7 @@
 	char name[32];
 };
 
-struct si_device port[SI_MAX_PORTS];
+static struct si_device port[SI_MAX_PORTS];
 
 
 #ifdef HACK_FORCE_KEYBOARD_PORT

Update of /cvsroot/gc-linux/linux/arch/ppc/boot/simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/arch/ppc/boot/simple

Modified Files:
	Makefile 
Log Message:
2.6.16 merged.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/simple/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	18 Jan 2006 23:41:52 -0000	1.15
+++ Makefile	24 Mar 2006 21:45:18 -0000	1.16
@@ -194,6 +194,8 @@
 boot-$(CONFIG_8xx)		+= embed_config.o
 boot-$(CONFIG_8260)		+= embed_config.o
 boot-$(CONFIG_GAMECUBE)		+= embed_config.o
+boot-$(CONFIG_EP405)		+= embed_config.o
+boot-$(CONFIG_XILINX_ML300)	+= embed_config.o
 boot-$(CONFIG_BSEIP)		+= iic.o
 boot-$(CONFIG_MBX)		+= iic.o pci.o qspan_pci.o
 boot-$(CONFIG_MV64X60)		+= misc-mv64x60.o

Update of /cvsroot/gc-linux/linux/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/include/linux

Modified Files:
	fb.h 
Log Message:
2.6.16 merged.


Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- fb.h	18 Jan 2006 23:41:54 -0000	1.16
+++ fb.h	24 Mar 2006 21:45:19 -0000	1.17
@@ -611,15 +611,15 @@
 	int (*fb_sync)(struct fb_info *info);
 
 	/* perform fb specific ioctl (optional) */
-	int (*fb_ioctl)(struct inode *inode, struct file *file, unsigned int cmd,
-			unsigned long arg, struct fb_info *info);
+	int (*fb_ioctl)(struct fb_info *info, unsigned int cmd,
+			unsigned long arg);
 
 	/* Handle 32bit compat ioctl (optional) */
-	long (*fb_compat_ioctl)(struct file *f, unsigned cmd, unsigned long arg,
-			       struct fb_info *info);
+	int (*fb_compat_ioctl)(struct fb_info *info, unsigned cmd,
+			unsigned long arg);
 
 	/* perform fb specific mmap */
-	int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma);
+	int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma);
 
 	/* save current hardware state */
 	void (*fb_save_state)(struct fb_info *info);

Update of /cvsroot/gc-linux/linux/drivers/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/drivers/video

Modified Files:
	Kconfig gcnfb.c gcngx.c gcngx.h 
Log Message:
2.6.16 merged.


Index: gcngx.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gcngx.h	22 Oct 2004 20:51:16 -0000	1.1
+++ gcngx.h	24 Mar 2006 21:45:18 -0000	1.2
@@ -1,12 +1,8 @@
 #ifndef __GCGX__
 #define __GCGX__
 
-int gcngx_mmap(struct fb_info *info,struct file *file,
-		    struct vm_area_struct *vma);
-
-int gcngx_ioctl(struct inode *inode,struct file *file,
-			    unsigned int cmd,unsigned long arg,
-			    struct fb_info *info);
+int gcngx_mmap(struct fb_info *info, struct vm_area_struct *vma);
+int gcngx_ioctl(struct fb_info *info, unsigned int cmd,unsigned long arg);
 
 int gcngx_init(struct fb_info *info);
 void gcngx_exit(struct fb_info *info);

Index: gcnfb.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gcnfb.c	13 Feb 2006 16:03:07 -0000	1.12
+++ gcnfb.c	24 Mar 2006 21:45:18 -0000	1.13
@@ -378,9 +378,8 @@
 /**
  *
  */
-static int gcnfb_ioctl(struct inode *inode, struct file *file,
-		       unsigned int cmd, unsigned long arg,
-		       struct fb_info *info)
+static int gcnfb_ioctl(struct fb_info *info,
+		       unsigned int cmd, unsigned long arg)
 {
 	u32 phys;
 	void __user *argp;
@@ -400,7 +399,7 @@
 		return 0;
 	}
 	/* see if the GX module will handle it */
-	return gcngx_ioctl(inode, file, cmd, arg, info);
+	return gcngx_ioctl(info, cmd, arg);
 }
 
 /**

Index: gcngx.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcngx.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gcngx.c	18 Jan 2006 23:41:53 -0000	1.7
+++ gcngx.c	24 Mar 2006 21:45:18 -0000	1.8
@@ -213,9 +213,8 @@
 	return IRQ_HANDLED;
 }
 
-int gcngx_ioctl(struct inode *inode,struct file *file,
-		unsigned int cmd,unsigned long arg,
-		struct fb_info *info)
+int gcngx_ioctl(struct fb_info *info,
+                unsigned int cmd, unsigned long arg)
 {
 	if (cmd == FBIOFLIP)
 	{
@@ -286,9 +285,9 @@
 #endif
 }
 
-int gcngx_mmap(struct fb_info *info,struct file *file,
-	       struct vm_area_struct *vma)
+int gcngx_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
+	struct file *file = vma->vm_file;
 	int ret;
 	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
 	u32 phys;

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Kconfig	18 Jan 2006 23:41:53 -0000	1.16
+++ Kconfig	24 Mar 2006 21:45:18 -0000	1.17
@@ -520,16 +520,11 @@
 config FB_GBE_MEM
 	int "Video memory size in MB"
 	depends on FB_GBE
-	default 8
+	default 4
 	help
 	  This is the amount of memory reserved for the framebuffer,
 	  which can be any value between 1MB and 8MB.
 
-config BUS_I2C
-	bool
-	depends on (FB = y) && VISWS
-	default y
-
 config FB_SUN3
 	bool "Sun3 framebuffer support"
 	depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
@@ -993,12 +988,6 @@
 	  Say Y if you have a laptop with an ATI Rage LT PRO, Rage Mobility,
 	  Rage XC, or Rage XL chipset.
 
-config FB_ATY_XL_INIT
-	bool "Rage XL No-BIOS Init support"
-	depends on FB_ATY_CT
-	help
-	  Say Y here to support booting a Rage XL without BIOS support.
-
 config FB_ATY_GX
 	bool "Mach64 GX support" if PCI
 	depends on FB_ATY
@@ -1151,7 +1140,7 @@
 
 config FB_CYBLA
 	tristate "Cyberblade/i1 support"
-	depends on FB && PCI
+	depends on FB && PCI && X86_32 && !64BIT
 	select FB_CFB_IMAGEBLIT
 	select VIDEO_SELECT
 	---help---
@@ -1385,7 +1374,7 @@
 
 	  This driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called vfb. If you want to compile it as a module,
+	  module will be called pxafb. If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>.
 
 	  If unsure, say N.
@@ -1418,7 +1407,7 @@
 
 	  This driver is also available as a module ( = code which can be
 	  inserted and removed from the running kernel whenever you want). The
-	  module will be called vfb. If you want to compile it as a module,
+	  module will be called w100fb. If you want to compile it as a module,
 	  say M here and read <file:Documentation/modules.txt>.
 
 	  If unsure, say N.

Update of /cvsroot/gc-linux/linux/arch/ppc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/arch/ppc

Modified Files:
	Kconfig 
Log Message:
2.6.16 merged.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Kconfig	18 Jan 2006 23:41:51 -0000	1.34
+++ Kconfig	24 Mar 2006 21:45:18 -0000	1.35
@@ -8,9 +8,6 @@
 	bool
 	default y
 
-config UID16
-	bool
-
 config GENERIC_HARDIRQS
 	bool
 	default y
@@ -61,11 +58,11 @@
 	help
 	  There are four types of PowerPC chips supported.  The more common
 	  types (601, 603, 604, 740, 750, 7400), the Motorola embedded
-	  versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the IBM embedded
-	  versions (403 and 405) and the high end 64 bit Power processors
-	  (POWER 3, POWER4, and IBM 970 also known as G5)
+	  versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the IBM
+	  embedded versions (403 and 405) and the POWER3 processor.
+	  (For support for more recent 64-bit processors, set ARCH=powerpc.)
 	  Unless you are building a kernel for one of the embedded processor
-	  systems, 64 bit IBM RS/6000 or an Apple G5, choose 6xx.
+	  systems or a POWER3-based IBM RS/6000, choose 6xx.
 	  Note that the kernel runs in 32-bit mode even on 64-bit chips.
 	  Also note that because the 52xx, 82xx, & 83xx family has a 603e core,
 	  specific support for that chipset is asked later on.
@@ -80,10 +77,6 @@
 	select PPC_FPU
 	bool "POWER3"
 
-config POWER4
-	select PPC_FPU
-	bool "POWER4 and 970 (G5)"
-
 config 8xx
 	bool "8xx"
 
@@ -126,7 +119,7 @@
 
 config ALTIVEC
 	bool "AltiVec Support"
-	depends on 6xx || POWER4
+	depends on 6xx
 	depends on !8260 && !83xx
 	---help---
 	  This option enables kernel support for the Altivec extensions to the
@@ -238,18 +231,9 @@
 
 source "drivers/cpufreq/Kconfig"
 
-config CPU_FREQ_PMAC
-	bool "Support for Apple PowerBooks"
-	depends on CPU_FREQ && ADB_PMU
-	select CPU_FREQ_TABLE
-	help
-	  This adds support for frequency switching on Apple PowerBooks,
-	  this currently includes some models of iBook & Titanium
-	  PowerBook.
-
 config PPC601_SYNC_FIX
 	bool "Workarounds for PPC601 bugs"
-	depends on 6xx && (PPC_PREP || PPC_PMAC)
+	depends on 6xx && PPC_PREP
 	help
 	  Some versions of the PPC601 (the first PowerPC chip) have bugs which
 	  mean that extra synchronization instructions are required near
@@ -261,26 +245,17 @@
 
 	  If in doubt, say Y here.
 
-config HOTPLUG_CPU
-	bool "Support for enabling/disabling CPUs"
-	depends on SMP && HOTPLUG && EXPERIMENTAL && PPC_PMAC
-	---help---
-	  Say Y here to be able to disable and re-enable individual
-	  CPUs at runtime on SMP machines.
-
-	  Say N if you are unsure.
-
 source arch/ppc/platforms/4xx/Kconfig
 source arch/ppc/platforms/85xx/Kconfig
 
 config PPC64BRIDGE
 	bool
-	depends on POWER3 || POWER4
+	depends on POWER3
 	default y
 
 config PPC_STD_MMU
 	bool
-	depends on 6xx || POWER3 || POWER4
+	depends on 6xx || POWER3
 	default y
 
 # Although 750CXe (Gekko) seems to be cache coherent capable, the GAMECUBE
@@ -512,7 +487,7 @@
 
 choice
 	prompt "Machine Type"
-	depends on 6xx || POWER3 || POWER4
+	depends on 6xx || POWER3
 	default PPC_MULTIPLATFORM
 	---help---
 	  Linux currently supports several different kinds of PowerPC-based
@@ -523,11 +498,15 @@
 	  Platform) machines (including all of the recent IBM RS/6000 and
 	  pSeries machines), and several embedded PowerPC systems containing
 	  4xx, 6xx, 7xx, 8xx, 74xx, and 82xx processors.  Currently, the
-	  default option is to build a kernel which works on the first three.
+	  default option is to build a kernel which works on PReP and CHRP.
 
-	  Select CHRP/PowerMac/PReP if configuring for an IBM RS/6000 or
-	  pSeries machine, a Power Macintosh (including iMacs, iBooks and
-	  Powerbooks), or a PReP machine.
+	  Note that support for Apple machines is now only available with
+	  ARCH=powerpc, and has been removed from this menu.  If you wish
+	  to build a kernel for an Apple machine, exit this configuration
+	  process and re-run it with ARCH=powerpc.
+
+	  Select CHRP/PReP if configuring for an IBM RS/6000 or
+	  pSeries machine, or a PReP machine.
 
 	  Select Gemini if configuring for a Synergy Microsystems' Gemini
 	  series Single Board Computer.  More information is available at:
@@ -537,7 +516,7 @@
 	  available at: <http://linux-apus.sourceforge.net/>.
 
 config PPC_MULTIPLATFORM
-	bool "CHRP/PowerMac/PReP"
+	bool "CHRP/PReP"
 
 config APUS
 	bool "Amiga-APUS"
@@ -776,6 +755,10 @@
 	bool
 	default y if MPC834x_SYS
 
+config PPC_83xx
+	bool
+	default y if 83xx
+
 config CPM1
 	bool
 	depends on 8xx
@@ -797,25 +780,14 @@
 	  on it (826x, 827x, 8560).
 
 config PPC_CHRP
-	bool
+	bool "Support for CHRP (Common Hardware Reference Platform) machines"
 	depends on PPC_MULTIPLATFORM
 	select PPC_I8259
 	select PPC_INDIRECT_PCI
 	default y
 
-config PPC_PMAC
-	bool
-	depends on PPC_MULTIPLATFORM
-	select PPC_INDIRECT_PCI
-	default y
-
-config PPC_PMAC64
-	bool
-	depends on PPC_PMAC && POWER4
-	default y
-
 config PPC_PREP
-	bool
+	bool "Support for PReP (PowerPC Reference Platform) machines"
 	depends on PPC_MULTIPLATFORM
 	select PPC_I8259
 	select PPC_INDIRECT_PCI
@@ -823,7 +795,7 @@
 
 config PPC_OF
 	bool
-	depends on PPC_PMAC || PPC_CHRP
+	depends on PPC_CHRP
 	default y
 
 config PPC_GEN550
@@ -1195,7 +1167,7 @@
 
 config GENERIC_ISA_DMA
 	bool
-	depends on POWER3 || POWER4 || 6xx && !CPM2
+	depends on POWER3 || 6xx && !CPM2
 	default y
 
 config PPC_I8259

Update of /cvsroot/gc-linux/linux/arch/ppc/boot/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/arch/ppc/boot/common

Modified Files:
	util.S 
Log Message:
2.6.16 merged.


Index: util.S
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/boot/common/util.S,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- util.S	31 Oct 2005 00:31:01 -0000	1.8
+++ util.S	24 Mar 2006 21:45:18 -0000	1.9
@@ -261,7 +261,8 @@
  * First, flush the data cache in case it was enabled and may be
  * holding instructions for copy back.
  */
-_GLOBAL(flush_instruction_cache)
+        .globl flush_instruction_cache
+flush_instruction_cache:        
 	mflr	r6
 	bl	flush_data_cache
 
@@ -306,7 +307,8 @@
  * Flush data cache
  * Do this by just reading lots of stuff into the cache.
  */
-_GLOBAL(flush_data_cache)
+        .globl flush_data_cache
+flush_data_cache:       
 	lis	r3,cache_flush_buffer@...
 	ori	r3,r3,cache_flush_buffer@...
 	li	r4,NUM_CACHE_LINES

Update of /cvsroot/gc-linux/linux/include/asm-ppc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/include/asm-ppc

Modified Files:
	io.h 
Log Message:
2.6.16 merged.


Index: io.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/io.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- io.h	18 Jan 2006 23:41:53 -0000	1.12
+++ io.h	24 Mar 2006 21:45:19 -0000	1.13
@@ -27,6 +27,8 @@
 
 #if defined(CONFIG_4xx)
 #include <asm/ibm4xx.h>
+#elif defined(CONFIG_PPC_MPC52xx)
+#include <asm/mpc52xx.h>
 #elif defined(CONFIG_8xx)
 #include <asm/mpc8xx.h>
 #elif defined(CONFIG_8260)

Update of /cvsroot/gc-linux/linux/arch/ppc/configs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/arch/ppc/configs

Modified Files:
	gamecube_defconfig 
Log Message:
2.6.16 merged.


Index: gamecube_defconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gamecube_defconfig	18 Jan 2006 23:41:52 -0000	1.37
+++ gamecube_defconfig	24 Mar 2006 21:45:18 -0000	1.38
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15
-# Wed Jan 18 23:25:21 2006
+# Linux kernel version: 2.6.16
+# Fri Mar 24 21:27:52 2006
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -17,7 +17,6 @@
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 
@@ -32,16 +31,16 @@
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
-# CONFIG_HOTPLUG is not set
-CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
+CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -50,8 +49,10 @@
 CONFIG_CC_ALIGN_LABELS=0
 CONFIG_CC_ALIGN_LOOPS=0
 CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -89,7 +90,6 @@
 # CONFIG_40x is not set
 # CONFIG_44x is not set
 # CONFIG_POWER3 is not set
-# CONFIG_POWER4 is not set
 # CONFIG_8xx is not set
 # CONFIG_E200 is not set
 # CONFIG_E500 is not set
@@ -206,6 +206,7 @@
 #
 # Networking options
 #
+# CONFIG_NETDEBUG is not set
 # CONFIG_PACKET is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
@@ -241,6 +242,11 @@
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set
@@ -501,6 +507,12 @@
 # CONFIG_I2C is not set
 
 #
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
@@ -510,6 +522,7 @@
 #
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_F71805F is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -584,6 +597,8 @@
 CONFIG_SND_OSSEMUL=y
 # CONFIG_SND_MIXER_OSS is not set
 CONFIG_SND_PCM_OSS=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 
@@ -634,7 +649,7 @@
 #
 
 #
-# SN Devices
+# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
 #
 
 #
@@ -644,11 +659,11 @@
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
 # CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
@@ -663,6 +678,7 @@
 #
 # CONFIG_ISO9660_FS is not set
 # CONFIG_UDF_FS is not set
+# CONFIG_GCDVD_FS is not set
 
 #
 # DOS/FAT/NT Filesystems
@@ -684,6 +700,7 @@
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
 # CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -777,6 +794,7 @@
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+# CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=14

Update of /cvsroot/gc-linux/linux/drivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/drivers

Modified Files:
	Makefile 
Log Message:
2.6.16 merged.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile	13 Feb 2006 16:05:58 -0000	1.14
+++ Makefile	24 Mar 2006 21:45:18 -0000	1.15
@@ -13,6 +13,7 @@
 # PnP must come after ACPI since it will eventually need to check if acpi
 # was used and do nothing if so
 obj-$(CONFIG_PNP)		+= pnp/
+obj-$(CONFIG_ARM_AMBA)		+= amba/
 
 # char/ comes before serial/ etc so that the VT console is the boot-time
 # default.
@@ -40,6 +41,7 @@
 obj-$(CONFIG_IEEE1394)		+= ieee1394/
 obj-y				+= cdrom/
 obj-$(CONFIG_MTD)		+= mtd/
+obj-$(CONFIG_SPI)		+= spi/
 obj-$(CONFIG_PCCARD)		+= pcmcia/
 obj-$(CONFIG_DIO)		+= dio/
 obj-$(CONFIG_SBUS)		+= sbus/
@@ -61,12 +63,13 @@
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BT)		+= bluetooth/
 obj-$(CONFIG_ISDN)		+= isdn/
+obj-$(CONFIG_EDAC)		+= edac/
 obj-$(CONFIG_MCA)		+= mca/
 obj-$(CONFIG_EISA)		+= eisa/
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_MMC)		+= mmc/
 obj-$(CONFIG_INFINIBAND)	+= infiniband/
-obj-$(CONFIG_SGI_IOC4)		+= sn/
+obj-$(CONFIG_SGI_SN)		+= sn/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/

Update of /cvsroot/gc-linux/linux/drivers/video/logo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/drivers/video/logo

Modified Files:
	Makefile 
Log Message:
2.6.16 merged.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/logo/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	29 Aug 2005 19:50:20 -0000	1.3
+++ Makefile	24 Mar 2006 21:45:18 -0000	1.4
@@ -17,7 +17,7 @@
 
 # How to generate logo's
 
-# Use logo-cfiles to retreive list of .c files to be built
+# Use logo-cfiles to retrieve list of .c files to be built
 logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \
               $(wildcard $(srctree)/$(src)/*$(1).$(2))))

Update of /cvsroot/gc-linux/linux/fs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/fs

Modified Files:
	Kconfig Makefile 
Log Message:
2.6.16 merged.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	6 Mar 2006 00:32:42 -0000	1.1
+++ Makefile	24 Mar 2006 21:45:18 -0000	1.2
@@ -10,11 +10,11 @@
 		ioctl.o readdir.o select.o fifo.o locks.o dcache.o inode.o \
 		attr.o bad_inode.o file.o filesystems.o namespace.o aio.o \
 		seq_file.o xattr.o libfs.o fs-writeback.o mpage.o direct-io.o \
-		ioprio.o pnode.o
+		ioprio.o pnode.o drop_caches.o
 
 obj-$(CONFIG_INOTIFY)		+= inotify.o
 obj-$(CONFIG_EPOLL)		+= eventpoll.o
-obj-$(CONFIG_COMPAT)		+= compat.o
+obj-$(CONFIG_COMPAT)		+= compat.o compat_ioctl.o
 
 nfsd-$(CONFIG_NFSD)		:= nfsctl.o
 obj-y				+= $(nfsd-y) $(nfsd-m)
@@ -102,3 +102,5 @@
 obj-$(CONFIG_HOSTFS)		+= hostfs/
 obj-$(CONFIG_HPPFS)		+= hppfs/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
+obj-$(CONFIG_CONFIGFS_FS)	+= configfs/
+obj-$(CONFIG_OCFS2_FS)		+= ocfs2/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Kconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kconfig	6 Mar 2006 00:32:42 -0000	1.1
+++ Kconfig	24 Mar 2006 21:45:18 -0000	1.2
@@ -70,6 +70,7 @@
 
 config EXT3_FS
 	tristate "Ext3 journalling file system support"
+	select JBD
 	help
 	  This is the journaling version of the Second extended file system
 	  (often called ext3), the de facto standard Linux file system
@@ -138,23 +139,20 @@
 	  extended attributes for file security labels, say N.
 
 config JBD
-# CONFIG_JBD could be its own option (even modular), but until there are
-# other users than ext3, we will simply make it be the same as CONFIG_EXT3_FS
-# dep_tristate '  Journal Block Device support (JBD for ext3)' CONFIG_JBD $CONFIG_EXT3_FS
 	tristate
-	default EXT3_FS
 	help
 	  This is a generic journaling layer for block devices.  It is
-	  currently used by the ext3 file system, but it could also be used to
-	  add journal support to other file systems or block devices such as
-	  RAID or LVM.
+	  currently used by the ext3 and OCFS2 file systems, but it could
+	  also be used to add journal support to other file systems or block
+	  devices such as RAID or LVM.
 
-	  If you are using the ext3 file system, you need to say Y here. If
-	  you are not using ext3 then you will probably want to say N.
+	  If you are using the ext3 or OCFS2 file systems, you need to
+	  say Y here. If you are not using ext3 OCFS2 then you will probably
+	  want to say N.
 
 	  To compile this device as a module, choose M here: the module will be
-	  called jbd.  If you are compiling ext3 into the kernel, you cannot
-	  compile this code as a module.
+	  called jbd.  If you are compiling ext3 or OCFS2 into the kernel,
+	  you cannot compile this code as a module.
 
 config JBD_DEBUG
 	bool "JBD (ext3) debugging support"
@@ -326,6 +324,38 @@
 
 source "fs/xfs/Kconfig"
 
+config OCFS2_FS
+	tristate "OCFS2 file system support (EXPERIMENTAL)"
+	depends on NET && EXPERIMENTAL
+	select CONFIGFS_FS
+	select JBD
+	select CRC32
+	select INET
+	help
+	  OCFS2 is a general purpose extent based shared disk cluster file
+	  system with many similarities to ext3. It supports 64 bit inode
+	  numbers, and has automatically extending metadata groups which may
+	  also make it attractive for non-clustered use.
+
+	  You'll want to install the ocfs2-tools package in order to at least
+	  get "mount.ocfs2".
+
+	  Project web page:    http://oss.oracle.com/projects/ocfs2
+	  Tools web page:      http://oss.oracle.com/projects/ocfs2-tools
+	  OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
+
+	  Note: Features which OCFS2 does not support yet:
+	          - extended attributes
+		  - shared writeable mmap
+	          - loopback is supported, but data written will not
+	            be cluster coherent.
+	          - quotas
+	          - cluster aware flock
+	          - Directory change notification (F_NOTIFY)
+	          - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
+	          - POSIX ACLs
+	          - readpages / writepages (not user visible)
+
 config MINIX_FS
 	tristate "Minix fs support"
 	help
@@ -779,7 +809,7 @@
 
 config PROC_VMCORE
         bool "/proc/vmcore support (EXPERIMENTAL)"
-        depends on PROC_FS && EMBEDDED && EXPERIMENTAL && CRASH_DUMP
+        depends on PROC_FS && EXPERIMENTAL && CRASH_DUMP
         help
         Exports the dump image of crashed kernel in ELF format.
 
@@ -852,6 +882,18 @@
 
 	  If unsure, say N.
 
+config CONFIGFS_FS
+	tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	help
+	  configfs is a ram-based filesystem that provides the converse
+	  of sysfs's functionality. Where sysfs is a filesystem-based
+	  view of kernel objects, configfs is a filesystem-based manager
+	  of kernel objects, or config_items.
+
+	  Both sysfs and configfs can and should exist together on the
+	  same system. One is not a replacement for the other.
+
 endmenu
 
 menu "Miscellaneous filesystems"
@@ -1294,7 +1336,7 @@
 
 config UFS_FS_WRITE
 	bool "UFS file system write support (DANGEROUS)"
-	depends on UFS_FS && EXPERIMENTAL
+	depends on UFS_FS && EXPERIMENTAL && BROKEN
 	help
 	  Say Y here if you want to try writing to UFS partitions. This is
 	  experimental, so you should back up your UFS partitions beforehand.

Update of /cvsroot/gc-linux/linux/drivers/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/drivers/net

Modified Files:
	Kconfig Makefile 
Log Message:
2.6.16 merged.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	18 Jan 2006 23:41:53 -0000	1.16
+++ Makefile	24 Mar 2006 21:45:18 -0000	1.17
@@ -13,7 +13,10 @@
 obj-$(CONFIG_BONDING) += bonding/
 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
 
-gianfar_driver-objs := gianfar.o gianfar_ethtool.o gianfar_mii.o
+gianfar_driver-objs := gianfar.o \
+		gianfar_ethtool.o \
+		gianfar_mii.o \
+		gianfar_sysfs.o
 
 #
 # link order important here
@@ -59,6 +62,7 @@
 obj-$(CONFIG_SPIDER_NET) += spidernet.o
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SKGE) += skge.o
+obj-$(CONFIG_SKY2) += sky2.o
 obj-$(CONFIG_SK98LIN) += sk98lin/
 obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_VIA_RHINE) += via-rhine.o
@@ -121,6 +125,7 @@
 endif
 
 obj-$(CONFIG_DUMMY) += dummy.o
+obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_DE600) += de600.o
 obj-$(CONFIG_DE620) += de620.o
 obj-$(CONFIG_LANCE) += lance.o
@@ -203,6 +208,7 @@
 obj-$(CONFIG_HAMRADIO) += hamradio/
 obj-$(CONFIG_IRDA) += irda/
 obj-$(CONFIG_ETRAX_ETHERNET) += cris/
+obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
 
 obj-$(CONFIG_NETCONSOLE) += netconsole.o
 

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Kconfig	18 Jan 2006 23:41:53 -0000	1.19
+++ Kconfig	24 Mar 2006 21:45:18 -0000	1.20
@@ -4,9 +4,10 @@
 #
 
 menu "Network device support"
+	depends on NET
 
 config NETDEVICES
-	depends on NET
+	default y if UML
 	bool "Network device support"
 	---help---
 	  You can say N here if you don't intend to connect your Linux box to
@@ -23,9 +24,19 @@
 
 	  If unsure, say Y.
 
-# All the following symbols are dependent on NETDEVICES - do not repeat
-# that for each of the symbols.
-if NETDEVICES
+
+config IFB
+	tristate "Intermediate Functional Block support"
+	depends on NET_CLS_ACT
+	---help---
+	  This is an intermidiate driver that allows sharing of
+	  resources.
+	  To compile this driver as a module, choose M here: the module
+	  will be called ifb.  If you want to use more than one ifb
+	  device at a time, you need to compile this driver as a module.
+	  Instead of 'ifb', the devices will then be called 'ifb0',
+	  'ifb1' etc.
+	  Look at the iproute2 documentation directory for usage etc
 
 config DUMMY
 	tristate "Dummy net driver support"
@@ -129,7 +140,7 @@
 
 	  If you don't have this card, of course say N.
 
-	source "drivers/net/arcnet/Kconfig"
+source "drivers/net/arcnet/Kconfig"
 
 source "drivers/net/phy/Kconfig"
 
@@ -853,7 +864,7 @@
 
 config DM9000
 	tristate "DM9000 support"
-	depends on ARM && NET_ETHERNET
+	depends on (ARM || MIPS) && NET_ETHERNET
 	select CRC32
 	select MII
 	---help---
@@ -1085,7 +1096,8 @@
 	  without a specific driver are compatible with NE2000.
 
 	  If you have a PCI NE2000 card however, say N here and Y to "PCI
-	  NE2000 support", above. If you have a NE2000 card and are running on
+	  NE2000 and clone support" under "EISA, VLB, PCI and on board
+	  controllers" below. If you have a NE2000 card and are running on
 	  an MCA system (a bus system used on some IBM PS/2 computers and
 	  laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
 	  below.
@@ -1383,7 +1395,7 @@
 
 config CS89x0
 	tristate "CS89x0 support"
-	depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105
+	depends on NET_PCI && (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X)
 	---help---
 	  Support for CS89x0 chipset based Ethernet cards. If you have a
 	  network (Ethernet) card of this type, say Y and read the
@@ -1393,7 +1405,7 @@
 
 	  To compile this driver as a module, choose M here and read
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
-	  called cs89x.
+	  called cs89x0.
 
 config TC35815
 	tristate "TOSHIBA TC35815 Ethernet support"
@@ -1800,7 +1812,7 @@
 
 config FEC
 	bool "FEC ethernet controller (of ColdFire CPUs)"
-	depends on M523x || M527x || M5272 || M528x
+	depends on M523x || M527x || M5272 || M528x || M520x
 	help
 	  Say Y here if you want to use the built-in 10/100 Fast ethernet
 	  controller on some Motorola ColdFire processors.
@@ -1910,6 +1922,17 @@
 
 	  If in doubt, say N.
 
+config E1000_DISABLE_PACKET_SPLIT
+	bool "Disable Packet Split for PCI express adapters"
+	depends on E1000
+	help
+	  Say Y here if you want to use the legacy receive path for PCI express
+	  hadware.
+
+	  If in doubt, say N.
+
+source "drivers/net/ixp2000/Kconfig"
+
 config MYRI_SBUS
 	tristate "MyriCOM Gigabit Ethernet support"
 	depends on SBUS
@@ -2007,8 +2030,8 @@
 	  will be called sis190.  This is recommended.
 
 config SKGE
-	tristate "New SysKonnect GigaEthernet support (EXPERIMENTAL)"
-	depends on PCI && EXPERIMENTAL
+	tristate "New SysKonnect GigaEthernet support"
+	depends on PCI
 	select CRC32
 	---help---
 	  This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
@@ -2017,14 +2040,47 @@
 
 	  It does not support the link failover and network management 
 	  features that "portable" vendor supplied sk98lin driver does.
-	
+
+	  This driver supports adapters based on the original Yukon chipset:
+	  Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T,
+	  Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872.
+
+	  It does not support the newer Yukon2 chipset: a separate driver,
+	  sky2, is provided for Yukon2-based adapters.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called skge.  This is recommended.
+
+config SKY2
+	tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
+	depends on PCI && EXPERIMENTAL
+	select CRC32
+	---help---
+	  This driver supports Gigabit Ethernet adapters based on the the
+	  Marvell Yukon 2 chipset:
+	  Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
+	  88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
+
+	  This driver does not support the original Yukon chipset: a seperate
+	  driver, skge, is provided for Yukon-based adapters.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sky2.  This is recommended.
+
 config SK98LIN
 	tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
 	depends on PCI
 	---help---
 	  Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
-	  compliant Gigabit Ethernet Adapter. The following adapters are supported
-	  by this driver:
+	  compliant Gigabit Ethernet Adapter.
+
+	  This driver supports the original Yukon chipset. A cleaner driver is 
+	  also available (skge) which seems to work better than this one.
+
+	  This driver does not support the newer Yukon2 chipset. A seperate
+	  driver, sky2, is provided to support Yukon2-based adapters.
+
+	  The following adapters are supported by this driver:
 	    - 3Com 3C940 Gigabit LOM Ethernet Adapter
 	    - 3Com 3C941 Gigabit LOM Ethernet Adapter
 	    - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
@@ -2036,7 +2092,6 @@
 	    - Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
 	    - Allied Telesyn AT-2971T Gigabit Ethernet Adapter
 	    - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45
-	    - DGE-530T Gigabit Ethernet Adapter
 	    - EG1032 v2 Instant Gigabit Network Adapter
 	    - EG1064 v2 Instant Gigabit Network Adapter
 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)
@@ -2129,7 +2184,7 @@
 
 config SPIDER_NET
 	tristate "Spider Gigabit Ethernet driver"
-	depends on PCI && PPC_BPA
+	depends on PCI && PPC_CELL
 	help
 	  This driver supports the Gigabit Ethernet chips present on the
 	  Cell Processor-Based Blades from IBM.
@@ -2659,10 +2714,6 @@
 	  Class-Based Queueing (CBQ) scheduling support which you get if you
 	  say Y to "QoS and/or fair queueing" above.
 
-	  To set up and configure shaper devices, you need the shapecfg
-	  program, available from <ftp://shadow.cabi.net/pub/Linux/> in the
-	  shaper package.
-
 	  To compile this driver as a module, choose M here: the module
 	  will be called shaper.  If unsure, say N.
 
@@ -2673,8 +2724,6 @@
 	If you want to log kernel messages over the network, enable this.
 	See <file:Documentation/networking/netconsole.txt> for details.
 
-endif #NETDEVICES
-
 config NETPOLL
 	def_bool NETCONSOLE

Update of /cvsroot/gc-linux/linux/drivers/block
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/drivers/block

Modified Files:
	Kconfig gcn-aram.c gcn-sd.c 
Log Message:
2.6.16 merged.


Index: gcn-aram.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gcn-aram.c	18 Jan 2006 23:41:52 -0000	1.10
+++ gcn-aram.c	24 Mar 2006 21:45:18 -0000	1.11
@@ -207,7 +207,7 @@
 	if (req) {
 		if (!end_that_request_first(req, 1, req->current_nr_sectors)) {
 			add_disk_randomness(req->rq_disk);
-			end_that_request_last(req);
+			end_that_request_last(req, 1);
 		}
 		dma_unmap_single(&adev->pdev.dev, adev->dma_addr, adev->dma_len,
 				 rq_dir_to_dma_dir(req));

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Kconfig	18 Jan 2006 23:41:52 -0000	1.20
+++ Kconfig	24 Mar 2006 21:45:18 -0000	1.21
@@ -179,7 +179,7 @@
 
 config PARIDE
 	tristate "Parallel port IDE device support"
-	depends on PARPORT
+	depends on PARPORT_PC
 	---help---
 	  There are many external CD-ROM and disk devices that connect through
 	  your computer's parallel port. Most of them are actually IDE devices
@@ -420,7 +420,8 @@
 	  This driver supports certain USB attached storage devices
 	  such as flash keys.
 
-	  Warning: Enabling this cripples the usb-storage driver.
+	  If you enable this driver, it is recommended to avoid conflicts
+	  with usb-storage by enabling USB_LIBUSUAL.
 
 	  If unsure, say N.
 
@@ -494,12 +495,12 @@
 	  This controls the maximum number of active concurrent packets. More
 	  concurrent packets can increase write performance, but also require
 	  more memory. Each concurrent packet will require approximately 64Kb
-	  of non-swappable kernel memory, memory which will be allocated at
-	  pktsetup time.
+	  of non-swappable kernel memory, memory which will be allocated when
+	  a disc is opened for writing.
 
 config CDROM_PKTCDVD_WCACHE
-	bool "Enable write caching"
-	depends on CDROM_PKTCDVD
+	bool "Enable write caching (EXPERIMENTAL)"
+	depends on CDROM_PKTCDVD && EXPERIMENTAL
 	help
 	  If enabled, write caching will be set for the CD-R/W device. For now
 	  this option is dangerous unless the CD-RW media is known good, as we

Index: gcn-sd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-sd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gcn-sd.c	7 Nov 2005 21:38:04 -0000	1.6
+++ gcn-sd.c	24 Mar 2006 21:45:18 -0000	1.7
@@ -255,7 +255,7 @@
  * FIXME: use a faster method (table)
  * (the in-kernel crc 16 (ccitt crc) tables seem not compatible with us)
  */
-u16 crc_xmodem_update(u16 crc, u8 data)
+static u16 crc_xmodem_update(u16 crc, u8 data)
 {
 	int i;
 
@@ -1183,10 +1183,11 @@
 			}
 
 			if (!end_that_request_first(req, uptodate, nr_sectors))
-				end_that_request_last(req);
+				end_that_request_last(req, uptodate);
 
 			/* avoid cpu monopolization, we are damn greedy */
-			yield();
+			//yield();
+			cond_resched();
 
 			spin_lock(&host->queue_lock);
 			blk_start_queue(host->queue);

Update of /cvsroot/gc-linux/linux/sound/ppc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/sound/ppc

Modified Files:
	Kconfig 
Log Message:
2.6.16 merged.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Kconfig	31 Oct 2005 00:44:18 -0000	1.10
+++ Kconfig	24 Mar 2006 21:45:19 -0000	1.11
@@ -13,7 +13,6 @@
 	tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
 	depends on SND && I2C && INPUT && PPC_PMAC
 	select SND_PCM
-	select SND_GENERIC_DRIVER
 	help
 	  Say Y here to include support for the integrated sound device.

Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/drivers/block/gcn-di

Modified Files:
	gcn-di.c 
Log Message:
2.6.16 merged.


Index: gcn-di.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gcn-di.c	19 Jan 2006 00:31:40 -0000	1.16
+++ gcn-di.c	24 Mar 2006 21:45:18 -0000	1.17
@@ -1824,6 +1824,7 @@
 	struct di_device *ddev = cmd->ddev;
 	struct request *req;
 	unsigned long flags;
+	int uptodate = (cmd->result & DI_SR_TCINT)?1:0;
 
 	spin_lock_irqsave(&ddev->lock, flags);
 
@@ -1833,11 +1834,10 @@
 	spin_unlock_irqrestore(&ddev->lock, flags);
 
 	if (req) {
-		if (!end_that_request_first(req,
-					    (cmd->result & DI_SR_TCINT)?1:0,
+		if (!end_that_request_first(req, uptodate,
 					    req->current_nr_sectors)) {
 			add_disk_randomness(req->rq_disk);
-			end_that_request_last(req);
+			end_that_request_last(req, uptodate);
 		}
 		spin_lock(&ddev->queue_lock);
 		blk_start_queue(ddev->queue);
@@ -2138,9 +2138,13 @@
 	spin_unlock_irqrestore(&ddev->io_lock, flags);
 
 	di_retrieve_drive_model(ddev);
-	di_select_drive_code(ddev);
-	di_check_for_addons(ddev);
+	if (di_select_drive_code(ddev)) {
+		free_irq(ddev->irq, ddev);
+		retval = -ENODEV;
+		goto out;
+	}
 
+	di_check_for_addons(ddev);
 	di_schedule_motor_off(ddev, DI_MOTOR_OFF_TIMEOUT);
 
 out:
@@ -2405,6 +2409,8 @@
 	retval = driver_register(&di_driver);
 	if (!retval) {
 		retval = platform_device_register(&di_device.pdev);
+		if (retval)
+			driver_unregister(&di_driver);
 	}
 
 	return retval;

Update of /cvsroot/gc-linux/linux/arch/ppc/platforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/arch/ppc/platforms

Modified Files:
	Makefile 
Log Message:
2.6.16 merged.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile	18 Jan 2006 23:41:52 -0000	1.21
+++ Makefile	24 Mar 2006 21:45:18 -0000	1.22
@@ -3,26 +3,18 @@
 #
 
 # Extra CFLAGS so we don't have to do relative includes
-CFLAGS_pmac_setup.o	+= -Iarch/$(ARCH)/mm
+CFLAGS_chrp_setup.o	+= -Iarch/$(ARCH)/mm
 
 obj-$(CONFIG_APUS)		+= apus_setup.o
 ifeq ($(CONFIG_APUS),y)
 obj-$(CONFIG_PCI)		+= apus_pci.o
 endif
-obj-$(CONFIG_PPC_PMAC)		+= pmac_pic.o pmac_setup.o pmac_time.o \
-					pmac_feature.o pmac_pci.o pmac_sleep.o \
-					pmac_low_i2c.o pmac_cache.o
 obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o \
 					chrp_pegasos_eth.o
 ifeq ($(CONFIG_PPC_CHRP),y)
 obj-$(CONFIG_NVRAM)		+= chrp_nvram.o
 endif
 obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o
-ifeq ($(CONFIG_PPC_PMAC),y)
-obj-$(CONFIG_NVRAM)		+= pmac_nvram.o
-obj-$(CONFIG_CPU_FREQ_PMAC)	+= pmac_cpufreq.o
-endif
-obj-$(CONFIG_PMAC_BACKLIGHT)	+= pmac_backlight.o
 obj-$(CONFIG_PREP_RESIDUAL)	+= residual.o
 obj-$(CONFIG_PQ2ADS)		+= pq2ads.o
 obj-$(CONFIG_TQM8260)		+= tqm8260_setup.o
@@ -51,6 +43,5 @@
 obj-$(CONFIG_GAMECUBE_RESET)	+= gcn-rsw.o
 
 ifeq ($(CONFIG_SMP),y)
-obj-$(CONFIG_PPC_PMAC)		+= pmac_smp.o
 obj-$(CONFIG_PPC_CHRP)		+= chrp_smp.o
 endif

Update of /cvsroot/gc-linux/libsdl/src/video/gc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17380/src/video/gc

Modified Files:
	SDL_gcvideo.c 
Log Message:
Do not modify the yres, even on PAL mode.
We want the yres equal to the actual physical screen mode.
Make sure video page 0 is both the visible and back page when
no double-buffering is enabled.


Index: SDL_gcvideo.c
===================================================================
RCS file: /cvsroot/gc-linux/libsdl/src/video/gc/SDL_gcvideo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SDL_gcvideo.c	17 Mar 2006 22:32:02 -0000	1.3
+++ SDL_gcvideo.c	21 Mar 2006 22:36:38 -0000	1.4
@@ -439,8 +439,9 @@
 		vinfo.bits_per_pixel = bpp;
 		vinfo.xres = width;
 		vinfo.xres_virtual = width;
-		vinfo.yres = height;
-		vinfo.yres_virtual = 2*height;
+		/* do not modify yres*, we use a fake 640x480 mode in PAL */
+		//vinfo.yres = height;
+		//vinfo.yres_virtual = 2*height;
 		vinfo.xoffset = 0;
 		vinfo.yoffset = 0;
 		vinfo.red.length = vinfo.red.offset = 0;
@@ -456,7 +457,7 @@
 		int maxheight;
 
 		/* Figure out how much video memory is available */
-		maxheight = 2*height;
+		maxheight = 2*yres;
 		if (vinfo.yres_virtual > maxheight) {
 			vinfo.yres_virtual = maxheight;
 		}
@@ -514,12 +515,16 @@
 	page_address[0] = mapped_mem;
 	page_address[1] = mapped_mem + current->pitch * yres;
 
-	back_page = 0;
+	back_page = 1;
 	if (flags & SDL_DOUBLEBUF) {
 		current->flags |= SDL_DOUBLEBUF;
 		flip_pending = 1;
 	} else {
 		flip_pending = 0;
+		/* make page 0 both the visible and back page */
+		back_page = ioctl(console_fd, FBIOFLIPHACK, &back_page);
+		if (back_page < 0)
+			back_page = 0;
 	}
 
 	/* Set the update rectangle function */

Update of /cvsroot/gc-linux/libsdl/src/video/gc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12443/src/video/gc

Modified Files:
	SDL_gcevents.c SDL_gcvideo.c SDL_gcvideo.h SDL_gcyuv.c 
Log Message:
Added double buffering and automatic vsync (with near-zero wait).


Index: SDL_gcyuv.c
===================================================================
RCS file: /cvsroot/gc-linux/libsdl/src/video/gc/SDL_gcyuv.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- SDL_gcyuv.c	23 Jun 2005 18:18:33 -0000	1.1.1.1
+++ SDL_gcyuv.c	17 Mar 2006 22:32:02 -0000	1.2
@@ -3,7 +3,7 @@
     Copyright (C) 1997-2004 Sam Lantinga
 
     SDL port for the Nintendo GameCube
-    Copyright (C) 2004-2005 Albert Herranz
+    Copyright (C) 2004-2006 Albert Herranz
     Accelerated yuv blitters courtesy of kirin.
 
     This library is free software; you can redistribute it and/or
@@ -312,7 +312,9 @@
 		}
 	}
 
-	dst = mapped_mem + mapped_offset +
+	GC_WaitForFlipCompletion(_this);
+
+	dst = page_address[back_page] + page_offset +
 	    (dstrect->y * display->pitch) + dstrect->x * 2;
 	height = dstrect->h;	/* overlay->h; */
 	width = dstrect->w * 2;	/* overlay->w * 2; */

Index: SDL_gcevents.c
===================================================================
RCS file: /cvsroot/gc-linux/libsdl/src/video/gc/SDL_gcevents.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- SDL_gcevents.c	23 Jun 2005 18:18:34 -0000	1.1.1.1
+++ SDL_gcevents.c	17 Mar 2006 22:32:01 -0000	1.2
@@ -25,7 +25,7 @@
     slouken@...
 */
 
-#define DEBUG_KEYBOARD 1
+//#define DEBUG_KEYBOARD 1
 
 /* Handle the event stream, converting console events into SDL events */
 

Index: SDL_gcvideo.c
===================================================================
RCS file: /cvsroot/gc-linux/libsdl/src/video/gc/SDL_gcvideo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SDL_gcvideo.c	23 Jun 2005 19:08:16 -0000	1.2
+++ SDL_gcvideo.c	17 Mar 2006 22:32:02 -0000	1.3
@@ -3,7 +3,7 @@
     Copyright (C) 1997-2004 Sam Lantinga
 
     SDL port for the Nintendo GameCube
-    Copyright (C) 2004-2005 Albert Herranz
+    Copyright (C) 2004-2006 Albert Herranz
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <asm/page.h>		/* For definition of PAGE_SIZE */
@@ -50,7 +51,7 @@
 
 #ifdef HAVE_OPENGL
 #include "SDL_gcgl.h"
-#endif				/* HAVE_OPENGL */
+#endif /* HAVE_OPENGL */
 
 /* Initialization/Query functions */
 static int GC_VideoInit(_THIS, SDL_PixelFormat * vformat);
@@ -71,19 +72,30 @@
 static void GC_InitRGB2YUVTables(void);
 static void GC_UpdateRects(_THIS, int numrects, SDL_Rect * rects);
 static void GC_UpdateRectRGB16(_THIS, SDL_Rect * rect, int pitch);
-static void GC_UpdateRectRGB24(_THIS, SDL_Rect * rect, int pitch);
-static void GC_UpdateRectRGB32(_THIS, SDL_Rect * rect, int pitch);
-
+void GC_WaitForFlipCompletion(_THIS);
 
 #define GC_BLACK 0x00800080
 
-/* GC driver bootstrap functions */
 
+/*
+ *
+ * Bootstrap functions.
+ */
+
+/*
+ *
+ */
 static int GC_Available(void)
 {
 	int console;
 	const char *SDL_fbdev;
 
+	/*
+	 * XXX We could check that
+	 * "/sys/devices/platform/gcnfb.0/graphics\:fb0/name"
+	 * exists and contains gcnfb.
+	 */
+
 	SDL_fbdev = getenv("SDL_FBDEV");
 	if (SDL_fbdev == NULL) {
 		SDL_fbdev = "/dev/fb0";
@@ -95,6 +107,9 @@
 	return (console >= 0);
 }
 
+/*
+ *
+ */
 static void GC_DeleteDevice(_THIS)
 {
 	if (_this->hidden->buffer) {
@@ -103,11 +118,15 @@
 	}
 	free(_this->hidden);
 #ifdef HAVE_OPENGL
-	free(_this->gl_data);	/* check for NULL? */
+	if (_this->gl_data)
+		free(_this->gl_data);
 #endif				/* HAVE_OPENGL */
 	free(_this);
 }
 
+/*
+ *
+ */
 static SDL_VideoDevice *GC_CreateDevice(int devindex)
 {
 	_THIS;
@@ -116,31 +135,31 @@
 	_this = (SDL_VideoDevice *) malloc(sizeof(SDL_VideoDevice));
 	if (_this) {
 		memset(_this, 0, (sizeof *_this));
-		_this->hidden = (struct SDL_PrivateVideoData *)
-		    malloc((sizeof *_this->hidden));
+
 #ifdef HAVE_OPENGL
 		_this->gl_data = (struct SDL_PrivateGLData *)
 		    malloc((sizeof *_this->gl_data));
-#endif				/* HAVE_OPENGL */
-	}
-	if ((_this == NULL) || (_this->hidden == NULL)
+		if (_this->gl_data == NULL) {
+			SDL_OutOfMemory();
+			free(_this);
+			return 0;
+		}
+		memset(_this->gl_data, 0, (sizeof *_this->gl_data));
+#endif /* HAVE_OPENGL */
+
+		_this->hidden = (struct SDL_PrivateVideoData *)
+		    malloc((sizeof *_this->hidden));
+		if (_this->hidden == NULL) {
+			SDL_OutOfMemory();
 #ifdef HAVE_OPENGL
-	    || (_this->gl_data == NULL)
-#endif				/* HAVE_OPENGL */
-	    ) {			/* mem-leak if only one malloc fails.. */
-		SDL_OutOfMemory();
-		if (_this) {
+			free(_this->gl_data);
+#endif /* HAVE_OPENGL */
 			free(_this);
+			return (0);
 		}
-		return (0);
 	}
 	memset(_this->hidden, 0, (sizeof *_this->hidden));
-#ifdef HAVE_OPENGL
-	memset(_this->gl_data, 0, (sizeof *_this->gl_data));
-#endif				/* HAVE_OPENGL */
 
-	//wait_vbl = FB_WaitVBL;
-	//wait_idle = FB_WaitIdle;
 	keyboard_fd = -1;
 	in_graphics_mode = 0;
 
@@ -186,6 +205,15 @@
 	GC_Available, GC_CreateDevice
 };
 
+
+/*
+ *
+ * Video setup routines.
+ */
+
+/*
+ *
+ */
 int GC_VideoInit(_THIS, SDL_PixelFormat * vformat)
 {
 	struct fb_fix_screeninfo finfo;
@@ -250,13 +278,6 @@
 		GC_VideoQuit(_this);
 		return (-1);
 	}
-#if 0
-	if (vinfo.bits_per_pixel != 16) {
-		SDL_SetError("XXX Sorry, but I need a 16bpp mode for now...");
-		GC_VideoQuit(_this);
-		return (-1);
-	}
-#endif
 
 	/* XXX isobel, review */
 
@@ -288,64 +309,66 @@
 	return (0);
 }
 
-#if 0				//defined(GC_DEBUG)
-static void print_vinfo(struct fb_var_screeninfo *vinfo)
-{
-	fprintf(stderr, "Printing vinfo:\n");
-	fprintf(stderr, "\txres: %d\n", vinfo->xres);
-	fprintf(stderr, "\tyres: %d\n", vinfo->yres);
-	fprintf(stderr, "\txres_virtual: %d\n", vinfo->xres_virtual);
-	fprintf(stderr, "\tyres_virtual: %d\n", vinfo->yres_virtual);
-	fprintf(stderr, "\txoffset: %d\n", vinfo->xoffset);
-	fprintf(stderr, "\tyoffset: %d\n", vinfo->yoffset);
-	fprintf(stderr, "\tbits_per_pixel: %d\n", vinfo->bits_per_pixel);
-	fprintf(stderr, "\tgrayscale: %d\n", vinfo->grayscale);
-	fprintf(stderr, "\tnonstd: %d\n", vinfo->nonstd);
-	fprintf(stderr, "\tactivate: %d\n", vinfo->activate);
-	fprintf(stderr, "\theight: %d\n", vinfo->height);
-	fprintf(stderr, "\twidth: %d\n", vinfo->width);
-	fprintf(stderr, "\taccel_flags: %d\n", vinfo->accel_flags);
-	fprintf(stderr, "\tpixclock: %d\n", vinfo->pixclock);
-	fprintf(stderr, "\tleft_margin: %d\n", vinfo->left_margin);
-	fprintf(stderr, "\tright_margin: %d\n", vinfo->right_margin);
-	fprintf(stderr, "\tupper_margin: %d\n", vinfo->upper_margin);
-	fprintf(stderr, "\tlower_margin: %d\n", vinfo->lower_margin);
-	fprintf(stderr, "\thsync_len: %d\n", vinfo->hsync_len);
-	fprintf(stderr, "\tvsync_len: %d\n", vinfo->vsync_len);
-	fprintf(stderr, "\tsync: %d\n", vinfo->sync);
-	fprintf(stderr, "\tvmode: %d\n", vinfo->vmode);
-	fprintf(stderr, "\tred: %d/%d\n", vinfo->red.length, vinfo->red.offset);
-	fprintf(stderr, "\tgreen: %d/%d\n", vinfo->green.length,
-		vinfo->green.offset);
-	fprintf(stderr, "\tblue: %d/%d\n", vinfo->blue.length,
-		vinfo->blue.offset);
-	fprintf(stderr, "\talpha: %d/%d\n", vinfo->transp.length,
-		vinfo->transp.offset);
-}
-static void print_finfo(struct fb_fix_screeninfo *finfo)
+/*
+ *
+ * Note: If we are terminated, this could be called in the middle of
+ *       another SDL video routine -- notably UpdateRects.
+ */
+static void GC_VideoQuit(_THIS)
 {
-	fprintf(stderr, "Printing finfo:\n");
-	fprintf(stderr, "\tsmem_start = %p\n", (char *)finfo->smem_start);
-	fprintf(stderr, "\tsmem_len = %d\n", finfo->smem_len);
-	fprintf(stderr, "\ttype = %d\n", finfo->type);
-	fprintf(stderr, "\ttype_aux = %d\n", finfo->type_aux);
-	fprintf(stderr, "\tvisual = %d\n", finfo->visual);
-	fprintf(stderr, "\txpanstep = %d\n", finfo->xpanstep);
-	fprintf(stderr, "\typanstep = %d\n", finfo->ypanstep);
-	fprintf(stderr, "\tywrapstep = %d\n", finfo->ywrapstep);
-	fprintf(stderr, "\tline_length = %d\n", finfo->line_length);
-	fprintf(stderr, "\tmmio_start = %p\n", (char *)finfo->mmio_start);
-	fprintf(stderr, "\tmmio_len = %d\n", finfo->mmio_len);
-	fprintf(stderr, "\taccel = %d\n", finfo->accel);
+	if (_this->hidden->buffer) {
+		free(_this->hidden->buffer);
+		_this->hidden->buffer = NULL;
+	}
+	if (_this->screen) {
+		Uint32 *rowp = (Uint32 *) (mapped_mem + page_offset);
+		int left =
+		    (_this->screen->pitch * _this->screen->h) / sizeof(Uint32);
+		while (left--) {
+			*rowp++ = GC_BLACK;
+		}
+		if (_this->screen->pixels != NULL) {
+			/* already freed above */
+			_this->screen->pixels = NULL;
+		}
+	}
+	/* Close console and input file descriptors */
+	if (console_fd > 0) {
+		/* Unmap the video framebuffer and I/O registers */
+		if (mapped_mem) {
+			munmap(mapped_mem, mapped_memlen);
+			mapped_mem = NULL;
+		}
+
+		/* Restore the original video mode and palette */
+		if (GC_InGraphicsMode(_this)) {
+			//FB_RestorePalette(_this);
+			ioctl(console_fd, FBIOPUT_VSCREENINFO, &saved_vinfo);
+		}
+
+		/* We're all done with the framebuffer */
+		close(console_fd);
+		console_fd = -1;
+	}
+	GC_CloseKeyboard(_this);
 }
-#endif
 
+
+/*
+ *
+ * Video mode handling.
+ */
+
+/* only 640x480 16bpp is currently supported */
 const static SDL_Rect RECT_640x480 = { 0, 0, 640, 480 };
 const static SDL_Rect *vid_modes[] = {
 	&RECT_640x480,
 	NULL
 };
 
+/*
+ *
+ */
 SDL_Rect **GC_ListModes(_THIS, SDL_PixelFormat * format, Uint32 flags)
 {
 	switch (format->BitsPerPixel) {
@@ -360,9 +383,11 @@
 	default:
 		return NULL;
 	}
-//      return (SDL_Rect **) -1;
 }
 
+/*
+ *
+ */
 SDL_Surface *GC_SetVideoMode(_THIS, SDL_Surface * current,
 			     int width, int height, int bpp, Uint32 flags)
 {
@@ -373,8 +398,10 @@
 	Uint32 Gmask;
 	Uint32 Bmask;
 	Uint32 *p, *q;
+	Uint32 yres;
 
-	GC_DPRINTF("Setting %dx%d %dbpp mode\n", width, height, bpp);
+	GC_DPRINTF("Setting %dx%d %dbpp %smode\n", width, height, bpp,
+			(flags & SDL_DOUBLEBUF)?"(doublebuf) ":"");
 
 	/* Set the terminal into graphics mode */
 	if (GC_EnterGraphicsMode(_this) < 0) {
@@ -389,29 +416,22 @@
 		SDL_SetError("Couldn't get console screen info");
 		return (NULL);
 	}
-#if 0				//defined(GC_DEBUG)
-	fprintf(stderr, "Printing original vinfo:\n");
-	print_vinfo(&vinfo);
-#endif
+
+	yres = vinfo.yres;
 
 	/* hack to center 640x480 resolution on PAL cubes */
 	if (vinfo.xres == 640 && vinfo.yres == 576) {
-		mapped_offset = ((576 - 480) / 2) * 640 * ((bpp + 7) / 8);
-		
-		p = (Uint32 *)mapped_mem;
-		q = (Uint32 *)(mapped_mem + mapped_offset);
-		while (p < q)
-			*p++ = GC_BLACK;
-
-		q = (Uint32 *)(mapped_mem + mapped_memlen);
-		p = (Uint32 *)(mapped_mem + mapped_memlen - mapped_offset);
-		while (p < q)
-			*p++ = GC_BLACK;
-
+		page_offset = ((576 - 480) / 2) * 640 * ((bpp + 7) / 8);
 	} else {
-		mapped_offset = 0;
+		page_offset = 0;
 	}
 
+	/* clear all video memory */
+	p = (Uint32 *)mapped_mem;
+	q = (Uint32 *)(mapped_mem + mapped_memlen);
+	while (p < q)
+		*p++ = GC_BLACK;
+
 	if ((vinfo.xres != width) || (vinfo.yres != height) ||
 	    (vinfo.bits_per_pixel != bpp)) {
 		vinfo.activate = FB_ACTIVATE_NOW;
@@ -419,8 +439,8 @@
 		vinfo.bits_per_pixel = bpp;
 		vinfo.xres = width;
 		vinfo.xres_virtual = width;
-		//vinfo.yres = height;
-		vinfo.yres_virtual = height;
+		vinfo.yres = height;
+		vinfo.yres_virtual = 2*height;
 		vinfo.xoffset = 0;
 		vinfo.yoffset = 0;
 		vinfo.red.length = vinfo.red.offset = 0;
@@ -428,11 +448,6 @@
 		vinfo.blue.length = vinfo.blue.offset = 0;
 		vinfo.transp.length = vinfo.transp.offset = 0;
 
-#if 0				//defined(GC_DEBUG)
-		fprintf(stderr, "Printing wanted vinfo:\n");
-		print_vinfo(&vinfo);
-#endif
-
 		if (ioctl(console_fd, FBIOPUT_VSCREENINFO, &vinfo) < 0) {
 			SDL_SetError("Couldn't set console screen info");
 			return (NULL);
@@ -441,18 +456,13 @@
 		int maxheight;
 
 		/* Figure out how much video memory is available */
-		maxheight = height;
+		maxheight = 2*height;
 		if (vinfo.yres_virtual > maxheight) {
 			vinfo.yres_virtual = maxheight;
 		}
 	}
 	cache_vinfo = vinfo;
 
-#if 0				//defined(GC_DEBUG)
-	fprintf(stderr, "Printing actual vinfo:\n");
-	print_vinfo(&vinfo);
-#endif
-
 	Rmask = 0;
 	for (i = 0; i < vinfo.red.length; ++i) {
 		Rmask <<= 1;
@@ -501,18 +511,21 @@
 	current->pitch = width * ((bpp + 7) / 8);
 	current->pixels = _this->hidden->buffer;
 
+	page_address[0] = mapped_mem;
+	page_address[1] = mapped_mem + current->pitch * yres;
+
+	back_page = 0;
+	if (flags & SDL_DOUBLEBUF) {
+		current->flags |= SDL_DOUBLEBUF;
+		flip_pending = 1;
+	} else {
+		flip_pending = 0;
+	}
+
 	/* Set the update rectangle function */
 	switch (bpp) {
-	case 32:
-		GC_DPRINTF("Using 32bpp blitter (not working)\n");
-		_this->hidden->UpdateRect = GC_UpdateRectRGB32;
-		break;
-	case 24:
-		GC_DPRINTF("Using 24bpp blitter (not working)\n");
-		_this->hidden->UpdateRect = GC_UpdateRectRGB24;
-		break;
 	case 16:
-		GC_DPRINTF("Using new fast 16bpp blitter\n");
+		GC_DPRINTF("Using 16bpp blitter\n");
 		_this->hidden->UpdateRect = GC_UpdateRectRGB16;
 		break;
 	default:
@@ -536,32 +549,97 @@
 	return (current);
 }
 
-/* We don't actually allow hardware surfaces other than the main one */
+
+/*
+ *
+ * Hardware surface hooks.
+ */
+
+/*
+ *
+ */
 static int GC_AllocHWSurface(_THIS, SDL_Surface * surface)
 {
+	/* We don't actually allow hardware surfaces other than the main one */
 	return (-1);
 }
+
+/*
+ *
+ */
 static void GC_FreeHWSurface(_THIS, SDL_Surface * surface)
 {
 	return;
 }
 
-/* We need to wait for vertical retrace on page flipped displays */
+/*
+ *
+ */
 static int GC_LockHWSurface(_THIS, SDL_Surface * surface)
 {
 	return (0);
 }
 
+/*
+ *
+ */
 static void GC_UnlockHWSurface(_THIS, SDL_Surface * surface)
 {
 	return;
 }
 
+/*
+ *
+ */
 static int GC_FlipHWSurface(_THIS, SDL_Surface * surface)
 {
+	if (flip_pending) {
+		/* SDL_UpdateRect was not called */
+		SDL_UpdateRect(_this->screen, 0, 0, 0, 0);
+	}
+
+	/* flip video page as soon as possible */
+	ioctl(console_fd, FBIOFLIPHACK, NULL);
+	flip_pending = 1;
+
 	return (0);
 }
 
+/*
+ *
+ */
+void GC_WaitForFlipCompletion(_THIS)
+{
+	int visible_page;
+	int result;
+
+	if (flip_pending) {
+		flip_pending = 0;
+		back_page ^= 1;
+		visible_page = back_page;
+		while (visible_page == back_page) {
+			/* wait until back_page is not visible */
+			result = ioctl(console_fd, FBIOFLIPHACK, &back_page);
+			if (result < 0) {
+				if ((errno == EINTR) || (errno == EAGAIN))
+					continue;
+				return; /* ioctl unsupported ... */
+			}
+			visible_page = result;
+		}
+		/*
+		 * At this point the back_page is not visible. We can safely
+		 * write to it without tearing.
+		 */
+	}
+}
+
+
+/*
+ *
+ * Color space handling.
+ */
+
 #define RGB2YUV_SHIFT   16
 #define RGB2YUV_LUMA    16
 #define RGB2YUV_CHROMA 128
@@ -595,6 +673,9 @@
 static Uint8 RGB16toU[1 << 16];
 static Uint8 RGB16toV[1 << 16];
 
+/*
+ *
+ */
 static void GC_InitRGB2YUVTables(void)
 {
 	unsigned int i;
@@ -634,6 +715,9 @@
 	}
 }
 
+/*
+ *
+ */
 static inline Uint32 rgbrgb16toyuy2(Uint16 rgb1, Uint16 rgb2)
 {
 	register int Y1, Cb, Y2, Cr;
@@ -665,6 +749,60 @@
 	    | (((char)Cr) << 0);
 }
 
+/*
+ *
+ */
+static int GC_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color * colors)
+{
+	int i;
+	__u16 r[256];
+	__u16 g[256];
+	__u16 b[256];
+	struct fb_cmap cmap;
+
+	/* Set up the colormap */
+	for (i = 0; i < ncolors; i++) {
+		r[i] = colors[i].r << 8;
+		g[i] = colors[i].g << 8;
+		b[i] = colors[i].b << 8;
+	}
+	cmap.start = firstcolor;
+	cmap.len = ncolors;
+	cmap.red = r;
+	cmap.green = g;
+	cmap.blue = b;
+	cmap.transp = NULL;
+
+	if ((ioctl(console_fd, FBIOPUTCMAP, &cmap) < 0) ||
+	    !(_this->screen->flags & SDL_HWPALETTE)) {
+		colors = _this->screen->format->palette->colors;
+		ncolors = _this->screen->format->palette->ncolors;
+		cmap.start = 0;
+		cmap.len = ncolors;
+		memset(r, 0, sizeof(r));
+		memset(g, 0, sizeof(g));
+		memset(b, 0, sizeof(b));
+		if (ioctl(console_fd, FBIOGETCMAP, &cmap) == 0) {
+			for (i = ncolors - 1; i >= 0; --i) {
+				colors[i].r = (r[i] >> 8);
+				colors[i].g = (g[i] >> 8);
+				colors[i].b = (b[i] >> 8);
+			}
+		}
+		return (0);
+	}
+	return (1);
+}
+
+
+/*
+ *
+ * Blitters.
+ */
+
+/*
+ *
+ */
 static void GC_UpdateRectRGB16(_THIS, SDL_Rect * rect, int pitch)
 {
 	int width, height, left, i, mod, mod32;
@@ -681,7 +819,8 @@
 
 	/* in bytes, src and dest are 16bpp */
 	src = _this->hidden->buffer + (rect->y * pitch) + left * 2;
-	dst = mapped_mem + mapped_offset + (rect->y * pitch) + left * 2;
+	dst = page_address[back_page] + page_offset +
+		 (rect->y * pitch) + left * 2;
 	mod = pitch - width * 2;
 
 	src32 = (Uint32 *) src;
@@ -696,96 +835,14 @@
 			*dst32++ = rgbrgb16toyuy2(rgb[0], rgb[1]);
 			src32++;
 		}
-		dst32 += mod32;
 		src32 += mod32;
+		dst32 += mod32;
 	}
 }
 
-static inline unsigned long rgbrgbtoyuy2(register int r1, register int g1,
-					 register int b1, register int r2,
-					 register int g2, register int b2)
-{
-	register int r, g, b;
-	register int Y1, Cb, Y2, Cr;
-
-	r = (r1 + r2) >> 1;
-	g = (g1 + g2) >> 1;
-	b = (b1 + b2) >> 1;
-
-	Y1 = clamp(16, 235, (r_Yr[r1] + g_Yg_[g1] + b_Yb[b1]) >> RGB2YUV_SHIFT);
-	Y2 = clamp(16, 235, (r_Yr[r2] + g_Yg_[g2] + b_Yb[b2]) >> RGB2YUV_SHIFT);
-	Cb = (r_Ur[r] + g_Ug_[g] + b_Ub[b]) >> RGB2YUV_SHIFT;
-	Cr = (r_Vr[r] + g_Vg_[g] + b_Vb[b]) >> RGB2YUV_SHIFT;
-
-	return (((((char)Y1) << 24) | (((char)Cb) << 16) | (((char)Y2) << 8)
-		 | (((char)Cr) << 0)));
-}
-
-static void GC_UpdateRectRGB24(_THIS, SDL_Rect * rect, int pitch)
-{
-	int width, height, left, i, srcmod, dstmod;
-	Uint8 *src, *dst;
-
-	/* XXX case width < 2 needs special treatment */
-
-	/* in pixel units */
-	left = rect->x & ~1;	/* 2 pixel align */
-	width = (rect->w + 1) & ~1;	/* 2 pixel align in excess */
-	height = rect->h;
-
-	/* in bytes, src is 24bpp (3 bytes) and dst is 16bpp */
-	src = _this->hidden->buffer + (rect->y * pitch) + left * 3;
-	srcmod = pitch - width * 3;
-	dst = mapped_mem + mapped_offset + (rect->y * pitch) + left * 2;
-	dstmod = _this->screen->w * 2 - width * 2;
-
-	while (height--) {
-		i = width / 2;
-		while (i--) {
-			*(unsigned long *)dst =
-			    rgbrgbtoyuy2(src[0], src[1], src[2], src[3], src[4],
-					 src[5]);
-			dst += 4;
-			src += 6;
-		}
-		dst += dstmod;
-		src += srcmod;
-	}
-}
-
-static void GC_UpdateRectRGB32(_THIS, SDL_Rect * rect, int pitch)
-{
-	int width, height, left, i, srcmod, dstmod;
-	Uint8 *src, *dst;
-
-/* DOESN'T WORK, WRONG COLORS */
-
-	/* XXX case width < 2 needs special treatment */
-
-	/* in pixel units */
-	left = rect->x & ~1;	/* 2 pixel align */
-	width = (rect->w + 1) & ~1;	/* 2 pixel align in excess */
-	height = rect->h;
-
-	/* in bytes, src is 32bpp (4 bytes) and dst is 16bpp */
-	src = _this->hidden->buffer + (rect->y * pitch) + left * 4;
-	srcmod = pitch - width * 4;
-	dst = mapped_mem + mapped_offset + (rect->y * pitch) + left * 2;
-	dstmod = _this->screen->w * 2 - width * 2;
-
-	while (height--) {
-		i = width / 2;
-		while (i--) {
-			*(Uint32 *) dst = rgbrgbtoyuy2(src[2], src[1], src[0],
-						       src[6], src[5], src[4]);
-			dst += 4;
-			src += 8;
-		}
-		dst += dstmod;
-		src += srcmod;
-	}
-}
-
+/*
+ *
+ */
 static void GC_UpdateRects(_THIS, int numrects, SDL_Rect * rects)
 {
 	SDL_Surface *screen;
@@ -797,6 +854,7 @@
 	pitch = screen->pitch;	/* this is the pitch of the shadow buffer */
 
 	if (_this->hidden->UpdateRect) {
+		GC_WaitForFlipCompletion(_this);
 		while (numrects--) {
 			if (rects->w <= 0 || rects->h <= 0)
 				continue;
@@ -806,94 +864,3 @@
 	}
 }
 
-#if 0
-static int GC_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color * colors)
-{
-	/* do nothing of note. */
-	return (1);
-}
-#endif
-
-static int GC_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color * colors)
-{
-	int i;
-	__u16 r[256];
-	__u16 g[256];
-	__u16 b[256];
-	struct fb_cmap cmap;
-
-	/* Set up the colormap */
-	for (i = 0; i < ncolors; i++) {
-		r[i] = colors[i].r << 8;
-		g[i] = colors[i].g << 8;
-		b[i] = colors[i].b << 8;
-	}
-	cmap.start = firstcolor;
-	cmap.len = ncolors;
-	cmap.red = r;
-	cmap.green = g;
-	cmap.blue = b;
-	cmap.transp = NULL;
-
-	if ((ioctl(console_fd, FBIOPUTCMAP, &cmap) < 0) ||
-	    !(_this->screen->flags & SDL_HWPALETTE)) {
-		colors = _this->screen->format->palette->colors;
-		ncolors = _this->screen->format->palette->ncolors;
-		cmap.start = 0;
-		cmap.len = ncolors;
-		memset(r, 0, sizeof(r));
-		memset(g, 0, sizeof(g));
-		memset(b, 0, sizeof(b));
-		if (ioctl(console_fd, FBIOGETCMAP, &cmap) == 0) {
-			for (i = ncolors - 1; i >= 0; --i) {
-				colors[i].r = (r[i] >> 8);
-				colors[i].g = (g[i] >> 8);
-				colors[i].b = (b[i] >> 8);
-			}
-		}
-		return (0);
-	}
-	return (1);
-}
-
-/* Note:  If we are terminated, this could be called in the middle of
-   another SDL video routine -- notably UpdateRects.
-*/
-static void GC_VideoQuit(_THIS)
-{
-	if (_this->hidden->buffer) {
-		free(_this->hidden->buffer);
-		_this->hidden->buffer = NULL;
-	}
-	if (_this->screen) {
-		Uint32 *rowp = (Uint32 *) (mapped_mem + mapped_offset);
-		int left =
-		    (_this->screen->pitch * _this->screen->h) / sizeof(Uint32);
-		while (left--) {
-			*rowp++ = GC_BLACK;
-		}
-		if (_this->screen->pixels != NULL) {
-			/* already freed above */
-			_this->screen->pixels = NULL;
-		}
-	}
-	/* Close console and input file descriptors */
-	if (console_fd > 0) {
-		/* Unmap the video framebuffer and I/O registers */
-		if (mapped_mem) {
-			munmap(mapped_mem, mapped_memlen);
-			mapped_mem = NULL;
-		}
-
-		/* Restore the original video mode and palette */
-		if (GC_InGraphicsMode(_this)) {
-			//FB_RestorePalette(_this);
-			ioctl(console_fd, FBIOPUT_VSCREENINFO, &saved_vinfo);
-		}
-
-		/* We're all done with the framebuffer */
-		close(console_fd);
-		console_fd = -1;
-	}
-	GC_CloseKeyboard(_this);
-}

Index: SDL_gcvideo.h
===================================================================
RCS file: /cvsroot/gc-linux/libsdl/src/video/gc/SDL_gcvideo.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- SDL_gcvideo.h	23 Jun 2005 18:18:34 -0000	1.1.1.1
+++ SDL_gcvideo.h	17 Mar 2006 22:32:02 -0000	1.2
@@ -40,9 +40,14 @@
 #include "SDL_sysvideo.h"
 #include "SDL_mutex.h"
 
+#define FBIOFLIPHACK            0x4623 /* gc-linux */
+
+
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_VideoDevice *_this
 
+extern void GC_WaitForFlipCompletion(_THIS);
+
 /* Private display data */
 
 struct SDL_PrivateVideoData {
@@ -54,62 +59,46 @@
 	int console_fd;
 	struct fb_var_screeninfo cache_vinfo;
 	struct fb_var_screeninfo saved_vinfo;
-	//int saved_cmaplen;
-	//__u16 *saved_cmap;
 
 	int current_vt;
 	int saved_vt;
 	int keyboard_fd;
 	int in_graphics_mode;
-	//int saved_kbd_mode;
-	//struct termios saved_kbd_termios;
 
 	//int mouse_fd;
 
 	char *mapped_mem;
 	int mapped_memlen;
-	int mapped_offset;
-	//char *mapped_io;
-	//long mapped_iolen;
 
-	//int flip_page;
-	//char *flip_address[2];
+	int flip_pending;
+	int back_page;
+	char *page_address[2];
+	int page_offset;
 
 #define NUM_MODELISTS   4	/* 8, 16, 24, and 32 bits-per-pixel */
 	int SDL_nummodes[NUM_MODELISTS];
 	SDL_Rect **SDL_modelist[NUM_MODELISTS];
 
-	void (*wait_vbl) (_THIS);
-	void (*wait_idle) (_THIS);
+//	SDL_mutex *hw_lock;
 };
 
 /* Old variable names */
 #define console_fd              (_this->hidden->console_fd)
+#define cache_vinfo             (_this->hidden->cache_vinfo)
+#define saved_vinfo             (_this->hidden->saved_vinfo)
 #define current_vt              (_this->hidden->current_vt)
 #define saved_vt                (_this->hidden->saved_vt)
 #define keyboard_fd             (_this->hidden->keyboard_fd)
 #define in_graphics_mode	(_this->hidden->in_graphics_mode)
-//#define saved_kbd_mode          (_this->hidden->saved_kbd_mode)
-//#define saved_kbd_termios       (_this->hidden->saved_kbd_termios)
 //#define mouse_fd                (_this->hidden->mouse_fd)
-#define cache_vinfo             (_this->hidden->cache_vinfo)
-#define saved_vinfo             (_this->hidden->saved_vinfo)
-#define saved_cmaplen           (_this->hidden->saved_cmaplen)
-#define saved_cmap              (_this->hidden->saved_cmap)
 #define mapped_mem              (_this->hidden->mapped_mem)
 #define mapped_memlen           (_this->hidden->mapped_memlen)
-#define mapped_offset           (_this->hidden->mapped_offset)
-#define mapped_io               (_this->hidden->mapped_io)
-#define mapped_iolen            (_this->hidden->mapped_iolen)
-#define flip_page               (_this->hidden->flip_page)
-#define flip_address            (_this->hidden->flip_address)
+#define flip_pending            (_this->hidden->flip_pending)
+#define back_page               (_this->hidden->back_page)
+#define page_address            (_this->hidden->page_address)
+#define page_offset             (_this->hidden->page_offset)
 #define SDL_nummodes            (_this->hidden->SDL_nummodes)
 #define SDL_modelist            (_this->hidden->SDL_modelist)
-#define surfaces                (_this->hidden->surfaces)
-#define surfaces_memtotal       (_this->hidden->surfaces_memtotal)
-#define surfaces_memleft        (_this->hidden->surfaces_memleft)
-#define hw_lock                 (_this->hidden->hw_lock)
-#define wait_vbl                (_this->hidden->wait_vbl)
-#define wait_idle               (_this->hidden->wait_idle)
+//#define hw_lock                 (_this->hidden->hw_lock)
 
 #endif				/* _SDL_gcvideo_h */