---

yaml --- r: 159203 b: refs/heads/master c: 663a31c h: refs/heads/master i: 159201: 8153d62 159199: 33f1858 v: v3
git-mirror · Jul 27, 2009 · 55a9e36 · 55a9e36
1 parent e5d8a46
commit 55a9e36
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70034918930d2e5b68c09bced637228c50d9561a
+refs/heads/master: 663a31ce5bbef2d14fa325023e48bf02b4249f27
diff --git a/trunk/drivers/isdn/hardware/mISDN/iohelper.h b/trunk/drivers/isdn/hardware/mISDN/iohelper.h
@@ -26,9 +26,9 @@
 #ifndef _IOHELPER_H
 #define _IOHELPER_H
 
-typedef	u8	(read_reg_t)(void *, u8);
-typedef	void	(write_reg_t)(void *, u8, u8);
-typedef	void	(fifo_func_t)(void *, u8, u8 *, int);
+typedef	u8	(read_reg_func)(void *hwp, u8 offset);
+typedef	void	(write_reg_func)(void *hwp, u8 offset, u8 value);
+typedef	void	(fifo_func)(void *hwp, u8 offset, u8 *datap, int size);
 
 struct _ioport {
 	u32	port;
@@ -90,7 +90,7 @@ struct _ioport {
 			*dp++ = readb(((typ *)hw->adr) + off);\
 	} \
 	static void WriteFiFo##name##_MIO(void *p, u8 off, u8 *dp, int size) {\
-		struct inf_hw *hw = p;\
+		struct hws *hw = p;\
 		while (size--)\
 			writeb(*dp++, ((typ *)hw->adr) + off);\
 	}
@@ -106,4 +106,4 @@ struct _ioport {
 	ASSIGN_FUNC(typ, IPAC, target);\
 	} while (0)
 
-#endif
+#endif
diff --git a/trunk/drivers/isdn/hardware/mISDN/ipac.h b/trunk/drivers/isdn/hardware/mISDN/ipac.h
@@ -30,10 +30,10 @@ struct isac_hw {
 	u32			off;		/* offset to isac regs */
 	char			*name;
 	spinlock_t		*hwlock;	/* lock HW acccess */
-	read_reg_t		*read_reg;
-	write_reg_t		*write_reg;
-	fifo_func_t		*read_fifo;
-	fifo_func_t		*write_fifo;
+	read_reg_func		*read_reg;
+	write_reg_func		*write_reg;
+	fifo_func		*read_fifo;
+	fifo_func		*write_fifo;
 	int			(*monitor)(void *, u32, u8 *, int);
 	void			(*release)(struct isac_hw *);
 	int			(*init)(struct isac_hw *);
@@ -73,10 +73,10 @@ struct ipac_hw {
 	spinlock_t		*hwlock;	/* lock HW acccess */
 	struct module		*owner;
 	u32			type;
-	read_reg_t		*read_reg;
-	write_reg_t		*write_reg;
-	fifo_func_t		*read_fifo;
-	fifo_func_t		*write_fifo;
+	read_reg_func		*read_reg;
+	write_reg_func		*write_reg;
+	fifo_func		*read_fifo;
+	fifo_func		*write_fifo;
 	void			(*release)(struct ipac_hw *);
 	int			(*init)(struct ipac_hw *);
 	int			(*ctrl)(struct ipac_hw *, u32, u_long);

diff --git a/trunk/drivers/isdn/hardware/mISDN/isar.h b/trunk/drivers/isdn/hardware/mISDN/isar.h
@@ -47,10 +47,10 @@ struct isar_hw {
 	spinlock_t	*hwlock;	/* lock HW acccess */
 	char		*name;
 	struct module	*owner;
-	read_reg_t	*read_reg;
-	write_reg_t	*write_reg;
-	fifo_func_t	*read_fifo;
-	fifo_func_t	*write_fifo;
+	read_reg_func	*read_reg;
+	write_reg_func	*write_reg;
+	fifo_func	*read_fifo;
+	fifo_func	*write_fifo;
 	int		(*ctrl)(void *, u32, u_long);
 	void		(*release)(struct isar_hw *);
 	int		(*init)(struct isar_hw *);