Date: Thu, 11 Nov 2004 07:15:14 -0800 From: Bruce M Simpson <bms@spc.org> To: Gary Jennejohn <garyj@jennejohn.org> Cc: freebsd-amd64@freebsd.org Subject: Re: Commitable R3000Z Patch! Message-ID: <20041111151514.GI723@empiric.icir.org> In-Reply-To: <200411111437.iABEbgE6005098@peedub.jennejohn.org> References: <astrodog@gmail.com> <2fd864e04111105557032a7c3@mail.gmail.com> <200411111437.iABEbgE6005098@peedub.jennejohn.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041111151514.GI723>