[Gc-linux-cvs] linux/include/asm-powerpc starlet.h, 1.5, 1.6 udbg.h, 1.1, 1.2

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/include/asm-powerpc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13650/include/asm-powerpc

Modified Files:
	starlet.h udbg.h 
Log Message:
Merged 2.6.25.
Queued small fixes for: 
- starlet-es
- starlet-ipc
- starlet-stm
- rvl-stsd
- rvl-sthcd
- gcn-ai



Index: starlet.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/asm-powerpc/starlet.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- starlet.h	2 Jul 2008 20:37:05 -0000	1.5
+++ starlet.h	13 Sep 2008 19:42:57 -0000	1.6
@@ -25,6 +25,8 @@
 #include <linux/timer.h>
 #include <asm/rheap.h>
 
+#define STARLET_EINVAL	-4
+
 
 #define STARLET_IPC_DMA_ALIGN   0x1f /* 32 bytes */
 
@@ -56,6 +58,8 @@
 	struct dma_pool *dma_pool;	/* to allocate requests */
 	struct starlet_ioh *ioh;	/* to allocate special io buffers */
 
+	unsigned int random_id;
+
 	spinlock_t list_lock;
 	struct list_head outstanding_list;
 	unsigned long nr_outstanding;
@@ -107,6 +111,12 @@
 	};
 	/* end starlet firmware request format */
 
+	/*
+	 * A signature is used to discard bogus requests from earlier
+	 * IPC instances.
+	 */
+	unsigned int sig;
+
 	dma_addr_t dma_addr;	/* request dma address */
 
 	/* ioctlv related data */

Index: udbg.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/asm-powerpc/udbg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- udbg.h	26 Mar 2008 19:52:16 -0000	1.1
+++ udbg.h	13 Sep 2008 19:42:57 -0000	1.2
@@ -48,6 +48,7 @@
 extern void __init udbg_init_debug_beat(void);
 extern void __init udbg_init_btext(void);
 extern void __init udbg_init_44x_as1(void);
+extern void __init udbg_init_40x_realmode(void);
 extern void __init udbg_init_cpm(void);
 extern void __init udbg_init_debug_usbgecko(void);