Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0d8737b authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds
Browse files

[PATCH] ISDN: Remove defunct test emulator 



Based on advice from K.  Keil, get rid of remaining traces of defunct test
emulator for HISAX.

Signed-off-by: default avatarRobert P. J. Day <rpjday@mindspring.com>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e3c07b96

drivers/isdn/hisax/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -340,8 +340,6 @@ config HISAX_HFC_SX 
	  This enables HiSax support for the HFC-S+, HFC-SP and HFC-PCMCIA

	  cards. This code is not finished yet.



#      bool '  TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU



config HISAX_ENTERNOW_PCI

	bool "Formula-n enter:now PCI card"

	depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

drivers/isdn/hisax/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -60,5 +60,4 @@ hisax-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o isac.o arcofi.o hscx.o 
hisax-$(CONFIG_HISAX_GAZEL)		+= gazel.o isac.o arcofi.o hscx.o

hisax-$(CONFIG_HISAX_W6692)		+= w6692.o

hisax-$(CONFIG_HISAX_ENTERNOW_PCI)	+= enternow_pci.o amd7930_fn.o

#hisax-$(CONFIG_HISAX_TESTEMU)		+= testemu.o

drivers/isdn/hisax/config.c

+0 −9
Original line number Diff line number Diff line
@@ -549,10 +549,6 @@ extern int setup_isurf(struct IsdnCard *card); 
extern int setup_saphir(struct IsdnCard *card);

#endif



#if CARD_TESTEMU

extern int setup_testemu(struct IsdnCard *card);

#endif



#if CARD_BKM_A4T

extern int setup_bkm_a4t(struct IsdnCard *card);

#endif
@@ -1061,11 +1057,6 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow 
		ret = setup_saphir(card);

		break;

#endif

#if CARD_TESTEMU

	case ISDN_CTYPE_TESTEMU:

		ret = setup_testemu(card);

		break;

#endif

#if	CARD_BKM_A4T

	case ISDN_CTYPE_BKM_A4T:

		ret = setup_bkm_a4t(card);

drivers/isdn/hisax/hisax.h

+0 −25
Original line number Diff line number Diff line
@@ -795,19 +795,6 @@ struct w6692_hw { 
	struct timer_list timer;

};



#ifdef  CONFIG_HISAX_TESTEMU

struct te_hw {

	unsigned char *sfifo;

	unsigned char *sfifo_w;

	unsigned char *sfifo_r;

	unsigned char *sfifo_e;

	int sfifo_cnt;

	unsigned int stat;

	wait_queue_head_t rwaitq;

	wait_queue_head_t swaitq;

};

#endif



struct arcofi_msg {

	struct arcofi_msg *next;

	u_char receive;
@@ -916,9 +903,6 @@ struct IsdnCardState { 
		struct ix1_hw niccy;

		struct isurf_hw isurf;

		struct saphir_hw saphir;

#ifdef CONFIG_HISAX_TESTEMU

		struct te_hw te;

#endif

		struct bkm_hw ax;

		struct gazel_hw gazel;

		struct w6692_hw w6692;
@@ -1175,15 +1159,6 @@ struct IsdnCardState { 
#define CARD_HSTSAPHIR 0

#endif



#ifdef	CONFIG_HISAX_TESTEMU

#define	CARD_TESTEMU 1

#define ISDN_CTYPE_TESTEMU 99

#undef ISDN_CTYPE_COUNT

#define  ISDN_CTYPE_COUNT ISDN_CTYPE_TESTEMU

#else

#define CARD_TESTEMU 0

#endif



#ifdef	CONFIG_HISAX_BKM_A4T

#define	CARD_BKM_A4T 1

#ifndef ISDN_CHIP_ISAC