summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorhm <hm@FreeBSD.org>1999-12-14 20:52:41 +0000
committerhm <hm@FreeBSD.org>1999-12-14 20:52:41 +0000
commit3c5fb5d6117ab71bf297ba339d596e6f8e41e818 (patch)
tree8cf01825227fa6f7fef987eb3686ce7b519a0184 /sys
parent57bc8b41244c53f38345080f7e4b02bed8685f82 (diff)
downloadFreeBSD-src-3c5fb5d6117ab71bf297ba339d596e6f8e41e818.zip
FreeBSD-src-3c5fb5d6117ab71bf297ba339d596e6f8e41e818.tar.gz
update to isdn4bsd beta release 0.90
drivers which are likely to be ported to newbus are commented out for now
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/NOTES73
-rw-r--r--sys/conf/files.i38614
-rw-r--r--sys/conf/options.i3869
-rw-r--r--sys/i386/conf/LINT73
-rw-r--r--sys/i386/conf/NOTES73
-rw-r--r--sys/i386/conf/files.i38614
-rw-r--r--sys/i386/conf/options.i3869
7 files changed, 142 insertions, 123 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index c98937f..afcfd8b 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1951,13 +1951,17 @@ controller pcf0 at isa? port 0x320 irq 5
# ISDN4BSD section
#
-# see /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
+# See /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
#
# i4b passive ISDN cards support (isic - I4b Siemens Isdn Chipset driver)
# note that the ``options'' and ``device'' lines must BOTH be defined !
#
-# Non-PnP Cards:
-# --------------
+# Driver entries marked "(not supported yet!)" are not working currently
+# due to not being converted to newbus. We hope to get them back to support
+# in the near future.
+#
+# ISA bus non-PnP Cards:
+# ----------------------
#
# Teles S0/8 or Niccy 1008
options TEL_S0_8
@@ -1975,61 +1979,61 @@ options TEL_S0_16_3
options AVM_A1
#device isic0 at isa? port 0x340 irq 5 flags 4
#
-# USRobotics Sportster ISDN TA intern
-options USR_STI
+# USRobotics Sportster ISDN TA intern (not supported yet!)
+#options USR_STI
#device isic0 at isa? port 0x268 irq 5 flags 7
#
-# ITK ix1 Micro ( < V.3, non-PnP version )
-options ITKIX1
+# ITK ix1 Micro ( < V.3, non-PnP version ) (not supported yet!)
+#options ITKIX1
#device isic0 at isa? port 0x398 irq 10 flags 18
#
# ELSA PCC-16
options "ELSA_PCC16"
-#device isic0 at isa? port 0x360 irq 10 flags 19
+#device isic0 at isa? port 0x360 irq 10 flags 20
#
-# PnP-Cards:
-# ----------
+# ISA bus PnP Cards:
+# ------------------
#
# Teles S0/16.3 PnP
options TEL_S0_16_3_P
-#device isic0 at isa? port ? irq ?
+#device isic0
#
# Creatix ISDN-S0 P&P
options CRTX_S0_P
-#device isic0 at isa? port ? irq ?
+#device isic0
#
# Dr. Neuhaus Niccy Go@
options DRN_NGO
-#device isic0 at isa? port ? irq ?
+#device isic0
#
# Sedlbauer Win Speed
options SEDLBAUER
-#device isic0 at isa? port ? irq ?
+#device isic0
#
-# Dynalink IS64PH
-options DYNALINK
-#device isic0 at isa? port ? irq ?
+# Dynalink IS64PH (not supported yet!)
+#options DYNALINK
+#device isic0
#
# ELSA QuickStep 1000pro ISA
options ELSA_QS1ISA
-#device isic0 at isa? port ? irq ?
+#device isic0
#
-# ITK ix1 Micro ( V.3, PnP version )
-options "ITKIX1"
-#device isic0 at isa? port ? irq ?
+# ITK ix1 Micro ( V.3, PnP version ) (not supported yet!)
+#options "ITKIX1"
+#device isic0
#
-# AVM Fritz!Card PnP
-options "AVM_PNP"
-#device isic0 at isa? port ? irq ?
+# AVM Fritz!Card PnP (not supported yet!)
+#options "AVM_PNP"
+#device isic0
#
# Siemens I-Surf 2.0
options "SIEMENS_ISURF2"
-#device isic0 at isa? port ? irq ?
+#device isic0
#
-# PCI-Cards:
-# ----------
+# PCI bus Cards:
+# --------------
#
-# ELSA QuickStep 1000pro PCI
+# ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI)
options ELSA_QS1PCI
#device isic0
#
@@ -2037,17 +2041,18 @@ options ELSA_QS1PCI
options "AVM_A1_PCI"
#device isic0
#
-# PCMCIA-Cards:
+# PCMCIA Cards:
# -------------
#
-# AVM PCMCIA Fritz!Card
-options AVM_A1_PCMCIA
-device isic0 at isa? port 0x340 irq 5 flags 10
+# AVM PCMCIA Fritz!Card (not supported yet!)
+#options AVM_A1_PCMCIA
+#device isic0 at isa? port 0x340 irq 5 flags 10
#
# Active Cards:
# -------------
#
-# Stollmann Tina-dd control device
+# Stollmann Tina-dd control device
+# (driver under development, not fully functional!)
device tina0 at isa? port 0x260 irq 10
#
# ISDN Protocol Stack
@@ -2081,6 +2086,8 @@ pseudo-device "i4btel" 2
pseudo-device "i4bipr" 4
# enable VJ header compression detection for ipr i/f
options IPR_VJ
+# enable logging of the first n IP packets to isdnd (n=32 here)
+#options IPR_LOG=32
#
# network driver for sync PPP over ISDN
pseudo-device "i4bisppp" 4
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 4af0f61..a7433e3 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -375,22 +375,21 @@ i386/svr4/svr4_machdep.c optional compat_svr4
i4b/layer1/i4b_asuscom_ipac.c optional isic
i4b/layer1/i4b_avm_a1.c optional isic
i4b/layer1/i4b_avm_fritz_pci.c optional isic
-i4b/layer1/i4b_avm_fritz_pcmcia.c optional isic
-i4b/layer1/i4b_avm_fritz_pnp.c optional isic
+#i4b/layer1/i4b_avm_fritz_pcmcia.c optional isic
+#i4b/layer1/i4b_avm_fritz_pnp.c optional isic
i4b/layer1/i4b_bchan.c optional isic
i4b/layer1/i4b_ctx_s0P.c optional isic
i4b/layer1/i4b_drn_ngo.c optional isic
-i4b/layer1/i4b_dynalink.c optional isic
+#i4b/layer1/i4b_dynalink.c optional isic
i4b/layer1/i4b_elsa_qs1i.c optional isic
i4b/layer1/i4b_elsa_qs1p.c optional isic
i4b/layer1/i4b_hscx.c optional isic
i4b/layer1/i4b_isac.c optional isic
i4b/layer1/i4b_isic.c optional isic
i4b/layer1/i4b_isic_isa.c optional isic
-i4b/layer1/i4b_isic_pci.c optional isic
-i4b/layer1/i4b_isic_pcmcia.c optional isic
+#i4b/layer1/i4b_isic_pcmcia.c optional isic
i4b/layer1/i4b_isic_pnp.c optional isic
-i4b/layer1/i4b_itk_ix1.c optional isic
+#i4b/layer1/i4b_itk_ix1.c optional isic
i4b/layer1/i4b_l1.c optional isic
i4b/layer1/i4b_l1fsm.c optional isic
i4b/layer1/i4b_siemens_isurf.c optional isic
@@ -398,8 +397,7 @@ i4b/layer1/i4b_sws.c optional isic
i4b/layer1/i4b_tel_s016.c optional isic
i4b/layer1/i4b_tel_s0163.c optional isic
i4b/layer1/i4b_tel_s08.c optional isic
-i4b/layer1/i4b_tel_s0P.c optional isic
-i4b/layer1/i4b_usr_sti.c optional isic
+#i4b/layer1/i4b_usr_sti.c optional isic
isa/atkbd_isa.c optional atkbd
isa/atkbdc_isa.c optional atkbdc
isa/psm.c optional psm
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 376f048..fe38c4e 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -149,7 +149,7 @@ TEL_S0_16 opt_i4b.h
TEL_S0_16_3 opt_i4b.h
AVM_A1 opt_i4b.h
USR_STI opt_i4b.h
-ITKIX1 opt_i4b.h
+#ITKIX1 opt_i4b.h
ELSA_PCC16 opt_i4b.h
# -------------------------------
# isdn4bsd: passive ISA PnP cards
@@ -158,10 +158,10 @@ CRTX_S0_P opt_i4b.h
DRN_NGO opt_i4b.h
TEL_S0_16_3_P opt_i4b.h
SEDLBAUER opt_i4b.h
-DYNALINK opt_i4b.h
+#DYNALINK opt_i4b.h
ASUSCOM_IPAC opt_i4b.h
ELSA_QS1ISA opt_i4b.h
-AVM_PNP opt_i4b.h
+#AVM_PNP opt_i4b.h
SIEMENS_ISURF2 opt_i4b.h
# -------------------------------
# isdn4bsd: passive PCI cards
@@ -171,7 +171,7 @@ AVM_A1_PCI opt_i4b.h
# -------------------------------
# isdn4bsd: passive PCMCIA cards
# -------------------------------
-AVM_A1_PCMCIA opt_i4b.h
+#AVM_A1_PCMCIA opt_i4b.h
# -------------------------------
# isdn4bsd: misc options
# -------------------------------
@@ -179,6 +179,7 @@ AVM_A1_PCMCIA opt_i4b.h
I4B_SMP_WORKAROUND opt_i4b.h
# enable VJ compression code for ipr i/f
IPR_VJ opt_i4b.h
+IPR_LOG opt_i4b.h
# -------------------------------
# oltr: build options
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index c98937f..afcfd8b 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -1951,13 +1951,17 @@ controller pcf0 at isa? port 0x320 irq 5
# ISDN4BSD section
#
-# see /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
+# See /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
#
# i4b passive ISDN cards support (isic - I4b Siemens Isdn Chipset driver)
# note that the ``options'' and ``device'' lines must BOTH be defined !
#
-# Non-PnP Cards:
-# --------------
+# Driver entries marked "(not supported yet!)" are not working currently
+# due to not being converted to newbus. We hope to get them back to support
+# in the near future.
+#
+# ISA bus non-PnP Cards:
+# ----------------------
#
# Teles S0/8 or Niccy 1008
options TEL_S0_8
@@ -1975,61 +1979,61 @@ options TEL_S0_16_3
options AVM_A1
#device isic0 at isa? port 0x340 irq 5 flags 4
#
-# USRobotics Sportster ISDN TA intern
-options USR_STI
+# USRobotics Sportster ISDN TA intern (not supported yet!)
+#options USR_STI
#device isic0 at isa? port 0x268 irq 5 flags 7
#
-# ITK ix1 Micro ( < V.3, non-PnP version )
-options ITKIX1
+# ITK ix1 Micro ( < V.3, non-PnP version ) (not supported yet!)
+#options ITKIX1
#device isic0 at isa? port 0x398 irq 10 flags 18
#
# ELSA PCC-16
options "ELSA_PCC16"
-#device isic0 at isa? port 0x360 irq 10 flags 19
+#device isic0 at isa? port 0x360 irq 10 flags 20
#
-# PnP-Cards:
-# ----------
+# ISA bus PnP Cards:
+# ------------------
#
# Teles S0/16.3 PnP
options TEL_S0_16_3_P
-#device isic0 at isa? port ? irq ?
+#device isic0
#
# Creatix ISDN-S0 P&P
options CRTX_S0_P
-#device isic0 at isa? port ? irq ?
+#device isic0
#
# Dr. Neuhaus Niccy Go@
options DRN_NGO
-#device isic0 at isa? port ? irq ?
+#device isic0
#
# Sedlbauer Win Speed
options SEDLBAUER
-#device isic0 at isa? port ? irq ?
+#device isic0
#
-# Dynalink IS64PH
-options DYNALINK
-#device isic0 at isa? port ? irq ?
+# Dynalink IS64PH (not supported yet!)
+#options DYNALINK
+#device isic0
#
# ELSA QuickStep 1000pro ISA
options ELSA_QS1ISA
-#device isic0 at isa? port ? irq ?
+#device isic0
#
-# ITK ix1 Micro ( V.3, PnP version )
-options "ITKIX1"
-#device isic0 at isa? port ? irq ?
+# ITK ix1 Micro ( V.3, PnP version ) (not supported yet!)
+#options "ITKIX1"
+#device isic0
#
-# AVM Fritz!Card PnP
-options "AVM_PNP"
-#device isic0 at isa? port ? irq ?
+# AVM Fritz!Card PnP (not supported yet!)
+#options "AVM_PNP"
+#device isic0
#
# Siemens I-Surf 2.0
options "SIEMENS_ISURF2"
-#device isic0 at isa? port ? irq ?
+#device isic0
#
-# PCI-Cards:
-# ----------
+# PCI bus Cards:
+# --------------
#
-# ELSA QuickStep 1000pro PCI
+# ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI)
options ELSA_QS1PCI
#device isic0
#
@@ -2037,17 +2041,18 @@ options ELSA_QS1PCI
options "AVM_A1_PCI"
#device isic0
#
-# PCMCIA-Cards:
+# PCMCIA Cards:
# -------------
#
-# AVM PCMCIA Fritz!Card
-options AVM_A1_PCMCIA
-device isic0 at isa? port 0x340 irq 5 flags 10
+# AVM PCMCIA Fritz!Card (not supported yet!)
+#options AVM_A1_PCMCIA
+#device isic0 at isa? port 0x340 irq 5 flags 10
#
# Active Cards:
# -------------
#
-# Stollmann Tina-dd control device
+# Stollmann Tina-dd control device
+# (driver under development, not fully functional!)
device tina0 at isa? port 0x260 irq 10
#
# ISDN Protocol Stack
@@ -2081,6 +2086,8 @@ pseudo-device "i4btel" 2
pseudo-device "i4bipr" 4
# enable VJ header compression detection for ipr i/f
options IPR_VJ
+# enable logging of the first n IP packets to isdnd (n=32 here)
+#options IPR_LOG=32
#
# network driver for sync PPP over ISDN
pseudo-device "i4bisppp" 4
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index c98937f..afcfd8b 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1951,13 +1951,17 @@ controller pcf0 at isa? port 0x320 irq 5
# ISDN4BSD section
#
-# see /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
+# See /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
#
# i4b passive ISDN cards support (isic - I4b Siemens Isdn Chipset driver)
# note that the ``options'' and ``device'' lines must BOTH be defined !
#
-# Non-PnP Cards:
-# --------------
+# Driver entries marked "(not supported yet!)" are not working currently
+# due to not being converted to newbus. We hope to get them back to support
+# in the near future.
+#
+# ISA bus non-PnP Cards:
+# ----------------------
#
# Teles S0/8 or Niccy 1008
options TEL_S0_8
@@ -1975,61 +1979,61 @@ options TEL_S0_16_3
options AVM_A1
#device isic0 at isa? port 0x340 irq 5 flags 4
#
-# USRobotics Sportster ISDN TA intern
-options USR_STI
+# USRobotics Sportster ISDN TA intern (not supported yet!)
+#options USR_STI
#device isic0 at isa? port 0x268 irq 5 flags 7
#
-# ITK ix1 Micro ( < V.3, non-PnP version )
-options ITKIX1
+# ITK ix1 Micro ( < V.3, non-PnP version ) (not supported yet!)
+#options ITKIX1
#device isic0 at isa? port 0x398 irq 10 flags 18
#
# ELSA PCC-16
options "ELSA_PCC16"
-#device isic0 at isa? port 0x360 irq 10 flags 19
+#device isic0 at isa? port 0x360 irq 10 flags 20
#
-# PnP-Cards:
-# ----------
+# ISA bus PnP Cards:
+# ------------------
#
# Teles S0/16.3 PnP
options TEL_S0_16_3_P
-#device isic0 at isa? port ? irq ?
+#device isic0
#
# Creatix ISDN-S0 P&P
options CRTX_S0_P
-#device isic0 at isa? port ? irq ?
+#device isic0
#
# Dr. Neuhaus Niccy Go@
options DRN_NGO
-#device isic0 at isa? port ? irq ?
+#device isic0
#
# Sedlbauer Win Speed
options SEDLBAUER
-#device isic0 at isa? port ? irq ?
+#device isic0
#
-# Dynalink IS64PH
-options DYNALINK
-#device isic0 at isa? port ? irq ?
+# Dynalink IS64PH (not supported yet!)
+#options DYNALINK
+#device isic0
#
# ELSA QuickStep 1000pro ISA
options ELSA_QS1ISA
-#device isic0 at isa? port ? irq ?
+#device isic0
#
-# ITK ix1 Micro ( V.3, PnP version )
-options "ITKIX1"
-#device isic0 at isa? port ? irq ?
+# ITK ix1 Micro ( V.3, PnP version ) (not supported yet!)
+#options "ITKIX1"
+#device isic0
#
-# AVM Fritz!Card PnP
-options "AVM_PNP"
-#device isic0 at isa? port ? irq ?
+# AVM Fritz!Card PnP (not supported yet!)
+#options "AVM_PNP"
+#device isic0
#
# Siemens I-Surf 2.0
options "SIEMENS_ISURF2"
-#device isic0 at isa? port ? irq ?
+#device isic0
#
-# PCI-Cards:
-# ----------
+# PCI bus Cards:
+# --------------
#
-# ELSA QuickStep 1000pro PCI
+# ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI)
options ELSA_QS1PCI
#device isic0
#
@@ -2037,17 +2041,18 @@ options ELSA_QS1PCI
options "AVM_A1_PCI"
#device isic0
#
-# PCMCIA-Cards:
+# PCMCIA Cards:
# -------------
#
-# AVM PCMCIA Fritz!Card
-options AVM_A1_PCMCIA
-device isic0 at isa? port 0x340 irq 5 flags 10
+# AVM PCMCIA Fritz!Card (not supported yet!)
+#options AVM_A1_PCMCIA
+#device isic0 at isa? port 0x340 irq 5 flags 10
#
# Active Cards:
# -------------
#
-# Stollmann Tina-dd control device
+# Stollmann Tina-dd control device
+# (driver under development, not fully functional!)
device tina0 at isa? port 0x260 irq 10
#
# ISDN Protocol Stack
@@ -2081,6 +2086,8 @@ pseudo-device "i4btel" 2
pseudo-device "i4bipr" 4
# enable VJ header compression detection for ipr i/f
options IPR_VJ
+# enable logging of the first n IP packets to isdnd (n=32 here)
+#options IPR_LOG=32
#
# network driver for sync PPP over ISDN
pseudo-device "i4bisppp" 4
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 4af0f61..a7433e3 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -375,22 +375,21 @@ i386/svr4/svr4_machdep.c optional compat_svr4
i4b/layer1/i4b_asuscom_ipac.c optional isic
i4b/layer1/i4b_avm_a1.c optional isic
i4b/layer1/i4b_avm_fritz_pci.c optional isic
-i4b/layer1/i4b_avm_fritz_pcmcia.c optional isic
-i4b/layer1/i4b_avm_fritz_pnp.c optional isic
+#i4b/layer1/i4b_avm_fritz_pcmcia.c optional isic
+#i4b/layer1/i4b_avm_fritz_pnp.c optional isic
i4b/layer1/i4b_bchan.c optional isic
i4b/layer1/i4b_ctx_s0P.c optional isic
i4b/layer1/i4b_drn_ngo.c optional isic
-i4b/layer1/i4b_dynalink.c optional isic
+#i4b/layer1/i4b_dynalink.c optional isic
i4b/layer1/i4b_elsa_qs1i.c optional isic
i4b/layer1/i4b_elsa_qs1p.c optional isic
i4b/layer1/i4b_hscx.c optional isic
i4b/layer1/i4b_isac.c optional isic
i4b/layer1/i4b_isic.c optional isic
i4b/layer1/i4b_isic_isa.c optional isic
-i4b/layer1/i4b_isic_pci.c optional isic
-i4b/layer1/i4b_isic_pcmcia.c optional isic
+#i4b/layer1/i4b_isic_pcmcia.c optional isic
i4b/layer1/i4b_isic_pnp.c optional isic
-i4b/layer1/i4b_itk_ix1.c optional isic
+#i4b/layer1/i4b_itk_ix1.c optional isic
i4b/layer1/i4b_l1.c optional isic
i4b/layer1/i4b_l1fsm.c optional isic
i4b/layer1/i4b_siemens_isurf.c optional isic
@@ -398,8 +397,7 @@ i4b/layer1/i4b_sws.c optional isic
i4b/layer1/i4b_tel_s016.c optional isic
i4b/layer1/i4b_tel_s0163.c optional isic
i4b/layer1/i4b_tel_s08.c optional isic
-i4b/layer1/i4b_tel_s0P.c optional isic
-i4b/layer1/i4b_usr_sti.c optional isic
+#i4b/layer1/i4b_usr_sti.c optional isic
isa/atkbd_isa.c optional atkbd
isa/atkbdc_isa.c optional atkbdc
isa/psm.c optional psm
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 376f048..fe38c4e 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -149,7 +149,7 @@ TEL_S0_16 opt_i4b.h
TEL_S0_16_3 opt_i4b.h
AVM_A1 opt_i4b.h
USR_STI opt_i4b.h
-ITKIX1 opt_i4b.h
+#ITKIX1 opt_i4b.h
ELSA_PCC16 opt_i4b.h
# -------------------------------
# isdn4bsd: passive ISA PnP cards
@@ -158,10 +158,10 @@ CRTX_S0_P opt_i4b.h
DRN_NGO opt_i4b.h
TEL_S0_16_3_P opt_i4b.h
SEDLBAUER opt_i4b.h
-DYNALINK opt_i4b.h
+#DYNALINK opt_i4b.h
ASUSCOM_IPAC opt_i4b.h
ELSA_QS1ISA opt_i4b.h
-AVM_PNP opt_i4b.h
+#AVM_PNP opt_i4b.h
SIEMENS_ISURF2 opt_i4b.h
# -------------------------------
# isdn4bsd: passive PCI cards
@@ -171,7 +171,7 @@ AVM_A1_PCI opt_i4b.h
# -------------------------------
# isdn4bsd: passive PCMCIA cards
# -------------------------------
-AVM_A1_PCMCIA opt_i4b.h
+#AVM_A1_PCMCIA opt_i4b.h
# -------------------------------
# isdn4bsd: misc options
# -------------------------------
@@ -179,6 +179,7 @@ AVM_A1_PCMCIA opt_i4b.h
I4B_SMP_WORKAROUND opt_i4b.h
# enable VJ compression code for ipr i/f
IPR_VJ opt_i4b.h
+IPR_LOG opt_i4b.h
# -------------------------------
# oltr: build options
OpenPOWER on IntegriCloud