From owner-p4-projects@FreeBSD.ORG  Tue Nov 11 19:32:29 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1C5EA16A4D0; Tue, 11 Nov 2003 19:32:29 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EAC0716A4CE
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 19:32:28 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 59DC843FDD
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 19:32:28 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAC3WSXJ032607
	for <perforce@freebsd.org>; Tue, 11 Nov 2003 19:32:28 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAC3WRCg032604
	for perforce@freebsd.org; Tue, 11 Nov 2003 19:32:27 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 11 Nov 2003 19:32:27 -0800 (PST)
Message-Id: <200311120332.hAC3WRCg032604@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42084 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Nov 2003 03:32:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=42084

Change 42084 by peter@peter_overcee on 2003/11/11 19:31:26

	create an atpic device which is optional.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#64 edit
.. //depot/projects/hammer/sys/conf/files.amd64#34 edit
.. //depot/projects/hammer/sys/conf/options.amd64#14 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#64 (text+ko) ====

@@ -42,12 +42,12 @@
 __FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.597 2003/11/09 20:31:02 marcel Exp $");
 
 #include "opt_atalk.h"
+#include "opt_atpic.h"
 #include "opt_compat.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
-#include "opt_isa.h"
 #include "opt_kstack_pages.h"
 #include "opt_maxmem.h"
 #include "opt_msgbuf.h"
@@ -1226,7 +1226,7 @@
 	 */
 	cninit();
 
-#ifdef DEV_ISA
+#ifdef DEV_ATPIC
 	atpic_startup();
 #endif
 

==== //depot/projects/hammer/sys/conf/files.amd64#34 (text+ko) ====

@@ -62,8 +62,8 @@
 amd64/amd64/tsc.c		standard
 amd64/amd64/uma_machdep.c	standard
 amd64/amd64/vm_machdep.c	standard
-amd64/isa/atpic.c		standard
-amd64/isa/atpic_vector.S	standard
+amd64/isa/atpic.c		optional	atpic isa
+amd64/isa/atpic_vector.S	optional	atpic isa
 amd64/isa/clock.c		standard
 amd64/isa/isa.c			standard
 amd64/isa/isa_dma.c		standard

==== //depot/projects/hammer/sys/conf/options.amd64#14 (text+ko) ====

@@ -30,3 +30,4 @@
 PSM_DEBUG		opt_psm.h
 IA32
 NO_MIXED_MODE
+DEV_ATPIC		opt_atpic.h