Linux on the Nintendo GameCube and Wii

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

Added Files:
	gc_aram.c 
Log Message:
added prelimiary aram block device driver, driver works well, but there is some ARAM corruption with the Audio thing ...


--- NEW FILE: gc_aram.c ---
/*
	gc_aram.c
	
	by GC-Linux Team , hamtitampti
*/
/*
 	// Some test things
 	
 	echo hello | dd of=/dev/aram seek=10
 	dd if=/dev/aram skip=10
  	cat /dev/aram  | wc -c

*/

#define DEVICE_NAME "ARAM"

#include <linux/major.h>
#include <linux/vmalloc.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/blkdev.h>

#include <asm/setup.h>
#include <asm/bitops.h>
#include <asm/pgtable.h>

#define ARAM_MAJOR Z2RAM_MAJOR


#define TRUE                  (1)
#define FALSE                 (0)

//#define ARAM_DBG	printk
#define ARAM_DBG(format, arg...); { }

//#define RAMDISK
#undef RAMDISK

#ifdef RAMDISK
	unsigned char *RAMDISKBuffer;
	#define ARAM_BUFFERSIZE 10*1024
#else
	#define ARAM_BUFFERSIZE 14*1024*1024
	#define ARAM_SOUNDMEMORYOFFSET	1024*1024
#endif





#define ARAM_CHUNKMASK		0xff


static int current_device   = -1;
static spinlock_t aram_lock = SPIN_LOCK_UNLOCKED;


static struct block_device_operations aram_fops;
static struct gendisk *aram_gendisk;

#define AR_DMA_MMADDR_H			*(volatile unsigned short*)0xCC005020
#define AR_DMA_MMADDR_L			*(volatile unsigned short*)0xCC005022
#define AR_DMA_ARADDR_H			*(volatile unsigned short*)0xCC005024
#define AR_DMA_ARADDR_L			*(volatile unsigned short*)0xCC005026
#define AR_DMA_CNT_H			*(volatile unsigned short*)0xCC005028
#define AR_DMA_CNT_L			*(volatile unsigned short*)0xCC00502A

#define ARAM_READ				1
#define ARAM_WRITE				0


void ARAM_StartDMA (unsigned long mmAddr, unsigned long arAddr, unsigned long length, unsigned long type)
{
	AR_DMA_MMADDR_H = mmAddr >> 16;
	AR_DMA_MMADDR_L = mmAddr & 0xFFFF;

	AR_DMA_ARADDR_H = arAddr >> 16;
	AR_DMA_ARADDR_L = arAddr & 0xFFFF;

	AR_DMA_CNT_H = (type << 15) | (length >> 16);
	AR_DMA_CNT_L = length & 0xFFFF;

	// Missing: Ready Flag for Transfer finished....
	
	//while (); ??????????

}



static void do_aram_request(request_queue_t *q)
{
	struct request *req;
	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);
			end_request(req, 0);
			continue;
		}
		
		#ifdef RAMDISK
		if (rq_data_dir(req) == READ) {
			memcpy(req->buffer, (char *)&RAMDISKBuffer[start], len);
		} else {
			memcpy((char *)&RAMDISKBuffer[start], req->buffer, len);
		}		
		#else
		if (rq_data_dir(req) == READ) {
			ARAM_StartDMA((unsigned long)req->buffer,start+ARAM_SOUNDMEMORYOFFSET, len,ARAM_READ);
		} else {
			ARAM_StartDMA((unsigned long)req->buffer,start+ARAM_SOUNDMEMORYOFFSET, len,ARAM_WRITE);
		}			
		#endif		
		
		end_request(req, 1);
	}
}


static int aram_open( struct inode *inode, struct file *filp )
{
	ARAM_DBG("A-RAM Open device\n");
	
	int device;
	int rc = -ENOMEM;
	
	device = iminor(inode);
	
	if ( current_device != -1 && current_device != device )
	{
		rc = -EBUSY;
		goto err_out;
	}
    
	#ifdef RAMDISK
	if ( current_device == -1 )
	{
		current_device = device;
		set_capacity(aram_gendisk,ARAM_BUFFERSIZE>>9);
	}
	#endif
	return 0;
	
err_out:
  	ARAM_DBG("A-RAM Open device Error %d\n",rc);
    	
    	return rc;

}

static int aram_ioctl(struct inode *inode, struct file *file,
		     unsigned int cmd, unsigned long arg)
{
	ARAM_DBG("A-RAM IOCTL\n");
	return 0;
}

static int aram_release( struct inode *inode, struct file *filp )
{
	ARAM_DBG("A-RAM Close device\n");
    	if ( current_device == -1 ) return 0;     

	return 0;
}

static struct block_device_operations aram_fops =
{
	.owner		= THIS_MODULE,
	.open		= aram_open,
	.release	= aram_release,
	.ioctl 		= aram_ioctl,
};


static struct request_queue *aram_queue;

int __init aram_init(void)
{
	int ret;
	
	printk("A-Ram Block Device Driver Init\n");
	
	ret = -EBUSY;
	if (register_blkdev(ARAM_MAJOR, DEVICE_NAME)) goto err;
	
	ret = -ENOMEM;
	aram_gendisk = alloc_disk(1);
	if (!aram_gendisk) goto out_disk;
	
	aram_queue = blk_init_queue(do_aram_request, &aram_lock);
	if (!aram_queue) goto out_queue;
	
	aram_gendisk->major = ARAM_MAJOR;
	aram_gendisk->first_minor = 0;
	aram_gendisk->fops = &aram_fops;
	sprintf(aram_gendisk->disk_name, "aram");
	strcpy(aram_gendisk->devfs_name, aram_gendisk->disk_name);
	
	aram_gendisk->queue = aram_queue;
	set_capacity(aram_gendisk,ARAM_BUFFERSIZE>>9);
	add_disk(aram_gendisk);
	
	#ifdef RAMDISK
	RAMDISKBuffer = kmalloc(ARAM_BUFFERSIZE,GFP_KERNEL);
	#endif
	
	return 0;

out_queue:
	put_disk(aram_gendisk);
out_disk:
	unregister_blkdev(ARAM_MAJOR, DEVICE_NAME);
err:
	return ret;
}


void __exit aram_cleanup(void)
{

	blk_unregister_region(MKDEV(ARAM_MAJOR, 0), 256);
	if ( unregister_blkdev( ARAM_MAJOR, DEVICE_NAME ) != 0 )
		printk( KERN_ERR DEVICE_NAME ": unregister of device failed\n");
	
	del_gendisk(aram_gendisk);
	put_disk(aram_gendisk);
	blk_cleanup_queue(aram_queue);
	
	#ifdef RAMDISK
	kfree(RAMDISKBuffer);
	#endif
	
	return;
} 

MODULE_LICENSE("GPL");
module_init(aram_init);
module_exit(aram_cleanup);

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

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

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

Modified Files:
	gc-net.c 
Log Message:
added timeout for TX lock


Index: gc-net.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gc-net.c	29 Feb 2004 08:36:29 -0000	1.20
+++ gc-net.c	1 Mar 2004 09:05:17 -0000	1.21
@@ -22,6 +22,9 @@
  * $Id$
  *
  * $Log$
+ * Revision 1.21  2004/03/01 09:05:17  hamtitampti
+ * added timeout for TX lock
+ *
  * Revision 1.20  2004/02/29 08:36:29  hamtitampti
  * improofed internal structure, read comment in file
  *
@@ -543,6 +546,8 @@
 	netif_stop_queue(dev);	
 		
 	if (priv->tx_lock) {
+		if ((dev->trans_start + 2*HZ)< jiffies) priv->tx_lock = 0;
+		
 		priv->stats.tx_dropped++;
 		udelay(1000);
 		netif_wake_queue(dev);

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

Modified Files:
	gc-net.c 
Log Message:
improofed internal structure, read comment in file


Index: gc-net.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gc-net.c	27 Feb 2004 00:06:33 -0000	1.19
+++ gc-net.c	29 Feb 2004 08:36:29 -0000	1.20
@@ -22,6 +22,9 @@
  * $Id$
  *
  * $Log$
+ * Revision 1.20  2004/02/29 08:36:29  hamtitampti
+ * improofed internal structure, read comment in file
+ *
  * Revision 1.19  2004/02/27 00:06:33  hamtitampti
  * changed IRQ timing, but .. yes, the bus is too slow it seems
  *
@@ -34,6 +37,84 @@
  *
  */
 
+/*
+	Important Notes for Developers:
+	
+	currently speeds:
+	1008 bytes from 192.168.0.2: icmp_seq=1 ttl=64 time=3.3 ms
+	2008 bytes from 192.168.0.2: icmp_seq=1 ttl=64 time=6.0 ms
+	5008 bytes from 192.168.0.2: icmp_seq=2 ttl=64 time=14.1 ms
+	10008 bytes from 192.168.0.2: icmp_seq=0 ttl=64 time=27.0 ms
+	20008 bytes from 192.168.0.2: icmp_seq=0 ttl=64 time=53.2 ms
+	65000 bytes about 172ms (with Win2000)
+
+	As you see, the Delay increases "linear"
+	this comes due to a Bandwith Problem with the EXI bus.
+	
+	note:
+	All ! i repeat ALL
+	packets are received with the 
+		static void gc_input(struct net_device *dev)
+	and sent to the linux kernel then.
+	
+	BUT !
+	the Transmit Back , the
+		static int gc_bba_start_xmit(struct sk_buff *skb, struct net_device *dev)
+	
+	As you see inside this function, i check, if the Transmit is currently in progress
+	if "yes" (priv->tx_lock)
+	i wait then a small time, and return with 1 ! 
+	(otherwise, the linux kernel try's to resume the packet .. about 1mill / sec or so)
+	the Return 1; indicates to the linux kernel to resume the packet tramsission.
+	
+		if (priv->tx_lock) {
+			priv->stats.tx_dropped++;
+			udelay(1000);
+			netif_wake_queue(dev);
+			return 1;	// This return will Resume the packet try
+		}	
+	
+	So it happens, that the packet wich the linux Stack wants to send , enters multiple times the Xmit thing.
+	Until it time-out in Linux Packet buffer, logically.
+	
+	due to the tx_dropped, you see in ifconfig the dropped TX packets increasing.
+	Clear, there are more dropped packets then (as kernel resumes automaticall)
+	but i had no better idea.
+          
+          RX packets:582 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:475 errors:0 dropped:775 overruns:0 carrier:0	
+
+
+	Flood Performance:
+	1K: 2531 packets transmitted, 2103 packets received, 16% packet loss
+	2K: 1095 packets transmitted, 736 packets received, 32% packet loss
+	4K: 886 packets transmitted, 472 packets received, 46% packet loss
+	8K: 773 packets transmitted, 276 packets received, 64% packet loss
+
+	ok
+	AT last:
+	
+	Even at flood, the kernel gets all RX (received frames)
+	but fails due to send back.
+
+
+	100Mbit issue:
+		eth_outb(0x30, 0x2);
+	
+	This activates 100Mbit 
+	Testet and operational. (market out in source)
+	
+	BAD: the ping / flood gets more worse.
+	as the packets arrive now faster, the bus almost crashes.
+	
+	BOYS, Write a Faster EXI driver, this is the maximum we can do now.
+	
+	hamtitampti
+	
+		
+
+*/
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -71,6 +152,7 @@
 	spinlock_t lock;
 	spinlock_t phylock;             /* phy lock */
 	unsigned long lockflags;        /* Lock flags */
+    	int tx_lock;
     	
 	// Statistical Data
 	struct net_device_stats stats;
@@ -157,8 +239,7 @@
 	while (len)
 	{
 		int tc = len;
-		if (tc > 4)
-			tc = 4;
+		if (tc > 4) tc = 4;
 		exi_imm(channel, d, tc, mode, 0);
 		exi_sync(channel);
 		len-=tc;
@@ -404,30 +485,6 @@
 
 
 /*
-
-static inline u8 de600_read_status(struct net_device *dev)
-{
-	u8 status;
-
-	outb_p(STATUS, DATA_PORT);
-	status = inb(STATUS_PORT);
-	outb_p(NULL_COMMAND | HI_NIBBLE, DATA_PORT);
-
-	return status;
-}
-
-static inline u8 de600_read_byte(unsigned char type, struct net_device *dev)
-{
-	// dev used by macros
-	u8 lo;
-	outb_p((type), DATA_PORT);
-	lo = ((unsigned char)inb(STATUS_PORT)) >> 4;
-	outb_p((type) | HI_NIBBLE, DATA_PORT);
-	return ((unsigned char)inb(STATUS_PORT) & (unsigned char)0xf0) | lo;
-}
-*/
-
-/*
  * Open/initialize the board.  This is called (in the current kernel)
  * after booting when 'ifconfig <dev->name> $IP_ADDR' is run (in rc.inet1).
  *
@@ -463,12 +520,6 @@
 static int gc_bba_close(struct net_device *dev)
 {
 	BBA_DBG("gc_bba_close\n");
-
-//	//select_nic();
-//	de600_put_command(RESET);
-//	de600_put_command(STOP_RESET);
-//	de600_put_command(0);
-//	//select_prn();
 	free_irq(dev->irq, dev);
 	return 0;
 }
@@ -480,15 +531,6 @@
 	return &priv->stats;
 }
 
-static inline void trigger_interrupt(struct net_device *dev)
-{
-//	de600_put_command(FLIP_IRQ);
-//	//select_prn();
-//	DE600_SLOW_DOWN;
-//	//select_nic();
-//	de600_put_command(0);
-}
-
 /*
  * Copy a buffer to the adapter transmit page memory.
  * Start sending.
@@ -497,17 +539,29 @@
 static int gc_bba_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct gc_private *priv = (struct gc_private *)dev->priv;
-	unsigned char Reg0;
+
+	netif_stop_queue(dev);	
+		
+	if (priv->tx_lock) {
+		priv->stats.tx_dropped++;
+		udelay(1000);
+		netif_wake_queue(dev);
+		return 1;	// This return will Resume the packet try
+	}
+
+	priv->tx_lock = 1;
 	
-	spin_lock_irqsave(&priv->lock, priv->lockflags);
-	netif_stop_queue(dev);
+	netif_wake_queue(dev);
 	
+	spin_lock_irqsave(&priv->lock, priv->lockflags);
+
 	//while(eth_inb(0x3a)&0x1);
 	
 	// TX Fifo Page to 0
+
 	eth_outb(0xf, 0);
 	eth_outb(0xe, 0);
-	
+
 	//printk("XMIT packet : len %d\n",skb->len);
 	/*
 		We send using the FIFO mode
@@ -516,13 +570,16 @@
 	BBA_DBG("gc_bba_start_xmit:len=%d, page %d/%d\n", skb->len, tx_fifo_in, free_tx_pages);
 
 	// We set the packetbuffer to beginning...
-	
+
+	eth_outb(0x3e, skb->len&0xff);
+	eth_outb(0x3f, (skb->len&0x0f00)>>8);
+		
 	unsigned int val=0xC0004800;	// register 0x48 is the output queue
 
 	exi_select(0, 2, 5);
 	exi_imm(0, &val, 4, EXI_WRITE, 0);
 	exi_sync(0);
-
+	
 	// Send Data from skb buffer to Network Driver now
 	exi_imm_ex(0, skb->data, skb->len, EXI_WRITE);	
 
@@ -544,13 +601,13 @@
 	val |=4;
 	eth_outb(0, val);
 
-
 	spin_unlock_irqrestore(&priv->lock, priv->lockflags);
+
 	dev->trans_start = jiffies;
-	dev_kfree_skb(skb);
-	 	
-	priv->stats.tx_bytes++;
+	priv->stats.tx_bytes += skb->len;
  	priv->stats.tx_packets++;
+ 	
+	dev_kfree_skb(skb);
 
 	return 0;
 }
@@ -570,7 +627,7 @@
 	/*
 	Input Flow concept: Take a look to Hardware spec page 35
 	*/
-	
+/*	
 	eth_outb(0x3a, 2);
 	if (eth_inb(0x3a) & 2)
 	{
@@ -578,7 +635,7 @@
 		priv->stats.rx_missed_errors++;
 		return ;
 	}
-		
+*/		
 	/*
 		Receive Buffer Write Page Pointer: Current receive write page pointer. The MSB
 		is the Reg17h.3 bit. The LSB is the Reg16h.0 bit. This register is controlled by
@@ -597,7 +654,6 @@
 	
 	p_read  = eth_inb(0x18);
 	p_read |= (eth_inb(0x19)&0x0f) << 8;
-	
 	if (p_read == p_write) return;
 	
 	//printk("Received a packet .. (start)\n");
@@ -686,13 +742,22 @@
 	dev->last_rx = jiffies;
 
 	priv->stats.rx_packets ++;	/* count all receives */
-	priv->stats.rx_bytes ++;	/* count all received bytes */
+	priv->stats.rx_bytes += skb->len;	/* count all received bytes */
 
 	gc_input(dev);
 	
 	return ;
 }
 
+#define BBA_IRQ_FRAGI	0x01
+#define BBA_IRQ_RI	0x02
+#define BBA_IRQ_TI	0x04
+#define BBA_IRQ_REI	0x08
+#define BBA_IRQ_TEI	0x10
+#define BBA_IRQ_FIFOEI	0x20
+#define BBA_IRQ_BUSEI	0x40
+#define BBA_IRQ_RBFI	0x80
+
 
 static void inline gcif_service(struct net_device *dev)
 {
@@ -705,61 +770,73 @@
 	int status = inb9 & inb8;
 
 	BBA_DBG("gcif_service: %08x %08x status %08x\n", inb8, inb9, status);
-
+	
 	if (!status) {
 		eth_outb(9, 0xff);
 		BBA_DBG("?? GC irq but no irq ??\n");
 	}
-
-	if (status & 4)
+	
+	if (status & BBA_IRQ_FRAGI)	// 0x1
 	{
-		eth_outb(9, 4);
-		// We clear the IRQ
-		netif_wake_queue(dev);		/* allow more packets into adapter */
-
-		
-		// TX Transmisstion compleated ...
-
-		/*
-		int s = eth_inb(4);
-		if (s)   // should not occur, since 4 == TX OK
-			BBA_DBG("tx error %02x\n", s);
-		*/
+		eth_outb(9, BBA_IRQ_FRAGI);
+		BBA_DBG("Fragmentet Interrupt\n");
 	}
 
-	if (status & 2)
+	if (status & BBA_IRQ_RI)	// 0x2
 	{
 		// We clear the IRQ
-		eth_outb(9, 2);
+		eth_outb(9, BBA_IRQ_RI);
 		spin_lock_irqsave(&priv->lock, priv->lockflags);
 		gc_input(dev);
 		spin_unlock_irqrestore(&priv->lock, priv->lockflags);
 		
 	}
+	
+	if (status & BBA_IRQ_TI)	// 0x4
+	{
+		eth_outb(9, BBA_IRQ_TI);
+		// We clear the IRQ
+		netif_wake_queue(dev);		/* allow more packets into adapter */
+		priv->tx_lock = 0;
+		// TX Transmisstion compleated ...
+	}
 
-	if (status & 8)
+	if (status & BBA_IRQ_REI)	// 0x8
 	{
-		eth_outb(9, 8);
-		//printk("receive error :(\n");
+		eth_outb(9, BBA_IRQ_REI);
+		BBA_DBG("receive error :(\n");
+		priv->stats.rx_frame_errors++;
 	}
 
-	if (status & 0x10)
+	if (status & BBA_IRQ_TEI)	// 0x10
 	{
-		eth_outb(9, 0x10);
+		eth_outb(9, BBA_IRQ_TEI);
 		netif_wake_queue(dev);		/* allow more packets into adapter */
-		//printk("tx error\n");
+		priv->tx_lock = 0;
+		BBA_DBG("tx error\n");
+		priv->stats.tx_errors++;
 	}
-	if (status & 0x20)
+
+	if (status & BBA_IRQ_FIFOEI)	// 0x20
 	{
-		eth_outb(9, 0x20);
-		BBA_DBG("rx fifo error\n");
+		eth_outb(9, BBA_IRQ_FIFOEI);
+		BBA_DBG("rx/tx fifo error\n");
+		adapter_init(dev);
+		priv->stats.rx_errors++;
 	}
-	if (status & 0x80)
+	
+	if (status & BBA_IRQ_BUSEI)	// 0x40
 	{
-		eth_outb(9, 0x80);
-		//printk("rx overflow!\n");
-		gc_input(dev);
-		
+		eth_outb(9, BBA_IRQ_BUSEI);
+		BBA_DBG("Bus Error\n");
+	}
+	
+	if (status & BBA_IRQ_RBFI)	// 0x80
+	{
+		eth_outb(9, BBA_IRQ_RBFI);
+		BBA_DBG("rx overflow!\n");
+		//gc_input(dev);
+		priv->stats.rx_over_errors++;
 		// RWP
 		eth_outb(0x16, GBA_RX_RWP);
 		eth_outb(0x17, 0x0);
@@ -771,16 +848,9 @@
 		// RHBP
 		eth_outb(0x1a, GBA_RX_RHBP);
 		eth_outb(0x1b, 0);
-		
-
-	}
 
-	if (status & ~(0xBE))
-	{
-		eth_outb(9, status & ~0xBE);
-		BBA_DBG("status %02x\n", status & ~0xBE);
 	}
-//	eth_outb(9, status);
+	
 }
 
 
@@ -795,8 +865,6 @@
 	struct net_device *dev  = (struct net_device *)dev_id;
     	struct gc_private *priv = (struct gc_private *)dev->priv;
 
-	int		retrig = 0;
-
 	/* This might just as well be deleted now, no crummy drivers present :-) */
 	if ((dev == NULL) || (dev->irq != irq)) {
 		BBA_DBG(KERN_ERR "%s: bogus interrupt %d\n", dev?dev->name:"GC_BBA", irq);
@@ -820,9 +888,6 @@
 			have_irq(ch * 3 + EXI_EVENT_IRQ);
 	}
 
-	if (retrig)
-		trigger_interrupt(dev);
-
 	spin_unlock(&priv->lock);
 	
 	return IRQ_HANDLED;
@@ -958,7 +1023,7 @@
 	
 	BBA_DBG("initializing BBA...\n");
 
-	
+	priv->tx_lock = 0;
 	
 	eth_outb(0x60, 0);	// unknown
 	udelay(10000);
@@ -982,7 +1047,7 @@
 	eth_outb(1, 0x10|PACKETS_PER_IRQ | BBA_PROMISC);
 
 	eth_outb(0x14, 0x0);
-	eth_outb(0x15, 0x8);
+	eth_outb(0x15, 0x6);
 
 	eth_outb(0x50, 0x80);
 
@@ -1037,7 +1102,7 @@
 	eth_outb(8, 0xFF); // enable all IRQs
 	eth_outb(9, 0xFF); // clear all irqs
 
-	//eth_outb(0x30, 0x2);	// 100 Mbit ?
+	//eth_outb(0x30, 0x2);	// 100 Mbit ?	-- FATAL , IF speed so high, EXI totally overloaded
 
 	
 	BBA_DBG("after all: irq mask %x %x\n", eth_inb(8), eth_inb(9));
@@ -1077,24 +1142,22 @@
 	eth_exi_outb(2, 0);
 	s = eth_exi_inb(3);
 
-	if (s & 0x80)
+	if (s & 0x08)
 	{
-//		BBA_DBG("GC_IRQ service.\n");
-		eth_exi_outb(3, 0x80);
-		gcif_service(dev);
+		BBA_DBG("GCIF - EXI - HASH function\n");
+		eth_exi_outb(3, 0x08);
 		eth_exi_outb(2, 0xF8);
 		return;
 	}
-	if (s & 0x40)
+
+	if (s & 0x10)
 	{
-		eth_exi_outb(3, 0x40);
+		BBA_DBG("GCIF - EXI - patchtru!\n");
+		eth_exi_outb(3, 0x10);
 		eth_exi_outb(2, 0xF8);
-//		BBA_DBG("GCIF - EXI - 0x40!\n");
-		adapter_init(dev);
 		return;
-		
-//		return;
 	}
+
 	if (s & 0x20)
 	{
 		BBA_DBG("GCIF - EXI - CMDERR!\n");
@@ -1102,20 +1165,25 @@
 		eth_exi_outb(2, 0xF8);
 		return;
 	}
-	if (s & 0x10)
+	
+	if (s & 0x40)
 	{
-		BBA_DBG("GCIF - EXI - patchtru!\n");
-		eth_exi_outb(3, 0x10);
+		eth_exi_outb(3, 0x40);
 		eth_exi_outb(2, 0xF8);
+		BBA_DBG("GCIF - EXI - 0x40!\n");
+		adapter_init(dev);
 		return;
-	}
-	if (s & 0x08)
+	}	
+
+	if (s & 0x80)
 	{
-		BBA_DBG("GCIF - EXI - HASH function\n");
-		eth_exi_outb(3, 0x08);
+		BBA_DBG("GC_IRQ service.\n");
+		eth_exi_outb(3, 0x80);
+		gcif_service(dev);
 		eth_exi_outb(2, 0xF8);
 		return;
 	}
+
 //	printk("GCIF - EXI - ?? %02x\n", s);
 	eth_exi_outb(2, 0xF8);
 }

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

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


Index: screenshots.xml
===================================================================
RCS file: /cvsroot/gc-linux/htdocs/xml/en/screenshots.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- screenshots.xml	27 Feb 2004 23:19:42 -0000	1.4
+++ screenshots.xml	27 Feb 2004 23:22:42 -0000	1.5
@@ -4,7 +4,7 @@
   <info>
     <title>Screenshots</title>
     <author>Michael Steil</author>
-    <date>2 February 2004</date>
+    <date>28 February 2004</date>
   </info>
 
   <h2>A full Linux system over NFS (28 Feb 2004)</h2>

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

Added Files:
	contact.xml 
Log Message:
...


--- NEW FILE: contact.xml ---
<?xml version="1.0" encoding="iso-8859-1"?>
<?xml-stylesheet type="text/xsl" href="iparticle.xsl"?>
<iparticle>
 <info>
  <title>Kontakt</title>
 </info>

<p>Das GameCube Linux Projekt besteht aus mehreren Entwicklern und Testern weltweit. Bitte versuchen Sie den richtigen Ansprechpartner zu kontaktieren. F&#252;r allgemeine Frage setzen Sie sich bitte mit Michael in Kontakt.</p>

<p><b>Michael Steil</b> &lt;<a href="mailto:steil&#64;in.tum.de">steil&#64;in.tum.de</a>&gt;,
IRC: "mist"<br/>
PGP: <a href="http://www.weihenstephan.org/~michaste/Michael_Steil.gpg.asc">http://www.weihenstephan.org/~michaste/Michael_Steil.gpg.asc</a>, fingerprint: BA1C 5B3A 462E B830 03DC  1D01 6970 821B 118C 4215</p>

<p><b>Costis S.</b> &lt;<a href="mailto:costis@...;,
IRC: "Costis"<br/>
</p>

<p><b>Edgar Hucek</b> &lt;<a href="mailto:hostmaster&#64;ed-soft.at">hostmaster&#64;ed-soft.at</a>&gt;,
IRC: "gimli,ed,ed[work]"</p>

<p><b>Lehner Franz</b> &lt;<a href="mailto:franz&#64;lehner.at">franz&#64;lehner.at</a>&gt;, IRC: "hamtitampti"<br/>
PGP: <a href="http://www.lehner.at/franz.asc">http://www.lehner.at/franz.asc</a></p>

<p><b>Stefan Esser</b> &lt;<a href="mailto:sesser&#64;nopiracy.de">sesser&#64;nopiracy.de</a>&gt;,
IRC: "ionic"</p>

<p><b>Bitte beachten:</b> Support oder Fragen die sich auf die Entwicklung beziehen, sollten an die <a href="mailinglist.html">Mailing Listen</a> gerichtet werden, es sei denn, der Grund l&#228;sst nur pers&#246;nlichen Kontakt zu. Sie k&#246;nnen &#228;ltere Diskussionsbeitr&#228;ge in den <a href="mailinglist.html">Archiven der Mailing Listen</a> suchen - die Wahrscheinlichkeit ist ziemlich hoch, dass Ihre Frage dort bereits beantwortet wurde.</p>

<p>Neben der Mailing Liste gibt es auch <b>Unterst&#252;tzung im IRC Channel</b>: <a href="irc://irc.oftc.net/gc-linux">#gc-linux</a>
@ <a href="http://www.oftc.net/oftc/infrastructure/">oftc.net</a>.</p>

<p>(Das System zur Erstellung der Webseite stammt von <a href="http://www.xbox-linux.org/docs/contact.html">Manuel Vetterli</a>.)</p>
</iparticle>
<!-- translator: Adrian von Buttlar -->

Update of /cvsroot/gc-linux/htdocs/xml/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6764/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.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- news.xml	8 Feb 2004 01:03:31 -0000	1.13
+++ news.xml	27 Feb 2004 23:19:42 -0000	1.14
@@ -2,6 +2,16 @@
 <?xml-stylesheet href="news.xsl" type="text/xsl"?>
 <news>
   <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>
+  </item>
+  <item>
+    <date>27 February 2004</date>
+    <title>Ethernet fully functional at 10 MBit</title>
+    <text>hamtitampti fixed the Ethernet driver, we now have stable TCP/IP traffic at rates of 1.05 MB/sec - and NFS-Root works flawlessly!</text>
+  </item>
+  <item>
     <date>6 February 2004</date>
     <title>First steps towards a full Linux system</title>
     <text>Jon Masters has contributed a workaround for the NFS problem, so that it now possible to boot a full system over NFS - though very slowly. hamtitampti is currently rewriting the network driver.</text>

Index: screenshots.xml
===================================================================
RCS file: /cvsroot/gc-linux/htdocs/xml/en/screenshots.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- screenshots.xml	3 Feb 2004 02:53:33 -0000	1.3
+++ screenshots.xml	27 Feb 2004 23:19:42 -0000	1.4
@@ -7,6 +7,18 @@
     <date>2 February 2004</date>
   </info>
 
+  <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>
+  <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>
+  </p>
+
+
   <h2>GameCube Linux Alpha (2 Feb 2004)</h2>
 
   <p>This is what can be seen if you point your web browser to your GameCube's IP:</p>

Index: yagcd.xml
===================================================================
RCS file: /cvsroot/gc-linux/htdocs/xml/en/yagcd.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- yagcd.xml	6 Feb 2004 13:39:48 -0000	1.7
+++ yagcd.xml	27 Feb 2004 23:19:42 -0000	1.8
@@ -9,7 +9,7 @@
 <a href="../../down/yet_another_gamecube_doc.pdf.tar.gz">pdf</a> (primary document, recommended for printing)<br />
 <hr />
 
-<small><b>last modified: Thu, 05 Feb 2004 09:04:41 </b></small><br />
+<small><b>last modified: Tue, 10 Feb 2004 03:53:32 </b></small><br />
  
 <h1 align="center">Yet Another Gamecube Documentation<br />
 <font size="-1">(but one that's worth printing)</font> </h1>
@@ -740,21 +740,6 @@
 without any unencrypted BIOS data for comparison.
 
[...4356 lines suppressed...]
 
 <div class="p"><!----></div>
- <h2><a name="tth_sEc16">
-16</a>&#160;&#160;Credits</h2>
+ <h2><a name="tth_sEc17">
+17</a>&#160;&#160;Credits</h2>
 
 <div class="p"><!----></div>
 besides freely available datasheets and patents, this document was created based
@@ -16964,6 +18109,10 @@
 
 <tr><td align="center"></td><td align="right">some image format info</td></tr>
 
+<tr><td align="center"><b>Steven Looman</b></td><td align="right">steven@...>
+
+<tr><td align="center"></td><td align="right">keyboard scancodes, comments on adapters</td></tr>
+
 <tr><td align="center"><b>Aktnot</b></td><td align="right">http://cube.iu.hio.no/s104086/</td></tr>
 
 <tr><td align="center"></td><td align="right">additional rtc/ipl pinout info</td></tr>

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

Added Files:
	exi.h 
Log Message:
EXI support, part 1 - Driver model stuff, take 1.

--- NEW FILE: exi.h ---
/*
 * include/linux/exi.h
 */

#ifndef __EXI_H
#define __EXI_H

#include <linux/device.h>


struct exi_dev {
	struct device dev;
};

#define to_exi_dev(n)		container_of(n, struct exi_dev, dev)

struct exi_driver {
	char *name;

	struct device_driver driver;
};

#define to_exi_driver(drv)	container_of(drv, struct exi_driver, driver)


extern struct bus_type exi_bus_type;

extern int exi_driver_register(struct exi_driver *drv);
extern void exi_driver_unregister(struct exi_driver *drv);

#endif	/* !__EXI_H */

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

Added Files:
	Makefile 
Log Message:
EXI support, part 1 - Driver model stuff, take 1.

--- NEW FILE: Makefile ---
#
# Makefile for the Linux kernel device drivers.
#
# 15 Sep 2000, Christoph Hellwig <hch@...>
# Rewritten to use lists instead of if-statements.
#

obj-$(CONFIG_PCI)		+= pci/
obj-$(CONFIG_PARISC)		+= parisc/
obj-$(CONFIG_ACPI_BOOT)		+= acpi/
# 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/

# char/ comes before serial/ etc so that the VT console is the boot-time
# default.
obj-y				+= char/
obj-y				+= serial/
obj-$(CONFIG_PARPORT)		+= parport/
obj-y				+= base/ block/ misc/ net/ media/
obj-$(CONFIG_NUBUS)		+= nubus/
obj-$(CONFIG_ATM)		+= atm/
obj-$(CONFIG_PPC_PMAC)		+= macintosh/
obj-$(CONFIG_IDE)		+= ide/
obj-$(CONFIG_FC4)		+= fc4/
obj-$(CONFIG_SCSI)		+= scsi/
obj-$(CONFIG_FUSION)		+= message/
obj-$(CONFIG_IEEE1394)		+= ieee1394/
obj-y				+= cdrom/ video/
obj-$(CONFIG_MTD)		+= mtd/
obj-$(CONFIG_PCMCIA)		+= pcmcia/
obj-$(CONFIG_DIO)		+= dio/
obj-$(CONFIG_SBUS)		+= sbus/
obj-$(CONFIG_ZORRO)		+= zorro/
obj-$(CONFIG_MAC)		+= macintosh/
obj-$(CONFIG_PARIDE) 		+= block/paride/
obj-$(CONFIG_TC)		+= tc/
obj-$(CONFIG_USB)		+= usb/
obj-$(CONFIG_USB_GADGET)	+= usb/gadget/
obj-$(CONFIG_INPUT)		+= input/
obj-$(CONFIG_GAMEPORT)		+= input/gameport/
obj-$(CONFIG_SERIO)		+= input/serio/
obj-$(CONFIG_I2O)		+= message/
obj-$(CONFIG_I2C)		+= i2c/
obj-$(CONFIG_PHONE)		+= telephony/
obj-$(CONFIG_MD)		+= md/
obj-$(CONFIG_BT)		+= bluetooth/
obj-$(CONFIG_ISDN_BOOL)		+= isdn/
obj-$(CONFIG_MCA)		+= mca/
obj-$(CONFIG_EISA)		+= eisa/
obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
obj-$(CONFIG_EXI)		+= exi/

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

Modified Files:
	Kconfig 
Log Message:
EXI support, part 1 - Driver model stuff, take 1.

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Kconfig	18 Feb 2004 20:01:57 -0000	1.7
+++ Kconfig	27 Feb 2004 12:26:01 -0000	1.8
@@ -1009,6 +1009,16 @@
 
 source "drivers/pci/Kconfig"
 
+config EXI
+	bool "EXI support (EXPERIMENTAL)"
+	depends on GAMECUBE && EXPERIMENTAL
+	default y
+	help
+	  This adds support for the Expansion Interface (bus) as found in
+	  the Nintendo GameCube.
+
+	  Say Y.
+
 config HOTPLUG
 	bool "Support for hot-pluggable devices"
 	---help---

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

Added Files:
	Makefile exi-driver.c 
Log Message:
EXI support, part 1 - Driver model stuff, take 1.

--- NEW FILE: Makefile ---
#
# Makefile for the EXI bus core.
#

obj-$(CONFIG_EXI)	+= exi-driver.o

--- NEW FILE: exi-driver.c ---
/*
 * drivers/exi/exi-driver.c
 *
 * Copyright (C) 2004  Arthur Othieno <a.othieno@...>
 */

#define DEBUG

#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/device.h>

#include <linux/exi.h>


/**
 *	exi_driver_register - register an EXI device driver.
 *	@drv: driver structure to register.
 *
 *	Registers an EXI device driver with the bus
 *	and consequently with the driver model core.
 */
int exi_driver_register(struct exi_driver *drv)
{
	drv->driver.name = drv->name;
	drv->driver.bus = &exi_bus_type;

	return driver_register(&drv->driver);
}

/**
 *	exi_driver_unregister - unregister an EXI device driver.
 *	@drv: driver structure to unregister.
 *
 *	Unregisters an EXI device driver with the bus
 *	and consequently with the driver model core.
 */
void exi_driver_unregister(struct exi_driver *drv)
{
	driver_unregister(&drv->driver);
}


struct bus_type exi_bus_type = {
	.name		= "exi",
};

static int __init exi_driver_init(void)
{
	return bus_register(&exi_bus_type);
}

postcore_initcall(exi_driver_init);

EXPORT_SYMBOL(exi_bus_type);
EXPORT_SYMBOL(exi_driver_register);
EXPORT_SYMBOL(exi_driver_unregister);

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

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

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

Modified Files:
	gc-net.c 
Log Message:
changed IRQ timing, but .. yes, the bus is too slow it seems


Index: gc-net.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gc-net.c	26 Feb 2004 22:33:51 -0000	1.18
+++ gc-net.c	27 Feb 2004 00:06:33 -0000	1.19
@@ -22,8 +22,8 @@
  * $Id$
  *
  * $Log$
- * Revision 1.18  2004/02/26 22:33:51  hamtitampti
- * 0% packet loss now :-)
+ * Revision 1.19  2004/02/27 00:06:33  hamtitampti
+ * changed IRQ timing, but .. yes, the bus is too slow it seems
  *
  * Revision 1.17  2004/02/11 20:15:27  hamtitampti
  * small changes, little bit better now
@@ -58,9 +58,6 @@
 #define BBA_DBG(format, arg...); { }
 //#define BBA_DBG(format, arg...) printk(f,## arg)
 
-//#define PACKETS_PER_IRQ (0x40)	// 2 packets / irq
-#define PACKETS_PER_IRQ 0	// IRQ / packet
-
 #define BBA_IRQ 4
 #define IRQ_EXI 4
 //#define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer. */
@@ -389,9 +386,11 @@
 #define RUNT 60		/* Too small Ethernet packet */
 #define ETH_LEN 6
 
-/*
- * D-Link driver variables:
- */
+
+#define BBA_PROMISC 0
+#define PACKETS_PER_IRQ (0x40)	// 2 packets / irq
+//#define PACKETS_PER_IRQ 0	// IRQ / packet
+
 
 
 #define GBA_IRQ_MASK	0xFF
@@ -502,6 +501,9 @@
 	
 	spin_lock_irqsave(&priv->lock, priv->lockflags);
 	netif_stop_queue(dev);
+	
+	//while(eth_inb(0x3a)&0x1);
+	
 	// TX Fifo Page to 0
 	eth_outb(0xf, 0);
 	eth_outb(0xe, 0);
@@ -608,14 +610,6 @@
 
 	eth_ins(p_read << 8, descr, 4);
 
-	next_receive_frame  = descr[0];
-	next_receive_frame |= (descr[1] & 0x0f) << 8;
-	
-	if (next_receive_frame>0xf) next_receive_frame = 1;
-
-	eth_outb(0x18, next_receive_frame&0xff);
-	eth_outb(0x19, (next_receive_frame&0x0f00)>>8);
-	
 		
 	/*
 		Size Looks Crazy, but ok, the Packet Lenght is indeed 3 nibbles = 12 bits
@@ -681,23 +675,19 @@
 
 	netif_rx(skb);
 
+	next_receive_frame  = descr[0];
+	next_receive_frame |= (descr[1] & 0x0f) << 8;
+	
+
+	eth_outb(0x18, next_receive_frame&0xff);
+	eth_outb(0x19, (next_receive_frame&0x0f00)>>8);
+
 	/* update stats */
 	dev->last_rx = jiffies;
 
 	priv->stats.rx_packets ++;	/* count all receives */
 	priv->stats.rx_bytes ++;	/* count all received bytes */
-	/*
-	next_receive_frame  = descr[0];
-	next_receive_frame |= (descr[1] & 0x0f) << 8;
-	
-	printk("Current Framepointer: %d\n",p_read);
-	printk("Next    Framepointer: %d\n",next_receive_frame);
-	printk("Write   Framepointer: %d\n",p_write);
-	printk("Recieved Len: %d\n",skb->len);
-	
-	if (next_receive_frame != p_write) printk("Multipacket Seen\n");
-	if (next_receive_frame != p_write) gc_input(dev);
-	*/
+
 	gc_input(dev);
 	
 	return ;
@@ -767,7 +757,7 @@
 	if (status & 0x80)
 	{
 		eth_outb(9, 0x80);
-		BBA_DBG("rx overflow!\n");
+		//printk("rx overflow!\n");
 		gc_input(dev);
 		
 		// RWP
@@ -888,7 +878,7 @@
 	eth_outb(0x5b, eth_inb(0x5b)&~(1<<7));
 	eth_outb(0x5e, 1);
 	eth_outb(0x5c, eth_inb(0x5c)|4);
-	eth_outb(1, 0x11 | PACKETS_PER_IRQ);
+	eth_outb(1, 0x10 | PACKETS_PER_IRQ | BBA_PROMISC);
 
 	eth_outb(0x50, 0x80);
 
@@ -912,8 +902,7 @@
 	eth_outb(0x1a, GBA_RX_RHBP);
 	eth_outb(0x1b, 0);
 
-	eth_outb(1, (eth_inb(1) & 0xFE) | 0x12| PACKETS_PER_IRQ);
-
+	
 	eth_outb(0, 8);
 	eth_outb(0x32, 8);
 
@@ -989,7 +978,11 @@
 	eth_outb(0x5b, eth_inb(0x5b)&~(1<<7));
 	eth_outb(0x5e, 1);
 	eth_outb(0x5c, eth_inb(0x5c)|4);
-	eth_outb(1, 0x11|PACKETS_PER_IRQ);
+	
+	eth_outb(1, 0x10|PACKETS_PER_IRQ | BBA_PROMISC);
+
+	eth_outb(0x14, 0x0);
+	eth_outb(0x15, 0x8);
 
 	eth_outb(0x50, 0x80);
 
@@ -1012,7 +1005,6 @@
 	eth_outb(0x1a, GBA_RX_RHBP);
 	eth_outb(0x1b, 0);
 	
-	eth_outb(1, (eth_inb(1) & 0xFE) | 0x12| PACKETS_PER_IRQ);
 
 	eth_outb(0, 8);
 	eth_outb(0x32, 8);
@@ -1045,7 +1037,7 @@
 	eth_outb(8, 0xFF); // enable all IRQs
 	eth_outb(9, 0xFF); // clear all irqs
 
-//	eth_outb(0x30, (eth_inb(0x30) | 0x2));	// 100 Mbit ?
+	//eth_outb(0x30, 0x2);	// 100 Mbit ?
 
 	
 	BBA_DBG("after all: irq mask %x %x\n", eth_inb(8), eth_inb(9));

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

Modified Files:
	gamecube.c 
Log Message:
Added gamecube_show_cpuinfo()

Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gamecube.c	26 Feb 2004 22:32:59 -0000	1.12
+++ gamecube.c	26 Feb 2004 22:47:26 -0000	1.13
@@ -6,6 +6,7 @@
 #include <linux/config.h>
 #include <linux/console.h>
 #include <linux/initrd.h>
+#include <linux/seq_file.h>
 
 #include <asm/machdep.h>
 #include <asm/bootinfo.h>
@@ -64,6 +65,15 @@
 	tb_to_us = mulhwu_scale_factor(freq/divisor, 1000000);
 }
 
+static int
+gamecube_show_cpuinfo(struct seq_file *m)
+{
+	seq_printf(m, "vendor\t\t: IBM\n");
+	seq_printf(m, "machine\t\t: Nintendo GameCube\n");
+
+	return 0;
+}
+
 void __init
 platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 	      unsigned long r6, unsigned long r7)
@@ -79,8 +89,7 @@
 #endif
 
 	ppc_md.setup_arch = gamecube_setup_arch;
-	ppc_md.setup_io_mappings = gamecube_map_io;
-	ppc_md.find_end_of_memory = gamecube_find_end_of_memory;
+	ppc_md.show_cpuinfo = gamecube_show_cpuinfo;
 
 	ppc_md.init_IRQ = gamecube_init_IRQ;
 	ppc_md.get_irq = gamecube_get_irq;
@@ -91,6 +100,9 @@
 
 	ppc_md.calibrate_decr = gamecube_calibrate_decr;
 
+	ppc_md.find_end_of_memory = gamecube_find_end_of_memory;
+	ppc_md.setup_io_mappings = gamecube_map_io;
+
 #ifdef CONFIG_DUMMY_CONSOLE
 	conswitchp = &dummy_con;
 #endif

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

Modified Files:
	gc-net.c 
Log Message:
0% packet loss now :-)


Index: gc-net.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gc-net.c	11 Feb 2004 20:15:27 -0000	1.17
+++ gc-net.c	26 Feb 2004 22:33:51 -0000	1.18
@@ -22,6 +22,9 @@
  * $Id$
  *
  * $Log$
+ * Revision 1.18  2004/02/26 22:33:51  hamtitampti
+ * 0% packet loss now :-)
+ *
  * Revision 1.17  2004/02/11 20:15:27  hamtitampti
  * small changes, little bit better now
  *
@@ -390,15 +393,12 @@
  * D-Link driver variables:
  */
 
-static volatile int		rx_page;
-
-#define TX_PAGES 2
-static volatile int		tx_fifo[TX_PAGES];
-static volatile int		tx_fifo_in;
-static volatile int		tx_fifo_out;
-static volatile int		free_tx_pages = TX_PAGES;
-static int			was_down;
 
+#define GBA_IRQ_MASK	0xFF
+#define GBA_RX_BP	0x1
+#define GBA_RX_RWP	0x1
+#define GBA_RX_RRP	0x1
+#define GBA_RX_RHBP	0xf
 
 static irqreturn_t gc_bba_interrupt(int irq, void *dev_id, struct pt_regs * regs);
 static int	adapter_init(struct net_device *dev);
@@ -466,7 +466,6 @@
 	BBA_DBG("gc_bba_close\n");
 
 //	//select_nic();
-	rx_page = 0;
 //	de600_put_command(RESET);
 //	de600_put_command(STOP_RESET);
 //	de600_put_command(0);
@@ -503,6 +502,9 @@
 	
 	spin_lock_irqsave(&priv->lock, priv->lockflags);
 	netif_stop_queue(dev);
+	// TX Fifo Page to 0
+	eth_outb(0xf, 0);
+	eth_outb(0xe, 0);
 	
 	//printk("XMIT packet : len %d\n",skb->len);
 	/*
@@ -650,13 +652,29 @@
 
 	/* 'skb->data' points to the start of sk_buff data area. */
 	skb_put(skb,size);
-	
+
 	// We calculate the DMA position
 	ptr = (p_read << 8) + 4;
-	// We read the Network buffer into the skb->data
-	eth_ins(ptr, skb->data, size);
-	skb->protocol=eth_type_trans(skb,dev);
+	//printk("Packet: %d %d\n",p_read,size);
+	
+	if ((ptr + size) < ((GBA_RX_RHBP+1)<<8)) {
+		// Full packet is linear to read
+		eth_ins(ptr, skb->data, size);
+		skb->protocol=eth_type_trans(skb,dev);
+	} else {
+		int temp_size = ((GBA_RX_RHBP+1)<<8) - ptr;
+		
+		// Full packet is Fragmentet to read
+		eth_ins(ptr, skb->data, temp_size);
 
+		p_read = GBA_RX_BP;
+		
+		eth_ins(p_read<<8, &skb->data[temp_size], size-temp_size);
+		skb->protocol=eth_type_trans(skb,dev);		
+		
+	}
+
+	
 	/*
 		We update the  Read Page Pointer with the next pointer, which was given to us
 	*/
@@ -753,15 +771,15 @@
 		gc_input(dev);
 		
 		// RWP
-		eth_outb(0x16, 0x1);
+		eth_outb(0x16, GBA_RX_RWP);
 		eth_outb(0x17, 0x0);
 	
 		// RRP
-		eth_outb(0x18, 0x1);
+		eth_outb(0x18, GBA_RX_RRP);
 		eth_outb(0x19, 0x0);
 	
 		// RHBP
-		eth_outb(0x1a, 0xF);
+		eth_outb(0x1a, GBA_RX_RHBP);
 		eth_outb(0x1b, 0);
 		
 
@@ -835,8 +853,7 @@
 	
 	SET_MODULE_OWNER(dev);
 
-	/* probe for adapter */
-	rx_page = 0;
+
 	//select_nic();
 
 	exi_select(0, 2, 5);
@@ -879,21 +896,20 @@
 
 	
 
-	
 	// BP
-	eth_outb(0xA,  0x1);
-	eth_outb(0xB,  0x0);
-	
+	eth_outb(0xA, GBA_RX_BP);
+	eth_outb(0xB, 0x0);
+
 	// RWP
-	eth_outb(0x16, 0x1);
+	eth_outb(0x16, GBA_RX_RWP);
 	eth_outb(0x17, 0x0);
 	
 	// RRP
-	eth_outb(0x18, 0x1);
+	eth_outb(0x18, GBA_RX_RRP);
 	eth_outb(0x19, 0x0);
 	
 	// RHBP
-	eth_outb(0x1a, 0xF);
+	eth_outb(0x1a, GBA_RX_RHBP);
 	eth_outb(0x1b, 0);
 
 	eth_outb(1, (eth_inb(1) & 0xFE) | 0x12| PACKETS_PER_IRQ);
@@ -951,9 +967,6 @@
 	
 	struct gc_private *priv = (struct gc_private *)dev->priv;
 	
-	//select_nic();
-	rx_page = 0; /* used by RESET */
-
 	BBA_DBG("initializing BBA...\n");
 
 	
@@ -984,19 +997,19 @@
 
 	
 	// BP
-	eth_outb(0xA,  0x1);
-	eth_outb(0xB,  0x0);
-	
+	eth_outb(0xA, GBA_RX_BP);
+	eth_outb(0xB, 0x0);
+
 	// RWP
-	eth_outb(0x16, 0x1);
+	eth_outb(0x16, GBA_RX_RWP);
 	eth_outb(0x17, 0x0);
 	
 	// RRP
-	eth_outb(0x18, 0x1);
+	eth_outb(0x18, GBA_RX_RRP);
 	eth_outb(0x19, 0x0);
 	
 	// RHBP
-	eth_outb(0x1a, 0xF);
+	eth_outb(0x1a, GBA_RX_RHBP);
 	eth_outb(0x1b, 0);
 	
 	eth_outb(1, (eth_inb(1) & 0xFE) | 0x12| PACKETS_PER_IRQ);

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

Modified Files:
	gamecube.c 
Log Message:
Fix compiler warning in platform_init()

Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gamecube.c	26 Feb 2004 21:20:09 -0000	1.11
+++ gamecube.c	26 Feb 2004 22:32:59 -0000	1.12
@@ -8,6 +8,7 @@
 #include <linux/initrd.h>
 
 #include <asm/machdep.h>
+#include <asm/bootinfo.h>
 #include <asm/time.h>
 #include <asm/io.h>

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

Modified Files:
	Makefile gamecube.c 
Added Files:
	gamecube_pic.c 
Log Message:
Moved interrupt code into arch/ppc/platforms/gamecube_pic.c

--- NEW FILE: gamecube_pic.c ---
/*
 * arch/ppc/platforms/gamecube_pic.c
 */

#undef DEBUG


#include <linux/irq.h>
#include <linux/init.h>
#include <linux/kernel.h>

#include <asm/io.h>


static void gamecube_mask_and_ack_irq(unsigned int irq)
{
	pr_debug("mask_and_ack(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM),
			GAMECUBE_IN(GAMECUBE_PIIC));
	if (irq < GAMECUBE_IRQS) {
		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) &
				~(1 << irq)); /* mask */
		GAMECUBE_OUT(GAMECUBE_PIIC, 1 << irq); /* ack */
	}
	pr_debug("after mask_and_ack(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM),
			GAMECUBE_IN(GAMECUBE_PIIC));
}

static void gamecube_mask_irq(unsigned int irq)
{
	pr_debug("mask(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM),
			GAMECUBE_IN(GAMECUBE_PIIC));
	if (irq < GAMECUBE_IRQS)
		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) &
				~(1 << irq)); /* mask */
}

static void
gamecube_unmask_irq(unsigned int irq)
{
	pr_debug(" before unmask(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM),
			GAMECUBE_IN(GAMECUBE_PIIC));
	if (irq < GAMECUBE_IRQS)
		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) |
				(1 << irq));
	pr_debug("after unmask(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM),
			GAMECUBE_IN(GAMECUBE_PIIC));
}


static struct hw_interrupt_type gamecube_pic = {
	.typename	= " GC-PIC ",
	.enable		= gamecube_unmask_irq,
	.disable	= gamecube_mask_irq,
	.ack		= gamecube_mask_and_ack_irq,
};

void __init gamecube_init_IRQ(void)
{
	int i;

	GAMECUBE_OUT(GAMECUBE_PIIM, 0); /* disable all irqs */
	GAMECUBE_OUT(GAMECUBE_PIIC, 0xffffffff); /* ack all irqs */

	for (i = 0; i < GAMECUBE_IRQS; i++)
		irq_desc[i].handler = &gamecube_pic;
}

/*
 * Find the highest IRQ that's generating an interrupt, if any.
 */
int gamecube_get_irq(struct pt_regs *regs)
{
	int irq = 0;
	u_int irq_status, irq_test = 1;

	pr_debug("get_irq(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM),
			GAMECUBE_IN(GAMECUBE_PIIC));
	irq_status = GAMECUBE_IN(GAMECUBE_PIIC) & GAMECUBE_IN(GAMECUBE_PIIM);

	if (irq_status == 0) {
		pr_debug("GC-PIC: Received a spurious IRQ\n");
		return -1;
/*		while(1);*/
	}

	do {
		if (irq_status & irq_test)
			break;
		irq++;
		irq_test <<= 1;
	} while (irq < GAMECUBE_IRQS);

	return irq;
}

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	18 Feb 2004 20:01:58 -0000	1.5
+++ Makefile	26 Feb 2004 21:20:09 -0000	1.6
@@ -46,7 +46,7 @@
 obj-$(CONFIG_PRPMC800)		+= prpmc800_setup.o prpmc800_pci.o
 obj-$(CONFIG_SANDPOINT)		+= sandpoint.o
 obj-$(CONFIG_SPRUCE)		+= spruce_setup.o spruce_pci.o
-obj-$(CONFIG_GAMECUBE)		+= gamecube.o
+obj-$(CONFIG_GAMECUBE)		+= gamecube.o gamecube_pic.o
 obj-$(CONFIG_GAMECUBE_CONSOLE)	+= console.o
 obj-$(CONFIG_GAMECUBE_RESET_SWITCH)	+= gc-rsw.o
 obj-$(CONFIG_GAMECUBE_DVD_COVER)	+= gc-dvdcover.o

Index: gamecube.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/gamecube.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gamecube.c	5 Feb 2004 12:33:11 -0000	1.10
+++ gamecube.c	26 Feb 2004 21:20:09 -0000	1.11
@@ -1,14 +1,23 @@
-#include <linux/config.h>
+/*
+ * arch/ppc/platforms/gamecube.c
+ */
+
 #include <linux/init.h>
-#include <linux/pagemap.h>
-#include <linux/irq.h>
+#include <linux/config.h>
 #include <linux/console.h>
 #include <linux/initrd.h>
+
+#include <asm/machdep.h>
 #include <asm/time.h>
 #include <asm/io.h>
-#include <asm/machdep.h>
+
 #include "console.h"
 
+
+extern void gamecube_init_IRQ(void);
+extern int gamecube_get_irq(struct pt_regs *regs);
+
+
 void __init
 gamecube_setup_arch(void)
 {
@@ -27,88 +36,6 @@
 }
 
 static void
-gamecube_unmask_irq(unsigned int irq)
-{
-	//printk("unmask(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM), GAMECUBE_IN(GAMECUBE_PIIC));
-	if (irq < GAMECUBE_IRQS) {
-		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) | (1 << irq));
-	}
-	//printk("after unmask(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM), GAMECUBE_IN(GAMECUBE_PIIC));
-}
-
-static void
-gamecube_mask_irq(unsigned int irq)
-{
-	//printk("mask(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM), GAMECUBE_IN(GAMECUBE_PIIC));
-	if (irq < GAMECUBE_IRQS) {
-		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) & ~(1 << irq)); /* mask */
-	}
-}
-
-static void
-gamecube_mask_and_ack_irq(unsigned int irq)
-{
-	//printk("mask_and_ack(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM), GAMECUBE_IN(GAMECUBE_PIIC));
-	if (irq < GAMECUBE_IRQS) {
-		GAMECUBE_OUT(GAMECUBE_PIIM, GAMECUBE_IN(GAMECUBE_PIIM) & ~(1 << irq)); /* mask */
-		GAMECUBE_OUT(GAMECUBE_PIIC, 1 << irq); /* ack */
-	}
-	//printk("after mask_and_ack(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM), GAMECUBE_IN(GAMECUBE_PIIC));
-}
-
-static struct hw_interrupt_type gamecube_pic = {
-	"GameCube PIC",
-	NULL, /* startup */
-	NULL, /* shutdown */
-	gamecube_unmask_irq,
-	gamecube_mask_irq,
-	gamecube_mask_and_ack_irq,
-	NULL, /* end */
-	NULL /* set_affinity */
-};
-
-static void __init
-gamecube_init_IRQ(void)
-{
-	int i;
-
-	GAMECUBE_OUT(GAMECUBE_PIIM,0);		/* disable all irqs */
-	GAMECUBE_OUT(GAMECUBE_PIIC,0xffffffff);	/* ack all irqs */
-
-	for (i = 0; i < GAMECUBE_IRQS; i++) {
-		irq_desc[i].handler = &gamecube_pic;
-	}
-}
-
-/*
- * Find the highest IRQ that generating an interrupt, if any.
- */
-int
-gamecube_get_irq(struct pt_regs *regs)
-{
-	int irq = 0;
-	u_int irq_status, irq_test = 1;
-
-	//printk("get_irq(): %x, %x\n", GAMECUBE_IN(GAMECUBE_PIIM), GAMECUBE_IN(GAMECUBE_PIIC));
-	irq_status = GAMECUBE_IN(GAMECUBE_PIIC) & GAMECUBE_IN(GAMECUBE_PIIM);
-
-	if(irq_status==0) {
-		return -1;
-		//printk("\nPanic: IRQ for no reason!\n\n\n\n\n\n");
-		//while(1);
-	}
-	do
-	{
-		if (irq_status & irq_test)
-			break;
-		irq++;
-		irq_test <<= 1;
-	} while (irq < GAMECUBE_IRQS);
-
-	return irq;
-}
-
-static void
 gamecube_restart(char *cmd)
 {
 	printk("gamecube_restart()\n");

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

Modified Files:
	asound.h 
Log Message:
Merged 2.6.3

Index: asound.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/sound/asound.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- asound.h	4 Feb 2004 23:53:26 -0000	1.1
+++ asound.h	18 Feb 2004 20:01:58 -0000	1.2
@@ -108,9 +108,10 @@
 	SNDRV_HWDEP_IFACE_VX,		/* Digigram VX cards */
 	SNDRV_HWDEP_IFACE_MIXART,	/* Digigram miXart cards */
 	SNDRV_HWDEP_IFACE_USX2Y,	/* Tascam US122, US224 & US428 usb */
+	SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */	
 
 	/* Don't forget to change the following: */
-	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USX2Y,
+	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE,
 };
 
 struct sndrv_hwdep_info {
@@ -273,6 +274,7 @@
 #define SNDRV_PCM_INFO_HALF_DUPLEX	0x00100000	/* only half duplex */
 #define SNDRV_PCM_INFO_JOINT_DUPLEX	0x00200000	/* playback and capture stream are somewhat correlated */
 #define SNDRV_PCM_INFO_SYNC_START	0x00400000	/* pcm support some kind of sync go */
+#define SNDRV_PCM_INFO_NONATOMIC_OPS	0x00800000	/* non-atomic prepare callback */
 
 enum sndrv_pcm_state {
 	SNDRV_PCM_STATE_OPEN = 0,	/* stream is open */
@@ -283,7 +285,8 @@
 	SNDRV_PCM_STATE_DRAINING,	/* stream is draining */
 	SNDRV_PCM_STATE_PAUSED,		/* stream is paused */
 	SNDRV_PCM_STATE_SUSPENDED,	/* hardware is suspended */
-	SNDRV_PCM_STATE_LAST = SNDRV_PCM_STATE_SUSPENDED,
+	SNDRV_PCM_STATE_DISCONNECTED,	/* hardware is disconnected */
+	SNDRV_PCM_STATE_LAST = SNDRV_PCM_STATE_DISCONNECTED,
 };
 
 enum {
@@ -684,7 +687,7 @@
  *                                                                          *
  ****************************************************************************/
 
-#define SNDRV_CTL_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 2)
+#define SNDRV_CTL_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 3)
 
 struct sndrv_ctl_card_info {
 	int card;			/* card number */
@@ -729,6 +732,7 @@
 #define SNDRV_CTL_ELEM_ACCESS_INACTIVE		(1<<8)	/* control does actually nothing, but may be updated */
 #define SNDRV_CTL_ELEM_ACCESS_LOCK		(1<<9)	/* write lock */
 #define SNDRV_CTL_ELEM_ACCESS_OWNER		(1<<10)	/* write lock owner */
+#define SNDRV_CTL_ELEM_ACCESS_USER		(1<<29) /* user space element */
 #define SNDRV_CTL_ELEM_ACCESS_DINDIRECT		(1<<30)	/* indirect access for matrix dimensions in the info structure */
 #define SNDRV_CTL_ELEM_ACCESS_INDIRECT		(1<<31)	/* indirect access for element value in the value structure */
 
@@ -825,6 +829,9 @@
 	SNDRV_CTL_IOCTL_ELEM_LOCK = _IOW('U', 0x14, struct sndrv_ctl_elem_id),
 	SNDRV_CTL_IOCTL_ELEM_UNLOCK = _IOW('U', 0x15, struct sndrv_ctl_elem_id),
 	SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS = _IOWR('U', 0x16, int),
+	SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct sndrv_ctl_elem_info),
+	SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct sndrv_ctl_elem_info),
+	SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct sndrv_ctl_elem_id),
 	SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int),
 	SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct sndrv_hwdep_info),
 	SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE = _IOR('U', 0x30, int),

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

Modified Files:
	main.c 
Log Message:
Merged 2.6.3

Index: main.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/init/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- main.c	14 Feb 2004 17:50:21 -0000	1.3
+++ main.c	18 Feb 2004 20:01:59 -0000	1.4
@@ -339,21 +339,21 @@
 /* Called by boot processor to activate the rest. */
 static void __init smp_init(void)
 {
-	unsigned int i, j=0;
+	unsigned int i;
+	unsigned j = 0;
 
 	/* FIXME: This should be done in userspace --RR */
 	for (i = 0; i < NR_CPUS; i++) {
 		if (num_online_cpus() >= max_cpus)
 			break;
 		if (cpu_possible(i) && !cpu_online(i)) {
-			printk("Bringing up %i\n", i);
 			cpu_up(i);
 			j++;
 		}
 	}
 
 	/* Any cleanup work */
-	printk("CPUS done %u\n", j);
+	printk("Brought up %u CPUs\n", j);
 	smp_cpus_done(max_cpus);
 #if 0
 	/* Get other processors into their bootup holding patterns. */

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

Modified Files:
	fb.h 
Log Message:
Merged 2.6.3

Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fb.h	29 Jan 2004 22:13:25 -0000	1.1
+++ fb.h	18 Feb 2004 20:01:58 -0000	1.2
@@ -1,10 +1,7 @@
 #ifndef _LINUX_FB_H
 #define _LINUX_FB_H
 
-#include <linux/tty.h>
-#include <linux/workqueue.h>
 #include <asm/types.h>
-#include <asm/io.h>
 
 /* Definitions of frame buffers						*/
 
@@ -326,32 +323,65 @@
 	struct fb_image	image;	/* Cursor image */
 };
 
+#ifdef __KERNEL__
+
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/tty.h>
+#include <linux/device.h>
+#include <linux/workqueue.h>
+#include <linux/devfs_fs_kernel.h>
+#include <linux/notifier.h>
+#include <asm/io.h>
+
+struct vm_area_struct;
+struct fb_info;
+struct device;
+struct file;
+
+/*
+ * Register/unregister for framebuffer events
+ */
+
+/*	The resolution of the passed in fb_info about to change */ 
+#define FB_EVENT_MODE_CHANGE		0x01
+/*	The display on this fb_info is beeing suspended, no access to the
+ *	framebuffer is allowed any more after that call returns
+ */
+#define FB_EVENT_SUSPEND		0x02
+/*	The display on this fb_info was resumed, you can restore the display
+ *	if you own it
+ */
+#define FB_EVENT_RESUME			0x03
+
+extern int fb_register_client(struct notifier_block *nb);
+extern int fb_unregister_client(struct notifier_block *nb);
+
+/*
+ * Pixmap structure definition
+ *
+ * The purpose of this structure is to translate data
+ * from the hardware independent format of fbdev to what
+ * format the hardware needs.
+ */
+
 #define FB_PIXMAP_DEFAULT 1     /* used internally by fbcon */
 #define FB_PIXMAP_SYSTEM  2     /* memory is in system RAM  */
 #define FB_PIXMAP_IO      4     /* memory is iomapped       */
 #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 flags;                      /* see 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);
-	spinlock_t lock;                  /* spinlock                      */
-	atomic_t count;
 };
-#ifdef __KERNEL__
-
-#include <linux/fs.h>
-#include <linux/init.h>
-
-struct fb_info;
-struct vm_area_struct;
-struct file;
 
     /*
      *  Frame buffer operations
@@ -362,58 +392,84 @@
     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);	
-    /* checks var and creates a par based on it */
-    int (*fb_check_var)(struct fb_var_screeninfo *var, struct fb_info *info);
-    /* set the video mode according to par */
+	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);
+	/* set the video mode according to info->var */
     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);
+			     unsigned blue, unsigned transp,
+			     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);
+	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); 
+	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); 
+	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);
+	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);
+	int (*fb_cursor) (struct fb_info * info,
+			  struct fb_cursor * cursor);
+
     /* Rotates the display */
     void (*fb_rotate)(struct fb_info *info, int angle);
+
     /* 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);
+	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);
+	int (*fb_mmap) (struct fb_info * info, struct file * file,
+			struct vm_area_struct * vma);
 };
 
 struct fb_info {
-   int node;
-   int flags;
-   int open;                            /* Has this been open already ? */
+	int node;
+	int flags;
+	int open;			/* Has this been open already ? */
 #define FBINFO_FLAG_MODULE	1	/* Low-level driver is a module */
-   struct fb_var_screeninfo var;        /* Current var */
-   struct fb_fix_screeninfo fix;        /* Current fix */
-   struct fb_monspecs monspecs;         /* Current Monitor specs */
-   struct fb_cursor cursor;		/* Current cursor */	
-   struct work_struct queue;		/* Framebuffer event queue */
-   struct fb_pixmap pixmap;	        /* Current pixmap */
-   struct fb_cmap cmap;                 /* Current cmap */
-   struct fb_ops *fbops;
-   char *screen_base;                   /* Virtual address */
-   struct vc_data *display_fg;		/* Console visible on this display */
-   int currcon;				/* Current VC. */	
-   void *pseudo_palette;                /* Fake palette of 16 colors */ 
-   /* From here on everything is device dependent */
-   void *par;	
+	struct fb_var_screeninfo var;	/* Current var */
+	struct fb_fix_screeninfo fix;	/* Current fix */
+	struct fb_monspecs monspecs;	/* Current Monitor specs */
+	struct fb_cursor cursor;	/* Current cursor */	
+	struct work_struct queue;	/* Framebuffer event queue */
+	struct fb_pixmap pixmap;	/* Image Hardware Mapper */
+	struct fb_cmap cmap;		/* Current cmap */
+	struct fb_ops *fbops;
+	char *screen_base;		/* Virtual address */
+	struct vc_data *display_fg;	/* Console visible on this display */
+	int currcon;			/* Current VC. */
+	void *pseudo_palette;		/* Fake palette of 16 colors */ 
+#define FBINFO_STATE_RUNNING	0
+#define FBINFO_STATE_SUSPENDED	1
+	u32 state;			/* Hardware state i.e suspend */
+	/* From here on everything is device dependent */
+	void *par;	
 };
 
 #ifdef MODULE
@@ -438,7 +494,7 @@
 #define fb_writeq sbus_writeq
 #define fb_memset sbus_memset_io
 
-#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__)
+#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__)
 
 #define fb_readb __raw_readb
 #define fb_readw __raw_readw
@@ -487,14 +543,20 @@
 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 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 void fb_set_suspend(struct fb_info *info, int state);
 extern struct fb_info *registered_fb[FB_MAX];
 extern int num_registered_fb;
 
+/* drivers/video/fbsysfs.c */
+extern struct fb_info *framebuffer_alloc(size_t size, struct device *dev);
+extern void framebuffer_release(struct fb_info *info);
+
 /* drivers/video/fbmon.c */
 #define FB_MAXTIMINGS       0
 #define FB_VSYNCTIMINGS     1
@@ -522,8 +584,7 @@
 /* drivers/video/fbcmap.c */
 extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp);
 extern void fb_dealloc_cmap(struct fb_cmap *cmap);
-extern int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to,
-			int fsfromto);
+extern int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to, int fsfromto);
 extern int fb_set_cmap(struct fb_cmap *cmap, int kspc, struct fb_info *fb_info);
 extern struct fb_cmap *fb_default_cmap(int len);
 extern void fb_invert_cmaps(void);
@@ -546,7 +607,8 @@
 
 #ifdef MODULE
 static inline int fb_find_mode(struct fb_var_screeninfo *var,
-			       struct fb_info *info, const char *mode_option,
+			       struct fb_info *info,
+			       const char *mode_option,
 			       const struct fb_videomode *db,
 			       unsigned int dbsize,
 			       const struct fb_videomode *default_mode,
@@ -573,7 +635,8 @@
 }
 #else
 extern int __init fb_find_mode(struct fb_var_screeninfo *var,
-			       struct fb_info *info, const char *mode_option,
+			       struct fb_info *info,
+			       const char *mode_option,
 			       const struct fb_videomode *db,
 			       unsigned int dbsize,
 			       const struct fb_videomode *default_mode,

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

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

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig	14 Feb 2004 17:50:21 -0000	1.2
+++ Kconfig	18 Feb 2004 20:01:58 -0000	1.3
@@ -462,6 +462,7 @@
 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
@@ -549,7 +550,6 @@
 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
@@ -614,16 +614,51 @@
 	  There is no need for enabling 'Matrox multihead support' if you have
 	  only one Matrox card in the box.
 
+config FB_RADEON_OLD
+	tristate "ATI Radeon display support (Old driver)"
+	depends on FB && PCI
+	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
+	  don't need to choose this to run the Radeon in plain VGA mode.
+	  There is a product page at
+	  <http://www.ati.com/na/pages/products/pc/radeon32/index.html>.
+
 config FB_RADEON
 	tristate "ATI Radeon display support"
 	depends on FB && PCI
+	select I2C_ALGOBIT 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
 	  don't need to choose this to run the Radeon in plain VGA mode.
+
+	  If you say Y here and want DDC/I2C support you must first say Y to
+	  "I2C support" and "I2C bit-banging support" in the character devices
+	  section.
+
+	  If you say M here then "I2C support" and "I2C bit-banging support" 
+	  can be build either as modules or built-in.
+
 	  There is a product page at
 	  <http://www.ati.com/na/pages/products/pc/radeon32/index.html>.
 
+config FB_RADEON_I2C
+	bool "DDC/I2C for ATI Radeon support"
+	depends on FB_RADEON && I2C
+	default y
+	help
+	  Say Y here if you want DDC/I2C support for your Radeon board. 
+
+config FB_RADEON_DEBUG
+	bool "Lots of debug output from Radeon driver"
+	depends on FB_RADEON
+	default n
+	help
+	  Say Y here if you want the Radeon driver to output all sorts
+	  of debugging informations to provide to the maintainer when
+	  something goes wrong.
+
 config FB_ATY128
 	tristate "ATI Rage128 display support"
 	depends on FB && PCI
@@ -673,26 +708,27 @@
 	  Say Y here to support booting a Rage XL without BIOS support.
 
 config FB_SIS
-	tristate "SIS acceleration"
+	tristate "SiS acceleration"
 	depends on FB && PCI
 	help
-	  This is the frame buffer device driver for the SiS 630 and 640 Super
-	  Socket 7 UMA cards.  Specs available at <http://www.sis.com.tw/>.
+	  This is the frame buffer device driver for the SiS 300, 315 and
+	  330 series VGA chipsets. Specs available at http://www.sis.com
+
+	  To compile this driver as a module, choose M here; the module
+	  will be called sisfb.
 
 config FB_SIS_300
-	bool "SIS 630/540/730 support"
+	bool "SiS 300 series support"
 	depends on FB_SIS
 	help
-	  This is the frame buffer device driver for the SiS 630 and related
-	  Super Socket 7 UMA cards.  Specs available at
-	  <http://www.sis.com.tw/>.
+	  Say Y here to support use of the SiS 300/305, 540, 630 and 730.
 
 config FB_SIS_315
-	bool "SIS 315H/315 support"
+	bool "SiS 315/330 series support"
 	depends on FB_SIS
 	help
-	  This is the frame buffer device driver for the SiS 315 graphics
-	  card.  Specs available at <http://www.sis.com.tw/>.
+	  Say Y here to support use of the SiS 315 and 330 series
+	  (315/H/PRO, 55x, 650, 651, 740, 330, 661, 741, 760).
 
 config FB_NEOMAGIC
 	tristate "NeoMagic display support"

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	14 Feb 2004 17:50:21 -0000	1.2
+++ Makefile	18 Feb 2004 20:01:58 -0000	1.3
@@ -7,7 +7,7 @@
 obj-$(CONFIG_VT)		  += console/
 obj-$(CONFIG_LOGO)		  += logo/
 
-obj-$(CONFIG_FB)                  += fbmem.o fbmon.o fbcmap.o modedb.o softcursor.o
+obj-$(CONFIG_FB)                  += fbmem.o fbmon.o fbcmap.o fbsysfs.o modedb.o softcursor.o
 # Only include macmodes.o if we have FB support and are PPC
 ifeq ($(CONFIG_FB),y)
 obj-$(CONFIG_PPC)                 += macmodes.o
@@ -21,7 +21,7 @@
 obj-$(CONFIG_FB_Q40)              += q40fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_ATARI)            += atafb.o
 obj-$(CONFIG_FB_68328)            += 68328fb.o
-obj-$(CONFIG_FB_RADEON)		  += radeonfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+obj-$(CONFIG_FB_RADEON_OLD)	  += radeonfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_IGA)              += igafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_CONTROL)          += controlfb.o macmodes.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
@@ -60,6 +60,7 @@
 obj-$(CONFIG_FB_SIS)		  += sis/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
 obj-$(CONFIG_FB_ATY)		  += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
 obj-$(CONFIG_FB_ATY128)		  += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
+obj-$(CONFIG_FB_RADEON)		  += aty/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
 obj-$(CONFIG_FB_I810)             += i810/ cfbfillrect.o cfbcopyarea.o \
 	                             cfbimgblt.o vgastate.o
 
@@ -67,7 +68,7 @@
 obj-$(CONFIG_FB_HGA)              += hgafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o 
 obj-$(CONFIG_FB_SA1100)           += sa1100fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_VIRTUAL)          += vfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o 
-obj-$(CONFIG_FB_HIT)              += hitfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+obj-$(CONFIG_FB_HIT)              += hitfb.o cfbfillrect.o cfbimgblt.o
 obj-$(CONFIG_FB_E1355)            += epson1355fb.o
 obj-$(CONFIG_FB_PVR2)             += pvr2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_KYRO)             += kyro/ cfbfillrect.o cfbcopyarea.o cfbimgblt.o

Index: fbmem.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/fbmem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbmem.c	14 Feb 2004 17:50:21 -0000	1.2
+++ fbmem.c	18 Feb 2004 20:01:58 -0000	1.3
@@ -27,6 +27,7 @@
 #include <linux/init.h>
 #include <linux/linux_logo.h>
 #include <linux/proc_fs.h>
+#include <linux/console.h>
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
 #endif
@@ -102,10 +103,10 @@
 extern int matroxfb_init(void);
 extern int matroxfb_setup(char*);
 extern int hpfb_init(void);
+extern int platinumfb_init(void);
+extern int platinumfb_setup(char*);
 extern int control_init(void);
 extern int control_setup(char*);
-extern int platinum_init(void);
-extern int platinum_setup(char*);
 extern int valkyriefb_init(void);
 extern int valkyriefb_setup(char*);
 extern int chips_init(void);
@@ -135,6 +136,8 @@
 extern int tx3912fb_setup(char*);
 extern int radeonfb_init(void);
 extern int radeonfb_setup(char*);
+extern int radeonfb_old_init(void);
+extern int radeonfb_old_setup(char*);
 extern int e1355fb_init(void);
 extern int e1355fb_setup(char*);
 extern int pvr2fb_init(void);
@@ -222,11 +225,14 @@
 #ifdef CONFIG_FB_RADEON
 	{ "radeonfb", radeonfb_init, radeonfb_setup },
 #endif
+#ifdef CONFIG_FB_RADEON_OLD
+	{ "radeonfb_old", radeonfb_old_init, radeonfb_old_setup },
+#endif
 #ifdef CONFIG_FB_CONTROL
 	{ "controlfb", control_init, control_setup },
 #endif
 #ifdef CONFIG_FB_PLATINUM
-	{ "platinumfb", platinum_init, platinum_setup },
+	{ "platinumfb", platinumfb_init, platinumfb_setup },
 #endif
 #ifdef CONFIG_FB_VALKYRIE
 	{ "valkyriefb", valkyriefb_init, valkyriefb_setup },
@@ -398,6 +404,7 @@
 
 static initcall_t pref_init_funcs[FB_MAX];
 static int num_pref_init_funcs __initdata = 0;
+static struct notifier_block *fb_notifier_list;
 struct fb_info *registered_fb[FB_MAX];
 int num_registered_fb;
 
@@ -466,23 +473,32 @@
  */
 u32 fb_get_buffer_offset(struct fb_info *info, u32 size)
 {
-	u32 align = info->pixmap.buf_align - 1;
-	u32 offset, count = 1000;
+	struct fb_pixmap *buf = &info->pixmap;
+	u32 align = buf->buf_align - 1, offset;
 
-	spin_lock(&info->pixmap.lock);
-	offset = info->pixmap.offset + align;
+	/* If IO mapped, we need to sync before access, no sharing of
+	 * the pixmap is done
+	 */
+	if (buf->flags & FB_PIXMAP_IO) {
+		if (info->fbops->fb_sync && (buf->flags & FB_PIXMAP_SYNC))
+			info->fbops->fb_sync(info);
+		return 0;
+	}
+
+	/* See if we fit in the remaining pixmap space */
+	offset = buf->offset + align;
 	offset &= ~align;
-	if (offset + size > info->pixmap.size) {
-		while (atomic_read(&info->pixmap.count) && count--);
-		if (info->fbops->fb_sync && 
-		    info->pixmap.flags & FB_PIXMAP_SYNC)
+	if (offset + size > buf->size) {
+		/* We do not fit. In order to be able to re-use the buffer,
+		 * we must ensure no asynchronous DMA'ing or whatever operation
+		 * is in progress, we sync for that.
+		 */
+		if (info->fbops->fb_sync && (buf->flags & FB_PIXMAP_SYNC))
 			info->fbops->fb_sync(info);
 		offset = 0;
 	}
-	info->pixmap.offset = offset + size;
-	atomic_inc(&info->pixmap.count);	
-	smp_mb__after_atomic_inc();
-	spin_unlock(&info->pixmap.lock);
+	buf->offset = offset + size;
+
 	return offset;
 }
 
@@ -688,8 +704,8 @@
 	struct fb_image image;
 	int x;
 
-	/* Return if the frame buffer is not mapped */
-	if (fb_logo.logo == NULL)
+	/* Return if the frame buffer is not mapped or suspended */
+	if (fb_logo.logo == NULL || info->state != FBINFO_STATE_RUNNING)
 		return 0;
 
 	image.depth = fb_logo.depth;
@@ -735,8 +751,6 @@
 	     x <= info->var.xres-fb_logo.logo->width; x += (fb_logo.logo->width + 8)) {
 		image.dx = x;
 		info->fbops->fb_imageblit(info, &image);
-		//atomic_dec(&info->pixmap.count);
-		//smp_mb__after_atomic_dec();
 	}
 	
 	if (palette != NULL)
@@ -783,6 +797,9 @@
 	if (!info || ! info->screen_base)
 		return -ENODEV;
 
+	if (info->state != FBINFO_STATE_RUNNING)
+		return -EPERM;
+
 	if (info->fbops->fb_read)
 		return info->fbops->fb_read(file, buf, count, ppos);
 	
@@ -818,6 +835,9 @@
 	if (!info || !info->screen_base)
 		return -ENODEV;
 
+	if (info->state != FBINFO_STATE_RUNNING)
+		return -EPERM;
+
 	if (info->fbops->fb_write)
 		return info->fbops->fb_write(file, buf, count, ppos);
 	
@@ -944,6 +964,8 @@
 			fb_pan_display(info, &info->var);
 
 			fb_set_cmap(&info->cmap, 1, info);
+
+			notifier_call_chain(&fb_notifier_list, FB_EVENT_MODE_CHANGE, info);
 		}
 	}
 	return 0;
@@ -982,7 +1004,7 @@
 	struct fb_con2fbmap con2fb;
 #endif
 	struct fb_cmap cmap;
-	int i;
+	int i, rc;
 	
 	if (!fb)
 		return -ENODEV;
@@ -993,7 +1015,9 @@
 	case FBIOPUT_VSCREENINFO:
 		if (copy_from_user(&var, (void *) arg, sizeof(var)))
 			return -EFAULT;
+		acquire_console_sem();
 		i = fb_set_var(info, &var);
+		release_console_sem();
 		if (i) return i;
 		if (copy_to_user((void *) arg, &var, sizeof(var)))
 			return -EFAULT;
@@ -1012,13 +1036,19 @@
 	case FBIOPAN_DISPLAY:
 		if (copy_from_user(&var, (void *) arg, sizeof(var)))
 			return -EFAULT;
-		if ((i = fb_pan_display(info, &var)))
+		acquire_console_sem();
+		i = fb_pan_display(info, &var);
+		release_console_sem();
+		if (i)
 			return i;
 		if (copy_to_user((void *) arg, &var, sizeof(var)))
 			return -EFAULT;
 		return 0;
 	case FBIO_CURSOR:
-		return (fb_cursor(info, (struct fb_cursor *) arg));
+		acquire_console_sem();
+		rc = fb_cursor(info, (struct fb_cursor *) arg);
+		release_console_sem();
+		return rc;
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE
 	case FBIOGET_CON2FBMAP:
 		if (copy_from_user(&con2fb, (void *)arg, sizeof(con2fb)))
@@ -1048,7 +1078,10 @@
 		return 0;
 #endif	/* CONFIG_FRAMEBUFFER_CONSOLE */
 	case FBIOBLANK:
-		return fb_blank(info, arg);
+		acquire_console_sem();
+		i = fb_blank(info, arg);
+		release_console_sem();
+		return i;
 	default:
 		if (fb->fb_ioctl == NULL)
 			return -EINVAL;
@@ -1245,7 +1278,6 @@
 		fb_info->pixmap.outbuf = sys_outbuf;
 	if (fb_info->pixmap.inbuf == NULL)
 		fb_info->pixmap.inbuf = sys_inbuf;
-	spin_lock_init(&fb_info->pixmap.lock);
 
 	registered_fb[i] = fb_info;
 
@@ -1282,6 +1314,43 @@
 	return 0;
 }
 
+/**
+ *	fb_register_client - register a client notifier
+ *	@nb: notifier block to callback on events
+ */
+int fb_register_client(struct notifier_block *nb)
+{
+	return notifier_chain_register(&fb_notifier_list, nb);
+}
+
+/**
+ *	fb_unregister_client - unregister a client notifier
+ *	@nb: notifier block to callback on events
+ */
+int fb_unregister_client(struct notifier_block *nb)
+{
+	return notifier_chain_unregister(&fb_notifier_list, nb);
+}
+
+/**
+ *	fb_set_suspend - low level driver signals suspend
+ *	@info: framebuffer affected
+ *	@state: 0 = resuming, !=0 = suspending
+ *
+ *	This is meant to be used by low level drivers to
+ * 	signal suspend/resume to the core & clients.
+ *	It must be called with the console semaphore held
+ */
+void fb_set_suspend(struct fb_info *info, int state)
+{
+	if (state) {
+		notifier_call_chain(&fb_notifier_list, FB_EVENT_SUSPEND, info);
+		info->state = FBINFO_STATE_SUSPENDED;
+	} else {
+		info->state = FBINFO_STATE_RUNNING;
+		notifier_call_chain(&fb_notifier_list, FB_EVENT_RESUME, info);
+	}
+}
 
 /**
  *	fbmem_init - init frame buffer subsystem
@@ -1396,5 +1465,8 @@
 EXPORT_SYMBOL(fb_get_buffer_offset);
 EXPORT_SYMBOL(move_buf_unaligned);
 EXPORT_SYMBOL(move_buf_aligned);
+EXPORT_SYMBOL(fb_set_suspend);
+EXPORT_SYMBOL(fb_register_client);
+EXPORT_SYMBOL(fb_unregister_client);
 
 MODULE_LICENSE("GPL");

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

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.3

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig	14 Feb 2004 17:50:21 -0000	1.2
+++ Kconfig	18 Feb 2004 20:01:58 -0000	1.3
@@ -1583,6 +1583,24 @@
 	  experience problems, you can enable this option to restore the
 	  old RX-reset behavior.  If unsure, say N.
 
+config 8139_RXBUF_IDX
+	int "Receive ring size (0 => 8K, 1 => 16K, 2 => 32K, 3 => 64K)"
+	depends on 8139TOO
+	range 0 3
+	default 1 if EMBEDDED || SH_DREAMCAST
+	default 2
+	help
+	   The 8139too driver has a fixed area of memory for receiving data.
+	   The default value is adequate for most systems. The 64KB 
+	   ring size has hardware issues that may cause problems.
+	   Values:
+		0  => 8 KB 
+		1  => 16 KB embedded systems
+		2  => 32 KB default for most systems
+		3  => 64 KB 
+	   If unsure, use the default 2.
+
+
 config SIS900
 	tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
 	depends on NET_PCI && PCI

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	14 Feb 2004 17:50:21 -0000	1.2
+++ Makefile	18 Feb 2004 20:01:58 -0000	1.3
@@ -112,7 +112,6 @@
 obj-$(CONFIG_DUMMY) += dummy.o
 obj-$(CONFIG_DE600) += de600.o
 obj-$(CONFIG_DE620) += de620.o
-obj-$(CONFIG_AT1500) += lance.o
 obj-$(CONFIG_LANCE) += lance.o
 obj-$(CONFIG_SUN3_82586) += sun3_82586.o
 obj-$(CONFIG_SUN3LANCE) += sun3lance.o

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

Modified Files:
	Kconfig 
Log Message:
Merged 2.6.3

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Kconfig	14 Feb 2004 17:50:21 -0000	1.6
+++ Kconfig	18 Feb 2004 20:01:57 -0000	1.7
@@ -30,6 +30,10 @@
 	bool
 	default y
 
+# All PPCs use generic nvram driver through ppc_md
+config GENERIC_NVRAM
+	bool
+	default y
 
 source "init/Kconfig"
 
@@ -181,7 +185,7 @@
 
 config PPC601_SYNC_FIX
 	bool "Workarounds for PPC601 bugs"
-	depends on 6xx
+	depends on 6xx && (PPC_PREP || PPC_PMAC)
 	help
 	  Some versions of the PPC601 (the first PowerPC chip) have bugs which
 	  mean that extra synchronization instructions are required near
@@ -608,14 +612,14 @@
 	depends on PPC_MULTIPLATFORM
 	default y
 
-config PPC_GEN550
+config PPC_PMAC
 	bool
-	depends on SANDPOINT
+	depends on PPC_MULTIPLATFORM
 	default y
 
-config PPC_PMAC
+config PPC_PMAC64
 	bool
-	depends on PPC_MULTIPLATFORM
+	depends on PPC_PMAC && POWER4
 	default y
 
 config PPC_PREP
@@ -628,6 +632,11 @@
 	depends on PPC_PMAC || PPC_CHRP
 	default y
 
+config PPC_GEN550
+	bool
+	depends on SANDPOINT || MCPN765 || SPRUCE
+	default y
+
 config FORCE
 	bool
 	depends on 6xx && (PCORE || POWERPMC250)
@@ -1020,8 +1029,6 @@
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/parport/Kconfig"
-
 endmenu
 
 menu "Advanced setup"
@@ -1120,179 +1127,10 @@
 	depends on ADVANCED_OPTIONS && 8xx
 endmenu
 
-source "drivers/base/Kconfig"
-
-source "drivers/mtd/Kconfig"
-
-source "drivers/pnp/Kconfig"
-
-source "drivers/block/Kconfig"
-
-source "drivers/md/Kconfig"
-
-source "drivers/ide/Kconfig"
-
-source "drivers/scsi/Kconfig"
-
-source "drivers/message/fusion/Kconfig"
-
-source "drivers/ieee1394/Kconfig"
-
-source "drivers/message/i2o/Kconfig"
-
-source "net/Kconfig"
-
-source "drivers/isdn/Kconfig"
-
-source "drivers/video/Kconfig"
-
-source "drivers/cdrom/Kconfig"
-
-source "drivers/input/Kconfig"
-
-
-menu "Macintosh device drivers"
-
-# we want to change this to something like CONFIG_SYSCTRL_CUDA/PMU
-config ADB_CUDA
-	bool "Support for CUDA based PowerMacs"
-	depends on PPC_PMAC
-	help
-	  This provides support for CUDA based Power Macintosh systems.  This
-	  includes most OldWorld PowerMacs, the first generation iMacs, the
-	  Blue&White G3 and the "Yikes" G4 (PCI Graphics).  All later models
-	  should use CONFIG_ADB_PMU instead.  It is safe to say Y here even if
-	  your machine doesn't have a CUDA.
-
-	  If unsure say Y.
-
-config ADB_PMU
-	bool "Support for PMU  based PowerMacs"
-	depends on PPC_PMAC
-	help
-	  On PowerBooks, iBooks, and recent iMacs and Power Macintoshes, the
-	  PMU is an embedded microprocessor whose primary function is to
-	  control system power, and battery charging on the portable models.
-	  The PMU also controls the ADB (Apple Desktop Bus) which connects to
-	  the keyboard and mouse on some machines, as well as the non-volatile
-	  RAM and the RTC (real time clock) chip.  Say Y to enable support for
-	  this device; you should do so if your machine is one of those
-	  mentioned above.
-
-config PMAC_PBOOK
-	bool "Power management support for PowerBooks"
-	depends on ADB_PMU
-	---help---
-	  This provides support for putting a PowerBook to sleep; it also
-	  enables media bay support.  Power management works on the
-	  PB2400/3400/3500, Wallstreet, Lombard, and Bronze PowerBook G3 and
-	  the Titanium Powerbook G4, as well as the iBooks.  You should get
-	  the power management daemon, pmud, to make it work and you must have
-	  the /dev/pmu device (see the pmud README).
-
-	  Get pmud from <ftp://ftp.samba.org/pub/ppclinux/pmud/>.
-
-	  If you have a PowerBook, you should say Y here.
-
-	  You may also want to compile the dma sound driver as a module and
-	  have it autoloaded. The act of removing the module shuts down the
-	  sound hardware for more power savings.
-
-config PM
-	bool
-	depends on PPC_PMAC && ADB_PMU && PMAC_PBOOK
-	default y
-
-config PMAC_APM_EMU
-	tristate "APM emulation"
-	depends on PMAC_PBOOK
-
-# made a separate option since backlight may end up beeing used
-# on non-powerbook machines (but only on PMU based ones AFAIK)
-config PMAC_BACKLIGHT
-	bool "Backlight control for LCD screens"
-	depends on ADB_PMU
-	help
-	  Say Y here to build in code to manage the LCD backlight on a
-	  Macintosh PowerBook.  With this code, the backlight will be turned
-	  on and off appropriately on power-management and lid-open/lid-closed
-	  events; also, the PowerBook button device will be enabled so you can
-	  change the screen brightness.
-
-config MAC_FLOPPY
-	bool "Support for PowerMac floppy"
-	depends on PPC_PMAC
-	help
-	  If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)
-	  floppy controller, say Y here. Most commonly found in PowerMacs.
-
-config MAC_SERIAL
-	tristate "Support for PowerMac serial ports (OBSOLETE DRIVER)"
-	depends on PPC_PMAC
-	help
-	  This driver is obsolete. Use CONFIG_SERIAL_PMACZILOG in
-	  "Character devices --> Serial drivers --> PowerMac z85c30" option.
-
-config ADB
-	bool "Apple Desktop Bus (ADB) support"
-	depends on PPC_PMAC
-	help
-	  Apple Desktop Bus (ADB) support is for support of devices which
-	  are connected to an ADB port.  ADB devices tend to have 4 pins.
-	  If you have an Apple Macintosh prior to the iMac, an iBook or
-	  PowerBook, or a "Blue and White G3", you probably want to say Y
-	  here.  Otherwise say N.
-
-config ADB_MACIO
-	bool "Include MacIO (CHRP) ADB driver"
-	depends on ADB
-	help
-	  Say Y here to include direct support for the ADB controller in the
-	  Hydra chip used on PowerPC Macintoshes of the CHRP type.  (The Hydra
-	  also includes a MESH II SCSI controller, DBDMA controller, VIA chip,
-	  OpenPIC controller and two RS422/Geoports.)
-
-config INPUT_ADBHID
-	bool "Support for ADB input devices (keyboard, mice, ...)"
-	depends on ADB && INPUT=y
-	help
-	  Say Y here if you want to have ADB (Apple Desktop Bus) HID devices
-	  such as keyboards, mice, joysticks, trackpads  or graphic tablets
-	  handled by the input layer.  If you say Y here, make sure to say Y to
-	  the corresponding drivers "Keyboard support" (CONFIG_INPUT_KEYBDEV),
-	  "Mouse Support" (CONFIG_INPUT_MOUSEDEV) and "Event interface
-	  support" (CONFIG_INPUT_EVDEV) as well.
-
-	  If unsure, say Y.
-
-config MAC_EMUMOUSEBTN
-	bool "Support for mouse button 2+3 emulation"
-	depends on INPUT_ADBHID
-	help
-	  This provides generic support for emulating the 2nd and 3rd mouse
-	  button with keypresses.  If you say Y here, the emulation is still
-	  disabled by default.  The emulation is controlled by these sysctl
-	  entries:
-	  /proc/sys/dev/mac_hid/mouse_button_emulation
-	  /proc/sys/dev/mac_hid/mouse_button2_keycode
-	  /proc/sys/dev/mac_hid/mouse_button3_keycode
-
-	  If you have an Apple machine with a 1-button mouse, say Y here.
-
-config ANSLCD
-	bool "Support for ANS LCD display"
-	depends on ADB_CUDA
-
-endmenu
-
-source "drivers/char/Kconfig"
-
-source "drivers/media/Kconfig"
+source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "sound/Kconfig"
-
 source "arch/ppc/8xx_io/Kconfig"
 
 source "arch/ppc/8260_io/Kconfig"
@@ -1317,8 +1155,6 @@
 
 endmenu
 
-source "drivers/usb/Kconfig"
-
 source "lib/Kconfig"
 
 
@@ -1436,7 +1272,7 @@
 
 config SERIAL_TEXT_DEBUG
 	bool "Support for early boot texts over serial port"
-	depends on 4xx || GT64260 || LOPEC || MCPN765 || PPLUS || PRPMC800 || SANDPOINT
+	depends on 4xx || GT64260 || LOPEC || PPLUS || PRPMC800 || PPC_GEN550
 
 config OCP
 	bool

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

Modified Files:
	Makefile 
Log Message:
Merged 2.6.3

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/platforms/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	30 Jan 2004 14:59:15 -0000	1.4
+++ Makefile	18 Feb 2004 20:01:58 -0000	1.5
@@ -17,9 +17,10 @@
 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_feature.o pmac_pci.o pmac_sleep.o \
+					pmac_low_i2c.o
 obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o
-obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_time.o prep_setup.o
+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

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

Modified Files:
	gamecube_defconfig 
Log Message:
Merged 2.6.3

Index: gamecube_defconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gamecube_defconfig	14 Feb 2004 17:50:21 -0000	1.12
+++ gamecube_defconfig	18 Feb 2004 20:01:58 -0000	1.13
@@ -6,6 +6,7 @@
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_PPC=y
 CONFIG_PPC32=y
+CONFIG_GENERIC_NVRAM=y
 
 #
 # Code maturity level options
@@ -63,7 +64,6 @@
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 # CONFIG_CPU_FREQ_24_API is not set
-# CONFIG_PPC601_SYNC_FIX is not set
 CONFIG_EMBEDDEDBOOT=y
 CONFIG_PPC_STD_MMU=y
 
@@ -116,11 +116,6 @@
 # CONFIG_HOTPLUG is not set
 
 #
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
 # Advanced setup
 #
 CONFIG_ADVANCED_OPTIONS=y
@@ -135,6 +130,10 @@
 CONFIG_BOOT_LOAD=0x400000
 
 #
+# Device Drivers
+#
+
+#
 # Generic Driver Options
 #
 
@@ -144,6 +143,11 @@
 # CONFIG_MTD is not set
 
 #
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
 # Plug and Play support
 #
 
@@ -164,11 +168,6 @@
 CONFIG_LBD=y
 
 #
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
 # ATA/ATAPI/MFM/RLL support
 #
 # CONFIG_IDE is not set
@@ -179,6 +178,11 @@
 # CONFIG_SCSI is not set
 
 #
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
 # Fusion MPT device support
 #
 
@@ -193,6 +197,10 @@
 # CONFIG_I2O is not set
 
 #
+# Macintosh device drivers
+#
+
+#
 # Networking support
 #
 CONFIG_NET=y
@@ -341,47 +349,9 @@
 # CONFIG_ISDN_BOOL is not set
 
 #
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_CT65550 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_S3TRIO is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_TRIDENT is not set
-CONFIG_FB_GAMECUBE=y
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_PCI_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
+# Telephony Support
 #
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_PHONE is not set
 
 #
 # Input device support
@@ -426,10 +396,6 @@
 # CONFIG_INPUT_MISC is not set
 
 #
-# Macintosh device drivers
-#
-
-#
 # Character devices
 #
 CONFIG_VT=y
@@ -479,6 +445,11 @@
 # CONFIG_RAW_DRIVER is not set
 
 #
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
@@ -489,6 +460,127 @@
 # CONFIG_DVB is not set
 
 #
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_CT65550 is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_S3TRIO is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+CONFIG_FB_GAMECUBE=y
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_PCI_CONSOLE=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+# CONFIG_SND_MIXER_OSS is not set
+CONFIG_SND_PCM_OSS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# PCI devices
+#
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VX222 is not set
+
+#
+# ALSA PPC devices
+#
+# CONFIG_SND_POWERMAC is not set
+CONFIG_SND_GAMECUBE=y
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+# CONFIG_USB is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -628,82 +720,6 @@
 # CONFIG_NLS_UTF8 is not set
 
 #
-# Sound
-#
-CONFIG_SOUND=y
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=y
-# CONFIG_SND_SEQUENCER is not set
-CONFIG_SND_OSSEMUL=y
-# CONFIG_SND_MIXER_OSS is not set
-CONFIG_SND_PCM_OSS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-
-#
-# PCI devices
-#
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_SND_AZT3328 is not set
-# CONFIG_SND_CS46XX is not set
-# CONFIG_SND_CS4281 is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_KORG1212 is not set
-# CONFIG_SND_NM256 is not set
-# CONFIG_SND_RME32 is not set
-# CONFIG_SND_RME96 is not set
-# CONFIG_SND_RME9652 is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_YMFPCI is not set
-# CONFIG_SND_ALS4000 is not set
-# CONFIG_SND_CMIPCI is not set
-# CONFIG_SND_ENS1370 is not set
-# CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
-# CONFIG_SND_MAESTRO3 is not set
-# CONFIG_SND_FM801 is not set
-# CONFIG_SND_ICE1712 is not set
-# CONFIG_SND_ICE1724 is not set
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_VIA82XX is not set
-# CONFIG_SND_VX222 is not set
-
-#
-# ALSA PPC devices
-#
-# CONFIG_SND_POWERMAC is not set
-CONFIG_SND_GAMECUBE=y
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
 # Library routines
 #
 CONFIG_CRC32=y