[Emc-commit] emc2/src/emc/drivers/sensoray ext526mot.c,1.1.2.2,1.1.2.3 sensoray526.c,1.1.2.3,1.1.2.4 sensoray526.h,1.1.2.3,1.1.2.4

[Paul C. <pa...@us...>]

Update of /cvsroot/emc/emc2/src/emc/drivers/sensoray
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23455/emc/drivers/sensoray

Modified Files:
      Tag: bdi-4
	ext526mot.c sensoray526.c sensoray526.h 
Log Message:
A weenie bug fix and some more checks in configure - Now need ncurses installed..

Index: ext526mot.c
===================================================================
RCS file: /cvsroot/emc/emc2/src/emc/drivers/sensoray/Attic/ext526mot.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** ext526mot.c	22 Feb 2005 19:02:30 -0000	1.1.2.2
--- ext526mot.c	23 Feb 2005 11:29:02 -0000	1.1.2.3
***************
*** 174,178 ****
  }
  
! extern unsigned int IO_BASE_ADDRESS;
  
  int extBaseFind()
--- 174,178 ----
  }
  
! extern int IO_BASE_ADDRESS;
  
  int extBaseFind()

Index: sensoray526.c
===================================================================
RCS file: /cvsroot/emc/emc2/src/emc/drivers/sensoray/Attic/sensoray526.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** sensoray526.c	23 Feb 2005 04:21:04 -0000	1.1.2.3
--- sensoray526.c	23 Feb 2005 11:29:02 -0000	1.1.2.4
***************
*** 17,23 ****
  
  #ifdef realtime
  #include <asm/io.h>
- #else
  
  #include <stdio.h>
  #include <string.h>
--- 17,27 ----
  
  #ifdef realtime
+ #ifdef __KERNEL__
+ #include <linux/kernel.h>
+ #endif
+ 
  #include <asm/io.h>
  
+ #else
  #include <stdio.h>
  #include <string.h>
***************
*** 32,35 ****
--- 36,40 ----
  #endif
  
+ #include "emcmot.h"
  #include "diagnostics.h"
  #include "sensoray526.h"
***************
*** 44,49 ****
  static char __attribute__((unused)) ident[] = "$Id$";
  
! unsigned long int IO_BASE_ADDRESS = DEFAULT_IO_BASE_ADDRESS;
! 
  
  char *s526Model(void)
--- 49,53 ----
  static char __attribute__((unused)) ident[] = "$Id$";
  
! int IO_BASE_ADDRESS = DEFAULT_IO_BASE_ADDRESS;
  
  char *s526Model(void)
***************
*** 54,66 ****
  int s526MotInit(const char * stuff)
  {
-     outw(0x8007, C0C);
-     outw(0x8007, C1C);
-     outw(0x8007, C2C);
-     outw(0x8007, C3C);
      outw(0x0480, C0M);  // Set the counter to x4 quadrature counting.
      outw(0x0480, C1M);
      outw(0x0480, C2M);
      outw(0x0480, C3M);
      outw(0x0001, MSC);
      return 0;
  }
--- 58,71 ----
  int s526MotInit(const char * stuff)
  {
      outw(0x0480, C0M);  // Set the counter to x4 quadrature counting.
      outw(0x0480, C1M);
      outw(0x0480, C2M);
      outw(0x0480, C3M);
+     outw(0x8007, C0C);
+     outw(0x8007, C1C);
+     outw(0x8007, C2C);
+     outw(0x8007, C3C);
      outw(0x0001, MSC);
+     diagnostics("Completed MotInit %X\n", IO_BASE_ADDRESS);
      return 0;
  }
***************
*** 72,75 ****
--- 77,81 ----
      outw(0x0000, C3M);
      outw(0x0000, MSC);
+     diagnostics("Completed MotQuit\n");
      return 0;
  }
***************
*** 104,107 ****
--- 110,115 ----
  }
  
+ int foo=0;
+ 
  int s526DioMaxOutputs(void)
  {
***************
*** 182,189 ****
  {
      int t;
!     if ((max > S526_MAX_AXIS) || (max < 0))
  	return -1;
      for (t = 0; t < max; t++){
! 	s526EncoderRead(0, counts);
      }
      return 0;
--- 190,198 ----
  {
      int t;
! /* FIXME - emcmot needs to read MAX_AXIS from the driver and use that number when calling Read/WriteAll functions */
!     if ((max > 8) || (max < 0))
  	return -1;
      for (t = 0; t < max; t++){
! 	s526EncoderRead(t, &counts[t]);
      }
      return 0;

Index: sensoray526.h
===================================================================
RCS file: /cvsroot/emc/emc2/src/emc/drivers/sensoray/Attic/sensoray526.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** sensoray526.h	23 Feb 2005 04:21:04 -0000	1.1.2.3
--- sensoray526.h	23 Feb 2005 11:29:02 -0000	1.1.2.4
***************
*** 19,23 ****
  
  // Use the default base address that Sensoray ship their board with.
! #define DEFAULT_IO_BASE_ADDRESS 0x02c0
  
  #ifdef __cplusplus
--- 19,23 ----
  
  // Use the default base address that Sensoray ship their board with.
! #define DEFAULT_IO_BASE_ADDRESS 0x2c0
  
  #ifdef __cplusplus
***************
*** 42,46 ****
  #define C0M IO_BASE_ADDRESS + 0x16
  #define C0C IO_BASE_ADDRESS + 0x18
! #define C1L IO_BASE_ADDRESS + 0x11
  #define C1H IO_BASE_ADDRESS + 0x1c
  #define C1M IO_BASE_ADDRESS + 0x1e
--- 42,46 ----
  #define C0M IO_BASE_ADDRESS + 0x16
  #define C0C IO_BASE_ADDRESS + 0x18
! #define C1L IO_BASE_ADDRESS + 0x1a
  #define C1H IO_BASE_ADDRESS + 0x1c
  #define C1M IO_BASE_ADDRESS + 0x1e
***************
*** 57,60 ****
--- 57,62 ----
  #define ECC IO_BASE_ADDRESS + 0x34
  
+ extern int IO_BASE_ADDRESS;
+ 
  extern char *s526Model(void);