Module Name: src
Committed By: martin
Date: Sat Apr 20 13:57:24 UTC 2019
Modified Files:
src/sys/arch/hppa/conf [netbsd-8]: files.hppa
src/sys/arch/hppa/dev [netbsd-8]: dino.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.22.1 src/sys/arch/hppa/conf/files.hppa
cvs rdiff -u -r1.3 -r1.3.10.1 src/sys/arch/hppa/dev/dino.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/conf/files.hppa
diff -u src/sys/arch/hppa/conf/files.hppa:1.18 src/sys/arch/hppa/conf/files.hppa:1.18.22.1
--- src/sys/arch/hppa/conf/files.hppa:1.18 Mon Feb 24 07:23:42 2014
+++ src/sys/arch/hppa/conf/files.hppa Sat Apr 20 13:57:24 2019
@@ -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 @@ file arch/hppa/dev/mongoose.c mongoose
# 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
Index: src/sys/arch/hppa/dev/dino.c
diff -u src/sys/arch/hppa/dev/dino.c:1.3 src/sys/arch/hppa/dev/dino.c:1.3.10.1
--- src/sys/arch/hppa/dev/dino.c:1.3 Fri Oct 2 05:22:51 2015
+++ src/sys/arch/hppa/dev/dino.c Sat Apr 20 13:57:24 2019
@@ -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 @@ struct dino_softc {
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 @@ dinoattach(device_t parent, device_t sel
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);
}
