Minor adjustments to make LINT compile again (thanks to phk for reminding me).

Because the Fritz!Card PCMCIA stuff is also affected, this includes the fix
from PR kern/10278 submitted by Udo Schweigert (udo.schweigert@mchp.siemens.de).
PR: kern/10278

5 files changed, 37 insertions, 34 deletions

diff --git a/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c b/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
index a4ee3e8..03029a0 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
@@ -33,9 +33,9 @@
  *	Fritz!Card pcmcia specific routines for isic driver
  *	---------------------------------------------------
  *
- *	$Id: i4b_avm_fritz_pcmcia.c,v 1.8 1999/02/14 09:44:58 hm Exp $ 
+ *	$Id: i4b_avm_fritz_pcmcia.c,v 1.2 1999/03/07 16:08:15 hm Exp $ 
  *
- *      last edit-date: [Sun Feb 14 10:25:21 1999]
+ *      last edit-date: [Tue Mar 16 10:49:53 1999]
  *
  *	-ap	added support for AVM PCMCIA Fritz!Card
  *	-mh	split into separate file
@@ -49,7 +49,7 @@
 #define NISIC 1
 #endif
 
-#if NISIC > 0 && defined(AVM_PCMCIA)
+#if NISIC > 0 && defined(AVM_A1_PCMCIA)
 
 #include <sys/param.h>
 #if defined(__FreeBSD__) && __FreeBSD__ >= 3
@@ -78,17 +78,15 @@
 #else
 #include <i4b/i4b_debug.h>
 #include <i4b/i4b_ioctl.h>
-
 #include <dev/pcmcia/pcmciareg.h>
 #include <dev/pcmcia/pcmciavar.h>
+#include <i4b/layer1/pcmcia_isic.h>
 #endif
 
 #include <i4b/layer1/i4b_l1.h>
 #include <i4b/layer1/i4b_isac.h>
 #include <i4b/layer1/i4b_hscx.h>
 
-#include <i4b/layer1/pcmcia_isic.h>
-
 #ifndef __FreeBSD__
 /* PCMCIA support routines */
 static u_int8_t avma1_pcmcia_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs));
@@ -392,10 +390,8 @@ isic_probe_avma1_pcmcia(struct isa_device *dev)
  *---------------------------------------------------------------------------*/
 #ifdef __FreeBSD__
 int
-isic_attach_fritzpcmica(struct isa_device *dev)
+isic_attach_fritz(struct isa_device *dev)
 {
-	struct isic_softc *sc = &isic_sc[dev->id_unit];
-
 	/* ResetController again just to make sure... */
 
 	outb(dev->id_iobase + STAT0_OFFSET, 0x00);
@@ -501,4 +497,4 @@ isic_attach_fritzpcmcia(struct pcmcia_isic_softc *psc, struct pcmcia_config_entr
 }
 #endif
 
-#endif /* NISIC > 0 && defined(AVM_PCMCIA) */
+#endif /* NISIC > 0 && defined(AVM_A1_PCMCIA) */
diff --git a/sys/i4b/layer1/i4b_isic_isa.c b/sys/i4b/layer1/i4b_isic_isa.c
index 19535f2..aa722c0 100644
--- a/sys/i4b/layer1/i4b_isic_isa.c
+++ b/sys/i4b/layer1/i4b_isic_isa.c
@@ -27,9 +27,9 @@
  *	i4b_isic_isa.c - ISA bus interface
  *	==================================
  *
- *	$Id: i4b_isic_isa.c,v 1.16 1999/02/14 19:51:02 hm Exp $ 
+ *	$Id: i4b_isic_isa.c,v 1.2 1999/03/07 16:08:15 hm Exp $ 
  *
- *      last edit-date: [Sun Feb 14 10:27:26 1999]
+ *      last edit-date: [Tue Mar 16 10:35:38 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -402,9 +402,9 @@ isicattach(int flags, struct isic_softc *sc)
 				   out of this ISA specific part for the other
 				   OS */
 
-#ifdef AVM_PCMCIA
+#ifdef AVM_A1_PCMCIA
 		case FLAG_AVM_A1_PCMCIA:
-			ret = isic_attach_fritzpcmcia(PARM);
+                      ret = isic_attach_fritz(PARM);
 			break;
 #endif
 
diff --git a/sys/i4b/layer1/i4b_isic_pcmcia.c b/sys/i4b/layer1/i4b_isic_pcmcia.c
index 98cb22a..c26f1ff 100644
--- a/sys/i4b/layer1/i4b_isic_pcmcia.c
+++ b/sys/i4b/layer1/i4b_isic_pcmcia.c
@@ -35,9 +35,9 @@
  *	i4b_isic_pcmcia.c - i4b FreeBSD PCMCIA support
  *	----------------------------------------------
  *
- *	$Id: i4b_isic_pcmcia.c,v 1.4 1999/02/14 09:44:59 hm Exp $
+ *	$Id: i4b_isic_pcmcia.c,v 1.4 1999/03/07 16:08:16 hm Exp $
  *
- *      last edit-date: [Sun Feb 14 10:27:42 1999]
+ *      last edit-date: [Tue Mar 16 10:36:56 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -50,10 +50,8 @@
 #if (NISIC > 0) && (NCARD > 0)
  
 #include "apm.h"
+#include <sys/types.h>
 #include <sys/select.h>
-#include <pccard/card.h>
-#include <pccard/driver.h>
-#include <pccard/slot.h>
 #include <sys/param.h>
 
 #if defined(__FreeBSD__) && __FreeBSD__ >= 3
@@ -70,6 +68,10 @@
 #include <machine/clock.h>
 #include <i386/isa/isa_device.h>
 
+#include <pccard/cardinfo.h>
+#include <pccard/driver.h>
+#include <pccard/slot.h>
+
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_trace.h>
@@ -81,6 +83,14 @@
 #include <i4b/include/i4b_l1l2.h>
 #include <i4b/include/i4b_mbuf.h>
 #include <i4b/include/i4b_global.h>
+
+#ifdef __FreeBSD__
+
+#if !(defined(__FreeBSD_version)) || (defined(__FreeBSD_version) && __FreeBSD_version >= 300006)
+void isicintr ( int unit );
+#endif
+
+#endif
  
 /*  
  * PC-Card (PCMCIA) specific code.
@@ -110,7 +120,6 @@ static int isic_pccard_init(devi)
 struct pccard_devinfo *devi;
 {   
     	struct isa_device *is = &devi->isahd;
-	struct isic_softc *sc = &isic_sc[is->id_unit];
 
 	if ((1 << is->id_unit) & opened)
 		return(EBUSY);
@@ -132,7 +141,9 @@ struct pccard_devinfo *devi;
 	/*
 	 * try to attach the PCMCIA card as a normal A1 card
 	 */
-	isicattach(is);
+
+	isic_realattach(is, 0);
+
 	return(0);
 }
 
diff --git a/sys/i4b/layer1/i4b_l1.h b/sys/i4b/layer1/i4b_l1.h
index 939f960..f00598a 100644
--- a/sys/i4b/layer1/i4b_l1.h
+++ b/sys/i4b/layer1/i4b_l1.h
@@ -27,9 +27,9 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- *	$Id: i4b_l1.h,v 1.57 1999/02/17 14:31:42 hm Exp $ 
+ *	$Id: i4b_l1.h,v 1.2 1999/03/07 16:08:16 hm Exp $ 
  *
- *      last edit-date: [Wed Feb 17 15:16:48 1999]
+ *      last edit-date: [Tue Mar 16 10:38:03 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -383,12 +383,12 @@ extern struct isic_softc isic_sc[];
 extern void isic_recover(struct isic_softc *sc);
 extern int isic_realattach(struct isa_device *dev, unsigned int iobase2);
 extern int isic_attach_avma1 ( struct isa_device *dev );
-extern int isic_attach_fritzpcmcia ( struct isa_device *dev );
+extern int isic_attach_fritz ( struct isa_device *dev );
 extern int isic_attach_Cs0P ( struct isa_device *dev, unsigned int iobase2);
 extern int isic_attach_Dyn ( struct isa_device *dev, unsigned int iobase2);
 extern int isic_attach_s016 ( struct isa_device *dev );
 extern int isic_attach_s0163 ( struct isa_device *dev );
-extern int isic_attach_s0163P ( struct isa_device *dev );
+extern int isic_attach_s0163P ( struct isa_device *dev, unsigned int iobase2);
 extern int isic_attach_s08 ( struct isa_device *dev );
 extern int isic_attach_usrtai ( struct isa_device *dev );
 extern int isic_attach_itkix1 ( struct isa_device *dev );
@@ -414,7 +414,7 @@ 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 );
 extern int isic_probe_s0163 ( struct isa_device *dev );
-extern int isic_probe_s0163P ( struct isa_device *dev );
+extern int isic_probe_s0163P ( struct isa_device *dev, unsigned int iobase2);
 extern int isic_probe_s08 ( struct isa_device *dev );
 extern int isic_probe_usrtai ( struct isa_device *dev );
 extern int isic_probe_itkix1 ( struct isa_device *dev );
diff --git a/sys/i4b/layer1/i4b_tel_s0P.c b/sys/i4b/layer1/i4b_tel_s0P.c
index ffe9bef..7ee1d06 100644
--- a/sys/i4b/layer1/i4b_tel_s0P.c
+++ b/sys/i4b/layer1/i4b_tel_s0P.c
@@ -38,13 +38,9 @@
  *		EXPERIMENTAL !!!
  *		================
  *
- *	$Id: i4b_tel_s0P.c,v 1.13 1999/02/14 09:45:00 hm Exp $ 
+ *	$Id: i4b_tel_s0P.c,v 1.2 1999/03/07 16:08:16 hm Exp $ 
  *
- *      last edit-date: [Sun Feb 14 10:29:00 1999]
- *
- *	-hm	rudimentary PnP support, hint from Andrew Gordon
- *	-hm	more cleanup
- *      -hm     NetBSD patches from Martin 
+ *      last edit-date: [Tue Mar 16 10:39:14 1999]
  *
  *---------------------------------------------------------------------------*/
 
@@ -200,7 +196,7 @@ tels0163P_read_reg(struct isic_softc *sc, int what, bus_size_t offs)
  *---------------------------------------------------------------------------*/
 #ifdef __FreeBSD__
 int
-isic_probe_s0163P(struct isa_device *dev)
+isic_probe_s0163P(struct isa_device *dev, unsigned int iobase2)
 {
 	struct isic_softc *sc = &isic_sc[dev->id_unit];
 	
@@ -330,7 +326,7 @@ isic_probe_s0163P(struct isa_device *dev)
  *---------------------------------------------------------------------------*/
 #ifdef __FreeBSD__
 int
-isic_attach_s0163P(struct isa_device *dev)
+isic_attach_s0163P(struct isa_device *dev, unsigned int iobase2)
 {
 	outb((dev->id_iobase) + 0x1c, 0);
 	DELAY(SEC_DELAY / 10);