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

Remove some extra printfs, now that Matt has lessened my confusion.

Browse Source
This commit is contained in:
thorpej 1996-05-20 15:52:32 +00:00
parent 64331ae191
commit bc16409b49
3 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/eisa/if_fea.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fea.c,v 1.2 1996/05/20 00:34:03 thorpej Exp $ */
/* $NetBSD: if_fea.c,v 1.3 1996/05/20 15:52:32 thorpej Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@ -462,27 +462,14 @@ pdq_eisa_attach(
pdq_uint32_t irq, maddr, msize;
eisa_intr_handle_t ih;
const char *intrstr;
const char *model;
sc->sc_bc = ea->ea_bc;
bcopy(sc->sc_dev.dv_xname, sc->sc_if.if_xname, IFNAMSIZ);
sc->sc_if.if_flags = 0;
sc->sc_if.if_softc = sc;
if (strcmp(ea->ea_idstring, "DEC3001") == 0)
model = EISA_PRODUCT_DEC3001;
else if (strcmp(ea->ea_idstring, "DEC3002") == 0)
model = EISA_PRODUCT_DEC3002;
else if (strcmp(ea->ea_idstring, "DEC3003") == 0)
model = EISA_PRODUCT_DEC3003;
else if (strcmp(ea->ea_idstring, "DEC3004") == 0)
model = EISA_PRODUCT_DEC3004;
else
model = "unknown model!";
printf(": %s\n", model);
if (bus_io_map(sc->sc_bc, EISA_SLOT_ADDR(ea->ea_slot), EISA_SLOT_SIZE, &sc->sc_iobase)) {
printf("%s: failed to map I/O!\n", sc->sc_dev.dv_xname);
printf("\n%s: failed to map I/O!\n", sc->sc_dev.dv_xname);
return;
}
@ -490,14 +477,14 @@ pdq_eisa_attach(
#if !defined(PDQ_IOMAPPED)
if (maddr == 0 || msize == 0) {
printf("%s: error: memory not enabled! ECU reconfiguration required\n",
printf("\n%s: error: memory not enabled! ECU reconfiguration required\n",
sc->sc_dev.dv_xname);
return;
}
if (bus_mem_map(sc->sc_bc, maddr, msize, 0, &sc->sc_membase)) {
bus_io_unmap(sc->sc_bc, sc->sc_iobase, EISA_SLOT_SIZE);
printf("%s: failed to map memory!\n", sc->sc_dev.dv_xname);
printf("\n%s: failed to map memory!\n", sc->sc_dev.dv_xname);
return;
}
#endif

22
sys/dev/pci/if_fpa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fpa.c,v 1.10 1996/05/20 00:30:49 thorpej Exp $ */
/* $NetBSD: if_fpa.c,v 1.11 1996/05/20 15:53:02 thorpej Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@ -386,7 +386,6 @@ pdq_pci_attach(
pdq_uint32_t data;
pci_intr_handle_t intrhandle;
const char *intrstr;
const char *model;
#ifdef PDQ_IOMAPPED
bus_io_addr_t iobase;
bus_io_size_t iosize;
@ -395,17 +394,6 @@ pdq_pci_attach(
bus_mem_size_t memsize;
#endif
switch (PCI_PRODUCT(pa->pa_id)) {
case PCI_PRODUCT_DEC_DEFPA:
model = "Digital Equipment DEFPA FDDI Controller";
break;
default:
model = "unknown model!";
break;
}
printf(": %s\n", model);
data = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_CFLT);
if ((data & 0xFF00) < (DEFPA_LATENCY << 8)) {
data &= ~0xFF00;
@ -420,12 +408,16 @@ pdq_pci_attach(
#ifdef PDQ_IOMAPPED
if (pci_io_find(pa->pa_pc, pa->pa_tag, PCI_CBIO, &iobase, &iosize)
|| bus_io_map(pa->pa_bc, iobase, iosize, &sc->sc_iobase))
|| bus_io_map(pa->pa_bc, iobase, iosize, &sc->sc_iobase)){
printf("\n%s: can't map I/O space!\n", sc->sc_dev.dv_xname);
return;
}
#else
if (pci_mem_find(pa->pa_pc, pa->pa_tag, PCI_CBMA, &membase, &memsize, NULL)
|| bus_mem_map(pa->pa_bc, membase, memsize, 0, &sc->sc_membase))
|| bus_mem_map(pa->pa_bc, membase, memsize, 0, &sc->sc_membase)) {
printf("\n%s: can't map memory space!\n", sc->sc_dev.dv_xname);
return;
}
#endif
sc->sc_pdq = pdq_initialize(sc->sc_bc, sc->sc_membase,

8
sys/dev/tc/if_fta.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fta.c,v 1.3 1996/05/20 01:31:07 cgd Exp $ */
/* $NetBSD: if_fta.c,v 1.4 1996/05/20 15:53:09 thorpej Exp $ */
/*-
* Copyright (c) 1996 Matt Thomas <matt@3am-software.com>
@ -91,11 +91,11 @@ pdq_tc_attach(
sc->sc_if.if_flags = 0;
sc->sc_if.if_softc = sc;
printf(": DEFTA FDDI Controller\n");
if (bus_mem_map(sc->sc_bc, ta->ta_addr + PDQ_TC_CSR_OFFSET,
PDQ_TC_CSR_SPACE, 0, &sc->sc_membase))
PDQ_TC_CSR_SPACE, 0, &sc->sc_membase)) {
printf("\n%s: can't map card memory!\n", sc->sc_dev.dv_xname);
return;
}
sc->sc_pdq = pdq_initialize(sc->sc_bc, sc->sc_membase,
sc->sc_if.if_xname, 0,