[Hamlib-commit-digest] SF.net SVN: hamlib:[3065] trunk/rotorez

[<kam...@us...>]

Revision: 3065
          http://hamlib.svn.sourceforge.net/hamlib/?rev=3065&view=rev
Author:   kamalmostafa
Date:     2011-02-27 23:26:13 +0000 (Sun, 27 Feb 2011)

Log Message:
-----------
source warnings cleanup: rotorez_rot_reset wrapper for stop

... and moved "API local implementation" static declarations from .h into .c

Modified Paths:
--------------
    trunk/rotorez/rotorez.c
    trunk/rotorez/rotorez.h

Modified: trunk/rotorez/rotorez.c
===================================================================
--- trunk/rotorez/rotorez.c	2011-02-27 22:43:06 UTC (rev 3064)
+++ trunk/rotorez/rotorez.c	2011-02-27 23:26:13 UTC (rev 3065)
@@ -50,6 +50,27 @@
 
 
 /*
+ * API local implementation
+ *
+ */
+
+static int rotorez_rot_init(ROT *rot);
+static int rotorez_rot_cleanup(ROT *rot);
+
+static int rotorez_rot_set_position(ROT *rot, azimuth_t azimuth, elevation_t elevation);
+static int rotorez_rot_get_position(ROT *rot, azimuth_t *azimuth, elevation_t *elevation);
+static int erc_rot_get_position(ROT *rot, azimuth_t *azimuth, elevation_t *elevation);
+
+static int rotorez_rot_reset(ROT *rot, rot_reset_t reset);
+static int rotorez_rot_stop(ROT *rot);
+static int dcu1_rot_stop(ROT *rot);
+
+static int rotorez_rot_set_conf(ROT *rot, token_t token, const char *val);
+
+static const char *rotorez_rot_get_info(ROT *rot);
+
+
+/*
  * Private data structure
  */
 struct rotorez_rot_priv_data {
@@ -213,7 +234,7 @@
 	.rot_cleanup =		rotorez_rot_cleanup,
 	.set_position =		rotorez_rot_set_position,
 	.stop =				dcu1_rot_stop,
-	.reset =			rotorez_rot_stop,		/* Not a typo! */
+	.reset =			rotorez_rot_reset,
 	.get_info =			rotorez_rot_get_info,
 
 };
@@ -258,7 +279,7 @@
 	.set_position =		rotorez_rot_set_position,
 	.get_position =		erc_rot_get_position,
 	.stop =				dcu1_rot_stop,
-	.reset =			rotorez_rot_stop,		/* Not a typo! */
+	.reset =			rotorez_rot_reset,
 //	.stop =				rotorez_rot_stop,
 //	.set_conf =			rotorez_rot_set_conf,
 	.get_info =			rotorez_rot_get_info,
@@ -542,7 +563,12 @@
 	return RIG_OK;
 }
 
+static int rotorez_rot_reset(ROT *rot, rot_reset_t reset) {
+	rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
+	return rotorez_rot_stop(rot);
+}
+
 /*
  * Stop rotation on DCU-1
  */

Modified: trunk/rotorez/rotorez.h
===================================================================
--- trunk/rotorez/rotorez.h	2011-02-27 22:43:06 UTC (rev 3064)
+++ trunk/rotorez/rotorez.h	2011-02-27 23:26:13 UTC (rev 3065)
@@ -47,24 +47,5 @@
 #define TOK_OVRSHT  TOKEN_BACKEND(3)
 #define TOK_UNSTICK TOKEN_BACKEND(4)
 
-/*
- * API local implementation
- *
- */
-
-static int rotorez_rot_init(ROT *rot);
-static int rotorez_rot_cleanup(ROT *rot);
-
-static int rotorez_rot_set_position(ROT *rot, azimuth_t azimuth, elevation_t elevation);
-static int rotorez_rot_get_position(ROT *rot, azimuth_t *azimuth, elevation_t *elevation);
-static int erc_rot_get_position(ROT *rot, azimuth_t *azimuth, elevation_t *elevation);
-
-static int rotorez_rot_stop(ROT *rot);
-static int dcu1_rot_stop(ROT *rot);
-
-static int rotorez_rot_set_conf(ROT *rot, token_t token, const char *val);
-
-static const char *rotorez_rot_get_info(ROT *rot);
-
 #endif  /* _ROT_ROTOREZ_H */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.