]> Pileus Git - ~andy/linux/blobdiff - drivers/isdn/hisax/enternow_pci.c
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[~andy/linux] / drivers / isdn / hisax / enternow_pci.c
index f55d29d6082635ca327ff610ce1c28fa646e50a8..b1e38b54ebac9dbc7d8dc60742f6b1df0ebde02b 100644 (file)
@@ -97,13 +97,13 @@ static unsigned char
 ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset)
 {
        /* direct register */
-       if(offset < 8)
-               return (inb(cs->hw.njet.isac + 4*offset));
+       if (offset < 8)
+               return (inb(cs->hw.njet.isac + 4 * offset));
 
        /* indirect register */
        else {
-               outb(offset, cs->hw.njet.isac + 4*AMD_CR);
-               return(inb(cs->hw.njet.isac + 4*AMD_DR));
+               outb(offset, cs->hw.njet.isac + 4 * AMD_CR);
+               return (inb(cs->hw.njet.isac + 4 * AMD_DR));
        }
 }
 
@@ -112,29 +112,29 @@ static void
 WriteByteAmd7930(struct IsdnCardState *cs, unsigned char offset, unsigned char value)
 {
        /* direct register */
-       if(offset < 8)
-               outb(value, cs->hw.njet.isac + 4*offset);
+       if (offset < 8)
+               outb(value, cs->hw.njet.isac + 4 * offset);
 
        /* indirect register */
        else {
-               outb(offset, cs->hw.njet.isac + 4*AMD_CR);
-               outb(value, cs->hw.njet.isac + 4*AMD_DR);
+               outb(offset, cs->hw.njet.isac + 4 * AMD_CR);
+               outb(value, cs->hw.njet.isac + 4 * AMD_DR);
        }
 }
 
 
 static void
 enpci_setIrqMask(struct IsdnCardState *cs, unsigned char val) {
-        if (!val)
-               outb(0x00, cs->hw.njet.base+NETJET_IRQMASK1);
-        else
-               outb(TJ_AMD_IRQ, cs->hw.njet.base+NETJET_IRQMASK1);
+       if (!val)
+               outb(0x00, cs->hw.njet.base + NETJET_IRQMASK1);
+       else
+               outb(TJ_AMD_IRQ, cs->hw.njet.base + NETJET_IRQMASK1);
 }
 
 
 static unsigned char dummyrr(struct IsdnCardState *cs, int chan, unsigned char off)
 {
-        return(5);
+       return (5);
 }
 
 static void dummywr(struct IsdnCardState *cs, int chan, unsigned char off, unsigned char value)
@@ -173,70 +173,70 @@ static int
 enpci_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 {
        u_long flags;
-        unsigned char *chan;
+       unsigned char *chan;
 
        if (cs->debug & L1_DEB_ISAC)
                debugl1(cs, "enter:now PCI: card_msg: 0x%04X", mt);
 
-        switch (mt) {
-               case CARD_RESET:
-                       spin_lock_irqsave(&cs->lock, flags);
-                       reset_enpci(cs);
-                        Amd7930_init(cs);
-                        spin_unlock_irqrestore(&cs->lock, flags);
-                       break;
-               case CARD_RELEASE:
-                       release_io_netjet(cs);
-                       break;
-               case CARD_INIT:
-                       reset_enpci(cs);
-                       inittiger(cs);
-                       /* irq must be on here */
-                       Amd7930_init(cs);
-                       break;
-               case CARD_TEST:
-                       break;
-                case MDL_ASSIGN:
-                        /* TEI assigned, LED1 on */
-                        cs->hw.njet.auxd = TJ_AMD_IRQ << 1;
-                        outb(cs->hw.njet.auxd, cs->hw.njet.base + NETJET_AUXDATA);
-                        break;
-                case MDL_REMOVE:
-                        /* TEI removed, LEDs off */
-                       cs->hw.njet.auxd = 0;
-                        outb(0x00, cs->hw.njet.base + NETJET_AUXDATA);
-                        break;
-                case MDL_BC_ASSIGN:
-                        /* activate B-channel */
-                        chan = (unsigned char *)arg;
-
-                        if (cs->debug & L1_DEB_ISAC)
-                               debugl1(cs, "enter:now PCI: assign phys. BC %d in AMD LMR1", *chan);
-
-                        cs->dc.amd7930.ph_command(cs, (cs->dc.amd7930.lmr1 | (*chan + 1)), "MDL_BC_ASSIGN");
-                        /* at least one b-channel in use, LED 2 on */
-                        cs->hw.njet.auxd |= TJ_AMD_IRQ << 2;
-                        outb(cs->hw.njet.auxd, cs->hw.njet.base + NETJET_AUXDATA);
-                        break;
-                case MDL_BC_RELEASE:
-                        /* deactivate B-channel */
-                        chan = (unsigned char *)arg;
-
-                        if (cs->debug & L1_DEB_ISAC)
-                               debugl1(cs, "enter:now PCI: release phys. BC %d in Amd LMR1", *chan);
-
-                        cs->dc.amd7930.ph_command(cs, (cs->dc.amd7930.lmr1 & ~(*chan + 1)), "MDL_BC_RELEASE");
-                        /* no b-channel active -> LED2 off */
-                        if (!(cs->dc.amd7930.lmr1 & 3)) {
-                                cs->hw.njet.auxd &= ~(TJ_AMD_IRQ << 2);
-                                outb(cs->hw.njet.auxd, cs->hw.njet.base + NETJET_AUXDATA);
-                        }
-                        break;
-                default:
-                        break;
+       switch (mt) {
+       case CARD_RESET:
+               spin_lock_irqsave(&cs->lock, flags);
+               reset_enpci(cs);
+               Amd7930_init(cs);
+               spin_unlock_irqrestore(&cs->lock, flags);
+               break;
+       case CARD_RELEASE:
+               release_io_netjet(cs);
+               break;
+       case CARD_INIT:
+               reset_enpci(cs);
+               inittiger(cs);
+               /* irq must be on here */
+               Amd7930_init(cs);
+               break;
+       case CARD_TEST:
+               break;
+       case MDL_ASSIGN:
+               /* TEI assigned, LED1 on */
+               cs->hw.njet.auxd = TJ_AMD_IRQ << 1;
+               outb(cs->hw.njet.auxd, cs->hw.njet.base + NETJET_AUXDATA);
+               break;
+       case MDL_REMOVE:
+               /* TEI removed, LEDs off */
+               cs->hw.njet.auxd = 0;
+               outb(0x00, cs->hw.njet.base + NETJET_AUXDATA);
+               break;
+       case MDL_BC_ASSIGN:
+               /* activate B-channel */
+               chan = (unsigned char *)arg;
+
+               if (cs->debug & L1_DEB_ISAC)
+                       debugl1(cs, "enter:now PCI: assign phys. BC %d in AMD LMR1", *chan);
+
+               cs->dc.amd7930.ph_command(cs, (cs->dc.amd7930.lmr1 | (*chan + 1)), "MDL_BC_ASSIGN");
+               /* at least one b-channel in use, LED 2 on */
+               cs->hw.njet.auxd |= TJ_AMD_IRQ << 2;
+               outb(cs->hw.njet.auxd, cs->hw.njet.base + NETJET_AUXDATA);
+               break;
+       case MDL_BC_RELEASE:
+               /* deactivate B-channel */
+               chan = (unsigned char *)arg;
+
+               if (cs->debug & L1_DEB_ISAC)
+                       debugl1(cs, "enter:now PCI: release phys. BC %d in Amd LMR1", *chan);
+
+               cs->dc.amd7930.ph_command(cs, (cs->dc.amd7930.lmr1 & ~(*chan + 1)), "MDL_BC_RELEASE");
+               /* no b-channel active -> LED2 off */
+               if (!(cs->dc.amd7930.lmr1 & 3)) {
+                       cs->hw.njet.auxd &= ~(TJ_AMD_IRQ << 2);
+                       outb(cs->hw.njet.auxd, cs->hw.njet.base + NETJET_AUXDATA);
+               }
+               break;
+       default:
+               break;
 
        }
-       return(0);
+       return (0);
 }
 
 static irqreturn_t
@@ -249,32 +249,32 @@ enpci_interrupt(int intno, void *dev_id)
        spin_lock_irqsave(&cs->lock, flags);
        s1val = inb(cs->hw.njet.base + NETJET_IRQSTAT1);
 
-        /* AMD threw an interrupt */
+       /* AMD threw an interrupt */
        if (!(s1val & TJ_AMD_IRQ)) {
-                /* read and clear interrupt-register */
+               /* read and clear interrupt-register */
                ir = ReadByteAmd7930(cs, 0x00);
                Amd7930_interrupt(cs, ir);
                s1val = 1;
        } else
                s1val = 0;
        s0val = inb(cs->hw.njet.base + NETJET_IRQSTAT0);
-       if ((s0val | s1val)==0) { // shared IRQ
+       if ((s0val | s1val) == 0) { // shared IRQ
                spin_unlock_irqrestore(&cs->lock, flags);
                return IRQ_NONE;
-       } 
+       }
        if (s0val)
                outb(s0val, cs->hw.njet.base + NETJET_IRQSTAT0);
 
        /* DMA-Interrupt: B-channel-stuff */
        /* set bits in sval to indicate which page is free */
        if (inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR) <
-               inl(cs->hw.njet.base + NETJET_DMA_WRITE_IRQ))
+           inl(cs->hw.njet.base + NETJET_DMA_WRITE_IRQ))
                /* the 2nd write page is free */
                s0val = 0x08;
        else    /* the 1st write page is free */
                s0val = 0x04;
        if (inl(cs->hw.njet.base + NETJET_DMA_READ_ADR) <
-               inl(cs->hw.njet.base + NETJET_DMA_READ_IRQ))
+           inl(cs->hw.njet.base + NETJET_DMA_READ_IRQ))
                /* the 2nd read page is free */
                s0val = s0val | 0x02;
        else    /* the 1st read page is free */
@@ -287,11 +287,11 @@ enpci_interrupt(int intno, void *dev_id)
                }
                cs->hw.njet.irqstat0 = s0val;
                if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) !=
-                       (cs->hw.njet.last_is0 & NETJET_IRQM0_READ))
+                   (cs->hw.njet.last_is0 & NETJET_IRQM0_READ))
                        /* we have a read dma int */
                        read_tiger(cs);
                if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_WRITE) !=
-                       (cs->hw.njet.last_is0 & NETJET_IRQM0_WRITE))
+                   (cs->hw.njet.last_is0 & NETJET_IRQM0_WRITE))
                        /* we have a write dma int */
                        write_tiger(cs);
                test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);
@@ -304,26 +304,26 @@ static int __devinit en_pci_probe(struct pci_dev *dev_netjet,
                                  struct IsdnCardState *cs)
 {
        if (pci_enable_device(dev_netjet))
-               return(0);
+               return (0);
        cs->irq = dev_netjet->irq;
        if (!cs->irq) {
                printk(KERN_WARNING "enter:now PCI: No IRQ for PCI card found\n");
-               return(0);
+               return (0);
        }
        cs->hw.njet.base = pci_resource_start(dev_netjet, 0);
        if (!cs->hw.njet.base) {
                printk(KERN_WARNING "enter:now PCI: No IO-Adr for PCI card found\n");
-               return(0);
+               return (0);
        }
        /* checks Sub-Vendor ID because system crashes with Traverse-Card */
        if ((dev_netjet->subsystem_vendor != 0x55) ||
            (dev_netjet->subsystem_device != 0x02)) {
                printk(KERN_WARNING "enter:now: You tried to load this driver with an incompatible TigerJet-card\n");
                printk(KERN_WARNING "Use type=20 for Traverse NetJet PCI Card.\n");
-               return(0);
+               return (0);
        }
 
-       return(1);
+       return (1);
 }
 
 static void __devinit en_cs_init(struct IsdnCard *card,
@@ -356,8 +356,8 @@ static int __devinit en_cs_init_rest(struct IsdnCard *card,
        const int bytecnt = 256;
 
        printk(KERN_INFO
-               "enter:now PCI: PCI card configured at 0x%lx IRQ %d\n",
-               cs->hw.njet.base, cs->irq);
+              "enter:now PCI: PCI card configured at 0x%lx IRQ %d\n",
+              cs->hw.njet.base, cs->irq);
        if (!request_region(cs->hw.njet.base, bytecnt, "Fn_ISDN")) {
                printk(KERN_WARNING
                       "HiSax: enter:now config port %lx-%lx already in use\n",
@@ -368,13 +368,13 @@ static int __devinit en_cs_init_rest(struct IsdnCard *card,
 
        setup_Amd7930(cs);
        cs->hw.njet.last_is0 = 0;
-        /* macro rByteAMD */
-        cs->readisac = &ReadByteAmd7930;
-        /* macro wByteAMD */
-        cs->writeisac = &WriteByteAmd7930;
-        cs->dc.amd7930.setIrqMask = &enpci_setIrqMask;
+       /* macro rByteAMD */
+       cs->readisac = &ReadByteAmd7930;
+       /* macro wByteAMD */
+       cs->writeisac = &WriteByteAmd7930;
+       cs->dc.amd7930.setIrqMask = &enpci_setIrqMask;
 
-        cs->BC_Read_Reg  = &dummyrr;
+       cs->BC_Read_Reg  = &dummyrr;
        cs->BC_Write_Reg = &dummywr;
        cs->BC_Send_Data = &netjet_fill_dma;
        cs->cardmsg = &enpci_card_msg;
@@ -398,27 +398,27 @@ setup_enternow_pci(struct IsdnCard *card)
 #error "not running on big endian machines now"
 #endif
 
-        strcpy(tmp, enternow_pci_rev);
+       strcpy(tmp, enternow_pci_rev);
        printk(KERN_INFO "HiSax: Formula-n Europe AG enter:now ISDN PCI driver Rev. %s\n", HiSax_getrev(tmp));
        if (cs->typ != ISDN_CTYPE_ENTERNOW)
-               return(0);
+               return (0);
        test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);
 
-       for ( ;; )
+       for (;;)
        {
                if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET,
-                       PCI_DEVICE_ID_TIGERJET_300,  dev_netjet))) {
+                                                       PCI_DEVICE_ID_TIGERJET_300,  dev_netjet))) {
                        ret = en_pci_probe(dev_netjet, cs);
                        if (!ret)
-                               return(0);
+                               return (0);
                } else {
-                        printk(KERN_WARNING "enter:now PCI: No PCI card found\n");
-                       return(0);
+                       printk(KERN_WARNING "enter:now PCI: No PCI card found\n");
+                       return (0);
                }
 
                en_cs_init(card, cs);
                break;
        }
 
-        return en_cs_init_rest(card, cs);
+       return en_cs_init_rest(card, cs);
 }