[Asterisk-cvs] zaptel wcfxs.c,1.26,1.27

[markster at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv12166

Modified Files:
	wcfxs.c 
Log Message:
Inidicate lock must be held


Index: wcfxs.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcfxs.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- wcfxs.c	9 Oct 2003 16:47:29 -0000	1.26
+++ wcfxs.c	9 Oct 2003 21:53:05 -0000	1.27
@@ -255,7 +255,7 @@
 static void wcfxs_reset_tdm(struct wcfxs *wc);
 static void wcfxs_restart_dma(struct wcfxs *wc);
 
-static inline void write_8bits(struct wcfxs *wc, unsigned char bits)
+static inline void __write_8bits(struct wcfxs *wc, unsigned char bits)
 {
 	/* Drop chip select */
 	int x;
@@ -281,7 +281,7 @@
 	outb(wc->ios, wc->ioaddr + WC_AUXD);
 	
 }
-static inline unsigned char read_8bits(struct wcfxs *wc)
+static inline unsigned char __read_8bits(struct wcfxs *wc)
 {
 	unsigned char res=0, c;
 	int x;
@@ -323,7 +323,7 @@
 	return inb(wc->ioaddr + WC_REGBASE + ((reg & 0xf) << 2));
 }
 
-static inline void wcfxs_setcard(struct wcfxs *wc, int card)
+static inline void __wcfxs_setcard(struct wcfxs *wc, int card)
 {
 	if (wc->curcard != card) {
 		wcfxs_setcreg(wc, WC_CS, (1 << card));
@@ -333,9 +333,9 @@
 
 static void __wcfxs_setreg(struct wcfxs *wc, int card, unsigned char reg, unsigned char value)
 {
-	wcfxs_setcard(wc, card);
-	write_8bits(wc, reg & 0x7f);
-	write_8bits(wc, value);
+	__wcfxs_setcard(wc, card);
+	__write_8bits(wc, reg & 0x7f);
+	__write_8bits(wc, value);
 }
 
 static void wcfxs_setreg(struct wcfxs *wc, int card, unsigned char reg, unsigned char value)
@@ -348,9 +348,9 @@
 
 static unsigned char __wcfxs_getreg(struct wcfxs *wc, int card, unsigned char reg)
 {
-	wcfxs_setcard(wc, card);
-	write_8bits(wc, reg | 0x80);
-	return read_8bits(wc);
+	__wcfxs_setcard(wc, card);
+	__write_8bits(wc, reg | 0x80);
+	return __read_8bits(wc);
 }
 
 static unsigned char wcfxs_getreg(struct wcfxs *wc, int card, unsigned char reg)