? emcmodule_remove_unused.patch
Index: emcmodule.cc
===================================================================
RCS file: /cvs/emc2/src/emc/usr_intf/axis/extensions/emcmodule.cc,v
retrieving revision 1.45
diff -u -U3 -r1.45 emcmodule.cc
--- emcmodule.cc	24 May 2009 05:11:17 -0000	1.45
+++ emcmodule.cc	1 Jun 2009 17:12:20 -0000
@@ -97,6 +97,10 @@
 
 static PyObject *m = NULL, *error = NULL;
 
+/***********************************************************************
+*                         INI FILE                                     *
+************************************************************************/
+
 static int Ini_init(pyIniFile *self, PyObject *a, PyObject *k) {
     char *inifile;
     if(!PyArg_ParseTuple(a, "s", &inifile)) return -1;
@@ -201,6 +205,9 @@
     0,                      /*tp_is_gc*/
 };
 
+/***********************************************************************
+*                         STATUS                                       *
+************************************************************************/
 
 #define EMC_COMMAND_TIMEOUT 2.0  // how long to wait until timeout
 #define EMC_COMMAND_DELAY   0.01 // how long to sleep between checks
@@ -222,7 +229,6 @@
     return -1;
 }
 
-
 static void emcWaitCommandReceived(int serial_number, RCS_STAT_CHANNEL *s) {
     double start = etime();
 
@@ -273,23 +279,6 @@
     return true;
 }
 
-static bool wait_stat(RCS_STAT_CHANNEL *emcStatusBuffer) {
-    if(!emcStatusBuffer->valid()) { 
-        PyErr_Format( error, "emcStatusBuffer invalid" );
-        return false;
-    }
-    while(emcStatusBuffer->peek() != EMC_STAT_TYPE) {
-        usleep(10000); 
-    }
-    return true;
-}
-
-static PyObject *gettaskfile(pyStatChannel *s, PyObject *o) {
-    if(!wait_stat(s->c)) return NULL;
-    EMC_STAT *emcStatus = static_cast<EMC_STAT*>(s->c->get_address());
-    return PyString_FromString(emcStatus->task.file);
-}
-
 static PyObject *poll(pyStatChannel *s, PyObject *o) {
     if(!check_stat(s->c)) return NULL;
     if(s->c->peek() == EMC_STAT_TYPE) {
@@ -302,20 +291,10 @@
 
 static PyMethodDef Stat_methods[] = {
     {"poll", (PyCFunction)poll, METH_NOARGS, "Update current machine state"},
-    {"gettaskfile", (PyCFunction)gettaskfile, METH_NOARGS,
-                                             "Get current task file"},
     {NULL}
 };
 
-
 #define O(x) offsetof(pyStatChannel,status.x)
-#define POS(prefix, member) \
-    {prefix "x", T_DOUBLE, O(member.tran.x), READONLY}, \
-    {prefix "y", T_DOUBLE, O(member.tran.y), READONLY}, \
-    {prefix "z", T_DOUBLE, O(member.tran.z), READONLY}, \
-    {prefix "a", T_DOUBLE, O(member.a), READONLY}, \
-    {prefix "b", T_DOUBLE, O(member.b), READONLY}, \
-    {prefix "c", T_DOUBLE, O(member.c), READONLY}
 static PyMemberDef Stat_members[] = {
 // stat 
     {"echo_serial_number", T_INT, O(echo_serial_number), READONLY},
@@ -377,7 +356,6 @@
 // EMC_TOOL_STAT io.tool
     {"tool_prepped", T_INT, O(io.tool.toolPrepped), READONLY},
     {"tool_in_spindle", T_INT, O(io.tool.toolInSpindle), READONLY},
-    
 
 // EMC_SPINDLE_STAT motion.spindle
     {"spindle_speed", T_DOUBLE, O(motion.spindle.speed), READONLY},
@@ -600,7 +578,6 @@
     7
 };
 
-
 static PyTypeObject ToolResultType;
 
 static PyObject *Stat_tool_table(pyStatChannel *s) {
@@ -695,6 +672,10 @@
     0,                      /*tp_is_gc*/
 };
 
+/***********************************************************************
+*                         COMMAND                                      *
+************************************************************************/
+
 static int Command_init(pyCommandChannel *self, PyObject *a, PyObject *k) {
     char *file = get_nmlfile();
     if(file == NULL) return -1;
@@ -722,7 +703,6 @@
     PyObject_Del(self);
 }
 
-
 static PyObject *block_delete(pyCommandChannel *s, PyObject *o) {
     int t;
     EMC_TASK_PLAN_SET_BLOCK_DELETE m;
@@ -738,7 +718,6 @@
     return Py_None;
 }
 
-
 static PyObject *optional_stop(pyCommandChannel *s, PyObject *o) {
     int t;
     EMC_TASK_PLAN_SET_OPTIONAL_STOP m;
@@ -803,7 +782,6 @@
     return Py_None;
 }
 
-
 static PyObject *spindle(pyCommandChannel *s, PyObject *o) {
     int dir;
     if(!PyArg_ParseTuple(o, "i", &dir)) return NULL;
@@ -1229,7 +1207,6 @@
     return Py_None;
 }
 
-
 static PyObject *set_max_limit(pyCommandChannel *s, PyObject *o) {
     EMC_AXIS_SET_MAX_POSITION_LIMIT m;
     if(!PyArg_ParseTuple(o, "id", &m.axis, &m.limit))
@@ -1386,6 +1363,9 @@
     0,                      /*tp_is_gc*/
 };
 
+/***********************************************************************
+*                         ERROR                                        *
+************************************************************************/
 
 static int Error_init(pyErrorChannel *self, PyObject *a, PyObject *k) {
     char *file = get_nmlfile();
@@ -1496,6 +1476,10 @@
     0,                      /*tp_is_gc*/
 };
 
+/***********************************************************************
+*                        POSITION LOGGER                               *
+************************************************************************/
+
 #include <GL/gl.h>
 
 static void rotate_z(double pt[3], double a) {
@@ -1528,8 +1512,6 @@
     pt[1] = tx; pt[2] = tz;
 }
 
-
-
 static void translate(double pt[3], double ox, double oy, double oz) {
     pt[0] += ox;
     pt[1] += oy;
@@ -1559,7 +1541,6 @@
     }
 }
 
-
 static void glvertex9(const double pt[9], const char *geometry) {
     double p[3];
     vertex9(pt, p, geometry);
@@ -1590,6 +1571,7 @@
         glvertex9(p2, geometry);
     }
 }
+
 static void line9b(const double p1[9], const double p2[9], const char *geometry) {
     glvertex9(p1, geometry);
     if(p1[3] != p2[3] || p1[4] != p2[4] || p1[5] != p2[5]) {