diff options
| author | bde <bde@FreeBSD.org> | 1998-06-14 15:21:27 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-06-14 15:21:27 +0000 |
| commit | 964096b168e28a3907b8d9b038b661f7d4d92f49 (patch) | |
| tree | befd7d4ac53078a9b55829e0cfc1236a6d815577 /sys | |
| parent | 4308a30345958dd9e4a4f2f202cf9e9989d93df3 (diff) | |
| download | FreeBSD-src-964096b168e28a3907b8d9b038b661f7d4d92f49.zip FreeBSD-src-964096b168e28a3907b8d9b038b661f7d4d92f49.tar.gz | |
Removed LOCORE ifdef. This header isn't used for locore stuff.
Use uoff_t instead of `unsigned long long' for unsigned offsets.
Fixed some style bugs.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/include/param.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index db3af03..d31f568 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $Id: param.h,v 1.41 1997/08/30 08:07:50 fsmp Exp $ + * $Id: param.h,v 1.42 1998/01/24 02:01:09 dyson Exp $ */ #ifndef _MACHINE_PARAM_H_ @@ -45,14 +45,13 @@ */ #define MACHINE "i386" +#define MID_MACHINE MID_I386 + #ifdef SMP #define NCPUS 2 #else #define NCPUS 1 #endif -#define MID_MACHINE MID_I386 - -#ifndef LOCORE /* * Round p (pointer or byte index) up to a correctly-aligned value @@ -76,7 +75,7 @@ #define DEV_BSIZE (1<<DEV_BSHIFT) #define BLKDEV_IOSIZE 2048 -#define DFLTPHYS (64 * 1024) /* default max raw I/O transfer size */ +#define DFLTPHYS (64 * 1024) /* default max raw I/O transfer size */ #define MAXPHYS (128 * 1024) /* max raw I/O transfer size */ #define IOPAGES 2 /* pages of i/o permission bitmap */ @@ -119,7 +118,7 @@ */ #define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \ (sizeof (bytes) > sizeof(long) \ - ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \ + ? (daddr_t)((uoff_t)(bytes) >> DEV_BSHIFT) \ : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT)) #define dbtob(db) /* calculates (db * DEV_BSIZE) */ \ @@ -139,6 +138,4 @@ #define i386_btop(x) ((unsigned)(x) >> PAGE_SHIFT) #define i386_ptob(x) ((unsigned)(x) << PAGE_SHIFT) -#endif /* !LOCORE */ - #endif /* !_MACHINE_PARAM_H_ */ |
