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

[markster at lists.digium.com]

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

Modified Files:
	wcfxs.c 
Log Message:
more syntactic changes for locking


Index: wcfxs.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcfxs.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- wcfxs.c	9 Oct 2003 21:53:05 -0000	1.27
+++ wcfxs.c	9 Oct 2003 21:56:26 -0000	1.28
@@ -313,12 +313,12 @@
 	return res;
 }
 
-static void wcfxs_setcreg(struct wcfxs *wc, unsigned char reg, unsigned char val)
+static void __wcfxs_setcreg(struct wcfxs *wc, unsigned char reg, unsigned char val)
 {
 	outb(val, wc->ioaddr + WC_REGBASE + ((reg & 0xf) << 2));
 }
 
-static unsigned char wcfxs_getcreg(struct wcfxs *wc, unsigned char reg)
+static unsigned char __wcfxs_getcreg(struct wcfxs *wc, unsigned char reg)
 {
 	return inb(wc->ioaddr + WC_REGBASE + ((reg & 0xf) << 2));
 }
@@ -326,7 +326,7 @@
 static inline void __wcfxs_setcard(struct wcfxs *wc, int card)
 {
 	if (wc->curcard != card) {
-		wcfxs_setcreg(wc, WC_CS, (1 << card));
+		__wcfxs_setcreg(wc, WC_CS, (1 << card));
 		wc->curcard = card;
 	}
 }
@@ -1166,14 +1166,14 @@
 
 	/* Check Freshmaker chip */
 	x=inb(wc->ioaddr + WC_CNTL);
-	ver = wcfxs_getcreg(wc, WC_VER);
+	ver = __wcfxs_getcreg(wc, WC_VER);
 	failed = 0;
 	if (ver != 0x59) {
 		printk("Freshmaker version: %02x\n", ver);
 		for (x=0;x<255;x++) {
 			/* Test registers */
-			wcfxs_setcreg(wc, WC_TEST, x);
-			y = wcfxs_getcreg(wc, WC_TEST);
+			__wcfxs_setcreg(wc, WC_TEST, x);
+			y = __wcfxs_getcreg(wc, WC_TEST);
 			if (x != y) {
 				printk("%02x != %02x\n", x, y);
 				failed++;
@@ -1186,8 +1186,8 @@
 			return -1;
 		}
 		/* Go to half-duty FSYNC */
-		wcfxs_setcreg(wc, WC_SYNC, 0x00);
-		y = wcfxs_getcreg(wc, WC_SYNC);
+		__wcfxs_setcreg(wc, WC_SYNC, 0x00);
+		y = __wcfxs_getcreg(wc, WC_SYNC);
 	} else {
 		printk("No freshmaker chip\n");
 	}
@@ -1254,7 +1254,7 @@
 	/* Return error if nothing initialized okay. */
 	if (!wc->cardflag)
 		return -1;
-	wcfxs_setcreg(wc, WC_SYNC, wc->cardflag << 1);
+	__wcfxs_setcreg(wc, WC_SYNC, wc->cardflag << 1);
 	return 0;
 }