Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the globals ramsize and rammb, the former was only ever used inside 

a single function, the latter is now the return value of get_ramsize().
Changed all uses of rammb to get_ramsize().
Used the 64bit HW_PHYSMEM64 so silly things don't happen if the memory size
approaches (or even exceeds) 4GB.
This commit is contained in:
dsl 2004-07-17 10:55:03 +00:00
parent 1ee4832b70
commit da414ff103
9 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/utils/sysinst/arch/arc/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.22 2004/06/06 06:06:59 christos Exp $ */
/* $NetBSD: md.c,v 1.23 2004/07/17 10:55:03 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -85,7 +85,7 @@ md_pre_disklabel(void)
int
md_post_disklabel(void)
{
if (rammb <= 32)
if (get_ramsize() <= 32)
set_swap(diskdev, bsdlabel);
/* Sector forwarding / badblocks ... */
@ -127,7 +127,7 @@ md_check_partitions(void)
int
md_pre_update(void)
{
if (rammb <= 8)
if (get_ramsize() <= 8)
set_swap(diskdev, NULL);
return 1;
}

6
distrib/utils/sysinst/arch/hp300/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.14 2004/06/06 06:07:00 christos Exp $ */
/* $NetBSD: md.c,v 1.15 2004/07/17 10:55:03 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -127,7 +127,7 @@ int
md_post_disklabel(void)
{
if (rammb < 6)
if (get_ramsize() < 6)
set_swap(diskdev, bsdlabel);
return (0);
@ -240,7 +240,7 @@ int
md_pre_update()
{
if (rammb < 6)
if (get_ramsize() < 6)
set_swap(diskdev, NULL);
return (1);
}

6
distrib/utils/sysinst/arch/i386/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.103 2004/06/06 05:45:04 christos Exp $ */
/* $NetBSD: md.c,v 1.104 2004/07/17 10:55:04 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -285,7 +285,7 @@ md_pre_disklabel(void)
int
md_post_disklabel(void)
{
if (rammb <= 32)
if (get_ramsize() <= 32)
set_swap(diskdev, bsdlabel);
return 0;
@ -386,7 +386,7 @@ md_make_bsd_partitions(void)
int
md_pre_update(void)
{
if (rammb <= 8)
if (get_ramsize() <= 8)
set_swap(diskdev, NULL);
return 1;
}

6
distrib/utils/sysinst/arch/mvme68k/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.13 2004/06/06 06:07:01 christos Exp $ */
/* $NetBSD: md.c,v 1.14 2004/07/17 10:55:04 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -126,7 +126,7 @@ int
md_post_disklabel(void)
{
if (rammb < 6)
if (get_ramsize() < 6)
set_swap(diskdev, bsdlabel);
return (0);
@ -239,7 +239,7 @@ int
md_pre_update()
{
if (rammb < 6)
if (get_ramsize() < 6)
set_swap(diskdev, NULL);
return (1);
}

6
distrib/utils/sysinst/arch/x68k/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.28 2004/06/06 06:07:02 christos Exp $ */
/* $NetBSD: md.c,v 1.29 2004/07/17 10:55:04 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -222,7 +222,7 @@ md_pre_disklabel(void)
int
md_post_disklabel(void)
{
if (rammb < 6)
if (get_ramsize() < 6)
set_swap(diskdev, bsdlabel);
return 0;
@ -330,7 +330,7 @@ md_cleanup_install(void)
int
md_pre_update()
{
if (rammb < 6)
if (get_ramsize() < 6)
set_swap(diskdev, NULL);
return 1;
}

4
distrib/utils/sysinst/bsddisklabel.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bsddisklabel.c,v 1.29 2004/07/12 22:33:21 christos Exp $ */
/* $NetBSD: bsddisklabel.c,v 1.30 2004/07/17 10:55:03 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -431,7 +431,7 @@ get_ptn_sizes(int part_start, int sectors, int no_swap)
}
/* Add space for 2 system dumps to / (traditional) */
i = rammb * sm;
i = get_ramsize() * sm;
i = ROUNDUP(i, dlcylsize);
if (pi.free_space > i * 2)
i *= 2;

8
distrib/utils/sysinst/defs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: defs.h,v 1.117 2004/07/15 21:06:45 dsl Exp $ */
/* $NetBSD: defs.h,v 1.118 2004/07/17 10:55:03 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -183,10 +183,6 @@ int scripting;
FILE *logfp;
FILE *script;
/* Hardware variables */
unsigned long ramsize;
unsigned int rammb ;
/* Actual name of the disk. */
char diskdev[SSTRSIZE];
int no_mbr; /* set for raid (etc) */
@ -345,7 +341,7 @@ int dir_exists_p(const char *);
int file_exists_p(const char *);
int file_mode_match(const char *, unsigned int);
int distribution_sets_exist_p(const char *);
void get_ramsize(void);
uint get_ramsize(void);
void ask_sizemult(int);
void run_makedev(void);
int get_via_floppy(void);

4
distrib/utils/sysinst/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.46 2004/06/12 19:18:24 dsl Exp $ */
/* $NetBSD: main.c,v 1.47 2004/07/17 10:55:03 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -79,8 +79,6 @@ init(void)
(void)strlcpy(rel, REL, SSTRSIZE);
(void)strlcpy(machine, MACH, SSTRSIZE);
sizemult = 1;
ramsize = 0;
rammb = 0;
(void)strlcpy(diskdev, "", SSTRSIZE);
disktype = "unknown";
tmp_mfs_size = 0;

11
distrib/utils/sysinst/util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.124 2004/07/16 21:35:44 dsl Exp $ */
/* $NetBSD: util.c,v 1.125 2004/07/17 10:55:03 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -179,16 +179,17 @@ distribution_sets_exist_p(const char *path)
}
void
uint
get_ramsize(void)
{
size_t len = sizeof(ramsize);
int mib[2] = {CTL_HW, HW_PHYSMEM};
uint64_t ramsize;
size_t len = sizeof ramsize;
int mib[2] = {CTL_HW, HW_PHYSMEM64};
sysctl(mib, 2, &ramsize, &len, NULL, 0);
/* Find out how many Megs ... round up. */
rammb = ((unsigned int)ramsize + MEG - 1) / MEG;
return (ramsize + MEG - 1) / MEG;
}
void