d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixups

Browse Source 
Submitted by:	ru
MFC after:	3 days
This commit is contained in:
Sam Leffler 2006-03-06 21:51:27 +00:00
parent 3563464ec1
commit f4ff12f3be
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/tools/ncpus/Makefile
View File

@ -1,12 +1,13 @@
# $FreeBSD$
PROG= ncpus
NO_MAN=
SRCS= ncpus.c acpi.c
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
SRCS+= biosmptable.c
.endif
NO_MAN= noman
BINDIR= /usr/local/bin
WARNS?= 6
DPADD= ${LIBDEVINFO}
LDADD= -ldevinfo

7
tools/tools/ncpus/acpi.c
View File

@ -38,6 +38,7 @@
#include <err.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <paths.h>
@ -56,11 +57,7 @@ static int addr_size;
static int ncpu;
static int
max(int a, int b)
{
return a < b ? b : a;
}
int acpi_detect(void);
static void
acpi_handle_apic(struct ACPIsdt *sdp)

25
tools/tools/ncpus/biosmptable.c
View File

@ -33,13 +33,17 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <unistd.h>
#include <fcntl.h>
#include <paths.h>
#include <err.h>
#include <sys/types.h>
#include <machine/mptable.h>
#include <err.h>
#include <fcntl.h>
#include <inttypes.h>
#include <paths.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#define MPFPS_SIG "_MP_"
#define MPCTH_SIG "PCMP"
@ -52,12 +56,13 @@ static mpcth_t biosmptable_check_mpcth(off_t addr);
static int memopen(void);
static void memclose(void);
int biosmptable_detect(void);
int
biosmptable_detect(void)
{
mpfps_t mpfps;
mpcth_t mpcth;
char buf[16];
char *entry_type_p;
proc_entry_ptr proc;
int ncpu, i;
@ -145,8 +150,8 @@ memclose(void)
static int
memread(off_t addr, void* entry, size_t size)
{
if (pread(pfd, entry, size, addr) != size) {
warn("pread (%lu @ 0x%lx)", size, addr);
if ((size_t)pread(pfd, entry, size, addr) != size) {
warn("pread (%zu @ 0x%jx)", size, (intmax_t)addr);
return 0;
}
return 1;
@ -225,7 +230,7 @@ biosmptable_check_mpcth(off_t addr)
/* mpcth must be in the first 1MB */
if ((u_int32_t)addr >= 1024 * 1024) {
warnx("bad mpcth address (0x%lx)\n", addr);
warnx("bad mpcth address (0x%jx)\n", (intmax_t)addr);
return (NULL);
}
@ -242,7 +247,7 @@ biosmptable_check_mpcth(off_t addr)
goto bad;
}
table_length = mpcth->base_table_length;
mpcth = (mpcth_t) realloc(mpcth, table_length);
mpcth = realloc(mpcth, table_length);
if (mpcth == NULL) {
warnx("unable to realloc space for mpcth (len %u)", table_length);
return (NULL);

2
tools/tools/ncpus/ncpus.c
View File

@ -6,7 +6,7 @@ extern int acpi_detect(void);
extern int biosmptable_detect(void);
int
main(int argc, char *argv[])
main(void)
{
printf("acpi: %d\n", acpi_detect());
#if defined(__amd64__) || defined(__i386__)