cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

zynq: remove uartconsole() function, already done by devuart internally

Browse source
This commit is contained in:
cinap_lenrek 2023-11-12 17:13:40 +00:00
parent ddbe5dd29a
commit e2ddc61fed
3 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/src/9/zynq/fns.h
View file

@ -24,7 +24,7 @@ void kunmap(KMap *);
#define VA(k) ((void*)(k))
#define PTR2UINT(p) ((uintptr)(p))
void uartinit(void);
void uartconsinit(void);
void mmuinit(void);
uintptr ttbget(void);
void ttbput(uintptr);
@ -50,7 +50,6 @@ void l1switch(L1 *, int);
void intrenable(int, void (*)(Ureg *, void *), void *, int, char *);
void intrinit(void);
int intr(Ureg *);
int uartconsole(void);
long fbctlread(Chan*,void*,long,vlong);
long fbctlwrite(Chan*,void*,long,vlong);
void fpoff(void);

3
sys/src/9/zynq/main.c
View file

@ -206,7 +206,6 @@ init0(void)
int i;
chandevinit();
uartconsole();
if(!waserror()){
ksetenv("cputype", "arm", 0);
@ -321,7 +320,7 @@ main(void)
schedinit();
return;
}
uartinit();
uartconsinit();
mmuinit();
l2init();
intrinit();

22
sys/src/9/zynq/uartzynq.c
View file

@ -30,8 +30,6 @@ typedef struct Ctlr {
int irq, iena;
} Ctlr;
Uart* uartenable(Uart *);
extern PhysUart zynqphysuart;
static Ctlr zctlr[1] = {
@ -53,9 +51,11 @@ static Uart zuart[1] = {
};
void
uartinit(void)
uartconsinit(void)
{
consuart = zuart;
uartctl(consuart, "l8 pn s1");
uartputs(kmesg.buf, kmesg.n);
}
static Uart *
@ -147,22 +147,6 @@ zuartputc(Uart *uart, int c)
return;
}
int
uartconsole(void)
{
Uart *uart = zuart;
if(up == nil)
return -1;
if(uartenable(uart) != nil){
serialoq = uart->oq;
uart->opens++;
consuart = uart;
}
return 0;
}
int
zuartbits(Uart *uart, int n)
{