summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1997-09-20 05:28:02 +0000
committerkato <kato@FreeBSD.org>1997-09-20 05:28:02 +0000
commit16203bbd93cef4831f887fffd9076c2eff3ea461 (patch)
treea5164009768eca1d701a2853856fdf340441db75
parentbbdf620f6f503d91d704c2f3738268a0e6793b65 (diff)
downloadFreeBSD-src-16203bbd93cef4831f887fffd9076c2eff3ea461.zip
FreeBSD-src-16203bbd93cef4831f887fffd9076c2eff3ea461.tar.gz
Synchronize with sys/i386/conf/options.i386 and sys/i386/isa/sio.c
revisions 1.60 and 1.182, respectively.
-rw-r--r--sys/conf/options.pc983
-rw-r--r--sys/pc98/cbus/sio.c135
-rw-r--r--sys/pc98/conf/options.pc983
-rw-r--r--sys/pc98/pc98/sio.c135
4 files changed, 248 insertions, 28 deletions
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 3ba2f80..b1ca5d4 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.38 1997/09/05 10:18:16 kato Exp $
+# $Id: options.pc98,v 1.39 1997/09/17 08:00:56 kato Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
@@ -22,6 +22,7 @@ CONUNIT opt_defunct.h
COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
DSI_SOFT_MODEM opt_sio.h
+EXTRA_SIO opt_sio.h
I586_CTR_GUPROF opt_i586_guprof.h
I586_PMC_GUPROF opt_i586_guprof.h
FAT_CURSOR opt_pcvt.h
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 2aba96d..149e220 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,13 +31,24 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.36 1997/09/01 10:45:02 kato Exp $
+ * $Id: sio.c,v 1.37 1997/09/14 16:27:35 kato Exp $
*/
#include "opt_comconsole.h"
#include "opt_ddb.h"
#include "opt_sio.h"
#include "sio.h"
+#include "pnp.h"
+
+#ifndef EXTRA_SIO
+#if NPNP > 0
+#define EXTRA_SIO 2
+#else
+#define EXTRA_SIO 0
+#endif
+#endif
+
+#define NSIOTOT (NSIO + EXTRA_SIO)
/*
* Serial driver, based on 386BSD-0.1 com driver.
@@ -161,6 +172,10 @@
#include <pccard/slot.h>
#endif
+#if NPNP > 0
+#include <i386/isa/pnp.h>
+#endif
+
#ifdef SMP
#define disable_intr() COM_DISABLE_INTR()
#define enable_intr() COM_ENABLE_INTR()
@@ -424,7 +439,7 @@ static int LoadSoftModem __P((int unit,int base_io, u_long size, u_char *ptr
static char driver_name[] = "sio";
/* table and macro for fast conversion from a unit number to its com struct */
-static struct com_s *p_com_addr[NSIO];
+static struct com_s *p_com_addr[NSIOTOT];
#define com_addr(unit) (p_com_addr[unit])
struct isa_driver siodriver = {
@@ -454,11 +469,11 @@ static Port_t siocniobase;
static int sio_timeout;
static int sio_timeouts_until_log;
#if 0 /* XXX */
-static struct tty *sio_tty[NSIO];
+static struct tty *sio_tty[NSIOTOT];
#else
-static struct tty sio_tty[NSIO];
+static struct tty sio_tty[NSIOTOT];
#endif
-static const int nsio_tty = NSIO;
+static const int nsio_tty = NSIOTOT;
#ifdef PC98
struct siodev {
@@ -730,7 +745,7 @@ sioinit(struct pccard_dev *dp, int first)
/* validate unit number. */
if (first) {
- if (dp->isahd.id_unit >= NSIO)
+ if (dp->isahd.id_unit >= (NSIOTOT))
return(ENODEV);
/* Make sure it isn't already probed. */
if (com_addr(dp->isahd.id_unit))
@@ -1432,7 +1447,7 @@ sioopen(dev, flag, mode, p)
mynor = minor(dev);
unit = MINOR_TO_UNIT(mynor);
- if ((u_int) unit >= NSIO || (com = com_addr(unit)) == NULL)
+ if ((u_int) unit >= NSIOTOT || (com = com_addr(unit)) == NULL)
return (ENXIO);
if (com->gone)
return (ENXIO);
@@ -1869,7 +1884,7 @@ siointr(unit)
COM_LOCK();
do {
possibly_more_intrs = FALSE;
- for (unit = 0; unit < NSIO; ++unit) {
+ for (unit = 0; unit < NSIOTOT; ++unit) {
com = com_addr(unit);
/*
* XXX COM_LOCK();
@@ -2376,7 +2391,7 @@ siopoll()
if (com_events == 0)
return;
repeat:
- for (unit = 0; unit < NSIO; ++unit) {
+ for (unit = 0; unit < NSIOTOT; ++unit) {
u_char *buf;
struct com_s *com;
u_char *ibuf;
@@ -3011,7 +3026,7 @@ siodevtotty(dev)
if (mynor & CONTROL_MASK)
return (NULL);
unit = MINOR_TO_UNIT(mynor);
- if ((u_int) unit >= NSIO)
+ if ((u_int) unit >= NSIOTOT)
return (NULL);
return (&sio_tty[unit]);
}
@@ -3087,7 +3102,7 @@ siosettimeout()
untimeout(comwakeup, (void *)NULL);
sio_timeout = hz;
someopen = FALSE;
- for (unit = 0; unit < NSIO; ++unit) {
+ for (unit = 0; unit < NSIOTOT; ++unit) {
com = com_addr(unit);
if (com != NULL && com->tp != NULL
&& com->tp->t_state & TS_ISOPEN && !com->gone) {
@@ -3122,7 +3137,7 @@ comwakeup(chan)
* Recover from lost output interrupts.
* Poll any lines that don't use interrupts.
*/
- for (unit = 0; unit < NSIO; ++unit) {
+ for (unit = 0; unit < NSIOTOT; ++unit) {
com = com_addr(unit);
if (com != NULL && !com->gone
&& (com->state >= (CS_BUSY | CS_TTGO) || com->poll)) {
@@ -3138,7 +3153,7 @@ comwakeup(chan)
if (--sio_timeouts_until_log > 0)
return;
sio_timeouts_until_log = hz / sio_timeout;
- for (unit = 0; unit < NSIO; ++unit) {
+ for (unit = 0; unit < NSIOTOT; ++unit) {
int errnum;
com = com_addr(unit);
@@ -3600,6 +3615,100 @@ error:
return EIO;
}
#endif /* DSI_SOFT_MODEM */
+
+/*
+ * support PnP cards if we are using 'em
+ */
+
+#if NPNP > 0
+
+static struct siopnp_ids {
+ u_long vend_id;
+ char *id_str;
+} siopnp_ids[] = {
+ { 0x8113b04e, "Supra1381"},
+ { 0x9012b04e, "Supra1290"},
+ { 0x11007256, "USR0011"},
+ { 0 }
+};
+
+static char *siopnp_probe(u_long csn, u_long vend_id);
+static void siopnp_attach(u_long csn, u_long vend_id, char *name,
+ struct isa_device *dev);
+static u_long nsiopnp = NSIO;
+
+static struct pnp_device siopnp = {
+ "siopnp",
+ siopnp_probe,
+ siopnp_attach,
+ &nsiopnp,
+ &tty_imask
+};
+DATA_SET (pnpdevice_set, siopnp);
+
+static char *
+siopnp_probe(u_long csn, u_long vend_id)
+{
+ struct siopnp_ids *ids;
+ char *s = NULL;
+
+ for(ids = siopnp_ids; ids->vend_id != 0; ids++) {
+ if (vend_id == ids->vend_id) {
+ s = ids->id_str;
+ break;
+ }
+ }
+
+ if (s) {
+ struct pnp_cinfo d;
+ read_pnp_parms(&d, 0);
+ if (d.enable == 0 || d.flags & 1) {
+ printf("CSN %d is disabled.\n", csn);
+ return (NULL);
+ }
+
+ }
+
+ return (s);
+}
+
+static void
+siopnp_attach(u_long csn, u_long vend_id, char *name, struct isa_device *dev)
+{
+ struct pnp_cinfo d;
+ struct isa_device *dvp;
+
+ if (dev->id_unit >= NSIOTOT)
+ return;
+
+ if (read_pnp_parms(&d, 0) == 0) {
+ printf("failed to read pnp parms\n");
+ return;
+ }
+
+ write_pnp_parms(&d, 0);
+
+ enable_pnp_card();
+
+ dev->id_iobase = d.port[0];
+ dev->id_irq = (1 << d.irq[0]);
+ dev->id_intr = siointr;
+ dev->id_ri_flags = RI_FAST;
+ dev->id_drq = -1;
+
+ if (dev->id_driver == NULL) {
+ dev->id_driver = &siodriver;
+ dvp = find_isadev(isa_devtab_tty, &siodriver, 0);
+ if (dvp != NULL)
+ dev->id_id = dvp->id_id;
+ }
+
+ if ((dev->id_alive = sioprobe(dev)) != 0)
+ sioattach(dev);
+ else
+ printf("sio%d: probe failed\n", dev->id_unit);
+}
+#endif
#ifdef PC98
/*
* pc98 local function
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index 3ba2f80..b1ca5d4 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.38 1997/09/05 10:18:16 kato Exp $
+# $Id: options.pc98,v 1.39 1997/09/17 08:00:56 kato Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
@@ -22,6 +22,7 @@ CONUNIT opt_defunct.h
COM_ESP opt_sio.h
COM_MULTIPORT opt_sio.h
DSI_SOFT_MODEM opt_sio.h
+EXTRA_SIO opt_sio.h
I586_CTR_GUPROF opt_i586_guprof.h
I586_PMC_GUPROF opt_i586_guprof.h
FAT_CURSOR opt_pcvt.h
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 2aba96d..149e220 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,13 +31,24 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.36 1997/09/01 10:45:02 kato Exp $
+ * $Id: sio.c,v 1.37 1997/09/14 16:27:35 kato Exp $
*/
#include "opt_comconsole.h"
#include "opt_ddb.h"
#include "opt_sio.h"
#include "sio.h"
+#include "pnp.h"
+
+#ifndef EXTRA_SIO
+#if NPNP > 0
+#define EXTRA_SIO 2
+#else
+#define EXTRA_SIO 0
+#endif
+#endif
+
+#define NSIOTOT (NSIO + EXTRA_SIO)
/*
* Serial driver, based on 386BSD-0.1 com driver.
@@ -161,6 +172,10 @@
#include <pccard/slot.h>
#endif
+#if NPNP > 0
+#include <i386/isa/pnp.h>
+#endif
+
#ifdef SMP
#define disable_intr() COM_DISABLE_INTR()
#define enable_intr() COM_ENABLE_INTR()
@@ -424,7 +439,7 @@ static int LoadSoftModem __P((int unit,int base_io, u_long size, u_char *ptr
static char driver_name[] = "sio";
/* table and macro for fast conversion from a unit number to its com struct */
-static struct com_s *p_com_addr[NSIO];
+static struct com_s *p_com_addr[NSIOTOT];
#define com_addr(unit) (p_com_addr[unit])
struct isa_driver siodriver = {
@@ -454,11 +469,11 @@ static Port_t siocniobase;
static int sio_timeout;
static int sio_timeouts_until_log;
#if 0 /* XXX */
-static struct tty *sio_tty[NSIO];
+static struct tty *sio_tty[NSIOTOT];
#else
-static struct tty sio_tty[NSIO];
+static struct tty sio_tty[NSIOTOT];
#endif
-static const int nsio_tty = NSIO;
+static const int nsio_tty = NSIOTOT;
#ifdef PC98
struct siodev {
@@ -730,7 +745,7 @@ sioinit(struct pccard_dev *dp, int first)
/* validate unit number. */
if (first) {
- if (dp->isahd.id_unit >= NSIO)
+ if (dp->isahd.id_unit >= (NSIOTOT))
return(ENODEV);
/* Make sure it isn't already probed. */
if (com_addr(dp->isahd.id_unit))
@@ -1432,7 +1447,7 @@ sioopen(dev, flag, mode, p)
mynor = minor(dev);
unit = MINOR_TO_UNIT(mynor);
- if ((u_int) unit >= NSIO || (com = com_addr(unit)) == NULL)
+ if ((u_int) unit >= NSIOTOT || (com = com_addr(unit)) == NULL)
return (ENXIO);
if (com->gone)
return (ENXIO);
@@ -1869,7 +1884,7 @@ siointr(unit)
COM_LOCK();
do {
possibly_more_intrs = FALSE;
- for (unit = 0; unit < NSIO; ++unit) {
+ for (unit = 0; unit < NSIOTOT; ++unit) {
com = com_addr(unit);
/*
* XXX COM_LOCK();
@@ -2376,7 +2391,7 @@ siopoll()
if (com_events == 0)
return;
repeat:
- for (unit = 0; unit < NSIO; ++unit) {
+ for (unit = 0; unit < NSIOTOT; ++unit) {
u_char *buf;
struct com_s *com;
u_char *ibuf;
@@ -3011,7 +3026,7 @@ siodevtotty(dev)
if (mynor & CONTROL_MASK)
return (NULL);
unit = MINOR_TO_UNIT(mynor);
- if ((u_int) unit >= NSIO)
+ if ((u_int) unit >= NSIOTOT)
return (NULL);
return (&sio_tty[unit]);
}
@@ -3087,7 +3102,7 @@ siosettimeout()
untimeout(comwakeup, (void *)NULL);
sio_timeout = hz;
someopen = FALSE;
- for (unit = 0; unit < NSIO; ++unit) {
+ for (unit = 0; unit < NSIOTOT; ++unit) {
com = com_addr(unit);
if (com != NULL && com->tp != NULL
&& com->tp->t_state & TS_ISOPEN && !com->gone) {
@@ -3122,7 +3137,7 @@ comwakeup(chan)
* Recover from lost output interrupts.
* Poll any lines that don't use interrupts.
*/
- for (unit = 0; unit < NSIO; ++unit) {
+ for (unit = 0; unit < NSIOTOT; ++unit) {
com = com_addr(unit);
if (com != NULL && !com->gone
&& (com->state >= (CS_BUSY | CS_TTGO) || com->poll)) {
@@ -3138,7 +3153,7 @@ comwakeup(chan)
if (--sio_timeouts_until_log > 0)
return;
sio_timeouts_until_log = hz / sio_timeout;
- for (unit = 0; unit < NSIO; ++unit) {
+ for (unit = 0; unit < NSIOTOT; ++unit) {
int errnum;
com = com_addr(unit);
@@ -3600,6 +3615,100 @@ error:
return EIO;
}
#endif /* DSI_SOFT_MODEM */
+
+/*
+ * support PnP cards if we are using 'em
+ */
+
+#if NPNP > 0
+
+static struct siopnp_ids {
+ u_long vend_id;
+ char *id_str;
+} siopnp_ids[] = {
+ { 0x8113b04e, "Supra1381"},
+ { 0x9012b04e, "Supra1290"},
+ { 0x11007256, "USR0011"},
+ { 0 }
+};
+
+static char *siopnp_probe(u_long csn, u_long vend_id);
+static void siopnp_attach(u_long csn, u_long vend_id, char *name,
+ struct isa_device *dev);
+static u_long nsiopnp = NSIO;
+
+static struct pnp_device siopnp = {
+ "siopnp",
+ siopnp_probe,
+ siopnp_attach,
+ &nsiopnp,
+ &tty_imask
+};
+DATA_SET (pnpdevice_set, siopnp);
+
+static char *
+siopnp_probe(u_long csn, u_long vend_id)
+{
+ struct siopnp_ids *ids;
+ char *s = NULL;
+
+ for(ids = siopnp_ids; ids->vend_id != 0; ids++) {
+ if (vend_id == ids->vend_id) {
+ s = ids->id_str;
+ break;
+ }
+ }
+
+ if (s) {
+ struct pnp_cinfo d;
+ read_pnp_parms(&d, 0);
+ if (d.enable == 0 || d.flags & 1) {
+ printf("CSN %d is disabled.\n", csn);
+ return (NULL);
+ }
+
+ }
+
+ return (s);
+}
+
+static void
+siopnp_attach(u_long csn, u_long vend_id, char *name, struct isa_device *dev)
+{
+ struct pnp_cinfo d;
+ struct isa_device *dvp;
+
+ if (dev->id_unit >= NSIOTOT)
+ return;
+
+ if (read_pnp_parms(&d, 0) == 0) {
+ printf("failed to read pnp parms\n");
+ return;
+ }
+
+ write_pnp_parms(&d, 0);
+
+ enable_pnp_card();
+
+ dev->id_iobase = d.port[0];
+ dev->id_irq = (1 << d.irq[0]);
+ dev->id_intr = siointr;
+ dev->id_ri_flags = RI_FAST;
+ dev->id_drq = -1;
+
+ if (dev->id_driver == NULL) {
+ dev->id_driver = &siodriver;
+ dvp = find_isadev(isa_devtab_tty, &siodriver, 0);
+ if (dvp != NULL)
+ dev->id_id = dvp->id_id;
+ }
+
+ if ((dev->id_alive = sioprobe(dev)) != 0)
+ sioattach(dev);
+ else
+ printf("sio%d: probe failed\n", dev->id_unit);
+}
+#endif
#ifdef PC98
/*
* pc98 local function
OpenPOWER on IntegriCloud