Re: [PATCH 2/3] m68k: compile fix - ADBREQ_RAW missing declaration

[Finn Thain]

On Thu, 15 Dec 2005, Al Viro wrote:

> With some archaeology...  It looks like drivers/macintosh part is from
> Geert (with chunks from benh? not sure) circa Dec 2000; adb.h is a missing
> piece of earlier patch (one that had leaked in Feb 2000, $DEITY knowns how
> much older it is)...


> --- a/drivers/macintosh/adb.c
> +++ b/drivers/macintosh/adb.c
> @@ -476,13 +476,15 @@ adb_request(struct adb_request *req, voi
>                 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);
> +       }

According to the the Linx-mac68k repo, one line of that change belongs to 
Joshua M. Thompson, while the rest of that code was committed by Ray 
Knight, (the changelog says it was a merge from 2.4.0).

http://cvs.sourceforge.net/viewcvs.py/linux-mac68k/linux-mac68k/drivers/macintosh/adb.c?annotate=1.25


>         va_end(list);
>  
>         if (flags & ADBREQ_NOSEND)
> diff --git a/include/linux/adb.h b/include/linux/adb.h
> index e9fdc63..aad7b1c 100644
> --- a/include/linux/adb.h
> +++ b/include/linux/adb.h
> @@ -76,6 +76,7 @@ struct adb_driver {
>  #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) */
> 

Credit for that change is due to Joshua M. Thompson.

http://cvs.sourceforge.net/viewcvs.py/linux-mac68k/linux-mac68k/include/linux/adb.h?annotate=1.7

-f
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/