devether: remove duplicated parseether() implementation (pull from libip)

[plan9front.git] / sys / src / 9 / omap / devuart.c

diff --git a/sys/src/9/omap/devuart.c b/sys/src/9/omap/devuart.c
old mode 100755 (executable)
new mode 100644 (file)
index af4fce7..59abbcb
--- a/sys/src/9/omap/devuart.c
+++ b/sys/src/9/omap/devuart.c
@@ -47,7 +47,7 @@ uartenable(Uart *p)
 //             return nil;
 
        if(p->iq == nil){
-               if((p->iq = qopen(8*1024, 0, uartflow, p)) == nil)
+               if((p->iq = qopen(8*1024, Qcoalesce, uartflow, p)) == nil)
                        return nil;
        }
        else
@@ -124,33 +124,6 @@ uartdisable(Uart *p)
        iunlock(&uartalloc);
 }
 
-void
-uartmouse(Uart* p, int (*putc)(Queue*, int), int setb1200)
-{
-       qlock(p);
-       if(p->opens++ == 0 && uartenable(p) == nil){
-               qunlock(p);
-               error(Enodev);
-       }
-       if(setb1200)
-               uartctl(p, "b1200");
-       p->putc = putc;
-       p->special = 1;
-       qunlock(p);
-}
-
-void
-uartsetmouseputc(Uart* p, int (*putc)(Queue*, int))
-{
-       qlock(p);
-       if(p->opens == 0 || p->special == 0){
-               qunlock(p);
-               error(Enodev);
-       }
-       p->putc = putc;
-       qunlock(p);
-}
-
 static void
 setlength(int i)
 {
@@ -225,11 +198,8 @@ uartreset(void)
                p->dev = i;
                if(p->console || p->special){
                        if(uartenable(p) != nil){
-                               if(p->console && up){
-                                       kbdq = p->iq;
+                               if(p->console && up)
                                        serialoq = p->oq;
-                                       p->putc = kbdcr2nl;
-                               }
                                p->opens++;
                        }
                }