From: Al Viro <viro@www.linux.org.uk>
To: geert@linux-m68k.org, torvalds@osdl.org
Cc: linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org
Subject: [PATCH] (22/22) ADBREQ_RAW missing declaration
Date: Thu, 25 Aug 2005 06:25:31 +0100 [thread overview]
Message-ID: <E1E8AF1-0005fA-Sq@parcelfarce.linux.theplanet.co.uk> (raw)
pulled from m68k CVS; ADBREQ_RAW is used in arch/m68k/mac/misc.c, but its
declaration had not been propagated to Linus' tree yet. Related chunk in
drivers/macintosh/adb.c also pulled in; even though the file is shared with
ppc, behaviour is changed only for m68k.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
----
diff -urN RC13-rc7-m68k-flags/drivers/macintosh/adb.c RC13-rc7-m68k-adb.patch/drivers/macintosh/adb.c
--- RC13-rc7-m68k-flags/drivers/macintosh/adb.c 2005-08-10 10:37:49.000000000 -0400
+++ RC13-rc7-m68k-adb.patch/drivers/macintosh/adb.c 2005-08-25 00:54:21.000000000 -0400
@@ -476,13 +476,15 @@
use_sreq = 1;
} else
use_sreq = 0;
- req->nbytes = nbytes+1;
+ i = (flags & ADBREQ_RAW) ? 0 : 1;
+ req->nbytes = nbytes+i;
req->done = done;
req->reply_expected = flags & ADBREQ_REPLY;
req->data[0] = ADB_PACKET;
va_start(list, nbytes);
- for (i = 0; i < nbytes; ++i)
- req->data[i+1] = va_arg(list, int);
+ while (i < req->nbytes) {
+ req->data[i++] = va_arg(list, int);
+ }
va_end(list);
if (flags & ADBREQ_NOSEND)
diff -urN RC13-rc7-m68k-flags/include/linux/adb.h RC13-rc7-m68k-adb.patch/include/linux/adb.h
--- RC13-rc7-m68k-flags/include/linux/adb.h 2005-06-17 15:48:29.000000000 -0400
+++ RC13-rc7-m68k-adb.patch/include/linux/adb.h 2005-08-25 00:54:21.000000000 -0400
@@ -76,6 +76,7 @@
#define ADBREQ_REPLY 1 /* expect reply */
#define ADBREQ_SYNC 2 /* poll until done */
#define ADBREQ_NOSEND 4 /* build the request, but don't send it */
+#define ADBREQ_RAW 8 /* send raw packet (don't prepend ADB_PACKET) */
/* Messages sent thru the client_list notifier. You should NOT stop
the operation, at least not with this version */
reply other threads:[~2005-08-25 5:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1E8AF1-0005fA-Sq@parcelfarce.linux.theplanet.co.uk \
--to=viro@www.linux.org.uk \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®