From owner-freebsd-amd64@FreeBSD.ORG  Thu Nov 11 15:15:32 2004
Return-Path: <owner-freebsd-amd64@FreeBSD.ORG>
Delivered-To: freebsd-amd64@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id AE51E16A4CE; Thu, 11 Nov 2004 15:15:32 +0000 (GMT)
Received: from arginine.spc.org (arginine.spc.org [195.206.69.236])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E9B5C43D39; Thu, 11 Nov 2004 15:15:31 +0000 (GMT)
	(envelope-from bms@spc.org)
Received: from localhost (localhost [127.0.0.1])
	by arginine.spc.org (Postfix) with ESMTP
	id CD8596538E; Thu, 11 Nov 2004 15:15:29 +0000 (GMT)
Received: from arginine.spc.org ([127.0.0.1])
 by localhost (arginine.spc.org [127.0.0.1]) (amavisd-new, port 10024)
 with LMTP id 41195-01-5; Thu, 11 Nov 2004 15:15:29 +0000 (GMT)
Received: from empiric.dek.spc.org (dhcp120.icir.org [192.150.187.120])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by arginine.spc.org (Postfix) with ESMTP
	id B30ED65381; Thu, 11 Nov 2004 15:15:25 +0000 (GMT)
Received: by empiric.dek.spc.org (Postfix, from userid 1001)
	id 138B36482; Thu, 11 Nov 2004 07:15:15 -0800 (PST)
Date: Thu, 11 Nov 2004 07:15:14 -0800
From: Bruce M Simpson <bms@spc.org>
To: Gary Jennejohn <garyj@jennejohn.org>
Message-ID: <20041111151514.GI723@empiric.icir.org>
Mail-Followup-To: Gary Jennejohn <garyj@jennejohn.org>,
	Astrodog <astrodog@gmail.com>, freebsd-current@freebsd.org,
	freebsd-amd64@freebsd.org
References: <astrodog@gmail.com> <2fd864e04111105557032a7c3@mail.gmail.com>
	<200411111437.iABEbgE6005098@peedub.jennejohn.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="V88s5gaDVPzZ0KCq"
Content-Disposition: inline
In-Reply-To: <200411111437.iABEbgE6005098@peedub.jennejohn.org>
cc: freebsd-current@freebsd.org
cc: freebsd-amd64@freebsd.org
Subject: Re: Commitable R3000Z Patch!
X-BeenThere: freebsd-amd64@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting FreeBSD to the AMD64 platform <freebsd-amd64.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-amd64>,
	<mailto:freebsd-amd64-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-amd64>
List-Post: <mailto:freebsd-amd64@freebsd.org>
List-Help: <mailto:freebsd-amd64-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-amd64>,
	<mailto:freebsd-amd64-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Nov 2004 15:15:32 -0000


--V88s5gaDVPzZ0KCq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Thu, Nov 11, 2004 at 03:37:42PM +0100, Gary Jennejohn wrote:
> diff -u is the preferred format for patches. With your patch it isn't
> even clear which file is being patched.

Try this (courtesy of cd2ud, from ports/devel/diffconvert, and some
style changes by hand merged back in with rediff from misc/patchutils)/

BMS

--V88s5gaDVPzZ0KCq
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="atkbdc.diff"

--- src/sys/dev/kbd/atkbdc.c.orig	Thu Nov 11 08:51:30 2004
+++ src/sys/dev/kbd/atkbdc.c	Thu Nov 11 07:42:35 2004
@@ -947,7 +947,8 @@
     int retry = KBD_MAXRETRY;
     int again = KBD_MAXWAIT;
     int c = -1;
-	
+	if (resource_disabled("atkbd", 0))
+		return 0;
     while (retry-- > 0) {
         empty_both_buffers(p, 10);
         if (write_controller_command(p, KBDC_TEST_KBD_PORT))
@@ -973,7 +974,8 @@
     int retry = KBD_MAXRETRY;
     int again = KBD_MAXWAIT;
     int c = -1;
-    
+    if (resource_disabled("atkbd", 0))
+		return 0;
     while (retry-- > 0) {
         empty_both_buffers(p, 10);
         if (write_controller_command(p, KBDC_TEST_AUX_PORT))

--V88s5gaDVPzZ0KCq--