Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Belatedly catch up with MI com(4) change in com.c rev. 1.351: 

http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/ic/com.c#rev1.351

XXX
pullup to netbsd-9
This commit is contained in:
rin 2019-12-15 09:38:40 +00:00
parent c3c15a2869
commit d83f8a8ef1
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/arch/powerpc/ibm4xx/dev/com_opb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_opb.c,v 1.22 2018/12/08 17:46:12 thorpej Exp $ */
/* $NetBSD: com_opb.c,v 1.23 2019/12/15 09:38:40 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.22 2018/12/08 17:46:12 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.23 2019/12/15 09:38:40 rin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -143,9 +143,6 @@ void
com_opb_cnattach(int com_freq, int conaddr, int conspeed, int conmode)
{
static int attached = 0;
#if (NCOM > 0)
struct com_regs regs;
#endif
if (attached)
return;
@ -153,12 +150,8 @@ com_opb_cnattach(int com_freq, int conaddr, int conspeed, int conmode)
#if (NCOM > 0)
/* We *know* the com-console attaches to opb */
regs.cr_iot = opb_get_bus_space_tag();
regs.cr_iobase = conaddr;
regs.cr_nports = COM_NPORTS;
/* regs.ioh is initialized by comcnattach */
if (comcnattach1(&regs, conspeed, com_freq, COM_TYPE_NORMAL, conmode))
if (comcnattach(opb_get_bus_space_tag(), conaddr, conspeed, com_freq,
COM_TYPE_NORMAL, conmode))
panic("can't init serial console @%x", conaddr);
else
return;