[Midnightbsd-cvs] src [11956] trunk/tools/tools/ncpus: tag

[laffer1 at midnightbsd.org]

Revision: 11956
          http://svnweb.midnightbsd.org/src/?rev=11956
Author:   laffer1
Date:     2018-07-22 15:23:38 -0400 (Sun, 22 Jul 2018)
Log Message:
-----------
tag

Modified Paths:
--------------
    trunk/tools/tools/ncpus/Makefile
    trunk/tools/tools/ncpus/acpi.c
    trunk/tools/tools/ncpus/acpidump.h
    trunk/tools/tools/ncpus/biosmptable.c
    trunk/tools/tools/ncpus/ncpus.c

Modified: trunk/tools/tools/ncpus/Makefile
===================================================================
--- trunk/tools/tools/ncpus/Makefile	2018-07-22 19:23:19 UTC (rev 11955)
+++ trunk/tools/tools/ncpus/Makefile	2018-07-22 19:23:38 UTC (rev 11956)
@@ -1,7 +1,8 @@
-# $FreeBSD: src/tools/tools/ncpus/Makefile,v 1.1.2.2 2006/03/10 22:04:07 sam Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/tools/tools/ncpus/Makefile 276486 2014-12-31 23:25:37Z ngie $
 
 PROG=	ncpus
-NO_MAN=
+MAN=
 SRCS=	ncpus.c acpi.c
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 SRCS+=	biosmptable.c

Modified: trunk/tools/tools/ncpus/acpi.c
===================================================================
--- trunk/tools/tools/ncpus/acpi.c	2018-07-22 19:23:19 UTC (rev 11955)
+++ trunk/tools/tools/ncpus/acpi.c	2018-07-22 19:23:38 UTC (rev 11956)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1998 Doug Rabson
  * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki at FreeBSD.org>
@@ -24,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/tools/tools/ncpus/acpi.c,v 1.2.2.2 2006/03/10 22:04:07 sam Exp $
+ *	$FreeBSD: stable/10/tools/tools/ncpus/acpi.c 199291 2009-11-15 16:44:43Z attilio $
  */
 
 #include <sys/param.h>
@@ -247,13 +248,13 @@
 devstate(devinfo_state_t state)
 {
 	switch (state) {
-	case DIS_NOTPRESENT:
+	case DS_NOTPRESENT:
 		return "not-present";
-	case DIS_ALIVE:
+	case DS_ALIVE:
 		return "alive";
-	case DIS_ATTACHED:
+	case DS_ATTACHED:
 		return "attached";
-	case DIS_BUSY:
+	case DS_BUSY:
 		return "busy";
 	default:
 		return "unknown-state";
@@ -266,8 +267,8 @@
 	printf("%s: %s %s\n", __func__, dd->dd_name, devstate(dd->dd_state));
 	/* NB: device must be present AND attached */
 	if (strcmp(dd->dd_name, "acpi0") == 0)
-		return (dd->dd_state == DIS_ATTACHED ||
-			dd->dd_state == DIS_BUSY);
+		return (dd->dd_state == DS_ATTACHED ||
+			dd->dd_state == DS_BUSY);
 	return devinfo_foreach_device_child(dd, acpi0_check, arg);
 }
 

Modified: trunk/tools/tools/ncpus/acpidump.h
===================================================================
--- trunk/tools/tools/ncpus/acpidump.h	2018-07-22 19:23:19 UTC (rev 11955)
+++ trunk/tools/tools/ncpus/acpidump.h	2018-07-22 19:23:38 UTC (rev 11956)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1999 Doug Rabson
  * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki at FreeBSD.org>
@@ -24,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/tools/tools/ncpus/acpidump.h,v 1.1.2.1 2006/03/01 06:03:55 sam Exp $
+ *	$FreeBSD: stable/10/tools/tools/ncpus/acpidump.h 155928 2006-02-22 21:51:09Z sam $
  */
 
 #ifndef _ACPIDUMP_H_

Modified: trunk/tools/tools/ncpus/biosmptable.c
===================================================================
--- trunk/tools/tools/ncpus/biosmptable.c	2018-07-22 19:23:19 UTC (rev 11955)
+++ trunk/tools/tools/ncpus/biosmptable.c	2018-07-22 19:23:38 UTC (rev 11956)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2005 Sandvine Incorporated.  All righs reserved.
  *
@@ -22,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Author: Ed Maste <emaste at phaedrus.sandvine.ca>
+ * Author: Ed Maste <emaste at FreeBSD.org>
  */
 
 /*
@@ -31,10 +32,10 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/tools/tools/ncpus/biosmptable.c,v 1.1.2.2 2006/03/10 22:04:07 sam Exp $");
+__FBSDID("$FreeBSD: stable/10/tools/tools/ncpus/biosmptable.c 219519 2011-03-11 18:44:16Z brucec $");
 
 #include <sys/types.h>
-#include <machine/mptable.h>
+#include <x86/mptable.h>
 
 #include <err.h>
 #include <fcntl.h>

Modified: trunk/tools/tools/ncpus/ncpus.c
===================================================================
--- trunk/tools/tools/ncpus/ncpus.c	2018-07-22 19:23:19 UTC (rev 11955)
+++ trunk/tools/tools/ncpus/ncpus.c	2018-07-22 19:23:38 UTC (rev 11956)
@@ -1,4 +1,5 @@
-/* $FreeBSD: src/tools/tools/ncpus/ncpus.c,v 1.1.2.2 2006/03/10 22:04:07 sam Exp $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/tools/tools/ncpus/ncpus.c 156362 2006-03-06 21:51:27Z sam $ */
 
 #include <stdio.h>