Sun Oct 11 08:46:43 2015 UTC ()

Felix Deichmann in PR port-alpha/50326: cosmetic patch for Pyxis attach
message.


(martin)

diff -r1.73 -r1.74 src/sys/arch/alpha/pci/cia.c

--- src/sys/arch/alpha/pci/cia.c 2012/02/06 02:14:14	1.73
+++ src/sys/arch/alpha/pci/cia.c 2015/10/11 08:46:43	1.74

 @@ -1,14 +1,14 @@
-/* $NetBSD: cia.c,v 1.73 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: cia.c,v 1.74 2015/10/11 08:46:43 martin Exp $ */
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -55,27 +55,27 @@
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include "opt_dec_eb164.h"
 #include "opt_dec_kn20aa.h"
 #include "opt_dec_550.h"
 #include "opt_dec_1000a.h"
 #include "opt_dec_1000.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.73 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.74 2015/10/11 08:46:43 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
 #include <machine/sysarch.h>
 #include <machine/alpha.h>
 #include <dev/isa/isareg.h>
 @@ -258,50 +258,47 @@ cia_init(struct cia_config *ccp, int mal
 	alpha_pci_chipset = &ccp->cc_pc;
 	ccp->cc_initted = 1;
+}
 void
 ciaattach(device_t parent, device_t self, void *aux)
+{
 	struct cia_softc *sc = device_private(self);
 	struct cia_config *ccp;
 	struct pcibus_attach_args pba;
 	char bits[64];
 	const char *name;
 	int pass;
 	/* note that we've attached the chipset; can't have 2 CIAs. */
 	ciafound = 1;
 	sc->sc_dev = self;
 	/*
 	 * set up the chipset's info; done once at console init time
 	 * (maybe), but we must do it here as well to take care of things
 	 * that need to use memory allocation.
 	 */
 	ccp = sc->sc_ccp = &cia_configuration;
 	cia_init(ccp, 1);
 	if (ccp->cc_flags & CCF_ISPYXIS) {
 		name = "Pyxis";
 		pass = ccp->cc_rev;
 	} else {
 		name = "ALCOR/ALCOR2";
 		pass = ccp->cc_rev + 1;
+	}
 	aprint_normal(": DECchip 2117x Core Logic Chipset (%s), pass %d\n",
-	    name, pass);
+	    name, ccp->cc_rev + 1);
 	if (ccp->cc_cnfg) {
 		snprintb(bits, sizeof(bits), CIA_CSR_CNFG_BITS, ccp->cc_cnfg);
 		aprint_normal_dev(self, "extended capabilities: %s\n", bits);
+	}
 	switch (ccp->cc_flags & (CCF_PCI_USE_BWX|CCF_BUS_USE_BWX)) {
 	case CCF_PCI_USE_BWX|CCF_BUS_USE_BWX:
 		name = "PCI config and bus";
 		break;
 	case CCF_PCI_USE_BWX:
 		name = "PCI config";
 		break;
 	case CCF_BUS_USE_BWX: