From 4aa50787c25aa34416ab9f201ae1a34bba2b8830 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Wed, 2 Aug 2006 16:19:22 +1000
Subject: [PATCH] Minor changes to casting self, implementation of Fix

r1038 | dcl | 2006-08-02 16:19:22 +1000 (Wed, 02 Aug 2006) | 2 lines
---
 site_ansto/counterdriv.c | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/site_ansto/counterdriv.c b/site_ansto/counterdriv.c
index 73af2d41..c730cccc 100644
--- a/site_ansto/counterdriv.c
+++ b/site_ansto/counterdriv.c
@@ -81,7 +81,7 @@ typedef struct {
 static int MonGetStatus(CounterDriver *cntrData, float *fControl) {
   BeamMon *self = NULL;
 
-  self = (BeamMon *) cntrData;
+  self = (BeamMon *) cntrData->pData;
 }   
 
 /** \brief Starts counting in the current mode and with the current preset
@@ -91,7 +91,7 @@ static int MonGetStatus(CounterDriver *cntrData, float *fControl) {
 static int MonStart(CounterDriver *cntrData) {
   BeamMon *self = NULL;
 
-  self = (BeamMon *) cntrData;
+  self = (BeamMon *) cntrData->pData;
 }           
 
 /** \brief Pauses a counting operation
@@ -101,7 +101,7 @@ static int MonStart(CounterDriver *cntrData) {
 static int MonPause(CounterDriver *cntrData) {
   BeamMon *self = NULL;
 
-  self = (BeamMon *) cntrData;
+  self = (BeamMon *) cntrData->pData;
 }           
 
 /* \brief Continues a paused counting operation.
@@ -111,7 +111,7 @@ static int MonPause(CounterDriver *cntrData) {
 static int MonContinue(CounterDriver *cntrData) {
   BeamMon *self = NULL;
 
-  self = (BeamMon *) cntrData;
+  self = (BeamMon *) cntrData->pData;
 }           
 
 /** \brief Cancels a counting operation. This is an emergency stop used when interrupting an operation.
@@ -120,7 +120,7 @@ static int MonContinue(CounterDriver *cntrData) {
 static int MonHalt(CounterDriver *cntrData) {
   BeamMon *self = NULL;
 
-  self = (BeamMon *) cntrData;
+  self = (BeamMon *) cntrData->pData;
 }          
 
 /** \brief Reads the counter and the monitors in the lCounts array.
@@ -130,7 +130,7 @@ static int MonHalt(CounterDriver *cntrData) {
 static int MonReadValues(CounterDriver *cntrData) {
   BeamMon *self = NULL;
 
-  self = (BeamMon *) cntrData;
+  self = (BeamMon *) cntrData->pData;
 }    
 
 /* \brief Called when an error condition is reported by a counter operation.
@@ -143,7 +143,7 @@ static int MonReadValues(CounterDriver *cntrData) {
 static int MonGetError(CounterDriver *cntrData, int *iCode, char *error, int iErrLen) {
   BeamMon *self = NULL;
 
-  self = (BeamMon *) cntrData;
+  self = (BeamMon *) cntrData->pData;
 }  		
 
 /* \brief Tries to fix problem associated with iCode error reported by MonGetError. 
@@ -157,7 +157,15 @@ static int MonGetError(CounterDriver *cntrData, int *iCode, char *error, int iEr
 static int MonTryAndFixIt(CounterDriver *cntrData, int iCode) {
   BeamMon *self = NULL;
 
-  self = (BeamMon *) cntrData;
+  self = (BeamMon *) cntrData->pData;
+  assert(self != NULL);
+
+  switch(iCode){
+    case NOTCONNECTED:
+      initRS232(self->controller);
+      return COREDO;
+  }
+  return COTERM;
 }
 
 /*\brief Sets a parameter to a given value.
@@ -169,7 +177,7 @@ static int MonTryAndFixIt(CounterDriver *cntrData, int iCode) {
 static int MonSet(CounterDriver *cntrData, char *name, int iCter, float FVal) {
   BeamMon *self = NULL;
 
-  self = cntrData->pData;
+  self = (BeamMon *) cntrData->pData;
   if(strcmp(name,"threshold") == 0){
     //TODO set threshold 
     self->dummy_threshold = FVal;
@@ -179,7 +187,7 @@ static int MonSet(CounterDriver *cntrData, char *name, int iCter, float FVal) {
 static int MonGet(CounterDriver *cntrData, char *name, int iCter, float *fVal) {
   BeamMon *self = NULL;
 
-  self = cntrData->pData;
+  self = (BeamMon *) cntrData->pData;
   if(strcmp(name,"threshold") == 0){
     //TODO get threshold 
     *fVal = self->dummy_threshold;
@@ -191,7 +199,7 @@ static int MonGet(CounterDriver *cntrData, char *name, int iCter, float *fVal) {
 static int MonSend(CounterDriver *cntrData, char *pText, char *pReply, int iReplyLen) {
   BeamMon *self = NULL;
 
-  self = (BeamMon *) cntrData;
+  self = (BeamMon *) cntrData->pData;
 }
 
 static void KillMon(pCounterDriver self) {