[src/netbsd-8]: src/sys/arch/hppa Pull up following revision(s) (requested by...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5348e07922e8
branches:  netbsd-8
changeset: 852340:5348e07922e8
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Apr 20 13:57:24 2019 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #1235):

        sys/arch/hppa/conf/files.hppa: revision 1.20
        sys/arch/hppa/dev/dino.c: revision 1.4

dino depends on gedoens

 -

Re-arrange dino_softc members to improve alignment

diffstat:

 sys/arch/hppa/conf/files.hppa |   4 ++--
 sys/arch/hppa/dev/dino.c      |  17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diffs (67 lines):

diff -r b2549e4f0c84 -r 5348e07922e8 sys/arch/hppa/conf/files.hppa
--- a/sys/arch/hppa/conf/files.hppa     Sat Apr 20 13:51:47 2019 +0000
+++ b/sys/arch/hppa/conf/files.hppa     Sat Apr 20 13:57:24 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.hppa,v 1.18 2014/02/24 07:23:42 skrll Exp $
+#      $NetBSD: files.hppa,v 1.18.22.1 2019/04/20 13:57:24 martin Exp $
 #
 #      $OpenBSD: files.hppa,v 1.31 2001/06/26 02:41:25 mickey Exp $
 #
@@ -157,7 +157,7 @@
 
 # Dino, GSC-PCI bridge. Includes ps/2, serial, and flying toaster interfaces
 # Cujo is a 64-bit data path Dino
-device dino { }: pcibus
+device dino { } : pcibus, gedoens
 attach dino at gedoens
 file   arch/hppa/dev/dino.c            dino
 
diff -r b2549e4f0c84 -r 5348e07922e8 sys/arch/hppa/dev/dino.c
--- a/sys/arch/hppa/dev/dino.c  Sat Apr 20 13:51:47 2019 +0000
+++ b/sys/arch/hppa/dev/dino.c  Sat Apr 20 13:57:24 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dino.c,v 1.3 2015/10/02 05:22:51 msaitoh Exp $ */
+/*     $NetBSD: dino.c,v 1.3.10.1 2019/04/20 13:57:24 martin Exp $ */
 
 /*     $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.3 2015/10/02 05:22:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.3.10.1 2019/04/20 13:57:24 martin Exp $");
 
 /* #include "cardbus.h" */
 
@@ -121,15 +121,19 @@
        bus_space_tag_t sc_bt;
        bus_space_handle_t sc_bh;
        bus_dma_tag_t sc_dmat;
+
+       struct hppa_bus_dma_tag sc_dmatag;
+       struct hppa_bus_space_tag sc_memt;
+
        volatile struct dino_regs *sc_regs;
 
        struct hppa_pci_chipset_tag sc_pc;
        struct hppa_bus_space_tag sc_iot;
-       char sc_ioexname[20];
+
        struct extent *sc_ioex;
-       struct hppa_bus_space_tag sc_memt;
        int sc_memrefcount[30];
-       struct hppa_bus_dma_tag sc_dmatag;
+
+       char sc_ioexname[20];
 };
 
 int    dinomatch(device_t, struct cfdata *, void *);
@@ -1735,6 +1739,5 @@
 static device_t
 dino_callback(device_t self, struct confargs *ca)
 {
-
-       return config_found_sm_loc(self, "dino", NULL, ca, mbprint, mbsubmatch);
+       return config_found_sm_loc(self, "gedoens", NULL, ca, mbprint, mbsubmatch);
 }