diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-26 15:35:18 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-26 15:35:18 +0000 |
| commit | 522370568a7e1ff9f9c84cf277a796ca18a945df (patch) | |
| tree | 5e7987626740c4b1ab8a063af3f8ea89b3be934a /sys/arch | |
| parent | 3dc2115b1effca39cdb1a9e361df7b7f444f7816 (diff) | |
correct newlines surrounding the sub-bus configuration, and unify
pchb's further
ok reyk oga
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/pci/pchb.c | 7 | ||||
| -rw-r--r-- | sys/arch/i386/pci/pchb.c | 20 |
2 files changed, 13 insertions, 14 deletions
diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c index 571bdc5b814..0c8039255ca 100644 --- a/sys/arch/amd64/pci/pchb.c +++ b/sys/arch/amd64/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.13 2007/11/26 10:35:42 reyk Exp $ */ +/* $OpenBSD: pchb.c,v 1.14 2007/11/26 15:35:17 deraadt Exp $ */ /* $NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -192,6 +192,7 @@ pchbattach(struct device *parent, struct device *self, void *aux) switch (PCI_VENDOR(pa->pa_id)) { case PCI_VENDOR_AMD: + printf("\n"); switch (PCI_PRODUCT(pa->pa_id)) { case PCI_PRODUCT_AMD_AMD64_HT: for (i = 0; i < AMD64HT_NUM_LDT; i++) @@ -200,6 +201,7 @@ pchbattach(struct device *parent, struct device *self, void *aux) } break; case PCI_VENDOR_INTEL: + printf("\n"); switch (PCI_PRODUCT(pa->pa_id)) { case PCI_PRODUCT_INTEL_82915G_HB: case PCI_PRODUCT_INTEL_82925X_HB: @@ -244,7 +246,6 @@ pchbattach(struct device *parent, struct device *self, void *aux) } break; } - printf("\n"); /* * If we haven't detected AGP yet (via a product ID), @@ -253,11 +254,9 @@ pchbattach(struct device *parent, struct device *self, void *aux) if (has_agp || pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP, NULL, NULL) != 0) { - printf("\n"); apa.apa_busname = "agp"; apa.apa_pci_args = *pa; config_found(self, &apa, agpbus_print); - printf("\n"); } } diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c index 6173e3f8612..f6e3c5c63ea 100644 --- a/sys/arch/i386/pci/pchb.c +++ b/sys/arch/i386/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.59 2007/11/26 10:35:42 reyk Exp $ */ +/* $OpenBSD: pchb.c,v 1.60 2007/11/26 15:35:17 deraadt Exp $ */ /* $NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $ */ /* @@ -144,7 +144,7 @@ struct cfdriver pchb_cd = { }; void pchb_rnd(void *v); -void pchb_amd64ht_attach (struct device *, struct pci_attach_args *, int); +void pchb_amd64ht_attach(struct device *, struct pci_attach_args *, int); const struct pci_matchid via_devices[] = { { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C586_PWR }, @@ -199,19 +199,20 @@ pchbattach(struct device *parent, struct device *self, void *aux) switch (PCI_VENDOR(pa->pa_id)) { case PCI_VENDOR_AMD: + printf("\n"); switch (PCI_PRODUCT(pa->pa_id)) { case PCI_PRODUCT_AMD_SC751_SC: case PCI_PRODUCT_AMD_762_PCHB: - has_agp =1; /* XXX is this detected otherwise */ + has_agp = 1; /* XXX is this detected otherwise */ break; case PCI_PRODUCT_AMD_AMD64_HT: - printf("\n"); for (i = 0; i < AMD64HT_NUM_LDT; i++) pchb_amd64ht_attach(self, pa, i); break; } break; case PCI_VENDOR_RCC: + printf("\n"); bdnum = pci_conf_read(pa->pa_pc, pa->pa_tag, 0x44); if (bdnum >= (sizeof(rcc_bus_visited) * 8) || (rcc_bus_visited & (1 << bdnum))) @@ -341,9 +342,11 @@ pchbattach(struct device *parent, struct device *self, void *aux) has_agp = 1; break; } + printf("\n"); + break; + default: + printf("\n"); break; - default: - break; } /* @@ -411,11 +414,9 @@ pchbattach(struct device *parent, struct device *self, void *aux) if (has_agp || pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP, NULL, NULL) != 0) { - printf("\n"); apa.apa_busname = "agp"; apa.apa_pci_args = *pa; config_found(self, &apa, agpbus_print); - printf("\n"); } if (doattach) { @@ -427,7 +428,6 @@ pchbattach(struct device *parent, struct device *self, void *aux) pba.pba_bus = pbnum; pba.pba_bridgetag = NULL; pba.pba_pc = pa->pa_pc; - printf("\n"); config_found(self, &pba, pchb_print); pba.pba_bridgetag = NULL; memset(&pba.pba_intrtag, 0, sizeof(pba.pba_intrtag)); @@ -483,7 +483,7 @@ pchb_rnd(void *v) } void -pchb_amd64ht_attach (struct device *self, struct pci_attach_args *pa, int i) +pchb_amd64ht_attach(struct device *self, struct pci_attach_args *pa, int i) { struct pcibus_attach_args pba; pcireg_t type, bus; |