summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2010-01-18 11:49:04 +0800
committerChia-I Wu <olvaffe@gmail.com>2010-01-18 11:50:03 +0800
commitb118f0c810080476968f8a0e00d26ed61d0f496e (patch)
treeccbb1fe0d450e39fa0fbeae6e34f66fe062e2f44
parentf25d66f299190b90e991d4f00519d91c5ac60203 (diff)
Move st_manager_api after st_api.
The other structs form an integral part.
-rw-r--r--st_api.h74
1 files changed, 37 insertions, 37 deletions
diff --git a/st_api.h b/st_api.h
index 2a8daa9..40ab7ce 100644
--- a/st_api.h
+++ b/st_api.h
@@ -166,43 +166,6 @@ struct st_framebuffer
};
/**
- * Represent a state tracker manager resource.
- *
- * The input and output depend on the resource type.
- */
-struct st_manager_resource
-{
- enum st_manager_resource_type type;
-
- const union {
- void *ptr;
- } in;
-
- union {
- struct st_framebuffer *fb;
- } out;
-};
-
-/**
- * Represent a state tracker manager.
- *
- * This interface is implemented by the state tracker manager.
- */
-struct st_manager_api
-{
- /**
- * Lock and unlock a state tracker manager resource.
- *
- * This gives access to the underlying data structure of a state tracker
- * manager resource.
- */
- boolean (*lock_resource)(const struct st_manager_api *smapi,
- struct st_manager_resource *smres);
- void (*unlock_resource)(const struct st_manager_api *smapi,
- const struct st_manager_resource *smres);
-};
-
-/**
* Represent a state tracker context resource.
*
* The input and output depend on the resource type.
@@ -330,6 +293,43 @@ struct st_api
};
/**
+ * Represent a state tracker manager resource.
+ *
+ * The input and output depend on the resource type.
+ */
+struct st_manager_resource
+{
+ enum st_manager_resource_type type;
+
+ const union {
+ void *ptr;
+ } in;
+
+ union {
+ struct st_framebuffer *fb;
+ } out;
+};
+
+/**
+ * Represent a state tracker manager.
+ *
+ * This interface is implemented by the state tracker manager.
+ */
+struct st_manager_api
+{
+ /**
+ * Lock and unlock a state tracker manager resource.
+ *
+ * This gives access to the underlying data structure of a state tracker
+ * manager resource.
+ */
+ boolean (*lock_resource)(const struct st_manager_api *smapi,
+ struct st_manager_resource *smres);
+ void (*unlock_resource)(const struct st_manager_api *smapi,
+ const struct st_manager_resource *smres);
+};
+
+/**
* Represent a state tracker.
*
* This is the entry point of a state tracker.