diff options
| -rw-r--r-- | sys/dev/pci/cy_pci.c | 148 |
1 files changed, 74 insertions, 74 deletions
diff --git a/sys/dev/pci/cy_pci.c b/sys/dev/pci/cy_pci.c index f174dbe2df5..1ffb003d35b 100644 --- a/sys/dev/pci/cy_pci.c +++ b/sys/dev/pci/cy_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy_pci.c,v 1.5 2000/12/10 11:12:07 deraadt Exp $ */ +/* $OpenBSD: cy_pci.c,v 1.6 2001/06/29 00:16:32 smart Exp $ */ /* * cy.c @@ -61,7 +61,7 @@ int cy_probe_common __P((int card, bus_space_tag_t, void cyattach __P((struct device *, struct device *, void *)); struct cfattach cy_pci_ca = { - sizeof(struct cy_softc), cy_probe_pci, cyattach + sizeof(struct cy_softc), cy_probe_pci, cyattach }; /* @@ -69,85 +69,85 @@ struct cfattach cy_pci_ca = { */ int cy_probe_pci(parent, match, aux) - struct device *parent; - void *match, *aux; + struct device *parent; + void *match, *aux; { - int card = ((struct device *)match)->dv_unit; - struct pci_attach_args *pa = aux; - bus_space_tag_t memt; - bus_space_handle_t memh; - bus_addr_t memaddr; - bus_size_t memsize; - bus_space_tag_t iot; - bus_space_handle_t ioh; - bus_addr_t iobase; - bus_size_t iosize; - int cacheable; - int plx_ver; - - if(!(PCI_VENDOR(pa->pa_id) == PCI_VENDOR_CYCLADES && - (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CYCLADES_CYCLOMY_1 || - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CYCLADES_CYCLOMY_2))) - return 0; + int card = ((struct device *)match)->dv_unit; + struct pci_attach_args *pa = aux; + bus_space_tag_t memt; + bus_space_handle_t memh; + bus_addr_t memaddr; + bus_size_t memsize; + bus_space_tag_t iot; + bus_space_handle_t ioh; + bus_addr_t iobase; + bus_size_t iosize; + int cacheable; + int plx_ver; + + if (!(PCI_VENDOR(pa->pa_id) == PCI_VENDOR_CYCLADES && + (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CYCLADES_CYCLOMY_1 || + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CYCLADES_CYCLOMY_2))) + return (0); #ifdef CY_DEBUG - printf("cy: Found Cyclades PCI device, id = 0x%x\n", pa->pa_id); + printf("cy: Found Cyclades PCI device, id = 0x%x\n", pa->pa_id); #endif - memt = pa->pa_memt; - iot = pa->pa_iot; - - if(pci_mem_find(pa->pa_pc, pa->pa_tag, 0x18, - &memaddr, &memsize, &cacheable) != 0) { - printf("cy%d: can't find PCI card memory", card); - return 0; - } - - /* map the memory (non-cacheable) */ - if(bus_space_map(memt, memaddr, memsize, 0, &memh) != 0) { - printf("cy%d: couldn't map PCI memory region\n", card); - return 0; - } - - /* the PCI Cyclom IO space is only used for enabling interrupts */ - if(pci_io_find(pa->pa_pc, pa->pa_tag, 0x14, &iobase, &iosize) != 0) { - bus_space_unmap(memt, memh, memsize); - printf("cy%d: couldn't find PCI io region\n", card); - return 0; - } - - if(bus_space_map(iot, iobase, iosize, 0, &ioh) != 0) { - bus_space_unmap(memt, memh, memsize); - printf("cy%d: couldn't map PCI io region\n", card); - return 0; - } + memt = pa->pa_memt; + iot = pa->pa_iot; + + if (pci_mem_find(pa->pa_pc, pa->pa_tag, 0x18, + &memaddr, &memsize, &cacheable) != 0) { + printf("cy%d: can't find PCI card memory", card); + return (0); + } + + /* map the memory (non-cacheable) */ + if (bus_space_map(memt, memaddr, memsize, 0, &memh) != 0) { + printf("cy%d: couldn't map PCI memory region\n", card); + return (0); + } + + /* the PCI Cyclom IO space is only used for enabling interrupts */ + if (pci_io_find(pa->pa_pc, pa->pa_tag, 0x14, &iobase, &iosize) != 0) { + bus_space_unmap(memt, memh, memsize); + printf("cy%d: couldn't find PCI io region\n", card); + return (0); + } + + if (bus_space_map(iot, iobase, iosize, 0, &ioh) != 0) { + bus_space_unmap(memt, memh, memsize); + printf("cy%d: couldn't map PCI io region\n", card); + return (0); + } #ifdef CY_DEBUG - printf("cy%d: pci mapped mem 0x%lx (size %d), io 0x%x (size %d)\n", - card, memaddr, memsize, iobase, iosize); + printf("cy%d: pci mapped mem 0x%lx (size %d), io 0x%x (size %d)\n", + card, memaddr, memsize, iobase, iosize); #endif - if(cy_probe_common(card, memt, memh, CY_BUSTYPE_PCI) == 0) { - bus_space_unmap(memt, memh, memsize); - bus_space_unmap(iot, ioh, iosize); - printf("cy%d: PCI Cyclom card with no CD1400s!?\n", card); - return 0; - } - - /* Get PLX version */ - plx_ver = bus_space_read_1(memt, memh, CY_PLX_VER) & 0x0f; - - /* Enable PCI card interrupts */ - switch (plx_ver) { - case CY_PLX_9050: - bus_space_write_2(iot, ioh, CY_PCI_INTENA_9050, - bus_space_read_2(iot, ioh, CY_PCI_INTENA_9050) | 0x40); - break; - case CY_PLX_9060: - case CY_PLX_9080: - default: - bus_space_write_2(iot, ioh, CY_PCI_INTENA, - bus_space_read_2(iot, ioh, CY_PCI_INTENA) | 0x900); - } - return 1; + if (cy_probe_common(card, memt, memh, CY_BUSTYPE_PCI) == 0) { + bus_space_unmap(memt, memh, memsize); + bus_space_unmap(iot, ioh, iosize); + printf("cy%d: PCI Cyclom card with no CD1400s!?\n", card); + return (0); + } + + /* Get PLX version */ + plx_ver = bus_space_read_1(memt, memh, CY_PLX_VER) & 0x0f; + + /* Enable PCI card interrupts */ + switch (plx_ver) { + case CY_PLX_9050: + bus_space_write_2(iot, ioh, CY_PCI_INTENA_9050, + bus_space_read_2(iot, ioh, CY_PCI_INTENA_9050) | 0x40); + break; + case CY_PLX_9060: + case CY_PLX_9080: + default: + bus_space_write_2(iot, ioh, CY_PCI_INTENA, + bus_space_read_2(iot, ioh, CY_PCI_INTENA) | 0x900); + } + return (1); } |