From e0a2b8d82a5521d9391ca8c6f055777954c76c2f Mon Sep 17 00:00:00 2001 From: "Charles.Forsyth" Date: Wed, 25 Mar 2009 16:37:32 +0000 Subject: x20090315-1636 --- emu/port/devcons.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'emu/port/devcons.c') diff --git a/emu/port/devcons.c b/emu/port/devcons.c index 8e823839..00fbd4d8 100644 --- a/emu/port/devcons.c +++ b/emu/port/devcons.c @@ -333,20 +333,7 @@ consread(Chan *c, void *va, long n, vlong offset) return readstr(offset, va, n, buf); case Qdrivers: - p = malloc(READSTR); - if(p == nil) - error(Enomem); - l = 0; - for(i = 0; devtab[i] != nil; i++) - l += snprint(p+l, READSTR-l, "#%C %s\n", devtab[i]->dc, devtab[i]->name); - if(waserror()){ - free(p); - nexterror(); - } - n = readstr(offset, va, n, p); - poperror(); - free(p); - return n; + return devtabread(c, buf, n, off); case Qmemory: return poolread(va, n, offset); @@ -611,7 +598,9 @@ Dev consdevtab = { 'c', "cons", + devreset, consinit, + devshutdown, consattach, conswalk, consstat, -- cgit v1.2.3