Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Only define MACHINE & MACHINE_ARCH in port-dependen...
details: https://anonhg.NetBSD.org/src/rev/fc60548a585f
branches: trunk
changeset: 504509:fc60548a585f
user: matt <matt%NetBSD.org@localhost>
date: Sun Mar 04 08:28:51 2001 +0000
description:
Only define MACHINE & MACHINE_ARCH in port-dependent param.h.
Everything else (since it's common) is from <arm/arm32/param.h>
diffstat:
sys/arch/arm/include/arm32/param.h | 25 +----
sys/arch/arm32/include/param.h | 141 +-----------------------------------
sys/arch/hpcarm/include/param.h | 145 +-----------------------------------
3 files changed, 15 insertions(+), 296 deletions(-)
diffs (truncated from 376 to 300 lines):
diff -r bee6a3313fd6 -r fc60548a585f sys/arch/arm/include/arm32/param.h
--- a/sys/arch/arm/include/arm32/param.h Sun Mar 04 08:25:38 2001 +0000
+++ b/sys/arch/arm/include/arm32/param.h Sun Mar 04 08:28:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.2 2001/02/24 09:58:43 toshii Exp $ */
+/* $NetBSD: param.h,v 1.3 2001/03/04 08:28:51 matt Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -32,8 +32,8 @@
* SUCH DAMAGE.
*/
-#ifndef _ARM32_PARAM_H_
-#define _ARM32_PARAM_H_
+#ifndef _ARM_ARM32_PARAM_H_
+#define _ARM_ARM32_PARAM_H_
#ifdef _KERNEL
# include <machine/cpu.h>
@@ -42,20 +42,9 @@
/*
* Machine dependent constants for ARM6+ processors
*/
-
-#ifdef HPCARM
-# define _MACHINE hpcarm
-# define MACHINE "hpcarm"
-# define _MACHINE_ARCH arm
-# define MACHINE_ARCH "arm"
-# define MID_MACHINE MID_ARM6
-#else
-# define _MACHINE arm32
-# define MACHINE "arm32"
-# define _MACHINE_ARCH arm32
-# define MACHINE_ARCH "arm32"
-# define MID_MACHINE MID_ARM6
-#endif
+/* These are defined in the Port File before it includes
+ * this file. */
+#define MID_MACHINE MID_ARM6
/*
* Round p (pointer or byte index) up to a correctly-aligned value
@@ -189,4 +178,4 @@
#endif
#endif
-#endif /* _ARM_PARAM_H_ */
+#endif /* _ARM_ARM32_PARAM_H_ */
diff -r bee6a3313fd6 -r fc60548a585f sys/arch/arm32/include/param.h
--- a/sys/arch/arm32/include/param.h Sun Mar 04 08:25:38 2001 +0000
+++ b/sys/arch/arm32/include/param.h Sun Mar 04 08:28:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.20 2001/02/26 00:06:45 reinoud Exp $ */
+/* $NetBSD: param.h,v 1.21 2001/03/04 08:28:52 matt Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -35,10 +35,6 @@
#ifndef _ARM32_PARAM_H_
#define _ARM32_PARAM_H_
-#ifdef _KERNEL
-# include <machine/cpu.h>
-#endif
-
/*
* Machine dependent constants for ARM6+ processors
*/
@@ -47,138 +43,7 @@
#define MACHINE "arm32"
#define _MACHINE_ARCH arm32
#define MACHINE_ARCH "arm32"
-#define MID_MACHINE MID_ARM6
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...). The result is u_int and
- * must be cast to any desired pointer type.
- *
- * ALIGNED_POINTER is a boolean macro that checks whether an address
- * is valid to fetch data elements of type t from on this architecture.
- * This does not reflect the optimal alignment, just the possibility
- * (within reasonable limits).
- *
- */
-#define ALIGNBYTES (sizeof(int) - 1)
-#define ALIGN(p) (((u_int)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-#define ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0)
-
-#define PGSHIFT 12 /* LOG2(NBPG) */
-#define NBPG (1 << PGSHIFT) /* bytes/page */
-#define PGOFSET (NBPG-1) /* byte offset into page */
-#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
-
-
-#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
-#define DEV_BSIZE (1 << DEV_BSHIFT)
-#define BLKDEV_IOSIZE 2048
-#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
-
-#define SSIZE 1 /* initial stack size/NBPG */
-#define SINCR 1 /* increment of stack/NBPG */
-#define UPAGES 2 /* pages of u-area */
-#define USPACE (UPAGES * NBPG) /* total size of u-area */
-
-#ifndef MSGBUFSIZE
-#define MSGBUFSIZE NBPG /* default message buffer size */
-#endif
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (the software page size), and,
- * on machines that exchange pages of input or output buffers with mbuf
- * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
- * of the hardware page size.
- */
-#define MSIZE 256 /* size of an mbuf */
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-#define MCLOFSET (MCLBYTES - 1) /* offset within a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 512 /* map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 256 /* map size, max cluster allocation */
-#endif
-#endif
-/*
- * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
- * logical pages.
- */
-#define NKMEMPAGES_MIN_DEFAULT ((6 * 1024 * 1024) >> PAGE_SHIFT)
-#define NKMEMPAGES_MAX_DEFAULT ((7 * 1024 * 1024) >> PAGE_SHIFT)
-
-/* pages ("clicks") (4096 bytes) to disk blocks */
-#define ctod(x) ((x) << (PGSHIFT - DEV_BSHIFT))
-#define dtoc(x) ((x) >> (PGSHIFT - DEV_BSHIFT))
-/*#define dtob(x) ((x) << DEV_BSHIFT)*/
-
-#define ctob(x) ((x) << PGSHIFT)
-
-/* bytes to pages */
-#define btoc(x) (((x) + PGOFSET) >> PGSHIFT)
-
-#define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \
- ((bytes) >> DEV_BSHIFT)
-#define dbtob(db) /* calculates (db * DEV_BSIZE) */ \
- ((db) << DEV_BSHIFT)
-
-/*
- * Map a ``block device block'' to a file system block.
- * This should be device dependent, and should use the bsize
- * field from the disk label.
- * For now though just use DEV_BSIZE.
- */
-#define bdbtofsb(bn) ((bn) / (BLKDEV_IOSIZE / DEV_BSIZE))
-
-/* Constants used to divide the USPACE area */
+#include <arm/arm32/param.h>
-/*
- * The USPACE area contains :
- * 1. the user structure for the process
- * 2. the fp context for FP emulation
- * 3. the kernel (svc) stack
- * 4. the undefined instruction stack
- *
- * The layout of the area looks like this
- *
- * | user area | FP context | undefined stack | kernel stack |
- *
- * The size of the user area is known.
- * The size of the FP context is variable depending of the FP emulator
- * in use and whether there is hardware FP support. However we can put
- * an upper limit on it.
- * The undefined stack needs to be at least 512 bytes. This is a requirement
- * if the FP emulators
- * The kernel stack should be at least 4K is size.
- *
- * The stack top addresses are used to set the stack pointers. The stack bottom
- * addresses at the addresses monitored by the diagnostic code for stack overflows
- *
- */
-
-#define FPCONTEXTSIZE (0x100)
-#define USPACE_SVC_STACK_TOP (USPACE)
-#define USPACE_SVC_STACK_BOTTOM (USPACE_SVC_STACK_TOP - 0x1000)
-#define USPACE_UNDEF_STACK_TOP (USPACE_SVC_STACK_BOTTOM - 0x10)
-#define USPACE_UNDEF_STACK_BOTTOM (sizeof(struct user) + FPCONTEXTSIZE + 10)
-
-#define arm_byte_to_page(x) ((x) >> PGSHIFT)
-#define arm_page_to_byte(x) ((x) << PGSHIFT)
-
-#ifdef _KERNEL
-#ifndef _LOCORE
-void delay __P((unsigned));
-#define DELAY(x) delay(x)
-#endif
-#endif
-
-#endif /* _ARM_PARAM_H_ */
+#endif /* _ARM32_PARAM_H_ */
diff -r bee6a3313fd6 -r fc60548a585f sys/arch/hpcarm/include/param.h
--- a/sys/arch/hpcarm/include/param.h Sun Mar 04 08:25:38 2001 +0000
+++ b/sys/arch/hpcarm/include/param.h Sun Mar 04 08:28:51 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.3 2001/02/26 00:07:54 reinoud Exp $ */
+/* $NetBSD: param.h,v 1.4 2001/03/04 08:28:52 matt Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -32,12 +32,8 @@
* SUCH DAMAGE.
*/
-#ifndef _ARM32_PARAM_H_
-#define _ARM32_PARAM_H_
-
-#ifdef _KERNEL
-# include <machine/cpu.h>
-#endif
+#ifndef _HPCARM_PARAM_H_
+#define _HPCARM_PARAM_H_
/*
* Machine dependent constants for ARM6+ processors
@@ -47,138 +43,7 @@
#define MACHINE "hpcarm"
#define _MACHINE_ARCH arm
#define MACHINE_ARCH "arm"
-#define MID_MACHINE MID_ARM6
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...). The result is u_int and
- * must be cast to any desired pointer type.
- *
- * ALIGNED_POINTER is a boolean macro that checks whether an address
- * is valid to fetch data elements of type t from on this architecture.
- * This does not reflect the optimal alignment, just the possibility
- * (within reasonable limits).
- *
- */
-#define ALIGNBYTES (sizeof(int) - 1)
-#define ALIGN(p) (((u_int)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-#define ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0)
-
-#define PGSHIFT 12 /* LOG2(NBPG) */
-#define NBPG (1 << PGSHIFT) /* bytes/page */
-#define PGOFSET (NBPG-1) /* byte offset into page */
-#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
-
-
-#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
-#define DEV_BSIZE (1 << DEV_BSHIFT)
-#define BLKDEV_IOSIZE 2048
-#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
-
-#define SSIZE 1 /* initial stack size/NBPG */
-#define SINCR 1 /* increment of stack/NBPG */
-#define UPAGES 2 /* pages of u-area */
-#define USPACE (UPAGES * NBPG) /* total size of u-area */
-
-#ifndef MSGBUFSIZE
-#define MSGBUFSIZE NBPG /* default message buffer size */
-#endif
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (the software page size), and,
- * on machines that exchange pages of input or output buffers with mbuf
- * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
- * of the hardware page size.
- */
-#define MSIZE 256 /* size of an mbuf */
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-#define MCLOFSET (MCLBYTES - 1) /* offset within a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 512 /* map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 256 /* map size, max cluster allocation */
-#endif
-#endif
Home |
Main Index |
Thread Index |
Old Index