diff -ruN i4b_81/FreeBSD/CONFIG i4b/FreeBSD/CONFIG --- i4b_81/FreeBSD/CONFIG Tue Mar 16 15:57:53 1999 +++ i4b/FreeBSD/CONFIG Sun May 30 11:19:33 1999 @@ -70,6 +70,10 @@ #options "ELSA_QS1ISA" #device isic0 at isa? port ? net irq ? vector isicintr # +# AVM Fritz!Card PnP +# options "AVM_PNP" +# device isic0 at isa? port ? net irq ? vector isicintr +# # PCI-Cards: # ---------- # diff -ruN i4b_81/layer1/i4b_isic_isa.c i4b/layer1/i4b_isic_isa.c --- i4b_81/layer1/i4b_isic_isa.c Mon May 10 11:37:35 1999 +++ i4b/layer1/i4b_isic_isa.c Mon May 24 22:12:09 1999 @@ -456,6 +456,13 @@ break; #endif +#ifdef AVM_PNP + case FLAG_AVM_PNP: + ret = isic_attach_avm_pnp(PARM2); + ret = 0; + break; +#endif + #endif /* __FreeBSD__ / P&P specific part */ /* --- XXX - don't know how to handle this - should be removed!!!! ---- */ diff -ruN i4b_81/layer1/i4b_isic_pnp.c i4b/layer1/i4b_isic_pnp.c --- i4b_81/layer1/i4b_isic_pnp.c Tue Apr 20 16:28:46 1999 +++ i4b/layer1/i4b_isic_pnp.c Mon May 24 22:12:09 1999 @@ -82,6 +82,7 @@ #define VID_SEDLBAUER 0x0100274c /* Sedlbauer WinSpeed */ #define VID_NICCYGO 0x5001814c /* Neuhaus Niccy GO@ */ #define VID_ELSAQS1P 0x33019315 /* ELSA Quickstep1000pro*/ +#define VID_AVMPNP 0x0009cd06 /* AVM Fritz! PnP */ static struct i4b_pnp_ids { u_long vend_id; @@ -93,6 +94,7 @@ { VID_SEDLBAUER, "Sedlbauer WinSpeed" }, { VID_NICCYGO, "Dr.Neuhaus Niccy Go@" }, { VID_ELSAQS1P, "ELSA QuickStep 1000pro"}, + { VID_AVMPNP, "AVM Fritz!Card PnP"}, { 0 } }; @@ -211,6 +213,9 @@ case VID_ELSAQS1P: dev->id_flags = FLAG_ELSA_QS1P_ISA; break; + case VID_AVMPNP: + dev->id_flags = FLAG_AVM_PNP; + break; } write_pnp_parms(&spci, 0); @@ -287,6 +292,13 @@ ret = isic_probe_Eqs1pi(dev, iobase2); break; #endif + +#ifdef AVM_PNP + case FLAG_AVM_PNP: + ret = isic_probe_avm_pnp(dev, iobase2); + break; +#endif + default: break; } diff -ruN i4b_81/layer1/i4b_l1.h i4b/layer1/i4b_l1.h --- i4b_81/layer1/i4b_l1.h Wed Apr 21 09:50:31 1999 +++ i4b/layer1/i4b_l1.h Sun May 30 11:14:35 1999 @@ -77,6 +77,7 @@ #define FLAG_ELSA_MLMCALL 17 /* XXX - not needed, remove! */ #define FLAG_ITK_IX1 18 #define FLAG_ELSA_PCC16 19 +#define FLAG_AVM_PNP 21 #define SEC_DELAY 1000000 /* one second DELAY for DELAY*/ @@ -396,6 +397,7 @@ extern int isic_attach_drnngo ( struct isa_device *dev, unsigned int iobase2); extern int isic_attach_sws ( struct isa_device *dev ); extern int isic_attach_Eqs1pi(struct isa_device *dev, unsigned int iobase2); +extern int isic_attach_avm_pnp(struct isa_device *dev, unsigned int iobase2); extern int isic_attach_Eqs1pp(int unit, unsigned int iobase1, unsigned int iobase2); extern void isic_bchannel_setup (int unit, int hscx_channel, int bprot, int activate ); extern int isic_hscx_fifo(isic_Bchan_t *, struct isic_softc *); @@ -412,6 +414,7 @@ extern char *isic_printstate ( struct isic_softc *sc ); extern int isic_probe_avma1 ( struct isa_device *dev ); extern int isic_probe_avma1_pcmcia ( struct isa_device *dev ); +extern int isic_probe_avm_pnp ( struct isa_device *dev, unsigned int iobase2); extern int isic_probe_Cs0P ( struct isa_device *dev, unsigned int iobase2); extern int isic_probe_Dyn ( struct isa_device *dev, unsigned int iobase2); extern int isic_probe_s016 ( struct isa_device *dev ); diff -ruN i4b_81/machine/i4b_ioctl.h i4b/machine/i4b_ioctl.h --- i4b_81/machine/i4b_ioctl.h Wed May 19 10:51:14 1999 +++ i4b/machine/i4b_ioctl.h Mon May 24 22:13:53 1999 @@ -103,6 +103,7 @@ #define CARD_TYPEP_ITKIX1 18 /* ITK ix1 micro */ #define CARD_TYPEP_AVMA1PCI 19 /* AVM FRITZ!CARD PCI */ #define CARD_TYPEP_PCC16 20 /* ELSA PCC-16 */ +#define CARD_TYPEP_AVM_PNP 21 /* AVM FRITZ!CARD PnP */ /* * in case you add support for more cards, please update: @@ -113,7 +114,7 @@ * and adjust CARD_TYPEP_MAX below. */ -#define CARD_TYPEP_MAX 20 /* max type */ +#define CARD_TYPEP_MAX 21 /* max type */ /*---------------------------------------------------------------------------* * card types for CTRL_DAIC