d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synced with sio.c: added support for TIOCDCDTIMESTAMP and simplified

Browse Source 
timestamp code.
This commit is contained in:
Bruce Evans 1996-07-30 19:50:37 +00:00
parent 33ded19fc2
commit 98a51b2b94
3 changed files with 93 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
sys/dev/cy/cy.c
View File

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: cy.c,v 1.32 1996/05/02 09:34:34 phk Exp $ * $Id: cy.c,v 1.33 1996/06/12 05:03:36 gpalmer Exp $
*/ */
#include "cy.h" #include "cy.h"
@ -90,8 +90,6 @@
#include <machine/clock.h> #include <machine/clock.h>
#include <i386/isa/icu.h> /* XXX just to get at `imen' */
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h> #include <i386/isa/isa_device.h>
#include <i386/isa/cyreg.h> #include <i386/isa/cyreg.h>
#include <i386/isa/ic/cd1400.h> #include <i386/isa/ic/cd1400.h>
@ -132,7 +130,6 @@
#define sioioctl cyioctl #define sioioctl cyioctl
#define siointr cyintr #define siointr cyintr
#define siointr1 cyintr1 #define siointr1 cyintr1
#define siointrts cyintrts
#define sioopen cyopen #define sioopen cyopen
#define siopoll cypoll #define siopoll cypoll
#define sioprobe cyprobe #define sioprobe cyprobe
@ -282,7 +279,9 @@ struct com_s {
struct termios lt_out; struct termios lt_out;
bool_t do_timestamp; bool_t do_timestamp;
bool_t do_dcd_timestamp;
struct timeval timestamp; struct timeval timestamp;
struct timeval dcd_timestamp;
u_long bytes_in; /* statistics */ u_long bytes_in; /* statistics */
u_long bytes_out; u_long bytes_out;
@ -330,8 +329,7 @@ struct com_s {
* by `config', not here. * by `config', not here.
*/ */
/* Interrupt handling entry points. */ /* Interrupt handling entry point. */
inthand2_t siointrts;
void siopoll __P((void)); void siopoll __P((void));
/* Device switch entry points. */ /* Device switch entry points. */
@ -367,8 +365,6 @@ static char driver_name[] = "cy";
static struct com_s *p_com_addr[NSIO]; static struct com_s *p_com_addr[NSIO];
#define com_addr(unit) (p_com_addr[unit]) #define com_addr(unit) (p_com_addr[unit])
static struct timeval intr_timestamp;
struct isa_driver siodriver = { struct isa_driver siodriver = {
sioprobe, sioattach, driver_name sioprobe, sioattach, driver_name
}; };
@ -455,7 +451,6 @@ sioprobe(dev)
cy_nr_cd1400s[unit] = 0; cy_nr_cd1400s[unit] = 0;
sioregisterdev(dev); sioregisterdev(dev);
/* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */ /* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
cy_inb(iobase, CY16_RESET); /* XXX? */ cy_inb(iobase, CY16_RESET); /* XXX? */
DELAY(500); /* wait for the board to get its act together */ DELAY(500); /* wait for the board to get its act together */
@ -990,24 +985,6 @@ siodtrwakeup(chan)
wakeup(&com->dtr_wait); wakeup(&com->dtr_wait);
} }
/* Interrupt routine for timekeeping purposes */
void
siointrts(unit)
int unit;
{
/*
* XXX microtime() reenables CPU interrupts. We can't afford to
* be interrupted and don't want to slow down microtime(), so lock
* out interrupts in another way.
*/
outb(IO_ICU1 + 1, 0xff);
microtime(&intr_timestamp);
disable_intr();
outb(IO_ICU1 + 1, imen);
siointr(unit);
}
void void
siointr(unit) siointr(unit)
int unit; int unit;
@ -1064,10 +1041,6 @@ siointr(unit)
& CD1400_xIVR_CHAN)); & CD1400_xIVR_CHAN));
#endif #endif
if (com->do_timestamp)
/* XXX a little bloat here... */
com->timestamp = intr_timestamp;
if (serv_type & CD1400_RIVR_EXCEPTION) { if (serv_type & CD1400_RIVR_EXCEPTION) {
++com->recv_exception; ++com->recv_exception;
line_status = cd_inb(iobase, CD1400_RDSR); line_status = cd_inb(iobase, CD1400_RDSR);
@ -1109,6 +1082,8 @@ siointr(unit)
if (ioptr >= com->ibufend) if (ioptr >= com->ibufend)
CE_RECORD(com, CE_INTERRUPT_BUF_OVERFLOW); CE_RECORD(com, CE_INTERRUPT_BUF_OVERFLOW);
else { else {
if (com->do_timestamp)
microtime(&com->timestamp);
++com_events; ++com_events;
ioptr[0] = recv_data; ioptr[0] = recv_data;
ioptr[CE_INPUT_OFFSET] = line_status; ioptr[CE_INPUT_OFFSET] = line_status;
@ -1136,16 +1111,22 @@ siointr(unit)
if (count > ifree) { if (count > ifree) {
count -= ifree; count -= ifree;
com_events += ifree; com_events += ifree;
while (ifree-- != 0) { if (ifree != 0) {
recv_data = cd_inb(iobase, CD1400_RDSR); if (com->do_timestamp)
microtime(&com->timestamp);
do {
recv_data = cd_inb(iobase,
CD1400_RDSR);
#ifdef SOFT_HOTCHAR #ifdef SOFT_HOTCHAR
if (com->hotchar != 0 if (com->hotchar != 0
&& recv_data == com->hotchar) && recv_data
setsofttty(); == com->hotchar)
setsofttty();
#endif #endif
ioptr[0] = recv_data; ioptr[0] = recv_data;
ioptr[CE_INPUT_OFFSET] = 0; ioptr[CE_INPUT_OFFSET] = 0;
++ioptr; ++ioptr;
} while (--ifree != 0);
} }
com->delta_error_counts com->delta_error_counts
[CE_INTERRUPT_BUF_OVERFLOW] += count; [CE_INTERRUPT_BUF_OVERFLOW] += count;
@ -1158,6 +1139,8 @@ siointr(unit)
#endif #endif
} while (--count != 0); } while (--count != 0);
} else { } else {
if (com->do_timestamp)
microtime(&com->timestamp);
if (ioptr <= com->ihighwater if (ioptr <= com->ihighwater
&& ioptr + count > com->ihighwater && ioptr + count > com->ihighwater
&& com->state & CS_RTS_IFLOW) && com->state & CS_RTS_IFLOW)
@ -1225,6 +1208,11 @@ siointr(unit)
++com->mdm; ++com->mdm;
modem_status = cd_inb(iobase, CD1400_MSVR2); modem_status = cd_inb(iobase, CD1400_MSVR2);
if (modem_status != com->last_modem_status) { if (modem_status != com->last_modem_status) {
if (com->do_dcd_timestamp
&& !(com->last_modem_status & MSR_DCD)
&& modem_status & MSR_DCD)
microtime(&com->dcd_timestamp);
/* /*
* Schedule high level to handle DCD changes. Note * Schedule high level to handle DCD changes. Note
* that we don't use the delta bits anywhere. Some * that we don't use the delta bits anywhere. Some
@ -1503,6 +1491,10 @@ sioioctl(dev, cmd, data, flag, p)
com->do_timestamp = TRUE; com->do_timestamp = TRUE;
*(struct timeval *)data = com->timestamp; *(struct timeval *)data = com->timestamp;
break; break;
case TIOCDCDTIMESTAMP:
com->do_dcd_timestamp = TRUE;
*(struct timeval *)data = com->dcd_timestamp;
break;
default: default:
splx(s); splx(s);
return (ENOTTY); return (ENOTTY);

70
sys/dev/cy/cy_isa.c
View File

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: cy.c,v 1.32 1996/05/02 09:34:34 phk Exp $ * $Id: cy.c,v 1.33 1996/06/12 05:03:36 gpalmer Exp $
*/ */
#include "cy.h" #include "cy.h"
@ -90,8 +90,6 @@
#include <machine/clock.h> #include <machine/clock.h>
#include <i386/isa/icu.h> /* XXX just to get at `imen' */
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h> #include <i386/isa/isa_device.h>
#include <i386/isa/cyreg.h> #include <i386/isa/cyreg.h>
#include <i386/isa/ic/cd1400.h> #include <i386/isa/ic/cd1400.h>
@ -132,7 +130,6 @@
#define sioioctl cyioctl #define sioioctl cyioctl
#define siointr cyintr #define siointr cyintr
#define siointr1 cyintr1 #define siointr1 cyintr1
#define siointrts cyintrts
#define sioopen cyopen #define sioopen cyopen
#define siopoll cypoll #define siopoll cypoll
#define sioprobe cyprobe #define sioprobe cyprobe
@ -282,7 +279,9 @@ struct com_s {
struct termios lt_out; struct termios lt_out;
bool_t do_timestamp; bool_t do_timestamp;
bool_t do_dcd_timestamp;
struct timeval timestamp; struct timeval timestamp;
struct timeval dcd_timestamp;
u_long bytes_in; /* statistics */ u_long bytes_in; /* statistics */
u_long bytes_out; u_long bytes_out;
@ -330,8 +329,7 @@ struct com_s {
* by `config', not here. * by `config', not here.
*/ */
/* Interrupt handling entry points. */ /* Interrupt handling entry point. */
inthand2_t siointrts;
void siopoll __P((void)); void siopoll __P((void));
/* Device switch entry points. */ /* Device switch entry points. */
@ -367,8 +365,6 @@ static char driver_name[] = "cy";
static struct com_s *p_com_addr[NSIO]; static struct com_s *p_com_addr[NSIO];
#define com_addr(unit) (p_com_addr[unit]) #define com_addr(unit) (p_com_addr[unit])
static struct timeval intr_timestamp;
struct isa_driver siodriver = { struct isa_driver siodriver = {
sioprobe, sioattach, driver_name sioprobe, sioattach, driver_name
}; };
@ -455,7 +451,6 @@ sioprobe(dev)
cy_nr_cd1400s[unit] = 0; cy_nr_cd1400s[unit] = 0;
sioregisterdev(dev); sioregisterdev(dev);
/* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */ /* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
cy_inb(iobase, CY16_RESET); /* XXX? */ cy_inb(iobase, CY16_RESET); /* XXX? */
DELAY(500); /* wait for the board to get its act together */ DELAY(500); /* wait for the board to get its act together */
@ -990,24 +985,6 @@ siodtrwakeup(chan)
wakeup(&com->dtr_wait); wakeup(&com->dtr_wait);
} }
/* Interrupt routine for timekeeping purposes */
void
siointrts(unit)
int unit;
{
/*
* XXX microtime() reenables CPU interrupts. We can't afford to
* be interrupted and don't want to slow down microtime(), so lock
* out interrupts in another way.
*/
outb(IO_ICU1 + 1, 0xff);
microtime(&intr_timestamp);
disable_intr();
outb(IO_ICU1 + 1, imen);
siointr(unit);
}
void void
siointr(unit) siointr(unit)
int unit; int unit;
@ -1064,10 +1041,6 @@ siointr(unit)
& CD1400_xIVR_CHAN)); & CD1400_xIVR_CHAN));
#endif #endif
if (com->do_timestamp)
/* XXX a little bloat here... */
com->timestamp = intr_timestamp;
if (serv_type & CD1400_RIVR_EXCEPTION) { if (serv_type & CD1400_RIVR_EXCEPTION) {
++com->recv_exception; ++com->recv_exception;
line_status = cd_inb(iobase, CD1400_RDSR); line_status = cd_inb(iobase, CD1400_RDSR);
@ -1109,6 +1082,8 @@ siointr(unit)
if (ioptr >= com->ibufend) if (ioptr >= com->ibufend)
CE_RECORD(com, CE_INTERRUPT_BUF_OVERFLOW); CE_RECORD(com, CE_INTERRUPT_BUF_OVERFLOW);
else { else {
if (com->do_timestamp)
microtime(&com->timestamp);
++com_events; ++com_events;
ioptr[0] = recv_data; ioptr[0] = recv_data;
ioptr[CE_INPUT_OFFSET] = line_status; ioptr[CE_INPUT_OFFSET] = line_status;
@ -1136,16 +1111,22 @@ siointr(unit)
if (count > ifree) { if (count > ifree) {
count -= ifree; count -= ifree;
com_events += ifree; com_events += ifree;
while (ifree-- != 0) { if (ifree != 0) {
recv_data = cd_inb(iobase, CD1400_RDSR); if (com->do_timestamp)
microtime(&com->timestamp);
do {
recv_data = cd_inb(iobase,
CD1400_RDSR);
#ifdef SOFT_HOTCHAR #ifdef SOFT_HOTCHAR
if (com->hotchar != 0 if (com->hotchar != 0
&& recv_data == com->hotchar) && recv_data
setsofttty(); == com->hotchar)
setsofttty();
#endif #endif
ioptr[0] = recv_data; ioptr[0] = recv_data;
ioptr[CE_INPUT_OFFSET] = 0; ioptr[CE_INPUT_OFFSET] = 0;
++ioptr; ++ioptr;
} while (--ifree != 0);
} }
com->delta_error_counts com->delta_error_counts
[CE_INTERRUPT_BUF_OVERFLOW] += count; [CE_INTERRUPT_BUF_OVERFLOW] += count;
@ -1158,6 +1139,8 @@ siointr(unit)
#endif #endif
} while (--count != 0); } while (--count != 0);
} else { } else {
if (com->do_timestamp)
microtime(&com->timestamp);
if (ioptr <= com->ihighwater if (ioptr <= com->ihighwater
&& ioptr + count > com->ihighwater && ioptr + count > com->ihighwater
&& com->state & CS_RTS_IFLOW) && com->state & CS_RTS_IFLOW)
@ -1225,6 +1208,11 @@ siointr(unit)
++com->mdm; ++com->mdm;
modem_status = cd_inb(iobase, CD1400_MSVR2); modem_status = cd_inb(iobase, CD1400_MSVR2);
if (modem_status != com->last_modem_status) { if (modem_status != com->last_modem_status) {
if (com->do_dcd_timestamp
&& !(com->last_modem_status & MSR_DCD)
&& modem_status & MSR_DCD)
microtime(&com->dcd_timestamp);
/* /*
* Schedule high level to handle DCD changes. Note * Schedule high level to handle DCD changes. Note
* that we don't use the delta bits anywhere. Some * that we don't use the delta bits anywhere. Some
@ -1503,6 +1491,10 @@ sioioctl(dev, cmd, data, flag, p)
com->do_timestamp = TRUE; com->do_timestamp = TRUE;
*(struct timeval *)data = com->timestamp; *(struct timeval *)data = com->timestamp;
break; break;
case TIOCDCDTIMESTAMP:
com->do_dcd_timestamp = TRUE;
*(struct timeval *)data = com->dcd_timestamp;
break;
default: default:
splx(s); splx(s);
return (ENOTTY); return (ENOTTY);

70
sys/i386/isa/cy.c
View File

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: cy.c,v 1.32 1996/05/02 09:34:34 phk Exp $ * $Id: cy.c,v 1.33 1996/06/12 05:03:36 gpalmer Exp $
*/ */
#include "cy.h" #include "cy.h"
@ -90,8 +90,6 @@
#include <machine/clock.h> #include <machine/clock.h>
#include <i386/isa/icu.h> /* XXX just to get at `imen' */
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h> #include <i386/isa/isa_device.h>
#include <i386/isa/cyreg.h> #include <i386/isa/cyreg.h>
#include <i386/isa/ic/cd1400.h> #include <i386/isa/ic/cd1400.h>
@ -132,7 +130,6 @@
#define sioioctl cyioctl #define sioioctl cyioctl
#define siointr cyintr #define siointr cyintr
#define siointr1 cyintr1 #define siointr1 cyintr1
#define siointrts cyintrts
#define sioopen cyopen #define sioopen cyopen
#define siopoll cypoll #define siopoll cypoll
#define sioprobe cyprobe #define sioprobe cyprobe
@ -282,7 +279,9 @@ struct com_s {
struct termios lt_out; struct termios lt_out;
bool_t do_timestamp; bool_t do_timestamp;
bool_t do_dcd_timestamp;
struct timeval timestamp; struct timeval timestamp;
struct timeval dcd_timestamp;
u_long bytes_in; /* statistics */ u_long bytes_in; /* statistics */
u_long bytes_out; u_long bytes_out;
@ -330,8 +329,7 @@ struct com_s {
* by `config', not here. * by `config', not here.
*/ */
/* Interrupt handling entry points. */ /* Interrupt handling entry point. */
inthand2_t siointrts;
void siopoll __P((void)); void siopoll __P((void));
/* Device switch entry points. */ /* Device switch entry points. */
@ -367,8 +365,6 @@ static char driver_name[] = "cy";
static struct com_s *p_com_addr[NSIO]; static struct com_s *p_com_addr[NSIO];
#define com_addr(unit) (p_com_addr[unit]) #define com_addr(unit) (p_com_addr[unit])
static struct timeval intr_timestamp;
struct isa_driver siodriver = { struct isa_driver siodriver = {
sioprobe, sioattach, driver_name sioprobe, sioattach, driver_name
}; };
@ -455,7 +451,6 @@ sioprobe(dev)
cy_nr_cd1400s[unit] = 0; cy_nr_cd1400s[unit] = 0;
sioregisterdev(dev); sioregisterdev(dev);
/* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */ /* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
cy_inb(iobase, CY16_RESET); /* XXX? */ cy_inb(iobase, CY16_RESET); /* XXX? */
DELAY(500); /* wait for the board to get its act together */ DELAY(500); /* wait for the board to get its act together */
@ -990,24 +985,6 @@ siodtrwakeup(chan)
wakeup(&com->dtr_wait); wakeup(&com->dtr_wait);
} }
/* Interrupt routine for timekeeping purposes */
void
siointrts(unit)
int unit;
{
/*
* XXX microtime() reenables CPU interrupts. We can't afford to
* be interrupted and don't want to slow down microtime(), so lock
* out interrupts in another way.
*/
outb(IO_ICU1 + 1, 0xff);
microtime(&intr_timestamp);
disable_intr();
outb(IO_ICU1 + 1, imen);
siointr(unit);
}
void void
siointr(unit) siointr(unit)
int unit; int unit;
@ -1064,10 +1041,6 @@ siointr(unit)
& CD1400_xIVR_CHAN)); & CD1400_xIVR_CHAN));
#endif #endif
if (com->do_timestamp)
/* XXX a little bloat here... */
com->timestamp = intr_timestamp;
if (serv_type & CD1400_RIVR_EXCEPTION) { if (serv_type & CD1400_RIVR_EXCEPTION) {
++com->recv_exception; ++com->recv_exception;
line_status = cd_inb(iobase, CD1400_RDSR); line_status = cd_inb(iobase, CD1400_RDSR);
@ -1109,6 +1082,8 @@ siointr(unit)
if (ioptr >= com->ibufend) if (ioptr >= com->ibufend)
CE_RECORD(com, CE_INTERRUPT_BUF_OVERFLOW); CE_RECORD(com, CE_INTERRUPT_BUF_OVERFLOW);
else { else {
if (com->do_timestamp)
microtime(&com->timestamp);
++com_events; ++com_events;
ioptr[0] = recv_data; ioptr[0] = recv_data;
ioptr[CE_INPUT_OFFSET] = line_status; ioptr[CE_INPUT_OFFSET] = line_status;
@ -1136,16 +1111,22 @@ siointr(unit)
if (count > ifree) { if (count > ifree) {
count -= ifree; count -= ifree;
com_events += ifree; com_events += ifree;
while (ifree-- != 0) { if (ifree != 0) {
recv_data = cd_inb(iobase, CD1400_RDSR); if (com->do_timestamp)
microtime(&com->timestamp);
do {
recv_data = cd_inb(iobase,
CD1400_RDSR);
#ifdef SOFT_HOTCHAR #ifdef SOFT_HOTCHAR
if (com->hotchar != 0 if (com->hotchar != 0
&& recv_data == com->hotchar) && recv_data
setsofttty(); == com->hotchar)
setsofttty();
#endif #endif
ioptr[0] = recv_data; ioptr[0] = recv_data;
ioptr[CE_INPUT_OFFSET] = 0; ioptr[CE_INPUT_OFFSET] = 0;
++ioptr; ++ioptr;
} while (--ifree != 0);
} }
com->delta_error_counts com->delta_error_counts
[CE_INTERRUPT_BUF_OVERFLOW] += count; [CE_INTERRUPT_BUF_OVERFLOW] += count;
@ -1158,6 +1139,8 @@ siointr(unit)
#endif #endif
} while (--count != 0); } while (--count != 0);
} else { } else {
if (com->do_timestamp)
microtime(&com->timestamp);
if (ioptr <= com->ihighwater if (ioptr <= com->ihighwater
&& ioptr + count > com->ihighwater && ioptr + count > com->ihighwater
&& com->state & CS_RTS_IFLOW) && com->state & CS_RTS_IFLOW)
@ -1225,6 +1208,11 @@ siointr(unit)
++com->mdm; ++com->mdm;
modem_status = cd_inb(iobase, CD1400_MSVR2); modem_status = cd_inb(iobase, CD1400_MSVR2);
if (modem_status != com->last_modem_status) { if (modem_status != com->last_modem_status) {
if (com->do_dcd_timestamp
&& !(com->last_modem_status & MSR_DCD)
&& modem_status & MSR_DCD)
microtime(&com->dcd_timestamp);
/* /*
* Schedule high level to handle DCD changes. Note * Schedule high level to handle DCD changes. Note
* that we don't use the delta bits anywhere. Some * that we don't use the delta bits anywhere. Some
@ -1503,6 +1491,10 @@ sioioctl(dev, cmd, data, flag, p)
com->do_timestamp = TRUE; com->do_timestamp = TRUE;
*(struct timeval *)data = com->timestamp; *(struct timeval *)data = com->timestamp;
break; break;
case TIOCDCDTIMESTAMP:
com->do_dcd_timestamp = TRUE;
*(struct timeval *)data = com->dcd_timestamp;
break;
default: default:
splx(s); splx(s);
return (ENOTTY); return (ENOTTY);