From 76da3d5a9ca31918f463677cc33474558b32c0c2 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 18 Mar 2013 10:45:07 -0700 Subject: [PATCH] --- yaml --- r: 363547 b: refs/heads/master c: 031d3996ec3d33d100f272cd4dd0311a95e347e2 h: refs/heads/master i: 363545: 0b597cf2abd401adef1b265a6be322994cd5a5ca 363543: c252ff110fa4a8862291ebdef7d5613a77f5c2e0 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6655/upc.h | 136 ++++++++++++++--------------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/[refs] b/[refs] index 1bef3ec83fa7..6b5951217a2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76dffe6435efee37e57efefb264a6a3b481e77fc +refs/heads/master: 031d3996ec3d33d100f272cd4dd0311a95e347e2 diff --git a/trunk/drivers/staging/vt6655/upc.h b/trunk/drivers/staging/vt6655/upc.h index 9596fdef0e3c..af6413694302 100644 --- a/trunk/drivers/staging/vt6655/upc.h +++ b/trunk/drivers/staging/vt6655/upc.h @@ -41,32 +41,32 @@ #ifdef IO_MAP -#define VNSvInPortB(dwIOAddress, pbyData) { \ - *(pbyData) = inb(dwIOAddress); \ -} +#define VNSvInPortB(dwIOAddress, pbyData) { \ + *(pbyData) = inb(dwIOAddress); \ + } -#define VNSvInPortW(dwIOAddress, pwData) { \ - *(pwData) = inw(dwIOAddress); \ -} +#define VNSvInPortW(dwIOAddress, pwData) { \ + *(pwData) = inw(dwIOAddress); \ + } -#define VNSvInPortD(dwIOAddress, pdwData) { \ - *(pdwData) = inl(dwIOAddress); \ -} +#define VNSvInPortD(dwIOAddress, pdwData) { \ + *(pdwData) = inl(dwIOAddress); \ + } -#define VNSvOutPortB(dwIOAddress, byData) { \ - outb(byData, dwIOAddress); \ -} +#define VNSvOutPortB(dwIOAddress, byData) { \ + outb(byData, dwIOAddress); \ + } -#define VNSvOutPortW(dwIOAddress, wData) { \ - outw(wData, dwIOAddress); \ -} +#define VNSvOutPortW(dwIOAddress, wData) { \ + outw(wData, dwIOAddress); \ + } -#define VNSvOutPortD(dwIOAddress, dwData) { \ - outl(dwData, dwIOAddress); \ -} +#define VNSvOutPortD(dwIOAddress, dwData) { \ + outl(dwData, dwIOAddress); \ + } #else @@ -75,38 +75,38 @@ // -#define VNSvInPortB(dwIOAddress, pbyData) { \ - volatile unsigned char * pbyAddr = ((unsigned char *)(dwIOAddress)); \ - *(pbyData) = readb(pbyAddr); \ -} +#define VNSvInPortB(dwIOAddress, pbyData) { \ + volatile unsigned char *pbyAddr = ((unsigned char *)(dwIOAddress)); \ + *(pbyData) = readb(pbyAddr); \ + } -#define VNSvInPortW(dwIOAddress, pwData) { \ - volatile unsigned short *pwAddr = ((unsigned short *)(dwIOAddress)); \ - *(pwData) = readw(pwAddr); \ -} +#define VNSvInPortW(dwIOAddress, pwData) { \ + volatile unsigned short *pwAddr = ((unsigned short *)(dwIOAddress)); \ + *(pwData) = readw(pwAddr); \ + } -#define VNSvInPortD(dwIOAddress, pdwData) { \ - volatile unsigned long *pdwAddr = ((unsigned long *)(dwIOAddress)); \ - *(pdwData) = readl(pdwAddr); \ -} +#define VNSvInPortD(dwIOAddress, pdwData) { \ + volatile unsigned long *pdwAddr = ((unsigned long *)(dwIOAddress)); \ + *(pdwData) = readl(pdwAddr); \ + } -#define VNSvOutPortB(dwIOAddress, byData) { \ - volatile unsigned char * pbyAddr = ((unsigned char *)(dwIOAddress)); \ - writeb((unsigned char)byData, pbyAddr); \ -} +#define VNSvOutPortB(dwIOAddress, byData) { \ + volatile unsigned char *pbyAddr = ((unsigned char *)(dwIOAddress)); \ + writeb((unsigned char)byData, pbyAddr); \ + } -#define VNSvOutPortW(dwIOAddress, wData) { \ - volatile unsigned short *pwAddr = ((unsigned short *)(dwIOAddress)); \ - writew((unsigned short)wData, pwAddr); \ -} +#define VNSvOutPortW(dwIOAddress, wData) { \ + volatile unsigned short *pwAddr = ((unsigned short *)(dwIOAddress)); \ + writew((unsigned short)wData, pwAddr); \ + } -#define VNSvOutPortD(dwIOAddress, dwData) { \ - volatile unsigned long *pdwAddr = ((unsigned long *)(dwIOAddress)); \ - writel((unsigned long)dwData, pdwAddr); \ -} +#define VNSvOutPortD(dwIOAddress, dwData) { \ + volatile unsigned long *pdwAddr = ((unsigned long *)(dwIOAddress)); \ + writel((unsigned long)dwData, pdwAddr); \ + } #endif @@ -115,42 +115,42 @@ // ALWAYS IO-Mapped IO when in 16-bit/32-bit environment // #define PCBvInPortB(dwIOAddress, pbyData) { \ - *(pbyData) = inb(dwIOAddress); \ -} + *(pbyData) = inb(dwIOAddress); \ + } #define PCBvInPortW(dwIOAddress, pwData) { \ - *(pwData) = inw(dwIOAddress); \ -} + *(pwData) = inw(dwIOAddress); \ + } #define PCBvInPortD(dwIOAddress, pdwData) { \ - *(pdwData) = inl(dwIOAddress); \ -} + *(pdwData) = inl(dwIOAddress); \ + } #define PCBvOutPortB(dwIOAddress, byData) { \ - outb(byData, dwIOAddress); \ -} + outb(byData, dwIOAddress); \ + } #define PCBvOutPortW(dwIOAddress, wData) { \ - outw(wData, dwIOAddress); \ -} + outw(wData, dwIOAddress); \ + } #define PCBvOutPortD(dwIOAddress, dwData) { \ - outl(dwData, dwIOAddress); \ -} - - -#define PCAvDelayByIO(uDelayUnit) { \ - unsigned char byData; \ - unsigned long ii; \ - \ - if (uDelayUnit <= 50) { \ - udelay(uDelayUnit); \ - } \ - else { \ - for (ii = 0; ii < (uDelayUnit); ii++) \ - byData = inb(0x61); \ - } \ -} + outl(dwData, dwIOAddress); \ + } + + +#define PCAvDelayByIO(uDelayUnit) { \ + unsigned char byData; \ + unsigned long ii; \ + \ + if (uDelayUnit <= 50) { \ + udelay(uDelayUnit); \ + } \ + else { \ + for (ii = 0; ii < (uDelayUnit); ii++) \ + byData = inb(0x61); \ + } \ + } /*--------------------- Export Classes ----------------------------*/