[Gc-linux-cvs] linux/include/linux exi.h,1.16,1.17 fb.h,1.30,1.31

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

Update of /cvsroot/gc-linux/linux/include/linux
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17186/include/linux

Modified Files:
	exi.h fb.h 
Log Message:
Merge 2.6.28.
Also:
- run checkpatch against the non-broken source code
- add GPIO driver fixes
- implement getgeo for the special block drivers
- small fixes


Index: exi.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/exi.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- exi.h	24 Feb 2008 18:05:34 -0000	1.16
+++ exi.h	1 Feb 2009 18:29:35 -0000	1.17
@@ -2,10 +2,10 @@
  * include/linux/exi.h
  *
  * Nintendo GameCube EXpansion Interface definitions
- * Copyright (C) 2004-2008 The GameCube Linux Team
+ * Copyright (C) 2004-2009 The GameCube Linux Team
  * Copyright (C) 2004 Arthur Othieno <a.o...@bl...>
  * Copyright (C) 2004,2005 Todd Jeffreys <to...@vo...>
- * Copyright (C) 2005,2007,2008 Albert Herranz
+ * Copyright (C) 2005,2007,2008,2009 Albert Herranz
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 #define __EXI_H
 
 #include <linux/device.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 
 struct exi_channel;
@@ -32,7 +32,7 @@
 
 	unsigned int		device;
 #define	EXI_DEVICE_ANY	(~0)
-	
+
 	u32			id;
 #define	EXI_ID_INVALID	(~0)
 #define	EXI_ID_NONE	(EXI_ID_INVALID-1)
@@ -53,7 +53,7 @@
 	struct device		dev;
 };
 
-#define to_exi_device(n) container_of(n,struct exi_device,dev)
+#define to_exi_device(n) container_of(n, struct exi_device, dev)
 
 struct exi_device *exi_get_exi_device(struct exi_channel *exi_channel,
 				      int device);
@@ -65,14 +65,14 @@
 	char			*name;
 	struct exi_device_id	*eid_table;
 	int			frequency;
-	
+
 	int  (*probe)  (struct exi_device *dev);
 	void (*remove) (struct exi_device *dev);
 
 	struct device_driver driver;
 };
 
-#define to_exi_driver(n) container_of(n,struct exi_driver,driver)
+#define to_exi_driver(n) container_of(n, struct exi_driver, driver)
 
 
 /*
@@ -89,7 +89,7 @@
 {
 	return dev_get_drvdata(&exi_dev->dev);
 }
-                                                                                
+
 static inline void exi_set_drvdata(struct exi_device *exi_dev, void *data)
 {
 	dev_set_drvdata(&exi_dev->dev, data);
@@ -117,6 +117,9 @@
  *
  */
 
+extern void exi_channel_init(struct exi_channel *exi_channel,
+			     unsigned int channel);
+
 extern struct exi_channel *to_exi_channel(unsigned int channel);
 extern unsigned int to_channel(struct exi_channel *exi_channel);
 
@@ -128,7 +131,7 @@
 #define EXI_EVENT_IRQ     0
 #define EXI_EVENT_INSERT  1
 #define EXI_EVENT_TC      2
-                                                                                
+
 typedef int (*exi_event_handler_t)(struct exi_channel *exi_channel,
 				   unsigned int event_id, void *data);
 
@@ -241,7 +244,7 @@
  *
  */
 
-/* 
+/*
  * Raw.
  */
 extern void exi_select_raw(struct exi_channel *exi_channel,
@@ -257,7 +260,7 @@
 extern void exi_dma_transfer_raw(struct exi_channel *channel,
 				 dma_addr_t data, size_t len, int mode);
 
-/* 
+/*
  * Standard.
  */
 

Index: fb.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/linux/fb.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- fb.h	15 Nov 2008 20:10:15 -0000	1.30
+++ fb.h	1 Feb 2009 18:29:35 -0000	1.31
@@ -39,7 +39,7 @@
 #define FBIOGET_DISPINFO        0x4618
 
 #define FBIOWAITRETRACE         0x4619
-#define FBIOWAITPEFINISH        0x4620 
+#define FBIOWAITPEFINISH        0x4620
 #define FBIOVIRTTOPHYS          0x4621
 #define FBIOFLIP                0x4622
 #define FBIOFLIPHACK            0x4623 /* libsdl */
@@ -813,6 +813,7 @@
 struct fb_info {
 	int node;
 	int flags;
+	struct mutex lock;		/* Lock for open/release/ioctl funcs */
 	struct fb_var_screeninfo var;	/* Current var */
 	struct fb_fix_screeninfo fix;	/* Current fix */
 	struct fb_monspecs monspecs;	/* Current Monitor specs */
@@ -904,8 +905,8 @@
 #  define fb_writel __raw_writel
 #else
    extern unsigned int vifb_writel(unsigned int, void *);
-#  define fb_writel(b,addr) vifb_writel(b,addr)
-#  define fb_writel_real(b,addr) /* __raw_writel */ (*(volatile u32 __iomem *) (addr) = (b))
+#  define fb_writel(b, addr) vifb_writel(b, addr)
+#  define fb_writel_real(b, addr) (*(/*volatile*/ u32 __iomem *)(addr) = (b))
 #endif
 #define fb_writeq __raw_writeq
 #define fb_memset memset_io