Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ir Implement input processing (untested).
details: https://anonhg.NetBSD.org/src/rev/620b657858ee
branches: trunk
changeset: 518716:620b657858ee
user: augustss <augustss%NetBSD.org@localhost>
date: Tue Dec 04 19:56:43 2001 +0000
description:
Implement input processing (untested).
diffstat:
sys/dev/ir/irframe_tty.c | 617 +++++++++++++++++++++-------------------------
1 files changed, 288 insertions(+), 329 deletions(-)
diffs (truncated from 814 to 300 lines):
diff -r 78bd20fcd3c8 -r 620b657858ee sys/dev/ir/irframe_tty.c
--- a/sys/dev/ir/irframe_tty.c Tue Dec 04 19:56:17 2001 +0000
+++ b/sys/dev/ir/irframe_tty.c Tue Dec 04 19:56:43 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.1 2001/12/03 23:32:32 augustss Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.2 2001/12/04 19:56:43 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,10 +45,12 @@
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/kernel.h>
+#include <sys/malloc.h>
#include <sys/conf.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/file.h>
+#include <sys/vnode.h>
#include <sys/poll.h>
#include <dev/ir/ir.h>
@@ -57,14 +59,16 @@
/* Macros to clear/set/test flags. */
#define SET(t, f) (t) |= (f)
-#define CLR(t, f) (t) &= ~((unsigned)(f))
+#define CLR(t, f) (t) &= ~(f)
#define ISSET(t, f) ((t) & (f))
#ifdef IRFRAMET_DEBUG
#define DPRINTF(x) if (irframetdebug) printf x
+#define Static
int irframetdebug = 1;
#else
#define DPRINTF(x)
+#define Static static
#endif
/* Protocol constants */
@@ -78,10 +82,40 @@
#define MAX_IRDA_FRAME 5000 /* XXX what is it? */
+struct frame {
+ u_char *buf;
+ u_int len;
+};
+#define MAXFRAMES 4
+
struct irframet_softc {
struct irframe_softc sc_irp;
struct tty *sc_tp;
+
+ int sc_state;
+#define IRT_RSLP 0x01 /* waiting for data (read) */
+#if 0
+#define IRT_WSLP 0x02 /* waiting for data (write) */
+#define IRT_CLOSING 0x04 /* waiting for output to drain */
+#endif
+
int sc_ebofs;
+
+ u_char* sc_inbuf;
+ int sc_maxsize;
+ int sc_framestate;
+#define FRAME_OUTSIDE 0
+#define FRAME_INSIDE 1
+#define FRAME_ESCAPE 2
+ int sc_inchars;
+ int sc_inFCS;
+ struct callout sc_timeout;
+
+ u_int sc_nframes;
+ u_int sc_framei;
+ u_int sc_frameo;
+ struct frame sc_frames[MAXFRAMES];
+ struct selinfo sc_rsel;
};
/* line discipline methods */
@@ -92,25 +126,30 @@
int irframetinput(int c, struct tty *tp);
int irframetstart(struct tty *tp);
-/* irframe methods */
-int irframet_open(void *h, int flag, int mode, struct proc *p);
-int irframet_close(void *h, int flag, int mode, struct proc *p);
-int irframet_read(void *h, struct uio *uio, int flag);
-int irframet_write(void *h, struct uio *uio, int flag);
-int irframet_poll(void *h, int events, struct proc *p);
-int irframet_set_params(void *h, struct irda_params *params);
-int irframet_reset_params(void *h);
-int irframet_get_speeds(void *h, int *speeds);
-int irframet_get_turnarounds(void *h, int *times);
-
-int irframet_write_buf(void *h, void *buf, size_t len);
-
+/* pseudo device init */
void irframettyattach(int);
-struct irframe_methods irframet_methods = {
+/* irframe methods */
+Static int irframet_open(void *h, int flag, int mode, struct proc *p);
+Static int irframet_close(void *h, int flag, int mode, struct proc *p);
+Static int irframet_read(void *h, struct uio *uio, int flag);
+Static int irframet_write(void *h, struct uio *uio, int flag);
+Static int irframet_poll(void *h, int events, struct proc *p);
+Static int irframet_set_params(void *h, struct irda_params *params);
+Static int irframet_get_speeds(void *h, int *speeds);
+Static int irframet_get_turnarounds(void *h, int *times);
+
+/* internal */
+Static int irt_write_buf(void *h, void *buf, size_t len);
+Static int irt_putc(int c, struct tty *tp);
+Static int irt_putesc(int c, struct tty *tp);
+Static void irt_frame(struct irframet_softc *sc, u_char *buf, u_int len);
+Static void irt_timeout(void *v);
+
+Static struct irframe_methods irframet_methods = {
irframet_open, irframet_close, irframet_read, irframet_write,
- irframet_poll, irframet_set_params, irframet_reset_params,
- irframet_get_speeds, irframet_get_speeds
+ irframet_poll, irframet_set_params,
+ irframet_get_speeds, irframet_get_turnarounds
};
void
@@ -119,6 +158,53 @@
}
/*
+ * CRC
+ */
+
+static const u_int16_t fcstab[] = {
+ 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
+ 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
+ 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
+ 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
+ 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
+ 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
+ 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
+ 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
+ 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
+ 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
+ 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
+ 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
+ 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
+ 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
+ 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
+ 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
+ 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
+ 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
+ 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
+ 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
+ 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
+ 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
+ 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
+ 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
+ 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
+ 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
+ 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
+ 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
+ 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
+ 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
+ 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
+ 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
+};
+
+static const u_int16_t INITFCS = 0xffff;
+static const u_int16_t GOODFCS = 0xf0b8;
+
+static __inline u_int16_t updateFCS(u_int16_t fcs, int c) {
+ return (fcs >> 8) ^ fcstab[(fcs^c) & 0xff];
+}
+
+
+/*
* Line specific open routine for async tty devices.
* Attach the given tty to the first available irframe unit.
* Called from device open routine or ttioctl.
@@ -149,7 +235,7 @@
}
}
- printf("%s attached at tty%d:", sc->sc_irp.sc_dev.dv_xname,
+ printf("%s attached at tty%02d:", sc->sc_irp.sc_dev.dv_xname,
minor(tp->t_dev));
tp->t_sc = irframe_alloc(sizeof (struct irframet_softc),
&irframet_methods, tp);
@@ -161,6 +247,15 @@
ttyflush(tp, FREAD | FWRITE);
splx(s);
+
+ sc->sc_ebofs = IRDA_DEFAULT_EBOFS;
+ sc->sc_maxsize = 0;
+ sc->sc_framestate = FRAME_OUTSIDE;
+ sc->sc_nframes = 0;
+ sc->sc_framei = 0;
+ sc->sc_frameo = 0;
+ callout_init(&sc->sc_timeout);
+
return (0);
}
@@ -175,15 +270,30 @@
{
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
int s;
+ int i;
DPRINTF(("%s: tp=%p\n", __FUNCTION__, tp));
+ callout_stop(&sc->sc_timeout);
+ s = splir();
+ if (sc->sc_inbuf != NULL) {
+ free(sc->sc_inbuf, M_DEVBUF);
+ sc->sc_inbuf = NULL;
+ }
+ for (i = 0; i < MAXFRAMES; i++) {
+ if (sc->sc_frames[i].buf != NULL) {
+ free(sc->sc_frames[i].buf, M_DEVBUF);
+ sc->sc_frames[i].buf = NULL;
+ }
+ }
+ splx(s);
+
s = spltty();
ttyflush(tp, FREAD | FWRITE);
tp->t_linesw = linesw[0]; /* default line discipline */
if (sc != NULL) {
tp->t_sc = NULL;
- printf("%s detached from tty%d\n", sc->sc_irp.sc_dev.dv_xname,
+ printf("%s detached from tty%02d\n", sc->sc_irp.sc_dev.dv_xname,
minor(tp->t_dev));
if (sc->sc_tp == tp)
@@ -248,6 +358,41 @@
return (0);
}
+void
+irt_frame(struct irframet_softc *sc, u_char *buf, u_int len)
+{
+ if (sc->sc_nframes >= MAXFRAMES) {
+#ifdef IRFRAMET_DEBUG
+ printf("%s: dropped frame\n", __FUNCTION__);
+#endif
+ return;
+ }
+ if (sc->sc_frames[sc->sc_framei].buf == NULL)
+ return;
+ memcpy(sc->sc_frames[sc->sc_framei].buf, buf, len);
+ sc->sc_frames[sc->sc_framei].len = len;
+ sc->sc_framei = (sc->sc_framei+1) % MAXFRAMES;
+ sc->sc_nframes++;
+ if (sc->sc_state & IRT_RSLP) {
+ sc->sc_state &= ~IRT_RSLP;
+ DPRINTF(("%s: waking up reader\n", __FUNCTION__));
+ wakeup(sc->sc_frames);
+ }
+ selwakeup(&sc->sc_rsel);
+}
+
+void
+irt_timeout(void *v)
+{
+ struct irframet_softc *sc = v;
+
+#ifdef IRFRAMET_DEBUG
+ if (sc->sc_framestate != FRAME_OUTSIDE)
+ printf("%s: input frame timeout\n", __FUNCTION__);
+#endif
+ sc->sc_framestate = FRAME_OUTSIDE;
+}
+
int
irframetinput(int c, struct tty *tp)
{
@@ -257,288 +402,59 @@
if (sc == NULL || tp != (struct tty *)sc->sc_tp)
return (0);
-#if 0
-
- ++tk_nin;
- ++sc->sc_stats.irframe_ibytes;
-
- if (c & TTY_FE) {
- /* framing error or overrun on this char - abort packet */
- if (sc->sc_flags & SC_DEBUG)
- printf("%s: bad char %x\n", sc->sc_if.if_xname, c);
- goto flush;
- }
-
- c &= 0xff;
-
Home |
Main Index |
Thread Index |
Old Index