diff options
author | markster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2003-10-09 21:56:26 +0000 |
---|---|---|
committer | markster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2003-10-09 21:56:26 +0000 |
commit | 9665f8f22b65b636199392066ac11c3883d7363c (patch) | |
tree | 99d706e1458a958af2eead0dd007de26f870c73d /wcfxs.c | |
parent | 1b4d959c6d7be6dcd3a1431ff48f303311251b02 (diff) |
more syntactic changes for locking
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@256 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wcfxs.c')
-rwxr-xr-x | wcfxs.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -313,12 +313,12 @@ static inline unsigned char __read_8bits(struct wcfxs *wc) 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 unsigned char wcfxs_getcreg(struct wcfxs *wc, unsigned char reg) 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 @@ static int wcfxs_hardware_init(struct wcfxs *wc) /* 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 @@ static int wcfxs_hardware_init(struct wcfxs *wc) 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 @@ static int wcfxs_hardware_init(struct wcfxs *wc) /* 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; } |