Commit 96a6099d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'isdn-cleanup' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 

* 'isdn-cleanup' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [ISDN] HiSax hfc_pci: minor cleanups
  [ISDN] HiSax bkm_a4t: split setup into two smaller functions
  [ISDN] HiSax enternow: split setup into 3 smaller functions
  [ISDN] HiSax netjet_u: split setup into 3 smaller functions
  [ISDN] HiSax netjet_s: code movement, prep for hotplug
  [ISDN] HiSax: move card state alloc/setup code into separate functions
  [ISDN] HiSax: move card setup into separate function
parents e779220e 98fc4839

drivers/isdn/hisax/bkm_a4t.c

+63 −45
Original line number Diff line number Diff line
@@ -255,28 +255,11 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg) 
	return (0);

}



static struct pci_dev *dev_a4t __devinitdata = NULL;



int __devinit

setup_bkm_a4t(struct IsdnCard *card)

static int __devinit a4t_pci_probe(struct pci_dev *dev_a4t,

				   struct IsdnCardState *cs,

				   u_int *found,

				   u_int *pci_memaddr)

{

	struct IsdnCardState *cs = card->cs;

	char tmp[64];

	u_int pci_memaddr = 0, found = 0;

	I20_REGISTER_FILE *pI20_Regs;

#ifdef CONFIG_PCI

#endif



	strcpy(tmp, bkm_a4t_revision);

	printk(KERN_INFO "HiSax: T-Berkom driver Rev. %s\n", HiSax_getrev(tmp));

	if (cs->typ == ISDN_CTYPE_BKM_A4T) {

		cs->subtyp = BKM_A4T;

	} else

		return (0);



#ifdef CONFIG_PCI

	while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN,

		PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) {

	u16 sub_sys;

	u16 sub_vendor;
@@ -284,25 +267,26 @@ setup_bkm_a4t(struct IsdnCard *card) 
	sub_sys = dev_a4t->subsystem_device;

	if ((sub_sys == PCI_DEVICE_ID_BERKOM_A4T) && (sub_vendor == PCI_VENDOR_ID_BERKOM)) {

		if (pci_enable_device(dev_a4t))

				return(0);

			found = 1;

			pci_memaddr = pci_resource_start(dev_a4t, 0);

			return (0);	/* end loop & function */

		*found = 1;

		*pci_memaddr = pci_resource_start(dev_a4t, 0);

		cs->irq = dev_a4t->irq;

			break;

		return (1);		/* end loop */

	}



	return (-1);			/* continue looping */

}

	if (!found) {

		printk(KERN_WARNING "HiSax: %s: Card not found\n", CardType[card->typ]);

		return (0);

	}



static int __devinit a4t_cs_init(struct IsdnCard *card,

				 struct IsdnCardState *cs,

				 u_int pci_memaddr)

{

	I20_REGISTER_FILE *pI20_Regs;



	if (!cs->irq) {		/* IRQ range check ?? */

		printk(KERN_WARNING "HiSax: %s: No IRQ\n", CardType[card->typ]);

		return (0);

	}

	if (!pci_memaddr) {

		printk(KERN_WARNING "HiSax: %s: No Memory base address\n", CardType[card->typ]);

		return (0);

	}

	cs->hw.ax.base = (long) ioremap(pci_memaddr, 4096);

	/* Check suspecious address */

	pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base);
@@ -317,11 +301,7 @@ setup_bkm_a4t(struct IsdnCard *card) 
	cs->hw.ax.jade_adr = cs->hw.ax.base + PO_OFFSET;

	cs->hw.ax.isac_ale = GCS_1;

	cs->hw.ax.jade_ale = GCS_3;

#else

	printk(KERN_WARNING "HiSax: %s: NO_PCI_BIOS\n", CardType[card->typ]);

	printk(KERN_WARNING "HiSax: %s: unable to configure\n", CardType[card->typ]);

	return (0);

#endif				/* CONFIG_PCI */



	printk(KERN_INFO "HiSax: %s: Card configured at 0x%lX IRQ %d\n",

	       CardType[card->typ], cs->hw.ax.base, cs->irq);
@@ -339,5 +319,43 @@ setup_bkm_a4t(struct IsdnCard *card) 
	ISACVersion(cs, "Telekom A4T:");

	/* Jade version */

	JadeVersion(cs, "Telekom A4T:");



	return (1);

}



static struct pci_dev *dev_a4t __devinitdata = NULL;



int __devinit

setup_bkm_a4t(struct IsdnCard *card)

{

	struct IsdnCardState *cs = card->cs;

	char tmp[64];

	u_int pci_memaddr = 0, found = 0;

	int ret;



	strcpy(tmp, bkm_a4t_revision);

	printk(KERN_INFO "HiSax: T-Berkom driver Rev. %s\n", HiSax_getrev(tmp));

	if (cs->typ == ISDN_CTYPE_BKM_A4T) {

		cs->subtyp = BKM_A4T;

	} else

		return (0);



	while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN,

		PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) {

		ret = a4t_pci_probe(dev_a4t, cs, &found, &pci_memaddr);

		if (!ret)

			return (0);

		if (ret > 0)

			break;

	}

	if (!found) {

		printk(KERN_WARNING "HiSax: %s: Card not found\n", CardType[card->typ]);

		return (0);

	}

	if (!pci_memaddr) {

		printk(KERN_WARNING "HiSax: %s: No Memory base address\n", CardType[card->typ]);

		return (0);

	}



	return a4t_cs_init(card, cs, pci_memaddr);

}

drivers/isdn/hisax/config.c

+140 −93
Original line number Diff line number Diff line
@@ -847,95 +847,10 @@ static int init_card(struct IsdnCardState *cs) 
	return 3;

}



static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner)

static int hisax_cs_setup_card(struct IsdnCard *card)

{

	int ret = 0;

	struct IsdnCard *card = cards + cardnr;

	struct IsdnCardState *cs;



	cs = kzalloc(sizeof(struct IsdnCardState), GFP_ATOMIC);

	if (!cs) {

		printk(KERN_WARNING

		       "HiSax: No memory for IsdnCardState(card %d)\n",

		       cardnr + 1);

		goto out;

	}

	card->cs = cs;

	spin_lock_init(&cs->statlock);

	spin_lock_init(&cs->lock);

	cs->chanlimit = 2;	/* maximum B-channel number */

	cs->logecho = 0;	/* No echo logging */

	cs->cardnr = cardnr;

	cs->debug = L1_DEB_WARN;

	cs->HW_Flags = 0;

	cs->busy_flag = busy_flag;

	cs->irq_flags = I4L_IRQ_FLAG;

#if TEI_PER_CARD

	if (card->protocol == ISDN_PTYPE_NI1)

		test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags);

#else

	test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags);

#endif

	cs->protocol = card->protocol;

	int ret;



	if (card->typ <= 0 || card->typ > ISDN_CTYPE_COUNT) {

		printk(KERN_WARNING

		       "HiSax: Card Type %d out of range\n", card->typ);

		goto outf_cs;

	}

	if (!(cs->dlog = kmalloc(MAX_DLOG_SPACE, GFP_ATOMIC))) {

		printk(KERN_WARNING

		       "HiSax: No memory for dlog(card %d)\n", cardnr + 1);

		goto outf_cs;

	}

	if (!(cs->status_buf = kmalloc(HISAX_STATUS_BUFSIZE, GFP_ATOMIC))) {

		printk(KERN_WARNING

		       "HiSax: No memory for status_buf(card %d)\n",

		       cardnr + 1);

		goto outf_dlog;

	}

	cs->stlist = NULL;

	cs->status_read = cs->status_buf;

	cs->status_write = cs->status_buf;

	cs->status_end = cs->status_buf + HISAX_STATUS_BUFSIZE - 1;

	cs->typ = card->typ;

#ifdef MODULE

	cs->iif.owner = lockowner;

#endif

	strcpy(cs->iif.id, id);

	cs->iif.channels = 2;

	cs->iif.maxbufsize = MAX_DATA_SIZE;

	cs->iif.hl_hdrlen = MAX_HEADER_LEN;

	cs->iif.features =

		ISDN_FEATURE_L2_X75I |

		ISDN_FEATURE_L2_HDLC |

		ISDN_FEATURE_L2_HDLC_56K |

		ISDN_FEATURE_L2_TRANS |

		ISDN_FEATURE_L3_TRANS |

#ifdef	CONFIG_HISAX_1TR6

		ISDN_FEATURE_P_1TR6 |

#endif

#ifdef	CONFIG_HISAX_EURO

		ISDN_FEATURE_P_EURO |

#endif

#ifdef	CONFIG_HISAX_NI1

		ISDN_FEATURE_P_NI1 |

#endif

		0;



	cs->iif.command = HiSax_command;

	cs->iif.writecmd = NULL;

	cs->iif.writebuf_skb = HiSax_writebuf_skb;

	cs->iif.readstat = HiSax_readstatus;

	register_isdn(&cs->iif);

	cs->myid = cs->iif.channels;

	printk(KERN_INFO

	       "HiSax: Card %d Protocol %s Id=%s (%d)\n", cardnr + 1,

	       (card->protocol == ISDN_PTYPE_1TR6) ? "1TR6" :

	       (card->protocol == ISDN_PTYPE_EURO) ? "EDSS1" :

	       (card->protocol == ISDN_PTYPE_LEASED) ? "LEASED" :

	       (card->protocol == ISDN_PTYPE_NI1) ? "NI1" :

	       "NONE", cs->iif.id, cs->myid);

	switch (card->typ) {

#if CARD_TELES0

	case ISDN_CTYPE_16_0:
@@ -1094,13 +1009,115 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow 
		printk(KERN_WARNING

		       "HiSax: Support for %s Card not selected\n",

		       CardType[card->typ]);

		ll_unload(cs);

		ret = 0;

		break;

	}



	return ret;

}



static int hisax_cs_new(int cardnr, char *id, struct IsdnCard *card,

			struct IsdnCardState **cs_out, int *busy_flag,

			struct module *lockowner)

{

	struct IsdnCardState *cs;



	*cs_out = NULL;



	cs = kzalloc(sizeof(struct IsdnCardState), GFP_ATOMIC);

	if (!cs) {

		printk(KERN_WARNING

		       "HiSax: No memory for IsdnCardState(card %d)\n",

		       cardnr + 1);

		goto out;

	}

	card->cs = cs;

	spin_lock_init(&cs->statlock);

	spin_lock_init(&cs->lock);

	cs->chanlimit = 2;	/* maximum B-channel number */

	cs->logecho = 0;	/* No echo logging */

	cs->cardnr = cardnr;

	cs->debug = L1_DEB_WARN;

	cs->HW_Flags = 0;

	cs->busy_flag = busy_flag;

	cs->irq_flags = I4L_IRQ_FLAG;

#if TEI_PER_CARD

	if (card->protocol == ISDN_PTYPE_NI1)

		test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags);

#else

	test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags);

#endif

	cs->protocol = card->protocol;



	if (card->typ <= 0 || card->typ > ISDN_CTYPE_COUNT) {

		printk(KERN_WARNING

		       "HiSax: Card Type %d out of range\n", card->typ);

		goto outf_cs;

	}

	if (!ret) {

		ll_unload(cs);

	if (!(cs->dlog = kmalloc(MAX_DLOG_SPACE, GFP_ATOMIC))) {

		printk(KERN_WARNING

		       "HiSax: No memory for dlog(card %d)\n", cardnr + 1);

		goto outf_cs;

	}

	if (!(cs->status_buf = kmalloc(HISAX_STATUS_BUFSIZE, GFP_ATOMIC))) {

		printk(KERN_WARNING

		       "HiSax: No memory for status_buf(card %d)\n",

		       cardnr + 1);

		goto outf_dlog;

	}

	cs->stlist = NULL;

	cs->status_read = cs->status_buf;

	cs->status_write = cs->status_buf;

	cs->status_end = cs->status_buf + HISAX_STATUS_BUFSIZE - 1;

	cs->typ = card->typ;

#ifdef MODULE

	cs->iif.owner = lockowner;

#endif

	strcpy(cs->iif.id, id);

	cs->iif.channels = 2;

	cs->iif.maxbufsize = MAX_DATA_SIZE;

	cs->iif.hl_hdrlen = MAX_HEADER_LEN;

	cs->iif.features =

		ISDN_FEATURE_L2_X75I |

		ISDN_FEATURE_L2_HDLC |

		ISDN_FEATURE_L2_HDLC_56K |

		ISDN_FEATURE_L2_TRANS |

		ISDN_FEATURE_L3_TRANS |

#ifdef	CONFIG_HISAX_1TR6

		ISDN_FEATURE_P_1TR6 |

#endif

#ifdef	CONFIG_HISAX_EURO

		ISDN_FEATURE_P_EURO |

#endif

#ifdef	CONFIG_HISAX_NI1

		ISDN_FEATURE_P_NI1 |

#endif

		0;



	cs->iif.command = HiSax_command;

	cs->iif.writecmd = NULL;

	cs->iif.writebuf_skb = HiSax_writebuf_skb;

	cs->iif.readstat = HiSax_readstatus;

	register_isdn(&cs->iif);

	cs->myid = cs->iif.channels;



	*cs_out = cs;

	return 1;	/* success */



outf_dlog:

	kfree(cs->dlog);

outf_cs:

	kfree(cs);

	card->cs = NULL;

out:

	return 0;	/* error */

}



static int hisax_cs_setup(int cardnr, struct IsdnCard *card,

			  struct IsdnCardState *cs)

{

	int ret;



	if (!(cs->rcvbuf = kmalloc(MAX_DFRAME_LEN_L1, GFP_ATOMIC))) {

		printk(KERN_WARNING "HiSax: No memory for isac rcvbuf\n");

		ll_unload(cs);
@@ -1143,11 +1160,41 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow 
	if (!test_bit(HW_ISAR, &cs->HW_Flags))

		ll_run(cs, 0);



	ret = 1;

	return 1;



outf_cs:

	kfree(cs);

	card->cs = NULL;

	return ret;

}



static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner)

{

	int ret;

	struct IsdnCard *card = cards + cardnr;

	struct IsdnCardState *cs;



	ret = hisax_cs_new(cardnr, id, card, &cs, busy_flag, lockowner);

	if (!ret)

		return 0;



	printk(KERN_INFO

	       "HiSax: Card %d Protocol %s Id=%s (%d)\n", cardnr + 1,

	       (card->protocol == ISDN_PTYPE_1TR6) ? "1TR6" :

	       (card->protocol == ISDN_PTYPE_EURO) ? "EDSS1" :

	       (card->protocol == ISDN_PTYPE_LEASED) ? "LEASED" :

	       (card->protocol == ISDN_PTYPE_NI1) ? "NI1" :

	       "NONE", cs->iif.id, cs->myid);



	ret = hisax_cs_setup_card(card);

	if (!ret) {

		ll_unload(cs);

		goto outf_cs;

	}



	ret = hisax_cs_setup(cardnr, card, cs);

	goto out;



 outf_dlog:

	kfree(cs->dlog);

 outf_cs:

	kfree(cs);

	card->cs = NULL;

drivers/isdn/hisax/enternow_pci.c

+89 −76
Original line number Diff line number Diff line
@@ -300,31 +300,9 @@ enpci_interrupt(int intno, void *dev_id) 
	return IRQ_HANDLED;

}





static struct pci_dev *dev_netjet __devinitdata = NULL;



/* called by config.c */

int __devinit

setup_enternow_pci(struct IsdnCard *card)

static int __devinit en_pci_probe(struct pci_dev *dev_netjet,

				  struct IsdnCardState *cs)

{

	int bytecnt;

	struct IsdnCardState *cs = card->cs;

	char tmp[64];



#ifdef CONFIG_PCI

#ifdef __BIG_ENDIAN

#error "not running on big endian machines now"

#endif

        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);

	test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);



	for ( ;; )

	{

		if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET,

			PCI_DEVICE_ID_TIGERJET_300,  dev_netjet))) {

	if (pci_enable_device(dev_netjet))

		return(0);

	cs->irq = dev_netjet->irq;
@@ -344,11 +322,13 @@ setup_enternow_pci(struct IsdnCard *card) 
		printk(KERN_WARNING "Use type=20 for Traverse NetJet PCI Card.\n");

		return(0);

	}

		} else {

                        printk(KERN_WARNING "enter:now PCI: No PCI card found\n");

			return(0);



	return(1);

}



static void __devinit en_cs_init(struct IsdnCard *card,

				 struct IsdnCardState *cs)

{

	cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA;

	cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD
@@ -368,30 +348,24 @@ setup_enternow_pci(struct IsdnCard *card) 
	outb(~TJ_AMD_IRQ, cs->hw.njet.base + NETJET_AUXCTRL);

	outb(TJ_AMD_IRQ, cs->hw.njet.base + NETJET_IRQMASK1);

	outb(cs->hw.njet.auxd, cs->hw.njet.auxa);



		break;

}

#else



	printk(KERN_WARNING "enter:now PCI: NO_PCI_BIOS\n");

	printk(KERN_WARNING "enter:now PCI: unable to config Formula-n enter:now ISDN PCI ab\n");

	return (0);



#endif /* CONFIG_PCI */



	bytecnt = 256;

static int __devinit en_cs_init_rest(struct IsdnCard *card,

				     struct IsdnCardState *cs)

{

	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);

	if (!request_region(cs->hw.njet.base, bytecnt, "Fn_ISDN")) {

		printk(KERN_WARNING

			   "HiSax: %s config port %lx-%lx already in use\n",

			   CardType[card->typ],

		       "HiSax: enter:now config port %lx-%lx already in use\n",

		       cs->hw.njet.base,

		       cs->hw.njet.base + bytecnt);

		return (0);

	}



	setup_Amd7930(cs);

	cs->hw.njet.last_is0 = 0;

        /* macro rByteAMD */
@@ -409,3 +383,42 @@ setup_enternow_pci(struct IsdnCard *card) 


	return (1);

}



static struct pci_dev *dev_netjet __devinitdata = NULL;



/* called by config.c */

int __devinit

setup_enternow_pci(struct IsdnCard *card)

{

	int ret;

	struct IsdnCardState *cs = card->cs;

	char tmp[64];



#ifdef __BIG_ENDIAN

#error "not running on big endian machines now"

#endif



        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);

	test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);



	for ( ;; )

	{

		if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET,

			PCI_DEVICE_ID_TIGERJET_300,  dev_netjet))) {

			ret = en_pci_probe(dev_netjet, cs);

			if (!ret)

				return(0);

		} else {

                        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);

}

drivers/isdn/hisax/hfc_pci.c

+93 −98
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ static const PCI_ENTRY id_list[] = 
};





#ifdef CONFIG_PCI



/******************************************/

/* free hardware resources used by driver */

/******************************************/
@@ -511,7 +509,6 @@ main_rec_hfcpci(struct BCState *bcs) 
	test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);

	if (count && receive)

		goto Begin;

	return;

}



/**************************/
@@ -582,7 +579,6 @@ hfcpci_fill_dfifo(struct IsdnCardState *cs) 


	dev_kfree_skb_any(cs->tx_skb);

	cs->tx_skb = NULL;

	return;

}



/**************************/
@@ -729,7 +725,6 @@ hfcpci_fill_fifo(struct BCState *bcs) 
	dev_kfree_skb_any(bcs->tx_skb);

	bcs->tx_skb = NULL;

	test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag);

	return;

}



/**********************************************/
@@ -924,7 +919,6 @@ receive_emsg(struct IsdnCardState *cs) 
	test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);

	if (count && receive)

		goto Begin;

	return;

}				/* receive_emsg */



/*********************/
@@ -1642,8 +1636,6 @@ hfcpci_card_msg(struct IsdnCardState *cs, int mt, void *arg) 
/* this variable is used as card index when more than one cards are present */

static struct pci_dev *dev_hfcpci __devinitdata = NULL;



#endif				/* CONFIG_PCI */



int __devinit

setup_hfcpci(struct IsdnCard *card)

{
@@ -1656,13 +1648,16 @@ setup_hfcpci(struct IsdnCard *card) 
#ifdef __BIG_ENDIAN

#error "not running on big endian machines now"

#endif



	strcpy(tmp, hfcpci_revision);

	printk(KERN_INFO "HiSax: HFC-PCI driver Rev. %s\n", HiSax_getrev(tmp));

#ifdef CONFIG_PCI



	cs->hw.hfcpci.int_s1 = 0;

	cs->dc.hfcpci.ph_state = 0;

	cs->hw.hfcpci.fifo = 255;

	if (cs->typ == ISDN_CTYPE_HFC_PCI) {

	if (cs->typ != ISDN_CTYPE_HFC_PCI)

		return(0);



	i = 0;

	while (id_list[i].vendor_id) {

		tmp_hfcpci = pci_find_device(id_list[i].vendor_id,
@@ -1680,7 +1675,11 @@ setup_hfcpci(struct IsdnCard *card) 
		}

	}



		if (tmp_hfcpci) {

	if (!tmp_hfcpci) {

		printk(KERN_WARNING "HFC-PCI: No PCI card found\n");

		return (0);

	}



	i--;

	dev_hfcpci = tmp_hfcpci;	/* old device */

	cs->hw.hfcpci.dev = dev_hfcpci;
@@ -1691,10 +1690,7 @@ setup_hfcpci(struct IsdnCard *card) 
	}

	cs->hw.hfcpci.pci_io = (char *)(unsigned long)dev_hfcpci->resource[1].start;

	printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name);

		} else {

			printk(KERN_WARNING "HFC-PCI: No PCI card found\n");

			return (0);

		}



	if (!cs->hw.hfcpci.pci_io) {

		printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");

		return (0);
@@ -1716,7 +1712,9 @@ setup_hfcpci(struct IsdnCard *card) 
	       cs->hw.hfcpci.fifos,

	       (u_int) virt_to_bus(cs->hw.hfcpci.fifos),

	       cs->irq, HZ);



	spin_lock_irqsave(&cs->lock, flags);



	pci_write_config_word(cs->hw.hfcpci.dev, PCI_COMMAND, PCI_ENA_MEMIO);	/* enable memory mapped ports, disable busmaster */

	cs->hw.hfcpci.int_m2 = 0;	/* disable alle interrupts */

	cs->hw.hfcpci.int_m1 = 0;
@@ -1724,6 +1722,7 @@ setup_hfcpci(struct IsdnCard *card) 
	Write_hfc(cs, HFCPCI_INT_M2, cs->hw.hfcpci.int_m2);

	/* At this point the needed PCI config is done */

	/* fifos are still not enabled */



	INIT_WORK(&cs->tqueue,  hfcpci_bh);

	cs->setstack_d = setstack_hfcpci;

	cs->BC_Send_Data = &hfcpci_send_data;
@@ -1740,12 +1739,8 @@ setup_hfcpci(struct IsdnCard *card) 
	init_timer(&cs->hw.hfcpci.timer);

	cs->cardmsg = &hfcpci_card_msg;

	cs->auxcmd = &hfcpci_auxcmd;



	spin_unlock_irqrestore(&cs->lock, flags);



	return (1);

	} else

		return (0);	/* no valid card type */

#else

	printk(KERN_WARNING "HFC-PCI: NO_PCI_BIOS\n");

	return (0);

#endif				/* CONFIG_PCI */

}

drivers/isdn/hisax/nj_s.c

+108 −86
Original line number Diff line number Diff line
@@ -148,30 +148,11 @@ NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg) 
	return(0);

}



static struct pci_dev *dev_netjet __devinitdata = NULL;



int __devinit

setup_netjet_s(struct IsdnCard *card)

static int __devinit njs_pci_probe(struct pci_dev *dev_netjet,

				   struct IsdnCardState *cs)

{

	int bytecnt,cfg;

	struct IsdnCardState *cs = card->cs;

	char tmp[64];

	int cfg;



#ifdef __BIG_ENDIAN

#error "not running on big endian machines now"

#endif

	strcpy(tmp, NETjet_S_revision);

	printk(KERN_INFO "HiSax: Traverse Tech. NETjet-S driver Rev. %s\n", HiSax_getrev(tmp));

	if (cs->typ != ISDN_CTYPE_NETJET_S)

		return(0);

	test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);



#ifdef CONFIG_PCI



	for ( ;; )

	{

		if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET,

			PCI_DEVICE_ID_TIGERJET_300,  dev_netjet))) {

	if (pci_enable_device(dev_netjet))

		return(0);

	pci_set_master(dev_netjet);
@@ -202,11 +183,14 @@ setup_netjet_s(struct IsdnCard *card) 
		return(0);

	}

	/* end new code */

		} else {

			printk(KERN_WARNING "NETjet-S: No PCI card found\n");

			return(0);



	return(1);

}



static int __devinit njs_cs_init(struct IsdnCard *card,

				 struct IsdnCardState *cs)

{



	cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA;

	cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF;
@@ -228,27 +212,23 @@ setup_netjet_s(struct IsdnCard *card) 
	switch ( ( ( NETjet_ReadIC( cs, ISAC_RBCH ) >> 5 ) & 3 ) )

	{

		case 0 :

				break;

			return 1;	/* end loop */



		case 3 :

			printk( KERN_WARNING "NETjet-S: NETspider-U PCI card found\n" );

				continue;

			return -1;	/* continue looping */



		default :

			printk( KERN_WARNING "NETjet-S: No PCI card found\n" );

				return 0;

			return 0;	/* end loop & function */

	}

                break;

	return 1;			/* end loop */

}

#else



	printk(KERN_WARNING "NETjet-S: NO_PCI_BIOS\n");

	printk(KERN_WARNING "NETjet-S: unable to config NETJET-S PCI\n");

	return (0);



#endif /* CONFIG_PCI */



	bytecnt = 256;

static int __devinit njs_cs_init_rest(struct IsdnCard *card,

				      struct IsdnCardState *cs)

{

	const int bytecnt = 256;



	printk(KERN_INFO

		"NETjet-S: %s card configured at %#lx IRQ %d\n",
@@ -273,5 +253,47 @@ setup_netjet_s(struct IsdnCard *card) 
	cs->irq_func = &netjet_s_interrupt;

	cs->irq_flags |= IRQF_SHARED;

	ISACVersion(cs, "NETjet-S:");



	return (1);

}



static struct pci_dev *dev_netjet __devinitdata = NULL;



int __devinit

setup_netjet_s(struct IsdnCard *card)

{

	int ret;

	struct IsdnCardState *cs = card->cs;

	char tmp[64];



#ifdef __BIG_ENDIAN

#error "not running on big endian machines now"

#endif

	strcpy(tmp, NETjet_S_revision);

	printk(KERN_INFO "HiSax: Traverse Tech. NETjet-S driver Rev. %s\n", HiSax_getrev(tmp));

	if (cs->typ != ISDN_CTYPE_NETJET_S)

		return(0);

	test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);



	for ( ;; )

	{

		if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET,

			PCI_DEVICE_ID_TIGERJET_300,  dev_netjet))) {

			ret = njs_pci_probe(dev_netjet, cs);

			if (!ret)

				return(0);

		} else {

			printk(KERN_WARNING "NETjet-S: No PCI card found\n");

			return(0);

		}



		ret = njs_cs_init(card, cs);

		if (!ret)

			return(0);

		if (ret > 0)

			break;

		/* otherwise, ret < 0, continue looping */

	}



	return njs_cs_init_rest(card, cs);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE