xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel/rdb: need to reenable polling mode on the uart, remove cruft

Browse source
This commit is contained in:
cinap_lenrek 2021-11-07 17:58:52 +00:00
parent 9eb192f586
commit a87ce74d60
1 changed files with 22 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
sys/src/9/port/rdb.c
View file

@ -6,51 +6,27 @@
#include "io.h"
#include "ureg.h"
#define DBG if(0)scrprint
#pragma varargck argpos scrprint 1
static Ureg ureg;
static void
scrprint(char *fmt, ...)
{
char buf[128];
va_list va;
int n;
va_start(va, fmt);
n = vseprint(buf, buf+sizeof buf, fmt, va)-buf;
va_end(va);
putstrn(buf, n);
}
static char*
getline(void)
{
static char buf[128];
int i, c;
for(;;){
for(i=0; i<nelem(buf) && (c=uartgetc()) != '\n'; i++){
DBG("%c...", c);
for(i = 0; i < sizeof(buf)-1 && (c=uartgetc()) != '\n'; i++)
buf[i] = c;
}
if(i < nelem(buf)){
buf[i] = 0;
return buf;
}
}
}
static void*
addr(char *s, Ureg *ureg, char **p)
{
ulong a;
uvlong a;
a = strtoul(s, p, 16);
a = strtoull(s, p, 16);
if(a < sizeof(Ureg))
return ((uchar*)ureg)+a;
return (void*)a;
return (void*)(uintptr)a;
}
static void
@ -59,18 +35,27 @@ talkrdb(Ureg *ureg)
uchar *a;
char *p, *req;
serialoq = nil; /* turn off serial console */
if(consuart == nil)
return;
if(serialoq != nil){
qhangup(serialoq, nil);
if(consuart->phys->disable != nil)
consuart->phys->disable(consuart);
if(consuart->phys->enable != nil)
consuart->phys->enable(consuart, 0);
serialoq = nil;
}
kprintoq = nil; /* turn off /dev/kprint if active */
// scrprint("Plan 9 debugger\n");
iprint("Edebugger reset\n");
for(;;){
req = getline();
switch(*req){
case 'r':
a = addr(req+1, ureg, nil);
DBG("read %p\n", a);
iprint("R%.8lux %.2ux %.2ux %.2ux %.2ux\n",
strtoul(req+1, 0, 16), a[0], a[1], a[2], a[3]);
iprint("R%.8zux %.2ux %.2ux %.2ux %.2ux\n",
(uintptr)a, a[0], a[1], a[2], a[3]);
break;
case 'w':
@ -78,22 +63,8 @@ talkrdb(Ureg *ureg)
*(ulong*)a = strtoul(p, nil, 16);
iprint("W\n");
break;
/*
* case Tmput:
n = min[4];
if(n > 4){
mesg(Rerr, Ecount);
break;
}
a = addr(min+0);
scrprint("mput %.8lux\n", a);
memmove(a, min+5, n);
mesg(Rmput, mout);
break;
*
*/
default:
DBG("unknown %c\n", *req);
iprint("Eunknown message\n");
break;
}