summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2010-03-30 09:54:26 -0700
committerAaron Plattner <aplattner@nvidia.com>2010-04-08 10:32:59 -0700
commitc4595fad1d79c0957d3f4dff6ef56d72ae8cc38d (patch)
tree28eedc414ffd252729c65be428341fcced8ecd93
parent5f2cc1e2b99d45a612204a86583abb386907be04 (diff)
XGE: Don't reserve an extension event.
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@nvidia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--ge.h4
-rw-r--r--geproto.txt11
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