diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-08-02 00:48:03 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-08-02 00:48:03 +0000 |
commit | d9ab6d3b31b9735b5143e6221b4b6d81d7ae77eb (patch) | |
tree | b20c57e6104006ca92f97f4e633462839d708149 /cpukit/libnetworking/machine | |
parent | 2002-08-01 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-d9ab6d3b31b9735b5143e6221b4b6d81d7ae77eb.tar.bz2 |
2002-08-01 Joel Sherrill <joel@OARcorp.com>
* machine/param.h, sys/syslimits.h: In the continued effort to
eliminate .h conflicts between newlib and RTEMS, these were moved to
newlib.
* machine/Makefile.am, sys/Makefile.am: Reflect above.
Diffstat (limited to 'cpukit/libnetworking/machine')
-rw-r--r-- | cpukit/libnetworking/machine/Makefile.am | 3 | ||||
-rw-r--r-- | cpukit/libnetworking/machine/param.h | 92 |
2 files changed, 1 insertions, 94 deletions
diff --git a/cpukit/libnetworking/machine/Makefile.am b/cpukit/libnetworking/machine/Makefile.am index 6e1f3371df..554fc8e8c1 100644 --- a/cpukit/libnetworking/machine/Makefile.am +++ b/cpukit/libnetworking/machine/Makefile.am @@ -5,8 +5,7 @@ include_machinedir = $(includedir)/machine -include_machine_HEADERS = conf.h cpu.h cpufunc.h endian.h in_cksum.h limits.h \ - param.h vmparam.h +include_machine_HEADERS = conf.h cpu.h cpufunc.h endian.h in_cksum.h vmparam.h PREINSTALL_FILES = $(PROJECT_INCLUDE)/machine \ $(include_machine_HEADERS:%=$(PROJECT_INCLUDE)/machine/%) diff --git a/cpukit/libnetworking/machine/param.h b/cpukit/libnetworking/machine/param.h deleted file mode 100644 index 4168f1f6cf..0000000000 --- a/cpukit/libnetworking/machine/param.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * $Id$ - */ - -#ifndef _MACHINE_PARAM_H_ -#define _MACHINE_PARAM_H_ - -/* - * These aren't really machine-dependent for RTEMS..... - */ - -/* -#define MACHINE "i386" -#define MID_MACHINE MID_I386 -*/ - -/* - * Round p (pointer or byte index) up to a correctly-aligned value - * for all data types (int, long, ...). The result is unsigned int - * and must be cast to any desired pointer type. - */ -#define ALIGNBYTES (sizeof(int) - 1) -#define ALIGN(p) (((unsigned)(p) + ALIGNBYTES) & ~ALIGNBYTES) - -#define PAGE_SHIFT 12 /* LOG2(PAGE_SIZE) */ -#define PAGE_SIZE (1<<PAGE_SHIFT) /* bytes/page */ -#define PAGE_MASK (PAGE_SIZE-1) -#define NPTEPG (PAGE_SIZE/(sizeof (pt_entry_t))) - -#define NPDEPG (PAGE_SIZE/(sizeof (pd_entry_t))) -#define PDRSHIFT 22 /* LOG2(NBPDR) */ -#define NBPDR (1<<PDRSHIFT) /* bytes/page dir */ - -#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 UPAGES 2 /* pages of u-area */ - -/* - * Constants related to network buffer management. - * MCLBYTES must be no larger than CLBYTES (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. - */ -#ifndef MSIZE -#define MSIZE 128 /* size of an mbuf */ -#endif /* MSIZE */ - -#ifndef MCLSHIFT -#define MCLSHIFT 11 /* convert bytes to m_buf clusters */ -#endif /* MCLSHIFT */ -#define MCLBYTES (1 << MCLSHIFT) /* size of an m_buf cluster */ -#define MCLOFSET (MCLBYTES - 1) /* offset within an m_buf cluster */ - -/* - * Some macros for units conversion - */ - -/* clicks to bytes */ -#define ctob(x) ((x)<<PAGE_SHIFT) - -/* bytes to clicks */ -#define btoc(x) (((unsigned)(x)+PAGE_MASK)>>PAGE_SHIFT) - -/* - * btodb() is messy and perhaps slow because `bytes' may be an off_t. We - * want to shift an unsigned type to avoid sign extension and we don't - * want to widen `bytes' unnecessarily. Assume that the result fits in - * a daddr_t. - */ -#define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \ - (sizeof (bytes) > sizeof(long) \ - ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \ - : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT)) - -#define dbtob(db) /* calculates (db * DEV_BSIZE) */ \ - ((off_t)(db) << DEV_BSHIFT) - -/* - * Mach derived conversion macros - */ -#define trunc_page(x) ((unsigned)(x) & ~PAGE_MASK) -#define round_page(x) ((((unsigned)(x)) + PAGE_MASK) & ~PAGE_MASK) - -#define atop(x) ((unsigned)(x) >> PAGE_SHIFT) -#define ptoa(x) ((unsigned)(x) << PAGE_SHIFT) - -#endif /* !_MACHINE_PARAM_H_ */ |