From d364093d263add583ed6fe2f2daa6ec85bb5f3ad Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas@paradise.net.nz>
Date: Wed, 12 May 2010 16:16:40 +1200
Subject: [PATCH] move init_* functions to bottom

---
 calibrate.c | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/calibrate.c b/calibrate.c
index 4ea177d..2e1b228 100644
--- a/calibrate.c
+++ b/calibrate.c
@@ -391,20 +391,13 @@ mode_find_screen(GstSparrow *sparrow, guint8 *in, guint8 *out){
   return SPARROW_STATUS_QUO;
 }
 
-INVISIBLE void
-init_find_screen(GstSparrow *sparrow){
-  //reset_pattern(GstSparrow *sparrow);
-}
-
-
 /* wait for the other projector to stop changing, for as many frames as are
    set in sparrow->countdown.  When sparrow->countdown reaches 0, return 1.
 
    If sparrow->countdown is already 0, do nothing.
 
    If something happens, reset sparrow->countdown to <blanktime>.
- */
-
+*/
 static int
 wait_for_blank(GstSparrow *sparrow, guint8 *in, guint8 *out, int blanktime){
   if (sparrow->countdown){
@@ -426,13 +419,6 @@ wait_for_blank(GstSparrow *sparrow, guint8 *in, guint8 *out, int blanktime){
   return (sparrow->countdown == 0);
 }
 
-/* Choose between green or magenta, randomly and iteratively, until the
-   other one chooses something else.  But first wait for blank? */
-INVISIBLE void
-init_pick_colour(GstSparrow *sparrow)
-{
-  sparrow->countdown = WAIT_COUNTDOWN;
-}
 
 static inline void
 new_calibration_colour(GstSparrow *sparrow){
@@ -442,6 +428,8 @@ new_calibration_colour(GstSparrow *sparrow){
   //sparrow->calibrate.wait == 0;
 }
 
+/* Choose between green or magenta, randomly and iteratively, until the
+   other one chooses something else.  But first wait for blank? */
 
 INVISIBLE sparrow_state
 mode_pick_colour(GstSparrow *sparrow, guint8 *in, guint8 *out){
@@ -453,8 +441,6 @@ mode_pick_colour(GstSparrow *sparrow, guint8 *in, guint8 *out){
   return SPARROW_STATUS_QUO;
 }
 
-INVISIBLE void
-init_wait_for_grid(GstSparrow *sparrow){}
 
 INVISIBLE sparrow_state
 mode_wait_for_grid(GstSparrow *sparrow, guint8 *in, guint8 *out){
@@ -464,7 +450,13 @@ mode_wait_for_grid(GstSparrow *sparrow, guint8 *in, guint8 *out){
   return SPARROW_STATUS_QUO;
 }
 
-INVISIBLE void init_find_grid(GstSparrow *sparrow){}
+/*init functions */
+
+INVISIBLE void
+init_wait_for_grid(GstSparrow *sparrow){}
+
+INVISIBLE void
+init_find_grid(GstSparrow *sparrow){}
 
 void INVISIBLE
 init_find_self(GstSparrow *sparrow){
@@ -482,3 +474,14 @@ init_find_self(GstSparrow *sparrow){
     sparrow->countdown = CALIBRATE_RETRY_WAIT;
   }
 }
+
+INVISIBLE void
+init_pick_colour(GstSparrow *sparrow)
+{
+  sparrow->countdown = WAIT_COUNTDOWN;
+}
+
+INVISIBLE void
+init_find_screen(GstSparrow *sparrow){
+  //reset_pattern(GstSparrow *sparrow);
+}
-- 
2.11.4.GIT