Linux on the Nintendo GameCube and Wii

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

Modified Files:
	gamecube_defconfig 
Log Message:
Trivial re-ordering to keep things sorted alphabetically.

Index: gamecube_defconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gamecube_defconfig	14 Mar 2004 23:45:44 -0000	1.14
+++ gamecube_defconfig	15 Mar 2004 00:27:56 -0000	1.15
@@ -85,6 +85,7 @@
 # CONFIG_PRPMC750 is not set
 # CONFIG_PRPMC800 is not set
 # CONFIG_SANDPOINT is not set
+CONFIG_GAMECUBE=y
 # CONFIG_ADIR is not set
 # CONFIG_K2 is not set
 # CONFIG_PAL4 is not set
@@ -93,7 +94,6 @@
 # CONFIG_SBS8260 is not set
 # CONFIG_RPX6 is not set
 # CONFIG_TQM8260 is not set
-CONFIG_GAMECUBE=y
 CONFIG_GAMECUBE_RESET_SWITCH=y
 CONFIG_GAMECUBE_DVD_COVER=y
 # CONFIG_SMP is not set

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

Modified Files:
	Kconfig 
Log Message:
Trivial re-ordering to keep things sorted alphabetically.

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Kconfig	14 Mar 2004 23:45:44 -0000	1.9
+++ Kconfig	15 Mar 2004 00:27:55 -0000	1.10
@@ -517,6 +517,13 @@
 	  Select SANDPOINT if configuring for a Motorola Sandpoint X3
 	  (any flavor).
 
+config GAMECUBE
+	bool "Nintendo-GameCube"
+	help
+	   Select GAMECUBE if configuring for the Nintendo GameCube.
+	   More information is available at:
+	   <http://gc-linux.sourceforge.net/>.
+
 config ADIR
 	bool "SBS-Adirondack"
 
@@ -560,11 +567,6 @@
 	  End of Life: not yet :-)
 	  URL: <http://www.denx.de/PDF/TQM82xx_SPEC_Rev005.pdf>
 
-config GAMECUBE
-	bool "GameCube"
-	---help---
-	   The Nintendo GamCube.
-
 endchoice
 
 config GAMECUBE_RESET_SWITCH

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

Modified Files:
	exi.txt 
Log Message:
structs exi_device_id and exi_driver are static.

Index: exi.txt
===================================================================
RCS file: /cvsroot/gc-linux/linux/Documentation/exi.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exi.txt	3 Mar 2004 23:04:08 -0000	1.1
+++ exi.txt	15 Mar 2004 00:06:56 -0000	1.2
@@ -8,8 +8,8 @@
 ---------------
 
 When writing drivers for devices attached to the EXI bus, do not bother with
-device probing, removal, hotplug and PM events. The bus driver already takes
-care of this.
+device probing, removal and hotplug events. The bus driver already takes care
+of this.
 
 
 Registration:
@@ -24,12 +24,12 @@
 `id_table' is a list of device IDs the driver claims to support. These
 should be taken from include/linux/exi_ids.h:
 
-	struct exi_device_id frob_id_table[] = {
+	static struct exi_device_id frob_id_table[] = {
 		{ EXI_ID_FROB0 },
 		{ EXI_ID_FROB1 },
 	};
 
-	struct exi_driver frob_driver = {
+	static struct exi_driver frob_driver = {
 		.name		= "frob",
 		.id_table	= frob_id_table,
 	};

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

Modified Files:
	main.c 
Log Message:
Merged 2.6.4


Index: main.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/init/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- main.c	18 Feb 2004 20:01:59 -0000	1.4
+++ main.c	14 Mar 2004 23:45:45 -0000	1.5
@@ -12,10 +12,12 @@
 #define __KERNEL_SYSCALLS__
 
 #include <linux/config.h>
+#include <linux/types.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/kernel.h>
+#include <linux/syscalls.h>
 #include <linux/unistd.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
@@ -36,6 +38,7 @@
 #include <linux/profile.h>
 #include <linux/rcupdate.h>
 #include <linux/moduleparam.h>
+#include <linux/kallsyms.h>
 #include <linux/writeback.h>
 #include <linux/cpu.h>
 #include <linux/efi.h>
@@ -141,6 +144,7 @@
 
 static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
 char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
+static const char *panic_later, *panic_param;
 
 __setup("profile=", profile_setup);
 
@@ -253,20 +257,27 @@
 		return 0;
 	}
 
+	if (panic_later)
+		return 0;
+
 	if (val) {
 		/* Environment option */
 		unsigned int i;
 		for (i = 0; envp_init[i]; i++) {
-			if (i == MAX_INIT_ENVS)
-				panic("Too many boot env vars at `%s'", param);
+			if (i == MAX_INIT_ENVS) {
+				panic_later = "Too many boot env vars at `%s'";
+				panic_param = param;
+			}
 		}
 		envp_init[i] = param;
 	} else {
 		/* Command line option */
 		unsigned int i;
 		for (i = 0; argv_init[i]; i++) {
-			if (i == MAX_INIT_ARGS)
-				panic("Too many boot init vars at `%s'",param);
+			if (i == MAX_INIT_ARGS) {
+				panic_later = "Too many boot init vars at `%s'";
+				panic_param = param;
+			}
 		}
 		argv_init[i] = param;
 	}
@@ -340,7 +351,7 @@
 static void __init smp_init(void)
 {
 	unsigned int i;
-	unsigned j = 0;
+	unsigned j = 1;
 
 	/* FIXME: This should be done in userspace --RR */
 	for (i = 0; i < NR_CPUS; i++) {
@@ -370,9 +381,11 @@
  * between the root thread and the init thread may cause start_kernel to
  * be reaped by free_initmem before the root thread has proceeded to
  * cpu_idle.
+ *
+ * gcc-3.4 accidentally inlines this function, so use noinline.
  */
 
-static void rest_init(void)
+static void noinline rest_init(void)
 {
 	kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND);
 	unlock_kernel();
@@ -427,6 +440,8 @@
 	 * this. But we do want output early, in case something goes wrong.
 	 */
 	console_init();
+	if (panic_later)
+		panic(panic_later, panic_param);
 	profile_init();
 	local_irq_enable();
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -453,6 +468,7 @@
 	fork_init(num_physpages);
 	proc_caches_init();
 	buffer_init();
+	unnamed_dev_init();
 	security_scaffolding_startup();
 	vfs_caches_init(num_physpages);
 	radix_tree_init();
@@ -498,8 +514,11 @@
 	for (call = &__initcall_start; call < &__initcall_end; call++) {
 		char *msg;
 
-		if (initcall_debug)
-			printk("calling initcall 0x%p\n", *call);
+		if (initcall_debug) {
+			printk(KERN_DEBUG "Calling initcall 0x%p", *call);
+			print_symbol(": %s()", (unsigned long) *call);
+			printk("\n");
+		}
 
 		(*call)();

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

Modified Files:
	fb.h 
Log Message:
Merged 2.6.4


Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fb.h	18 Feb 2004 20:01:58 -0000	1.2
+++ fb.h	14 Mar 2004 23:45:45 -0000	1.3
@@ -152,6 +152,7 @@
 #define FB_ACTIVATE_VBL	       16	/* activate values on next vbl  */
 #define FB_CHANGE_CMAP_VBL     32	/* change colormap on vbl	*/
 #define FB_ACTIVATE_ALL	       64	/* change all VCs on this fb	*/
+#define FB_ACTIVATE_FORCE     128	/* force apply even when no change*/
 
 #define FB_ACCELF_TEXT		1	/* text mode acceleration */
 
@@ -371,16 +372,16 @@
 #define FB_PIXMAP_SYNC    256   /* set if GPU can DMA       */
 
 struct fb_pixmap {
-	u8 *addr;		/* pointer to memory                    */
-	u32 size;		/* size of buffer in bytes              */
-	u32 offset;		/* current offset to buffer             */
-	u32 buf_align;		/* byte alignment of each bitmap        */
-	u32 scan_align;		/* alignment per scanline               */
-	u32 access_align;	/* alignment per read/write             */
-	u32 flags;		/* see FB_PIXMAP_*                      */
-					  /* access methods                */
-	void (*outbuf)(u8 *dst, u8 *addr, unsigned int size); 
-	u8   (*inbuf) (u8 *addr);
+	u8  *addr;		/* pointer to memory			*/
+	u32 size;		/* size of buffer in bytes		*/
+	u32 offset;		/* current offset to buffer		*/
+	u32 buf_align;		/* byte alignment of each bitmap	*/
+	u32 scan_align;		/* alignment per scanline		*/
+	u32 access_align;	/* alignment per read/write		*/
+	u32 flags;		/* see FB_PIXMAP_*			*/
+				/* access methods			*/
+	void (*outbuf)(struct fb_info *info, u8 *addr, u8 *src, unsigned int size);
+	u8   (*inbuf) (struct fb_info *info, u8 *addr);
 };
 
     /*
@@ -388,64 +389,53 @@
      */
 
 struct fb_ops {
-    /* open/release and usage marking */
-    struct module *owner;
-    int (*fb_open)(struct fb_info *info, int user);
-    int (*fb_release)(struct fb_info *info, int user);
+	/* open/release and usage marking */
+	struct module *owner;
+	int (*fb_open)(struct fb_info *info, int user);
+	int (*fb_release)(struct fb_info *info, int user);
 
-    /* For framebuffers with strange non linear layouts */	
-	ssize_t(*fb_read) (struct file * file, char *buf, size_t count,
-			   loff_t * ppos);
-	ssize_t(*fb_write) (struct file * file, const char *buf,
-			    size_t count, loff_t * ppos);
+	/* For framebuffers with strange non linear layouts */
+	ssize_t (*fb_read)(struct file *file, char *buf, size_t count, loff_t *ppos);
+	ssize_t (*fb_write)(struct file *file, const char *buf, size_t count, loff_t *ppos);
 
 	/* checks var and eventually tweaks it to something supported,
 	 * DO NOT MODIFY PAR */
-	int (*fb_check_var) (struct fb_var_screeninfo * var,
-			     struct fb_info * info);
+	int (*fb_check_var)(struct fb_var_screeninfo *var, struct fb_info *info);
 	/* set the video mode according to info->var */
-    int (*fb_set_par)(struct fb_info *info);
+	int (*fb_set_par)(struct fb_info *info);
 
-    /* set color register */
-    int (*fb_setcolreg)(unsigned regno, unsigned red, unsigned green,
-			     unsigned blue, unsigned transp,
-			     struct fb_info * info);
+	/* set color register */
+	int (*fb_setcolreg)(unsigned regno, unsigned red, unsigned green,
+			    unsigned blue, unsigned transp, struct fb_info *info);
 
-    /* blank display */
-    int (*fb_blank)(int blank, struct fb_info *info);
+	/* blank display */
+	int (*fb_blank)(int blank, struct fb_info *info);
 
-    /* pan display */
-	int (*fb_pan_display) (struct fb_var_screeninfo * var,
-			       struct fb_info * info);
+	/* pan display */
+	int (*fb_pan_display)(struct fb_var_screeninfo *var, struct fb_info *info);
 
-    /* draws a rectangle */
-	void (*fb_fillrect) (struct fb_info * info,
-			     const struct fb_fillrect * rect);
-    /* Copy data from area to another */
-	void (*fb_copyarea) (struct fb_info * info,
-			     const struct fb_copyarea * region);
-    /* Draws a image to the display */
-	void (*fb_imageblit) (struct fb_info * info,
-			      const struct fb_image * image);
+	/* Draws a rectangle */
+	void (*fb_fillrect) (struct fb_info *info, const struct fb_fillrect *rect);
+	/* Copy data from area to another */
+	void (*fb_copyarea) (struct fb_info *info, const struct fb_copyarea *region);
+	/* Draws a image to the display */
+	void (*fb_imageblit) (struct fb_info *info, const struct fb_image *image);
 
-    /* Draws cursor */
-	int (*fb_cursor) (struct fb_info * info,
-			  struct fb_cursor * cursor);
+	/* Draws cursor */
+	int (*fb_cursor) (struct fb_info *info, struct fb_cursor *cursor);
 
-    /* Rotates the display */
-    void (*fb_rotate)(struct fb_info *info, int angle);
+	/* Rotates the display */
+	void (*fb_rotate)(struct fb_info *info, int angle);
 
-    /* wait for blit idle, optional */
-    int (*fb_sync)(struct fb_info *info);		
+	/* wait for blit idle, optional */
+	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);
+	/* perform fb specific ioctl (optional) */
+	int (*fb_ioctl)(struct inode *inode, struct file *file, unsigned int cmd,
+			unsigned long arg, struct fb_info *info);
 
-    /* perform fb specific mmap */
-	int (*fb_mmap) (struct fb_info * info, struct file * file,
-			struct vm_area_struct * vma);
+	/* perform fb specific mmap */
+	int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma);
 };
 
 struct fb_info {
@@ -459,6 +449,7 @@
 	struct fb_cursor cursor;	/* Current cursor */	
 	struct work_struct queue;	/* Framebuffer event queue */
 	struct fb_pixmap pixmap;	/* Image Hardware Mapper */
+	struct fb_pixmap sprite;	/* Cursor hardware Mapper */
 	struct fb_cmap cmap;		/* Current cmap */
 	struct fb_ops *fbops;
 	char *screen_base;		/* Virtual address */
@@ -542,14 +533,16 @@
 extern int unregister_framebuffer(struct fb_info *fb_info);
 extern int fb_prepare_logo(struct fb_info *fb_info);
 extern int fb_show_logo(struct fb_info *fb_info);
-extern u32 fb_get_buffer_offset(struct fb_info *info, u32 size);
-extern void move_buf_unaligned(struct fb_info *info, u8 * dst, u8 * src,
-				u32 d_pitch, u32 height, u32 mask,
-				u32 shift_high, u32 shift_low, u32 mod,
-				u32 idx);
-extern void move_buf_aligned(struct fb_info *info, u8 * dst, u8 * src,
-				u32 d_pitch, u32 s_pitch, u32 height);
+extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size);
+extern void fb_move_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
+				u8 *dst, u32 d_pitch, u8 *src, u32 idx,
+				u32 height, u32 shift_high, u32 shift_low, u32 mod);
+extern void fb_move_buf_aligned(struct fb_info *info, struct fb_pixmap *buf,
+				u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch,
+				u32 height);
+extern void fb_load_cursor_image(struct fb_info *);
 extern void fb_set_suspend(struct fb_info *info, int state);
+
 extern struct fb_info *registered_fb[FB_MAX];
 extern int num_registered_fb;

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

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.4


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kconfig	18 Feb 2004 20:01:58 -0000	1.3
+++ Kconfig	14 Mar 2004 23:45:44 -0000	1.4
@@ -1360,8 +1360,9 @@
 	  say N.
 
 config E100
-	tristate "EtherExpressPro/100 support (e100, Alternate Intel driver)"
+	tristate "Intel(R) PRO/100+ support"
 	depends on NET_PCI && PCI
+	select MII
 	---help---
 	  This driver supports Intel(R) PRO/100 family of adapters, which 
 	  includes:
@@ -1434,6 +1435,10 @@
 	  <file:Documentation/networking/net-modules.txt>.  The module
 	  will be called e100.
 
+config E100_NAPI
+	bool "Use Rx Polling (NAPI)"
+	depends on E100
+
 config LNE390
 	tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
 	depends on NET_PCI && EISA && EXPERIMENTAL
@@ -1546,6 +1551,7 @@
 
 config 8139TOO_PIO
 	bool "Use PIO instead of MMIO"
+	default y
 	depends on 8139TOO
 	help
 	  This instructs the driver to use programmed I/O ports (PIO) instead
@@ -1676,25 +1682,23 @@
 	select CRC32
 	select MII
 	help
-	  If you have a VIA "rhine" based network card (Rhine-I (3043) or
-	  Rhine-2 (VT86c100A)), say Y here.
+	  If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A),
+	  Rhine-II (VT6102), or Rhine-III (VT6105)), say Y here. Rhine-type
+	  Ethernet functions can also be found integrated on South Bridges
+	  (e.g. VT8235).
 
-	  To compile this driver as a module, choose M here and read
-	  <file:Documentation/networking/net-modules.txt>. The module
+	  To compile this driver as a module, choose M here. The module
 	  will be called via-rhine.
 
 config VIA_RHINE_MMIO
-	bool "Use MMIO instead of PIO (EXPERIMENTAL)"
-	depends on VIA_RHINE && EXPERIMENTAL
+	bool "Use MMIO instead of PIO"
+	depends on VIA_RHINE
 	help
 	  This instructs the driver to use PCI shared memory (MMIO) instead of
 	  programmed I/O ports (PIO). Enabling this gives an improvement in
 	  processing time in parts of the driver.
 
-	  It is not known if this works reliably on all "rhine" based cards,
-	  but it has been tested successfully on some DFE-530TX adapters.
-
-	  If unsure, say N.
+	  If unsure, say Y.
 
 config LAN_SAA9730
 	bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)"
@@ -1721,7 +1725,8 @@
 	  <file:Documentation/Changes>) and you can say N here.
 
 	  Laptop users should read the Linux Laptop home page at
-	  <http://www.linux-on-laptops.com/>.
+	  <http://www.linux-on-laptops.com/> or
+	  Tuxmobil - Linux on Mobile Computers at <http://www.tuxmobil.org/>.
 
 	  Note that the answer to this question doesn't directly affect the
 	  kernel: saying N will just cause the configurator to skip all
@@ -1990,6 +1995,7 @@
 	    - Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter
 	    - 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
@@ -2001,6 +2007,7 @@
 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)
 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)
 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
+	    - Marvell 88E8050 Gigabit LOM Ethernet Adapter (Intel)
 	    - Marvell RDK-8001 Adapter
 	    - Marvell RDK-8002 Adapter
 	    - Marvell RDK-8003 Adapter
@@ -2012,6 +2019,7 @@
 	    - Marvell RDK-8010 Adapter
 	    - Marvell RDK-8011 Adapter
 	    - Marvell RDK-8012 Adapter
+	    - Marvell RDK-8052 Adapter
 	    - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit)
 	    - Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit)
 	    - N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
@@ -2168,6 +2176,17 @@
 	  under Linux, say Y here (you must also remember to enable the driver
 	  for your HIPPI card below). Most people will say N here.
 
+config IBMVETH
+	tristate "IBM LAN Virtual Ethernet support"
+	depends on NETDEVICES && NET_ETHERNET && PPC_PSERIES
+	---help---
+	  This driver supports virtual ethernet adapters on newer IBM iSeries
+	  and pSeries systems.
+
+	  To compile this driver as a module, choose M here and read
+	  <file:Documentation/networking/net-modules.txt>. The module will
+	  be called ibmveth.
+
 config ROADRUNNER
 	tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)"
 	depends on HIPPI && PCI

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	18 Feb 2004 20:01:58 -0000	1.3
+++ Makefile	14 Mar 2004 23:45:44 -0000	1.4
@@ -8,7 +8,6 @@
   obj-$(CONFIG_ISDN) += slhc.o
 endif
 
-obj-$(CONFIG_E100) += e100/
 obj-$(CONFIG_E1000) += e1000/
 obj-$(CONFIG_IXGB) += ixgb/
 obj-$(CONFIG_BONDING) += bonding/
@@ -39,13 +38,13 @@
 obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
 obj-$(CONFIG_PCNET32) += pcnet32.o
 obj-$(CONFIG_EEPRO100) += eepro100.o
+obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
 obj-$(CONFIG_SIS190) += sis190.o
 obj-$(CONFIG_SIS900) += sis900.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
 obj-$(CONFIG_ACENIC) += acenic.o
-obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NATSEMI) += natsemi.o
 obj-$(CONFIG_NS83820) += ns83820.o
 obj-$(CONFIG_STNIC) += stnic.o 8390.o
@@ -175,6 +174,7 @@
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
 obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
+obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_GAMECUBE_NET) += gc-net.o
 
 obj-$(CONFIG_ARM) += arm/

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

Modified Files:
	Kconfig Makefile fbmem.c 
Log Message:
Merged 2.6.4


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kconfig	18 Feb 2004 20:01:58 -0000	1.3
+++ Kconfig	14 Mar 2004 23:45:45 -0000	1.4
@@ -55,7 +55,7 @@
 
 config FB_PM2
 	tristate "Permedia2 support"
-	depends on FB && (AMIGA || PCI) && BROKEN
+	depends on FB && (AMIGA || PCI)
 	help
 	  This is the frame buffer device driver for the Permedia2 AGP frame
 	  buffer card from ASK, aka `Graphic Blaster Exxtreme'.  There is a
@@ -66,21 +66,7 @@
 	bool "enable FIFO disconnect feature"
 	depends on FB_PM2 && PCI
 	help
-	  Support the Permedia2 FIFOI disconnect feature (see CONFIG_FB_PM2).
-
-config FB_PM2_PCI
-	bool "generic Permedia2 PCI board support"
-	depends on FB_PM2 && PCI
-	help
-	  Say Y to enable support for Permedia2 AGP frame buffer card from
-	  3Dlabs (aka `Graphic Blaster Exxtreme') on the PCI bus.
-
-config FB_PM2_CVPPC
-	bool "Phase5 CVisionPPC/BVisionPPC support"
-	depends on FB_PM2 && AMIGA
-	help
-	  Say Y to enable support for the Amiga Phase 5 CVisionPPC BVisionPPC
-	  framebuffer cards.  Phase 5 is no longer with us, alas.
+	  Support the Permedia2 FIFO disconnect feature (see CONFIG_FB_PM2).
 
 config FB_ACORN
 	bool "Acorn VIDC support"
@@ -462,7 +448,6 @@
 config FB_MATROX
 	tristate "Matrox acceleration"
 	depends on FB && PCI
-	select I2C_ALGOBIT if FB_MATROX_I2C
 	---help---
 	  Say Y here if you have a Matrox Millennium, Matrox Millennium II,
 	  Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox
@@ -550,6 +535,7 @@
 config FB_MATROX_I2C
 	tristate "Matrox I2C support"
 	depends on FB_MATROX && I2C
+	select I2C_ALGOBIT
 	---help---
 	  This drivers creates I2C buses which are needed for accessing the
 	  DDC (I2C) bus present on all Matroxes, an I2C bus which
@@ -628,6 +614,7 @@
 	tristate "ATI Radeon display support"
 	depends on FB && PCI
 	select I2C_ALGOBIT if FB_RADEON_I2C
+	select I2C if FB_RADEON_I2C
 	help
 	  Choose this option if you want to use an ATI Radeon graphics card as
 	  a framebuffer device.  There are both PCI and AGP versions.  You
@@ -645,7 +632,7 @@
 
 config FB_RADEON_I2C
 	bool "DDC/I2C for ATI Radeon support"
-	depends on FB_RADEON && I2C
+	depends on FB_RADEON
 	default y
 	help
 	  Say Y here if you want DDC/I2C support for your Radeon board. 

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	18 Feb 2004 20:01:58 -0000	1.3
+++ Makefile	14 Mar 2004 23:45:45 -0000	1.4
@@ -15,7 +15,7 @@
 
 obj-$(CONFIG_FB_ACORN)            += acornfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
-obj-$(CONFIG_FB_PM2)              += pm2fb.o
+obj-$(CONFIG_FB_PM2)              += pm2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_PM3)		  += pm3fb.o
 obj-$(CONFIG_FB_APOLLO)           += dnfb.o cfbfillrect.o cfbimgblt.o
 obj-$(CONFIG_FB_Q40)              += q40fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o

Index: fbmem.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/fbmem.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fbmem.c	18 Feb 2004 20:01:58 -0000	1.3
+++ fbmem.c	14 Mar 2004 23:45:45 -0000	1.4
@@ -398,7 +398,7 @@
 };
 
 #define NUM_FB_DRIVERS	(sizeof(fb_drivers)/sizeof(*fb_drivers))
-#define FBPIXMAPSIZE	8192
+#define FBPIXMAPSIZE	16384
 
 extern const char *global_mode_option;
 
@@ -415,52 +415,54 @@
 /*
  * Drawing helpers.
  */
-u8 sys_inbuf(u8 *src)
+u8 sys_inbuf(struct fb_info *info, u8 *src)
 {	
 	return *src;
 }
 
-void sys_outbuf(u8 *src, u8 *dst, unsigned int size)
+void sys_outbuf(struct fb_info *info, u8 *dst, u8 *src, unsigned int size)
 {
 	memcpy(dst, src, size);
 }	
 
-void move_buf_aligned(struct fb_info *info, u8 *dst, u8 *src, u32 d_pitch, 
-			u32 s_pitch, u32 height)
+void fb_move_buf_aligned(struct fb_info *info, struct fb_pixmap *buf,
+			u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch,
+			u32 height)
 {
 	int i;
 
 	for (i = height; i--; ) {
-		info->pixmap.outbuf(src, dst, s_pitch);
+		buf->outbuf(info, dst, src, s_pitch);
 		src += s_pitch;
 		dst += d_pitch;
 	}
 }
 
-void move_buf_unaligned(struct fb_info *info, u8 *dst, u8 *src, u32 d_pitch, 
-			u32 height, u32 mask, u32 shift_high, u32 shift_low,
-			u32 mod, u32 idx)
+void fb_move_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
+			u8 *dst, u32 d_pitch, u8 *src, u32 idx,
+			u32 height, u32 shift_high, u32 shift_low,
+			u32 mod)
 {
+	u8 mask = (u8) (0xfff << shift_high), tmp;
 	int i, j;
-	u8 tmp;
 
 	for (i = height; i--; ) {
 		for (j = 0; j < idx; j++) {
-			tmp = info->pixmap.inbuf(dst+j);
+			tmp = buf->inbuf(info, dst+j);
 			tmp &= mask;
 			tmp |= *src >> shift_low;
-			info->pixmap.outbuf(&tmp, dst+j, 1);
+			buf->outbuf(info, dst+j, &tmp, 1);
 			tmp = *src << shift_high;
-			info->pixmap.outbuf(&tmp, dst+j+1, 1);
+			buf->outbuf(info, dst+j+1, &tmp, 1);
 			src++;
 		}
-		tmp = info->pixmap.inbuf(dst+idx);
+		tmp = buf->inbuf(info, dst+idx);
 		tmp &= mask;
 		tmp |= *src >> shift_low;
-		info->pixmap.outbuf(&tmp, dst+idx, 1);
+		buf->outbuf(info, dst+idx, &tmp, 1);
 		if (shift_high < mod) {
 			tmp = *src << shift_high;
-			info->pixmap.outbuf(&tmp, dst+idx+1, 1);
+			buf->outbuf(info, dst+idx+1, &tmp, 1);
 		}	
 		src++;
 		dst += d_pitch;
@@ -471,10 +473,10 @@
  * we need to lock this section since fb_cursor
  * may use fb_imageblit()
  */
-u32 fb_get_buffer_offset(struct fb_info *info, u32 size)
+char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size)
 {
-	struct fb_pixmap *buf = &info->pixmap;
 	u32 align = buf->buf_align - 1, offset;
+	char *addr = buf->addr;
 
 	/* If IO mapped, we need to sync before access, no sharing of
 	 * the pixmap is done
@@ -482,7 +484,7 @@
 	if (buf->flags & FB_PIXMAP_IO) {
 		if (info->fbops->fb_sync && (buf->flags & FB_PIXMAP_SYNC))
 			info->fbops->fb_sync(info);
-		return 0;
+		return addr;
 	}
 
 	/* See if we fit in the remaining pixmap space */
@@ -498,8 +500,9 @@
 		offset = 0;
 	}
 	buf->offset = offset + size;
+	addr += offset;
 
-	return offset;
+	return addr;
 }
 
 #ifdef CONFIG_LOGO
@@ -872,6 +875,15 @@
 }
 #endif /* CONFIG_KMOD */
 
+void
+fb_load_cursor_image(struct fb_info *info)
+{
+	unsigned int width = (info->cursor.image.width + 7) >> 3;
+	u8 *data = (u8 *) info->cursor.image.data;
+
+	info->sprite.outbuf(info, info->sprite.addr, data, width);
+}
+
 int
 fb_cursor(struct fb_info *info, struct fb_cursor *sprite)
 {
@@ -946,7 +958,8 @@
 {
 	int err;
 
-	if (memcmp(&info->var, var, sizeof(struct fb_var_screeninfo))) {
+	if ((var->activate & FB_ACTIVATE_FORCE) ||
+	    memcmp(&info->var, var, sizeof(struct fb_var_screeninfo))) {
 		if (!info->fbops->fb_check_var) {
 			*var = info->var;
 			return 0;
@@ -1279,6 +1292,21 @@
 	if (fb_info->pixmap.inbuf == NULL)
 		fb_info->pixmap.inbuf = sys_inbuf;
 
+	if (fb_info->sprite.addr == NULL) {
+		fb_info->sprite.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL);
+		if (fb_info->sprite.addr) {
+			fb_info->sprite.size = FBPIXMAPSIZE;
+			fb_info->sprite.buf_align = 1;
+			fb_info->sprite.scan_align = 1;
+			fb_info->sprite.flags = FB_PIXMAP_DEFAULT;
+		}
+	}
+	fb_info->sprite.offset = 0;
+	if (fb_info->sprite.outbuf == NULL)
+		fb_info->sprite.outbuf = sys_outbuf;
+	if (fb_info->sprite.inbuf == NULL)
+		fb_info->sprite.inbuf = sys_inbuf;
+
 	registered_fb[i] = fb_info;
 
 	devfs_mk_cdev(MKDEV(FB_MAJOR, i),
@@ -1307,8 +1335,10 @@
 		return -EINVAL;
 	devfs_remove("fb/%d", i);
 
-	if (fb_info->pixmap.addr)
+	if (fb_info->pixmap.addr && (fb_info->pixmap.flags & FB_PIXMAP_DEFAULT))
 		kfree(fb_info->pixmap.addr);
+	if (fb_info->sprite.addr && (fb_info->sprite.flags & FB_PIXMAP_DEFAULT))
+		kfree(fb_info->sprite.addr);
 	registered_fb[i]=NULL;
 	num_registered_fb--;
 	return 0;
@@ -1463,8 +1493,9 @@
 EXPORT_SYMBOL(fb_blank);
 EXPORT_SYMBOL(fb_pan_display);
 EXPORT_SYMBOL(fb_get_buffer_offset);
-EXPORT_SYMBOL(move_buf_unaligned);
-EXPORT_SYMBOL(move_buf_aligned);
+EXPORT_SYMBOL(fb_move_buf_unaligned);
+EXPORT_SYMBOL(fb_move_buf_aligned);
+EXPORT_SYMBOL(fb_load_cursor_image);
 EXPORT_SYMBOL(fb_set_suspend);
 EXPORT_SYMBOL(fb_register_client);
 EXPORT_SYMBOL(fb_unregister_client);

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

Modified Files:
	Kconfig 
Log Message:
Merged 2.6.4


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Kconfig	27 Feb 2004 12:26:01 -0000	1.8
+++ Kconfig	14 Mar 2004 23:45:44 -0000	1.9
@@ -1019,24 +1019,6 @@
 
 	  Say Y.
 
-config HOTPLUG
-	bool "Support for hot-pluggable devices"
-	---help---
-	  Say Y here if you want to plug devices into your computer while
-	  the system is running, and be able to use them quickly.  In many
-	  cases, the devices can likewise be unplugged at any time too.
-
-	  One well known example of this is PCMCIA- or PC-cards, credit-card
-	  size devices such as network cards, modems or hard drives which are
-	  plugged into slots found on all modern laptop computers.  Another
-	  example, used on modern desktops as well as laptops, is USB.
-
-	  Enable HOTPLUG and KMOD, and build a modular kernel.  Get agent
-	  software (at <http://linux-hotplug.sourceforge.net/>) and install it.
-	  Then your kernel will automatically call out to a user mode "policy
-	  agent" (/sbin/hotplug) to load modules and set up software needed
-	  to use devices as you hotplug them.
-
 source "drivers/pcmcia/Kconfig"
 
 endmenu

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

Modified Files:
	Makefile 
Log Message:
Merged 2.6.4


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	27 Feb 2004 12:26:02 -0000	1.1
+++ Makefile	14 Mar 2004 23:45:44 -0000	1.2
@@ -45,7 +45,7 @@
 obj-$(CONFIG_PHONE)		+= telephony/
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BT)		+= bluetooth/
-obj-$(CONFIG_ISDN_BOOL)		+= isdn/
+obj-$(CONFIG_ISDN)		+= isdn/
 obj-$(CONFIG_MCA)		+= mca/
 obj-$(CONFIG_EISA)		+= eisa/
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/

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

Modified Files:
	Makefile 
Log Message:
Merged 2.6.4


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	18 Feb 2004 20:01:57 -0000	1.3
+++ Makefile	14 Mar 2004 23:45:43 -0000	1.4
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 3
+SUBLEVEL = 4
 EXTRAVERSION =
 NAME=Feisty Dunnart
 
@@ -891,6 +891,9 @@
 # Brief documentation of the typical targets used
 # ---------------------------------------------------------------------------
 
+boards := $(wildcard $(srctree)/arch/$(ARCH)/configs/*_defconfig)
+boards := $(notdir $(boards))
+
 help:
 	@echo  'Cleaning targets:'
 	@echo  '  clean		  - remove most generated files but keep the config'
@@ -916,6 +919,11 @@
 	@$(if $(archhelp),$(archhelp),\
 		echo '  No architecture specific help defined for $(ARCH)')
 	@echo  ''
+	@$(if $(boards), \
+		$(foreach b, $(boards), \
+		printf "  %-24s - Build for %s\\n" $(b) $(subst _defconfig,,$(b));) \
+		echo '')
+
 	@echo  '  make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
 	@echo  '  make O=dir [targets] Locate all output files in "dir", including .config'
 	@echo  '  make C=1   [targets] Check all c source with checker tool'

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

Modified Files:
	gamecube_defconfig 
Log Message:
Merged 2.6.4


Index: gamecube_defconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gamecube_defconfig	18 Feb 2004 20:01:58 -0000	1.13
+++ gamecube_defconfig	14 Mar 2004 23:45:44 -0000	1.14
@@ -24,6 +24,7 @@
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_HOTPLUG is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_EMBEDDED is not set
@@ -113,7 +114,7 @@
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_LEGACY_PROC is not set
 # CONFIG_PCI_NAMES is not set
-# CONFIG_HOTPLUG is not set
+CONFIG_EXI=y
 
 #
 # Advanced setup
@@ -155,6 +156,7 @@
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
+# CONFIG_GAMECUBE_ARAM is not set
 # CONFIG_BLK_CPQ_DA is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -187,7 +189,7 @@
 #
 
 #
-# IEEE 1394 (FireWire) support (EXPERIMENTAL)
+# IEEE 1394 (FireWire) support
 #
 # CONFIG_IEEE1394 is not set
 
@@ -346,7 +348,7 @@
 #
 # ISDN subsystem
 #
-# CONFIG_ISDN_BOOL is not set
+# CONFIG_ISDN is not set
 
 #
 # Telephony Support
@@ -412,7 +414,8 @@
 # Non-8250 serial port support
 #
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
 
 #
 # Mice
@@ -450,6 +453,10 @@
 # CONFIG_I2C is not set
 
 #
+# Misc devices
+#
+
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
@@ -463,6 +470,7 @@
 # Graphics support
 #
 CONFIG_FB=y
+# CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_CT65550 is not set
 # CONFIG_FB_IMSTT is not set
@@ -560,7 +568,7 @@
 # CONFIG_SND_VX222 is not set
 
 #
-# ALSA PPC devices
+# ALSA PowerMac devices
 #
 # CONFIG_SND_POWERMAC is not set
 CONFIG_SND_GAMECUBE=y
@@ -620,7 +628,6 @@
 CONFIG_DEVFS_FS=y
 # CONFIG_DEVFS_MOUNT is not set
 # CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS=y
 # CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
@@ -632,6 +639,7 @@
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_HFS_FS=m
+# CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
@@ -652,7 +660,6 @@
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
-# CONFIG_INTERMEZZO_FS is not set
 # CONFIG_AFS_FS is not set
 
 #

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

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.4


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kconfig	2 Mar 2004 10:26:29 -0000	1.1
+++ Kconfig	14 Mar 2004 23:45:44 -0000	1.2
@@ -246,10 +246,13 @@
 	  bits of, say, a sound file). This is also safe if the file resides
 	  on a remote file server.
 
-	  There are several ways of doing this. Some of these require kernel
-	  patches. The vanilla kernel offers the cryptoloop option. If you
-	  want to use that, say Y to both LOOP and CRYPTOLOOP, and make sure
-	  you have a recent (version 2.12 or later) version of util-linux.
+	  There are several ways of encrypting disks. Some of these require
+	  kernel patches. The vanilla kernel offers the cryptoloop option
+	  and a Device Mapper target (which is superior, as it supports all
+	  file systems). If you want to use the cryptoloop, say Y to both
+	  LOOP and CRYPTOLOOP, and make sure you have a recent (version 2.12
+	  or later) version of util-linux. Additionally, be aware that
+	  the cryptoloop is not safe for storing journaled filesystems.
 
 	  Note that this loop device has nothing to do with the loopback
 	  device used for network connections from the machine to itself.
@@ -268,6 +271,11 @@
 	  provided by the CryptoAPI as loop transformation. This might be
 	  used as hard disk encryption.
 
+	  WARNING: This device is not safe for journaled file systems like
+	  ext3 or Reiserfs. Please use the Device Mapper crypto module
+	  instead, which can be configured to be on-disk compatible with the
+	  cryptoloop device.
+
 config BLK_DEV_NBD
 	tristate "Network block device support"
 	depends on NET
@@ -324,6 +332,7 @@
 
 config BLK_DEV_INITRD
 	bool "Initial RAM disk (initrd) support"
+	depends on BLK_DEV_RAM && BLK_DEV_RAM!=m
 	help
 	  The initial RAM disk is a RAM disk that is loaded by the boot loader
 	  (loadlin or lilo) and that is mounted as root before the normal boot

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	2 Mar 2004 10:26:29 -0000	1.1
+++ Makefile	14 Mar 2004 23:45:44 -0000	1.2
@@ -39,3 +39,5 @@
 obj-$(CONFIG_BLK_DEV_UMEM)	+= umem.o
 obj-$(CONFIG_BLK_DEV_NBD)	+= nbd.o
 obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o
+
+obj-$(CONFIG_VIODASD)		+= viodasd.o

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

Modified Files:
	Kconfig 
Log Message:
Brought up to date with 2.6.1+

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kconfig	4 Feb 2004 23:53:26 -0000	1.1
+++ Kconfig	13 Mar 2004 19:58:23 -0000	1.2
@@ -1,6 +1,6 @@
 # ALSA PowerMac drivers
 
-menu "ALSA PPC devices"
+menu "ALSA PowerMac devices"
 	depends on SND!=n && PPC
 
 config SND_POWERMAC

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

Modified Files:
	gamecube.h gc-dvdcover.c 
Log Message:
Patch from Albert Herranz (isobel) after he spotted a bug in
gc_dvdcover_handler() where it was handling only one (cover closed)
of all interrupts it was claiming.

Should fix the hang people were seeing pre-fbcon init.


Index: gamecube.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gamecube.h	30 Jan 2004 14:59:16 -0000	1.3
+++ gamecube.h	8 Mar 2004 23:19:06 -0000	1.4
@@ -7,6 +7,10 @@
  *
  * Author: Armin Kuster <akuster@...>
  *
+ * Albert Herranz
+ *	GAMECUBE
+ *	- Added some defines for DI interrupt handling.
+ *
  * 2001 (c) MontaVista, Software, Inc.  This file is licensed under
  * the terms of the GNU General Public License version 2.  This program
  * is licensed "as is" without any warranty of any kind, whether express
@@ -39,8 +43,17 @@
 #define GAMECUBE_RESET 0xcc003024 /* RESET */
 #define GAMECUBE_DICVR 0xcc006004 /* DI Cover Register */
 
-#define GAMECUBE_IN(a) (*(u_int *)a)
-#define GAMECUBE_OUT(a,d) (*(u_int *)a = d)
+#define GC_DI_DISR              0xcc006000 /* DI Status Register */
+#define GC_DI_DISR_BRKINT       (1<<6)
+#define GC_DI_DISR_BRKINTMASK   (1<<5)
+#define GC_DI_DISR_TCINT        (1<<4)
+#define GC_DI_DISR_TCINTMASK    (1<<3)
+#define GC_DI_DISR_DEINT        (1<<2)
+#define GC_DI_DISR_DEINTMASK    (1<<1)
+#define GC_DI_DISR_BRK          (1<<0)
+
+#define GAMECUBE_IN(a) (*(volatile unsigned long *)a)
+#define GAMECUBE_OUT(a,d) (*(volatile unsigned long *)a = d)
 
 #define GAMECUBE_IRQS 14
 

Index: gc-dvdcover.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gc-dvdcover.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gc-dvdcover.c	30 Jan 2004 14:59:16 -0000	1.1
+++ gc-dvdcover.c	8 Mar 2004 23:19:06 -0000	1.2
@@ -17,6 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.		     */
 /* ------------------------------------------------------------------------- */
+/*
+ * Albert Herranz
+ *	GAMECUBE
+ *	- Fixed bug that caused kernel to "loop" in gc_dvdcover_handler
+ *	  sometimes during kernel init.
+ */
 
 #include <linux/kernel.h>
 #include <linux/ioport.h>
@@ -40,19 +46,30 @@
 	if (reason & 4) {
 		GAMECUBE_OUT(GAMECUBE_DICVR, reason | 4);
 		printk(KERN_ERR "gc_dvdcover: DVD cover was closed\n");
+		return IRQ_HANDLED;
 	}
-	return IRQ_HANDLED;
+	return IRQ_NONE;
 }
 
 
 static int gc_dvdcover_init(void)
 {
+        unsigned long outval;
+                                                                                
+        /* clear pending DI interrupts and mask new ones */
+        /* this prevents an annoying bug while we lack a complete DVD driver */
+        outval = GC_DI_DISR_BRKINT | GC_DI_DISR_TCINT |
+                        GC_DI_DISR_DEINT;
+        outval &= ~(GC_DI_DISR_BRKINTMASK | GC_DI_DISR_TCINTMASK |
+                        GC_DI_DISR_DEINTMASK);
+        GAMECUBE_OUT(GC_DI_DISR, outval);
+                                                                                
 	if (request_irq(DVD_IRQ, gc_dvdcover_handler, 0, "GameCube DVD Cover", 0) < 0) {
 		printk(KERN_ERR "gc_dvdcover: Request irq%d failed\n", DVD_IRQ);
 	} else {
 		enable_irq(DVD_IRQ);
+		GAMECUBE_OUT(GAMECUBE_DICVR, GAMECUBE_IN(GAMECUBE_DICVR) | 2);
 	}
-	GAMECUBE_OUT(GAMECUBE_DICVR, GAMECUBE_IN(GAMECUBE_DICVR) | 2);
 	return 0;
 }

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

Modified Files:
	gamecube.c 
Log Message:
aligned the buffer and periods + now ignores just the first interrupt when starting to play.
basic sound playback seems to be working ok now (haven't tested much yet though..)



Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/gamecube.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gamecube.c	10 Feb 2004 22:47:34 -0000	1.2
+++ gamecube.c	7 Mar 2004 03:02:09 -0000	1.3
@@ -64,7 +64,7 @@
 	int dma_size;
 	int period_size;
 	int nperiods;
-	int cur_period;
+	volatile int cur_period;
 	volatile int start_play;
 	volatile int stop_play;
 } gamecube_t;
@@ -77,13 +77,13 @@
 			 SNDRV_PCM_INFO_MMAP_VALID),
 	.formats =	SNDRV_PCM_FMTBIT_S16_BE,
 	.rates =	/* SNDRV_PCM_RATE_8000_48000, */
-			SNDRV_PCM_RATE_32000,
-	.rate_min =	/* 8000 */ 32000,
-	.rate_max =	/* 48000 */ 32000,
+			SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000,
+	.rate_min =	32000,
+	.rate_max =	48000,
 	.channels_min =		2,
 	.channels_max =		2,
 	.buffer_bytes_max =	32768,
-	.period_bytes_min =	4096,
+	.period_bytes_min =	32,
 	.period_bytes_max =	32768,
 	.periods_min =		1,
 	.periods_max =		1024,
@@ -98,6 +98,10 @@
 	chip->playback_substream = substream;
 	runtime->hw = snd_gamecube_playback;
 
+	/* align to 32 bytes */ 
+	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 32);
+	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 32);
+
 	return 0;
 }
 
@@ -113,13 +117,13 @@
 static int snd_gamecube_hw_params(snd_pcm_substream_t * substream,
 		snd_pcm_hw_params_t * hw_params)
 {
-	printk(KERN_ALERT "snd_gamecube_hw_params\n");
+	/* printk(KERN_ALERT "snd_gamecube_hw_params\n"); */
 	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
 }
 
 static int snd_gamecube_hw_free(snd_pcm_substream_t * substream)
 {
-	printk(KERN_ALERT "snd_gamecube_hw_free\n");
+	/* printk(KERN_ALERT "snd_gamecube_hw_free\n"); */
 	return snd_pcm_lib_free_pages(substream);
 }
 
@@ -133,16 +137,20 @@
 			runtime->rate, runtime->channels, runtime->sample_bits);
 	printk("prepare: format=%i, access=%i\n",
 			runtime->format, runtime->access);
-	SetFreq32KHz();
-#if 0	
-	/* set requested samplerate */
 
-	/* set requestd format when available */
-	/* set FMT here !!! FIXME */
+	/* set requested samplerate */
+	switch (runtime->rate) {
+		case 32000:
+			SetFreq32KHz();
+			break;
+		case 48000:
+			SetFreq48KHz();
+			break;
+		default:
+			printk("unsupported rate: %i!\n", runtime->rate);
+			return -EINVAL;
+	}
 
-	s->period = 0;
-	s->periods = 0;
-#endif        
 	return 0;
 }
 
@@ -200,7 +208,7 @@
 	/* bytes = snd_pcm_lib_buffer_bytes(substream); */
 
 #ifdef GAMECUBE_AUDIO_DEBUG
-	printk("pointer: %i of %i bytes left, period #%i\n", left, bytes, chip->cur_period);
+	printk("pointer: %i of %i(%i) bytes left, period #%i\n", left, chip->period_size ,bytes, chip->cur_period);
 #endif
 	return bytes_to_frames(runtime, bytes - left);
 }
@@ -211,7 +219,6 @@
 	unsigned long val = AUDIO_DSP_CONTROL;
 
 	if (val & 0x100) {
-		int i;
 		u_int32_t addr;
 	
 #ifdef GAMECUBE_AUDIO_DEBUG
@@ -229,17 +236,15 @@
 			} else chip->cur_period = 0;
 
 			addr = (u_int32_t) chip->playback_substream->runtime->dma_area + (chip->cur_period * chip->period_size);
-			/* addr = (u_int32_t) sega + (chip->cur_period * chip->period_size); */
 
 			flush_dcache_range(addr, addr + chip->period_size);
 			LoadSample(addr, chip->period_size);
 
 			StartSample();
-			chip->start_play = 1;
+			/* chip->start_play = 1; */
 			
 			snd_pcm_period_elapsed(chip->playback_substream);
 		}
-		
 		AUDIO_DSP_CONTROL = (val | 0x100); /* clear DSP interrupt */
 	}
 
@@ -257,17 +262,6 @@
 	.pointer		= snd_gamecube_pointer,
 };
 
-static snd_pcm_ops_t snd_gamecube_capture_ops = {
-/*	.open			= snd_card_sa11xx_uda1341_open,
-	.close			= snd_card_sa11xx_uda1341_close,
-	.ioctl			= snd_pcm_lib_ioctl,
-	.hw_params	        = snd_sa11xx_uda1341_hw_params,
-	.hw_free	        = snd_sa11xx_uda1341_hw_free,
-	.prepare		= snd_sa11xx_uda1341_prepare,
-	.trigger		= snd_sa11xx_uda1341_trigger,
-	.pointer		= snd_sa11xx_uda1341_pointer,*/
-};
-
 static int __devinit snd_gamecube_new_pcm(gamecube_t *chip)
 {
 	snd_pcm_t *pcm;
@@ -277,7 +271,7 @@
 		return err;
 
 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_gamecube_playback_ops);
-	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_gamecube_capture_ops);
+	/* snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_gamecube_capture_ops); */
 	
 	/* preallocate 64k buffer */
 	snd_pcm_lib_preallocate_pages_for_all(pcm, 64 * 1024, 64 * 1024, GFP_KERNEL);
@@ -293,9 +287,8 @@
 
 static int __init alsa_card_gamecube_init(void)
 {
-	int i, err;
+	int err;
 	snd_card_t *card;
-	unsigned char *buf1;
 
 /*	if (!is_gamecube())
 		return -ENODEV; */
@@ -361,7 +354,7 @@
 {
 	printk(KERN_ALERT "Goodbye, cruel world\n");
 
-	free_irq(DSP_IRQ, (void*) 0);
+	free_irq(DSP_IRQ, gamecube_audio);
 	snd_card_free(gamecube_audio->card);
 }

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

Modified Files:
	gc_aram.c 
Log Message:
improofed aram


Index: gc_aram.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gc_aram.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gc_aram.c	5 Mar 2004 00:50:16 -0000	1.6
+++ gc_aram.c	6 Mar 2004 04:19:55 -0000	1.7
@@ -25,6 +25,10 @@
 #include <asm/bitops.h>
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
+#include <linux/interrupt.h>
+
+#include <linux/fcntl.h>        /* O_ACCMODE */
+#include <linux/hdreg.h>  /* HDIO_GETGEO */
 
 #define ARAM_MAJOR Z2RAM_MAJOR
 
@@ -42,9 +46,9 @@
 	unsigned char *RAMDISKBuffer;
 	#define ARAM_BUFFERSIZE 10*1024
 #else
-	#define ARAM_BUFFERSIZE 15*1024*1024
-	//#define ARAM_BUFFERSIZE 10*1024
+	#define ARAM_BUFFERSIZE 14*1024*1024
 	#define ARAM_SOUNDMEMORYOFFSET	1024*1024
+	//#define ARAM_BLOCKSIZE 1024
 #endif
 
 
@@ -82,11 +86,9 @@
 	
 	AR_DMA_CNT_H = (type << 15) | (length >> 16);
 	AR_DMA_CNT_L = length & 0xFFFF;
-	
-	// Without the Break, the While loop loops endless
-	while (AI_DSP_STATUS & 0x200) {
-	};
 
+	// We wait, until DMA finished
+	while (AI_DSP_STATUS & 0x200);
 }
 /*
  	echo YUHUUhello1234567890hello12345678901234567890CCC > /dev/aram 
@@ -97,6 +99,7 @@
 {
 	struct request *req;
 	blk_stop_queue(q);
+	spin_lock(&aram_lock);
 	
 	while ((req = elv_next_request(q)) != NULL) {
 		unsigned long start = req->sector << 9;
@@ -131,6 +134,7 @@
 		end_request(req, 1);
 	}
 	
+	spin_unlock(&aram_lock);
 	blk_start_queue(q);
 
 }
@@ -167,11 +171,40 @@
 
 }
 
+
+/*
+	mkfs.minix /dev/aram 
+	mount -t minix /dev/aram /mnt/
+
+
+	dd if=/dev/urandom bs=1M count=10 > /mnt/test.bin   
+	dd if=/dev/urandom bs=1M count=1 > /mnt/test1.bin
+
+	
+*/
 static int aram_ioctl(struct inode *inode, struct file *file,
 		     unsigned int cmd, unsigned long arg)
 {
 	ARAM_DBG("A-RAM IOCTL\n");
-	return 0;
+
+	if (cmd == HDIO_GETGEO) {
+		struct hd_geometry geo;
+		/*
+		 * get geometry: we have to fake one...  trim the size to a
+		 * multiple of 2048 (1M): tell we have 32 sectors, 64 heads,
+		 * whatever cylinders.
+		 */
+		geo.heads     = 64;
+		geo.sectors   = 32;
+		geo.start     = 0;
+		geo.cylinders = ARAM_BUFFERSIZE / (geo.heads * geo.sectors);
+
+		if (copy_to_user((void *) arg, &geo, sizeof(geo)))
+			return -EFAULT;
+		return 0;
+	}	
+	
+	return -EINVAL;
 }
 
 static int aram_release( struct inode *inode, struct file *filp )
@@ -182,17 +215,31 @@
 	return 0;
 }
 
+
+static int aram_revalidate(struct gendisk *disk)
+{
+	set_capacity(disk,ARAM_BUFFERSIZE>>9);
+	return 0;
+}
+
 static struct block_device_operations aram_fops =
 {
-	.owner		= THIS_MODULE,
-	.open		= aram_open,
-	.release	= aram_release,
-	.ioctl 		= aram_ioctl,
+	.owner			= THIS_MODULE,
+	.open			= aram_open,
+	.release		= aram_release,
+	.revalidate_disk	= aram_revalidate,
+	.ioctl 			= aram_ioctl,
 };
 
 
 static struct request_queue *aram_queue;
 
+static irqreturn_t aram_interrupt(int irq, void *dev_id, struct pt_regs * regs)
+{
+	printk("interrupt received\n");
+	return 0;
+}
+
 int __init aram_init(void)
 {
 	int ret;
@@ -217,9 +264,16 @@
 	
 	aram_gendisk->queue = aram_queue;
 	set_capacity(aram_gendisk,ARAM_BUFFERSIZE>>9);
+	
 	add_disk(aram_gendisk);
-//	spin_lock_init(aram_lock.queue_lock);
+	spin_lock_init(&aram_lock);
 	
+	ret = request_irq(5, aram_interrupt, 0,aram_gendisk->disk_name, aram_gendisk);
+	if (ret) {
+		//BBA_DBG(KERN_ERR "%s: unable to get IRQ %d\n", dev->name, dev->irq);
+		return ret;
+	}
+		
 	#ifdef RAMDISK
 	RAMDISKBuffer = kmalloc(ARAM_BUFFERSIZE,GFP_KERNEL);
 	#endif

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

Modified Files:
	gc_aram.c 
Log Message:
thx. to costis, the aram driver is now fixed up and should work stabile, good luck guys


Index: gc_aram.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gc_aram.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gc_aram.c	4 Mar 2004 09:58:20 -0000	1.5
+++ gc_aram.c	5 Mar 2004 00:50:16 -0000	1.6
@@ -42,7 +42,7 @@
 	unsigned char *RAMDISKBuffer;
 	#define ARAM_BUFFERSIZE 10*1024
 #else
-	#define ARAM_BUFFERSIZE 14*1024*1024
+	#define ARAM_BUFFERSIZE 15*1024*1024
 	//#define ARAM_BUFFERSIZE 10*1024
 	#define ARAM_SOUNDMEMORYOFFSET	1024*1024
 #endif
@@ -51,9 +51,6 @@
 
 
 
-#define ARAM_CHUNKMASK		0xff
-
-
 static int current_device   = -1;
 static spinlock_t aram_lock = SPIN_LOCK_UNLOCKED;
 extern void flush_cache(void *start, unsigned int len);
@@ -67,7 +64,7 @@
 #define AR_DMA_ARADDR_L			*(unsigned short*)0xCC005026
 #define AR_DMA_CNT_H			*(unsigned short*)0xCC005028
 #define AR_DMA_CNT_L			*(unsigned short*)0xCC00502A
-#define AI_DSP_STATUS	 		*(unsigned short*)0xCC00500A
+#define AI_DSP_STATUS	 		*(volatile unsigned short*)0xCC00500A
 
 #define ARAM_READ				1
 #define ARAM_WRITE				0
@@ -87,10 +84,7 @@
 	AR_DMA_CNT_L = length & 0xFFFF;
 	
 	// Without the Break, the While loop loops endless
-	int counter=0;
 	while (AI_DSP_STATUS & 0x200) {
-		counter++;
-		if (counter>0xfffff) break;
 	};
 
 }

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

Modified Files:
	gc_aram.c 
Log Message:
now with queue lock


Index: gc_aram.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gc_aram.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gc_aram.c	2 Mar 2004 15:52:41 -0000	1.4
+++ gc_aram.c	4 Mar 2004 09:58:20 -0000	1.5
@@ -72,13 +72,9 @@
 #define ARAM_READ				1
 #define ARAM_WRITE				0
 
-int ARAM_DMA_lock = 0;
 
 void ARAM_StartDMA (unsigned long mmAddr, unsigned long arAddr, unsigned long length, unsigned long type)
 {
-	while(ARAM_DMA_lock);
-	ARAM_DMA_lock = 1;
- 	
 	//printk("ARAM DMA copy -> %08x - %08x  - %d  %d\n",mmAddr,arAddr,length,type);
 	
 	AR_DMA_MMADDR_H = mmAddr >> 16;
@@ -90,16 +86,12 @@
 	AR_DMA_CNT_H = (type << 15) | (length >> 16);
 	AR_DMA_CNT_L = length & 0xFFFF;
 	
-	// For security
-	udelay(1000);
-
 	// Without the Break, the While loop loops endless
 	int counter=0;
 	while (AI_DSP_STATUS & 0x200) {
 		counter++;
 		if (counter>0xfffff) break;
 	};
-	ARAM_DMA_lock = 0;
 
 }
 /*
@@ -110,10 +102,13 @@
 static void do_aram_request(request_queue_t *q)
 {
 	struct request *req;
+	blk_stop_queue(q);
+	
 	while ((req = elv_next_request(q)) != NULL) {
 		unsigned long start = req->sector << 9;
 		unsigned long len  = req->current_nr_sectors << 9;
-
+		
+	
 		if (start + len > ARAM_BUFFERSIZE) {
 			printk( KERN_ERR DEVICE_NAME ": bad access: block=%lu, count=%u\n",
 				req->sector, req->current_nr_sectors);
@@ -141,6 +136,9 @@
 		
 		end_request(req, 1);
 	}
+	
+	blk_start_queue(q);
+
 }
 
 
@@ -226,6 +224,7 @@
 	aram_gendisk->queue = aram_queue;
 	set_capacity(aram_gendisk,ARAM_BUFFERSIZE>>9);
 	add_disk(aram_gendisk);
+//	spin_lock_init(aram_lock.queue_lock);
 	
 	#ifdef RAMDISK
 	RAMDISKBuffer = kmalloc(ARAM_BUFFERSIZE,GFP_KERNEL);

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

Added Files:
	exi.txt 
Log Message:
Preliminary (API) documentation.

--- NEW FILE: exi.txt ---
The Expansion Interface (EXI)
-----------------------------

[Introductory information goes here...]


Device drivers.
---------------

When writing drivers for devices attached to the EXI bus, do not bother with
device probing, removal, hotplug and PM events. The bus driver already takes
care of this.


Registration:
-------------

Drivers should declare a struct exi_driver. They must initialize both the
`name' and `id_table' fields.

`name' distinguishes the driver from others registered with the bus. It
should be short, unique, yet remain informative.

`id_table' is a list of device IDs the driver claims to support. These
should be taken from include/linux/exi_ids.h:

	struct exi_device_id frob_id_table[] = {
		{ EXI_ID_FROB0 },
		{ EXI_ID_FROB1 },
	};

	struct exi_driver frob_driver = {
		.name		= "frob",
		.id_table	= frob_id_table,
	};


From within the driver's initialization function, register the driver with
the bus by calling exi_driver_register() with the driver structure declared
previously, like so:

	static int __init frob_init(void)
	{
		return exi_driver_register(&frob_driver);
	}


If the driver may be compiled as a loadable kernel module,
call exi_driver_unregister() in the driver's exit function:

	static void __exit frob_exit(void)
	{
		exi_driver_unregister(&frob_driver);
	}

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

Log Message:
Directory /cvsroot/gc-linux/linux/Documentation added to the repository

Update of /cvsroot/gc-linux/htdocs/xml/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1961/xml/en

Modified Files:
	news.xml screenshots.xml yagcd.xml 
Log Message:
...


Index: news.xml
===================================================================
RCS file: /cvsroot/gc-linux/htdocs/xml/en/news.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- news.xml	27 Feb 2004 23:19:42 -0000	1.14
+++ news.xml	3 Mar 2004 12:25:17 -0000	1.15
@@ -2,6 +2,11 @@
 <?xml-stylesheet href="news.xsl" type="text/xsl"?>
 <news>
   <item>
+    <date>29 February 2004</date>
+    <title>A Debian base system to play with</title>
+    <text>Steve_- has provided a 22 MB Debian base system image for the use with NFS-Root. Read the howto <a href="down/debian_woody-unconfigured_base.guide.txt">here</a>; the file can be downloaded from <a href="down/">down/</a></text>
+  </item>
+  <item>
     <date>28 February 2004</date>
     <title>X Window and MPlayer partially working</title>
     <text>Look at the <a href="docs/screenshots.html">screenshots</a>!</text>

Index: screenshots.xml
===================================================================
RCS file: /cvsroot/gc-linux/htdocs/xml/en/screenshots.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- screenshots.xml	27 Feb 2004 23:22:42 -0000	1.5
+++ screenshots.xml	3 Mar 2004 12:25:17 -0000	1.6
@@ -10,12 +10,14 @@
   <h2>A full Linux system over NFS (28 Feb 2004)</h2>
 
   <p>Thanks to a fully functional (10 MBit only, so far) network driver, we can boot a full Linux system over NFS, i.e. another computer connected via Ethernet provides the full filesystem. This way, we can easily run many standard applications.</p>
-  <p>The picture on the left shows an X Window session. All applications are running on another Linux computer, but the X server is running on the GameCube.</p>
-  <p>The picture on the right is not some work of art by Andy Warhol, but Marilyn Monroe starring in "Some like it hot" playing in MPlayer - with colours off.</p>
+  <p>The first picture shows an X Window session. All applications are running on another Linux computer, but the X server is running on the GameCube.</p>
+  <p>The second picture is not some work of art by Andy Warhol, but Marilyn Monroe starring in "Some like it hot" playing in MPlayer - with colours off.</p>
+  <p>The third picture shows an IRC session using IRSSI.</p>
 
   <p>
   <a href="../pic/x-window.jpg"><img src="../pic/x-window.jpg" width="160"/></a>
   <a href="../pic/marilyn.jpg"><img src="../pic/marilyn.jpg" width="160"/></a>
+  <a href="../pic/irc.jpg"><img src="../pic/irc.jpg" width="160"/></a>
   </p>
 
 

Index: yagcd.xml
===================================================================
RCS file: /cvsroot/gc-linux/htdocs/xml/en/yagcd.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- yagcd.xml	27 Feb 2004 23:19:42 -0000	1.8
+++ yagcd.xml	3 Mar 2004 12:25:17 -0000	1.9
@@ -1,18131 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <?xml-stylesheet type="text/xsl" href="iparticle.xsl"?>
- 
-                      
-<iparticle><info><title> Yet Another Gamecube Documentation</title></info>
-for your convinience this document is also available for offline-viewing in the following formats:<br />
-<a href="../../down/yet_another_gamecube_doc.html.tar.gz">html</a> (without any site-specific formatting)<br />
-<a href="../../down/yet_another_gamecube_doc.txt.tar.gz">txt</a> (for terminal users and easy grep-ing)<br />
-<a href="../../down/yet_another_gamecube_doc.pdf.tar.gz">pdf</a> (primary document, recommended for printing)<br />
-<hr />
-
[...18109 lines suppressed...]
 
-<tr><td align="center"><b>Aktnot</b></td><td align="right">http://cube.iu.hio.no/s104086/</td></tr>
+<br />and last not least the online version is
+<li /><a href="yagcd/index.html">here</a><br />
 
-<tr><td align="center"></td><td align="right">additional rtc/ipl pinout info</td></tr>
 
-<tr><td align="center"></td></tr></table>
-</center>
-<div class="p"><!----></div>
-moreover, many thanks must go to everyone who helped making this document more consistant
-and error free by proofreading and pointing out mistakes, in particular tmbinc,
-org, hubb, Aaron Kaluszka, Skywalker, Jihad, xor37h, costis, CrowTrobo, mist, ionic
-...<br />
-<br />
-<br />
-EOT
+<hr /></iparticle>
 
-<br /><br /><hr /></iparticle>

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

Modified Files:
	docs 
Log Message:
...


Index: docs
===================================================================
RCS file: /cvsroot/gc-linux/htdocs/docs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- docs	23 Jan 2004 11:50:35 -0000	1.1.1.1
+++ docs	3 Mar 2004 12:25:16 -0000	1.2
@@ -18,8 +18,6 @@
  {
  $lang = "en";
  }
- 
-$fileurl = preg_split("/\//",$_SERVER["REQUEST_URI"]);
 
 $script_url = preg_replace("/^([^\?]*?)(\?.*)?$/",
                            "\\1",
@@ -27,29 +25,50 @@
 $script_name = $_SERVER["SCRIPT_NAME"];
 
 $pathinfo = preg_replace("'$script_name'", "", "$script_url",1);
-$pathinfo = str_replace("-","/",$pathinfo);
+
 $path = preg_split("/\//", "".$pathinfo);
 
 $pathlen = count($path)-1;
 
 if (strlen($path[$pathlen])<2) { $path[$pathlen] ="index.xml"; }
 
-if ($pathlen==1)
- {
- $user_lang = $lang;
- }
+
+if ($pathlen > 0)
+{
+    if (strpos($path[$pathlen],"-")===false)
+    {
+	$language = $lang;
+	$filename = $path[$pathlen];
+    }
+    else
+    {
+    $start = strpos($path[$pathlen],"-")+1;
+    $language = substr($path[$pathlen],0,2);
+    $filename = substr($path[$pathlen],$start);
+    }
+
+}
 else
- {
- $user_lang = $path[$pathlen-1];
- }
-$doc = $path[$pathlen];
+{
+    $filename = "index.xml";
+    $language = $lang;
+}
 
-$path[$pathlen] = ereg_replace(".html",".xml",$path[$pathlen]);
-$filepath = "./xml";
+for ($index=1;$index<$pathlen;$index++)
+{
+    $filepath .= "/".$path[$index]; 
+}
+$doc = $filename;
+$filename = ereg_replace(".html",".xml",$filename);
+//echo "[language: $language]";
+//echo "[filename: $filename]";
+//echo "[path: $filepath]";
+
+$root = "./xml";
 
 for ($index=0;$index<count($lang_list);$index++)
  {
- if (file_exists($filepath."/".$lang_list[$index]."/".$path[$pathlen]))
+ if (file_exists($root."/".$lang_list[$index].$filepath."/".$filename))
   {
   array_push($doc_lang,$lang_list[$index]);
   }
@@ -58,23 +77,23 @@
 reset($path);
 reset($doc_lang);
 
-if (!in_array($user_lang,$doc_lang) && (count($doc_lang)!=0))
+$file .= $root;
+if (!in_array($language,$doc_lang) && (count($doc_lang)!=0))
  {
- $filepath .= "/en/".$path[$pathlen];
+ $file .= "/en".$filepath."/".$filename;
  }
 else
  {
- $filepath .= "/".$user_lang."/".$path[$pathlen];
+ $file .= "/".$language.$filepath."/".$filename;
  }
 
+//echo "[file to load: $file]";
 if (count($doc_lang)==0) { header("HTTP/1.0 404 Not Found"); exit(); }
 
-$filepath = ereg_replace(".html",".xml",$filepath);
-
 reset($path);
 //dl("php_libxslt.so");
 dl("../../../../../home/groups/g/gc/gc-linux/php/php_libxslt.so");
-$xml = file_get_contents($filepath);
+$xml = file_get_contents($file);
 if (strstr($doc,"faq.html")===false)
  {
  $xsl = file_get_contents('./xml/en/iparticle.xsl');
@@ -123,7 +142,7 @@
  }
 echo "</div>";
 
-if (!in_array($user_lang,$doc_lang) && (count($doc_lang)!=0))
+if (!in_array($language,$doc_lang) && (count($doc_lang)!=0))
  {
  echo "<div align=center><font color=\"red\" size=\"6\"><b>Sorry the document you requested doesn't exist in your desired language!</b></font></div><div align=center><font color=red><b>You can help us translating this document to your native language. Interested? Read <a href=\"en-docsystem.html\">how to do it here!</a></b></font></div><br/><div align=center><font color=red><a href=\"en-{$doc}\">Click here</a> to display the English version of the requested document</font></div>";
  exit();

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

Modified Files:
	exi.h 
Log Message:
Added `exi_bus_dev' - parent to all devices attached to the bus.


Index: exi.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/exi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exi.h	2 Mar 2004 23:27:38 -0000	1.2
+++ exi.h	2 Mar 2004 23:43:24 -0000	1.3
@@ -31,6 +31,7 @@
 #define to_exi_driver(drv)	container_of(drv, struct exi_driver, driver)
 
 
+extern struct device exi_bus_dev;
 extern struct bus_type exi_bus_type;
 
 extern int exi_driver_register(struct exi_driver *drv);

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

Modified Files:
	exi-driver.c 
Log Message:
Added `exi_bus_dev' - parent to all devices attached to the bus.


Index: exi-driver.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/exi/exi-driver.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exi-driver.c	2 Mar 2004 23:27:37 -0000	1.2
+++ exi-driver.c	2 Mar 2004 23:43:24 -0000	1.3
@@ -70,6 +70,10 @@
 }
 
 
+struct device exi_bus_dev = {
+	.bus_id		= "exi0",
+};
+
 struct bus_type exi_bus_type = {
 	.name		= "exi",
 	.match		= exi_bus_match,
@@ -77,11 +81,19 @@
 
 static int __init exi_driver_init(void)
 {
-	return bus_register(&exi_bus_type);
+	int err;
+
+	if ((err = device_register(&exi_bus_dev)))
+		goto out;
+	if ((err = bus_register(&exi_bus_type)))
+		goto out;
+out:
+	return err;
 }
 
 postcore_initcall(exi_driver_init);
 
+EXPORT_SYMBOL(exi_bus_dev);
 EXPORT_SYMBOL(exi_bus_type);
 EXPORT_SYMBOL(exi_driver_register);
 EXPORT_SYMBOL(exi_driver_unregister);

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

Modified Files:
	exi.h 
Log Message:
Added match callback to do generic driver binding - exi_bus_match()


Index: exi.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/exi.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exi.h	27 Feb 2004 12:26:02 -0000	1.1
+++ exi.h	2 Mar 2004 23:27:38 -0000	1.2
@@ -9,15 +9,23 @@
 
 
 struct exi_dev {
-	struct device dev;
+	unsigned long		id;
+
+	struct device		dev;
 };
 
 #define to_exi_dev(n)		container_of(n, struct exi_dev, dev)
 
+
+struct exi_device_id {
+	unsigned long		dev_id;
+};
+
 struct exi_driver {
-	char *name;
+	char			*name;
+	struct exi_device_id	*id_table;
 
-	struct device_driver driver;
+	struct device_driver	driver;
 };
 
 #define to_exi_driver(drv)	container_of(drv, struct exi_driver, driver)