summaryrefslogtreecommitdiff
path: root/sys/dev/sio
diff options
context:
space:
mode:
authorYoshihiro Takahashi <nyan@FreeBSD.org>2017-01-28 02:22:15 +0000
committerYoshihiro Takahashi <nyan@FreeBSD.org>2017-01-28 02:22:15 +0000
commit2b375b4edd1b98884c3031d6ccd61acb10bd895d (patch)
treef35e4f57ad890ac86d5cb5d3ef760344a41fc0e6 /sys/dev/sio
parent34bac11eba2841255bf6319ec78728f0f941c6ac (diff)
Notes
Diffstat (limited to 'sys/dev/sio')
-rw-r--r--sys/dev/sio/sio_pccard.c3
-rw-r--r--sys/dev/sio/sio_pci.c4
-rw-r--r--sys/dev/sio/sio_puc.c4
-rw-r--r--sys/dev/sio/siovar.h30
4 files changed, 2 insertions, 39 deletions
diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c
index 7bdb755d8051d..93757c73870c8 100644
--- a/sys/dev/sio/sio_pccard.c
+++ b/sys/dev/sio/sio_pccard.c
@@ -87,9 +87,6 @@ sio_pccard_attach(device_t dev)
{
int err;
-#ifdef PC98
- SET_FLAG(dev, SET_IFTYPE(COM_IF_MODEM_CARD));
-#endif
/* Do not probe IRQ - pccard doesn't turn on the interrupt line */
/* until bus_setup_intr */
if ((err = sioprobe(dev, 0, 0UL, 1)) > 0)
diff --git a/sys/dev/sio/sio_pci.c b/sys/dev/sio/sio_pci.c
index a693536d33cd1..34010acada1e9 100644
--- a/sys/dev/sio/sio_pci.c
+++ b/sys/dev/sio/sio_pci.c
@@ -118,9 +118,7 @@ sio_pci_probe(dev)
if (id->desc == NULL)
return (ENXIO);
device_set_desc(dev, id->desc);
-#ifdef PC98
- SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550));
-#endif
+
return (sioprobe(dev, id->rid, 0UL, 0));
}
diff --git a/sys/dev/sio/sio_puc.c b/sys/dev/sio/sio_puc.c
index 0ae0e7d6424d7..199254b082013 100644
--- a/sys/dev/sio/sio_puc.c
+++ b/sys/dev/sio/sio_puc.c
@@ -89,9 +89,7 @@ sio_puc_probe(device_t dev)
if (BUS_READ_IVAR(parent, dev, PUC_IVAR_CLOCK, &rclk))
rclk = DEFAULT_RCLK;
-#ifdef PC98
- SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550));
-#endif
+
error = sioprobe(dev, 0, rclk, 1);
return ((error > 0) ? error : BUS_PROBE_LOW_PRIORITY);
}
diff --git a/sys/dev/sio/siovar.h b/sys/dev/sio/siovar.h
index 22a6019d8e62e..1a0abddf7a098 100644
--- a/sys/dev/sio/siovar.h
+++ b/sys/dev/sio/siovar.h
@@ -29,36 +29,6 @@
* $FreeBSD$
*/
-#ifdef PC98
-#define COM_IF_INTERNAL 0x00
-#define COM_IF_PC9861K_1 0x01
-#define COM_IF_PC9861K_2 0x02
-#define COM_IF_IND_SS_1 0x03
-#define COM_IF_IND_SS_2 0x04
-#define COM_IF_PIO9032B_1 0x05
-#define COM_IF_PIO9032B_2 0x06
-#define COM_IF_B98_01_1 0x07
-#define COM_IF_B98_01_2 0x08
-#define COM_IF_END1 COM_IF_B98_01_2
-#define COM_IF_RSA98 0x10 /* same as COM_IF_NS16550 */
-#define COM_IF_NS16550 0x11
-#define COM_IF_SECOND_CCU 0x12 /* same as COM_IF_NS16550 */
-#define COM_IF_MC16550II 0x13
-#define COM_IF_MCRS98 0x14 /* same as COM_IF_MC16550II */
-#define COM_IF_RSB3000 0x15
-#define COM_IF_RSB384 0x16
-#define COM_IF_MODEM_CARD 0x17
-#define COM_IF_RSA98III 0x18
-#define COM_IF_ESP98 0x19
-#define COM_IF_END2 COM_IF_ESP98
-
-#define GET_IFTYPE(type) (((type) >> 24) & 0x1f)
-#define SET_IFTYPE(type) ((type) << 24)
-
-#define SET_FLAG(dev, bit) device_set_flags(dev, device_get_flags(dev) | (bit))
-#define CLR_FLAG(dev, bit) device_set_flags(dev, device_get_flags(dev) & ~(bit))
-#endif /* PC98 */
-
int sioattach(device_t dev, int xrid, u_long rclk);
int siodetach(device_t dev);
int sioprobe(device_t dev, int xrid, u_long rclk, int noprobe);