2nd try. Fix errors (hopefully) that prevented this from compiling. This

has not been tested, as I lack the tools necessary to build this (and can't
bootstrap pmppc toolchain for some reason.)

Requested by garbled@
This commit is contained in:
gdamore 2006-08-16 21:28:36 +00:00
parent 035291d378
commit f943f04933

View File

@ -1,4 +1,4 @@
/* $NetBSD: com_cpcbus.c,v 1.7 2006/07/13 22:56:02 gdamore Exp $ */ /* $NetBSD: com_cpcbus.c,v 1.8 2006/08/16 21:28:36 gdamore Exp $ */
/* /*
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com_cpcbus.c,v 1.7 2006/07/13 22:56:02 gdamore Exp $"); __KERNEL_RCSID(0, "$NetBSD: com_cpcbus.c,v 1.8 2006/08/16 21:28:36 gdamore Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/device.h> #include <sys/device.h>
@ -80,14 +80,12 @@ com_cpc_attach(struct device *parent, struct device *self, void *aux)
int irq = caa->cpca_irq; int irq = caa->cpca_irq;
bus_space_handle_t ioh; bus_space_handle_t ioh;
sc->sc_com.sc_iobase = iobase;
if (!com_is_console(caa->cpca_tag, iobase, &ioh) && if (!com_is_console(caa->cpca_tag, iobase, &ioh) &&
bus_space_map(caa->cpca_tag, iobase, COM_NPORTS, 0, &ioh)) { bus_space_map(caa->cpca_tag, iobase, COM_NPORTS, 0, &ioh)) {
printf("%s: can't map i/o space\n", self->dv_xname); printf("%s: can't map i/o space\n", self->dv_xname);
return; return;
} }
COM_INIT_REGS(sc->sc_regs, caa->cpca_tag, ioh, iobase); COM_INIT_REGS(sc->sc_com.sc_regs, caa->cpca_tag, ioh, iobase);
sc->sc_com.sc_frequency = CPC_COM_SPEED(caa->cpca_freq); sc->sc_com.sc_frequency = CPC_COM_SPEED(caa->cpca_freq);