CVS commit: src/sys/arch/hp300/include

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar  7 10:01:09 UTC 2021

Modified Files:
src/sys/arch/hp300/include: bus.h

Log Message:
Provide a bus_space_mmap that always fails.  Nothing uses it yet, but it
will be very soon.

OK tsutsui@


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp300/include/bus.h

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/hp300/include/bus.h
diff -u src/sys/arch/hp300/include/bus.h:1.21 src/sys/arch/hp300/include/bus.h:1.22
--- src/sys/arch/hp300/include/bus.h:1.21	Sat Jan 23 19:38:07 2021
+++ src/sys/arch/hp300/include/bus.h	Sun Mar  7 10:01:08 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.21 2021/01/23 19:38:07 christos Exp $	*/
+/*	$NetBSD: bus.h,v 1.22 2021/03/07 10:01:08 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -167,6 +167,20 @@ int	bus_space_map(bus_space_tag_t, bus_a
 void	bus_space_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t);
 
 /*
+ *	paddr_t bus_space_mmap(bus_space_tag_t t,
+ *	bus_addr_t addr, off_t off, int prot, int flags);
+ *
+ * Provide a cookie for pmap_phys_address/pmap_mmap_flags for bus_space address at
+ * addr + offset and flags.
+ */
+static __inline paddr_t
+bus_space_mmap(bus_space_tag_t t, bus_addr_t addr, off_t off, int prot, int flags)
+{
+	/* Always fail for now */
+	return -1;
+}
+
+/*
  *	int bus_space_subregion(bus_space_tag_t t,
  *	bus_space_handle_t bsh, bus_size_t offset, bus_size_t size,
  *	bus_space_handle_t *nbshp);

CVS commit: src/sys/arch/hp300/include

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Fri Feb 18 16:05:22 UTC 2011

Modified Files:
src/sys/arch/hp300/include: bus.h

Log Message:
Add definitions for stream methods.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/include/bus.h

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/hp300/include/bus.h
diff -u src/sys/arch/hp300/include/bus.h:1.16 src/sys/arch/hp300/include/bus.h:1.17
--- src/sys/arch/hp300/include/bus.h:1.16	Sat Feb 12 05:15:39 2011
+++ src/sys/arch/hp300/include/bus.h	Fri Feb 18 16:05:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.16 2011/02/12 05:15:39 tsutsui Exp $	*/
+/*	$NetBSD: bus.h,v 1.17 2011/02/18 16:05:22 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -727,6 +727,35 @@
 #undef __HP300_copy_region_N
 
 /*
+ * Bus stream operations--defined in terms of non-stream counterparts
+ */
+#define	__BUS_SPACE_HAS_STREAM_METHODS 1
+#define	bus_space_read_stream_1 bus_space_read_1
+#define	bus_space_read_stream_2 bus_space_read_2
+#define	bus_space_read_stream_4 bus_space_read_4
+#define	bus_space_read_stream_8 bus_space_read_8
+#define	bus_space_read_multi_stream_1 bus_space_read_multi_1
+#define	bus_space_read_multi_stream_2 bus_space_read_multi_2
+#define	bus_space_read_multi_stream_4 bus_space_read_multi_4
+#define	bus_space_read_multi_stream_8 bus_space_read_multi_8
+#define	bus_space_read_region_stream_1 bus_space_read_region_1
+#define	bus_space_read_region_stream_2 bus_space_read_region_2
+#define	bus_space_read_region_stream_4 bus_space_read_region_4
+#define	bus_space_read_region_stream_8 bus_space_read_region_8
+#define	bus_space_write_stream_1 bus_space_write_1
+#define	bus_space_write_stream_2 bus_space_write_2
+#define	bus_space_write_stream_4 bus_space_write_4
+#define	bus_space_write_stream_8 bus_space_write_8
+#define	bus_space_write_multi_stream_1 bus_space_write_multi_1
+#define	bus_space_write_multi_stream_2 bus_space_write_multi_2
+#define	bus_space_write_multi_stream_4 bus_space_write_multi_4
+#define	bus_space_write_multi_stream_8 bus_space_write_multi_8
+#define	bus_space_write_region_stream_1 bus_space_write_region_1
+#define	bus_space_write_region_stream_2 bus_space_write_region_2
+#define	bus_space_write_region_stream_4 bus_space_write_region_4
+#define	bus_space_write_region_stream_8	bus_space_write_region_8
+
+/*
  * Bus read/write barrier methods.
  *
  *	void bus_space_barrier(bus_space_tag_t tag,

CVS commit: src/sys/arch/hp300/include

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sat Dec 25 15:05:22 UTC 2010

Modified Files:
src/sys/arch/hp300/include: cpu.h

Log Message:
Make sure MAXADDR is unsigned otherwise it could be mangled in shift ops
and causes silent hang on bootstrap.  Analyzed on HP9000/362 I get today,
but I'm not sure how 040 lkptpa code has worked on my HP382...


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/hp300/include/cpu.h

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/hp300/include/cpu.h
diff -u src/sys/arch/hp300/include/cpu.h:1.63 src/sys/arch/hp300/include/cpu.h:1.64
--- src/sys/arch/hp300/include/cpu.h:1.63	Wed Dec 22 02:42:27 2010
+++ src/sys/arch/hp300/include/cpu.h	Sat Dec 25 15:05:22 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.63 2010/12/22 02:42:27 matt Exp $	*/
+/*	$NetBSD: cpu.h,v 1.64 2010/12/25 15:05:22 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -194,7 +194,7 @@
 #define	INTIOTOP	(0x0060)
 #define	EXTIOBASE	(0x0060)
 #define	EXTIOTOP	(0x2000)
-#define	MAXADDR		(0 - NBPG)
+#define	MAXADDR		((paddr_t)(0 - NBPG))
 
 /*
  * Internal IO space:

CVS commit: src/sys/arch/hp300/include

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Dec 31 15:42:46 UTC 2009

Modified Files:
src/sys/arch/hp300/include: disklabel.h

Log Message:
Don't use DEV_BSIZE for LABELSECTOR.
We have never supported 256byte/sector media, and
current definition won't work on >512byte/sector media.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/include/disklabel.h

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/hp300/include/disklabel.h
diff -u src/sys/arch/hp300/include/disklabel.h:1.2 src/sys/arch/hp300/include/disklabel.h:1.3
--- src/sys/arch/hp300/include/disklabel.h:1.2	Tue Dec  6 17:06:00 2005
+++ src/sys/arch/hp300/include/disklabel.h	Thu Dec 31 15:42:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: disklabel.h,v 1.2 2005/12/06 17:06:00 tsutsui Exp $	*/
+/*	$NetBSD: disklabel.h,v 1.3 2009/12/31 15:42:46 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -33,7 +33,7 @@
 #ifndef _HP300_DISKLABEL_H_
 #define _HP300_DISKLABEL_H_
 
-#define	LABELSECTOR	(1024 / DEV_BSIZE)	/* sector containing label */
+#define	LABELSECTOR	2			/* sector containing label */
 #define	LABELOFFSET	0			/* offset of label in sector */
 #define	MAXPARTITIONS	8			/* number of partitions */
 #define	RAW_PART	2			/* raw partition: xx?c */

CVS commit: src/sys/arch/hp300/include

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Fri Dec 11 19:43:19 UTC 2009

Modified Files:
src/sys/arch/hp300/include: cpu.h

Log Message:
MAXADDR used for PA == VA mapping should be page size dependent.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/hp300/include/cpu.h

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/hp300/include/cpu.h
diff -u src/sys/arch/hp300/include/cpu.h:1.61 src/sys/arch/hp300/include/cpu.h:1.62
--- src/sys/arch/hp300/include/cpu.h:1.61	Wed Oct 21 21:11:59 2009
+++ src/sys/arch/hp300/include/cpu.h	Fri Dec 11 19:43:18 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.61 2009/10/21 21:11:59 rmind Exp $	*/
+/*	$NetBSD: cpu.h,v 1.62 2009/12/11 19:43:18 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -215,7 +215,7 @@
 #define	INTIOTOP	(0x0060)
 #define	EXTIOBASE	(0x0060)
 #define	EXTIOTOP	(0x2000)
-#define	MAXADDR		(0xF000)
+#define	MAXADDR		(0 - NBPG)
 
 /*
  * Internal IO space:

CVS commit: src/sys/arch/hp300/include

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Thu Apr  9 10:29:09 UTC 2009

Modified Files:
src/sys/arch/hp300/include: intr.h

Log Message:
Include  instead of  for struct evcnt.

 now requires  for struct device_lock, and
 requires  for ipl_cookie_t, so
including  from  causes recursive dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hp300/include/intr.h

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/hp300/include/intr.h
diff -u src/sys/arch/hp300/include/intr.h:1.32 src/sys/arch/hp300/include/intr.h:1.33
--- src/sys/arch/hp300/include/intr.h:1.32	Sun Dec 21 17:42:05 2008
+++ src/sys/arch/hp300/include/intr.h	Thu Apr  9 10:29:09 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.32 2008/12/21 17:42:05 tsutsui Exp $	*/
+/*	$NetBSD: intr.h,v 1.33 2009/04/09 10:29:09 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #ifndef _HP300_INTR_H_
 #define	_HP300_INTR_H_
 
-#include 
+#include 
 #include 
 #include