summaryrefslogtreecommitdiff
path: root/wctdm.c
diff options
context:
space:
mode:
authormarkster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2003-10-09 21:53:05 +0000
committermarkster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2003-10-09 21:53:05 +0000
commit1b4d959c6d7be6dcd3a1431ff48f303311251b02 (patch)
treea105e48601a804fa23b0f57d19eb69126771425d /wctdm.c
parent3192da8a79a86e139ad51e0b22e333108d359e96 (diff)
Inidicate lock must be held
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@255 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wctdm.c')
-rwxr-xr-xwctdm.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/wctdm.c b/wctdm.c
index bc4a91a..cde061b 100755
--- a/wctdm.c
+++ b/wctdm.c
@@ -255,7 +255,7 @@ static void wcfxs_stop_dma(struct wcfxs *wc);
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 @@ static inline void write_8bits(struct wcfxs *wc, unsigned char bits)
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 @@ static unsigned char wcfxs_getcreg(struct wcfxs *wc, unsigned char reg)
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 inline void wcfxs_setcard(struct wcfxs *wc, int card)
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 void wcfxs_setreg(struct wcfxs *wc, int card, unsigned char reg, unsigned
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)