[PATCH xextproto] XGE: Don't reserve an extension event

[Peter Hutterer]

On Tue, Mar 30, 2010 at 11:01:09AM -0700, Aaron Plattner wrote:
> The Generic Event Extension extension uses the "GenericEvent" core event
> type, so it doesn't need to also reserve an extension event.
> 
> Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
> ---
>  ge.h        |    4 +---
>  geproto.txt |   11 ++++++-----
>  2 files changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/ge.h b/ge.h
> index 6521698..aca1d8a 100644
> --- a/ge.h
> +++ b/ge.h
> @@ -47,9 +47,7 @@
>   *
>   */
>  
> -#define X_GenericEvent        0
> -
> -#define GENumberEvents        (X_GenericEvent + 1)
> +#define GENumberEvents        0
>  
>  /*********************************************************
>   *
> diff --git a/geproto.txt b/geproto.txt
> index 654cd0f..1054def 100644
> --- a/geproto.txt
> +++ b/geproto.txt
> @@ -5,7 +5,7 @@
>  
>  1. Introduction
>  2. Extension Initialization
> -3. Extension Events
> +3. Events
>  4. Notes
>  
>  _____________________________________________________________________________
> @@ -47,14 +47,15 @@ The name of this extension is "Generic Event Extension"
>  
>          As of version 1.0, no other requests are provided by this extension.
>  _____________________________________________________________________________
> -3. Extension Events
> +3. Events
>  
> -GE defines a single event, to be used by all extensions. The event's structure 
> -is similar to a reply.
> +GE defines a single event, to be used by all extensions. The event's structure
> +is similar to a reply.  This is a core protocol event, ID 35, and is not itself
> +an extension event.
>  
>  ┌───
>      GenericEvent
> -	type: BYTE;			always GenericEvent
> +	type: BYTE;			always GenericEvent (35)
>  	extension: CARD8;		extension offset
>  	sequenceNumber: CARD16		low 16 bits of request seq. number
>  	length: CARD32			length
> -- 
> 1.6.3.3

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
  Peter